Replaced _env with TAO_IN_ENV

41 files changed, 815 insertions, 815 deletions

diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h
index 3b55f2198f1..6786f85a127 100644
--- a/TAO/tao/Any.h
+++ b/TAO/tao/Any.h
@@ -285,13 +285,13 @@ public:
   void replace (CORBA::TypeCode_ptr type,
                 const void *value,
                 CORBA::Boolean any_owns_data,
-                CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Replace the current typecode and data with the specified one -
   // unsafe.
 
   void replace (CORBA::TypeCode_ptr type,
                 const void *value,
-                CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Replace the current typecode and data with the specified one -
   // unsafe. This uses a default value for the "any_owns_data" parameter
 
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h
index 8757388cf40..999f8a27619 100644
--- a/TAO/tao/CDR.h
+++ b/TAO/tao/CDR.h
@@ -242,7 +242,7 @@ public:
 
   CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                            TAO_InputCDR *src,
-                                           CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Append the contents of the CDR stream based on information
   // described by <tc>; returning any errors in <env>.
 
@@ -278,7 +278,7 @@ public:
   CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
                                            const void *data,
                                            const void *,
-                                           CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Marshalls the contents of <data> as described by the TypeCode in
   // <tc>. Any errors are reported though the <env> parameter.
 
@@ -491,7 +491,7 @@ public:
   CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                            const void *data,
                                            const void *,
-                                           CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Demarshall the contents of the CDR stream into <data> as
   // described by <tc>; returning any errors in <env>.
 
@@ -521,7 +521,7 @@ public:
   // Return 0 on failure and 1 on success.
 
   CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                         CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                         CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Skip the contents of the CDR stream based on information
   // described by <tc>; returning any errors in <env>.
 
diff --git a/TAO/tao/Connect.h b/TAO/tao/Connect.h
index 666101b3192..3f4b977e30e 100644
--- a/TAO/tao/Connect.h
+++ b/TAO/tao/Connect.h
@@ -178,7 +178,7 @@ public:
                               TAO_OutputCDR &response,
                               CORBA::Boolean &response_required,
                               CORBA::ULong &request_id,
-                              CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                              CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Handle processing of the request residing in <msg>, setting
   // <response_required> to zero if the request is for a oneway or
   // non-zero if for a two-way and <response> to any necessary
@@ -190,7 +190,7 @@ protected:
                              TAO_OutputCDR &response,
                              CORBA::Boolean &response_required,
                              CORBA::ULong &request_id,
-                             CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                             CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Handle processing of the location request residing in <msg>,
   // setting <response_required> to one if no errors are encountered.
   // The LocateRequestReply is placed into <response>.  In case of
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index c076005f434..5c2e381f223 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -108,11 +108,11 @@ class  CORBA_Current : public virtual ACE_CORBA_1 (Object)
  public:
   // the static operations
   static CORBA_Current_ptr _duplicate (CORBA_Current_ptr obj);
-  static CORBA_Current_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  static CORBA_Current_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   static CORBA_Current_ptr _nil (void);
 
   virtual CORBA::Boolean _is_a (const CORBA::Char *type_id,
-                                CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                 );
   virtual const char* _interface_repository_id (void) const;
  protected:
diff --git a/TAO/tao/CurrentS.cpp b/TAO/tao/CurrentS.cpp
index 5e4302083ba..c82a2dfbe81 100644
--- a/TAO/tao/CurrentS.cpp
+++ b/TAO/tao/CurrentS.cpp
@@ -136,10 +136,10 @@ CORBA::Boolean POA_CORBA::_tao_collocated_Current::_is_a (
 
 
 CORBA::Current*
-POA_CORBA::Current::_this (CORBA_Environment &_env)
+POA_CORBA::Current::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_CORBA::_tao_collocated_Current (this, stub);
 }
diff --git a/TAO/tao/DynAnyS.cpp b/TAO/tao/DynAnyS.cpp
index 82b8fd3347b..5fe167e8ed1 100644
--- a/TAO/tao/DynAnyS.cpp
+++ b/TAO/tao/DynAnyS.cpp
@@ -567,11 +567,11 @@ POA_CORBA::_tao_collocated_DynAny::rewind (
 
 
 CORBA_DynAny*
-POA_CORBA::DynAny::_this (CORBA_Environment &_env)
+POA_CORBA::DynAny::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  STUB_Object *stub = this->_create_stub (_env);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
 
-  if (_env.exception () != 0)
+  if (TAO_IN_ENV.exception () != 0)
     return 0;
 
   return new POA_CORBA::_tao_collocated_DynAny (this, stub);
@@ -723,11 +723,11 @@ POA_CORBA::_tao_collocated_DynEnum::value_as_ulong (
 
 
 CORBA_DynEnum*
-POA_CORBA::DynEnum::_this (CORBA_Environment &_env)
+POA_CORBA::DynEnum::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  STUB_Object *stub = this->_create_stub (_env);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
 
-  if (_env.exception () != 0)
+  if (TAO_IN_ENV.exception () != 0)
     return 0;
 
   return new POA_CORBA::_tao_collocated_DynEnum (this, 
@@ -874,11 +874,11 @@ POA_CORBA::_tao_collocated_DynStruct::set_members (
 
 
 CORBA_DynStruct*
-POA_CORBA::DynStruct::_this (CORBA_Environment &_env)
+POA_CORBA::DynStruct::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  STUB_Object *stub = this->_create_stub (_env);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
 
-  if (_env.exception () != 0)
+  if (TAO_IN_ENV.exception () != 0)
     return 0;
 
   return new POA_CORBA::_tao_collocated_DynStruct (this, 
@@ -1063,11 +1063,11 @@ POA_CORBA::_tao_collocated_DynUnion::member_kind (
 
 
 CORBA_DynUnion*
-POA_CORBA::DynUnion::_this (CORBA_Environment &_env)
+POA_CORBA::DynUnion::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  STUB_Object *stub = this->_create_stub (_env);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
 
-  if (_env.exception () != 0)
+  if (TAO_IN_ENV.exception () != 0)
     return 0;
 
   return new POA_CORBA::_tao_collocated_DynUnion (this, 
@@ -1214,11 +1214,11 @@ POA_CORBA::_tao_collocated_DynSequence::set_elements (
 
 
 CORBA_DynSequence*
-POA_CORBA::DynSequence::_this (CORBA_Environment &_env)
+POA_CORBA::DynSequence::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  STUB_Object *stub = this->_create_stub (_env);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
 
-  if (_env.exception () != 0)
+  if (TAO_IN_ENV.exception () != 0)
     return 0;
 
   return new POA_CORBA::_tao_collocated_DynSequence (this, 
@@ -1342,11 +1342,11 @@ POA_CORBA::_tao_collocated_DynArray::set_elements (
 
 
 CORBA_DynArray*
-POA_CORBA::DynArray::_this (CORBA_Environment &_env)
+POA_CORBA::DynArray::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  STUB_Object *stub = this->_create_stub (_env);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
 
-  if (_env.exception () != 0)
+  if (TAO_IN_ENV.exception () != 0)
     return 0;
 
   return new POA_CORBA::_tao_collocated_DynArray (this, 
diff --git a/TAO/tao/DynAny_i.cpp b/TAO/tao/DynAny_i.cpp
index 4659877985f..7f430e335c2 100644
--- a/TAO/tao/DynAny_i.cpp
+++ b/TAO/tao/DynAny_i.cpp
@@ -514,7 +514,7 @@ TAO_DynAny_i::get_wchar (CORBA::Environment &env)
 }
 
 CORBA::Any_ptr
-TAO_DynAny_i::get_any (CORBA::Environment& _env)
+TAO_DynAny_i::get_any (CORBA::Environment& TAO_IN_ENV)
 {
   CORBA_Any_ptr val;
 
@@ -527,7 +527,7 @@ TAO_DynAny_i::get_any (CORBA::Environment& _env)
     {
       delete val;
       val = 0;
-      _env.exception (new CORBA_DynAny::TypeMismatch);
+      TAO_IN_ENV.exception (new CORBA_DynAny::TypeMismatch);
     }
 
   return val;
@@ -538,9 +538,9 @@ TAO_DynAny_i::get_any (CORBA::Environment& _env)
 
 CORBA_DynAny_ptr
 TAO_DynAny_i::create_dyn_any (const CORBA_Any& any,
-                              CORBA::Environment& _env)
+                              CORBA::Environment& TAO_IN_ENV)
 {
-  switch (TAO_DynAny_i::unalias (any.type (), _env))
+  switch (TAO_DynAny_i::unalias (any.type (), TAO_IN_ENV))
     {
       case CORBA::tk_null:
       case CORBA::tk_void:
@@ -566,7 +566,7 @@ TAO_DynAny_i::create_dyn_any (const CORBA_Any& any,
                                 TAO_DynAny_i (any),
                                 CORBA::NO_MEMORY (),
                                 CORBA_DynAny::_nil ());
-          return dp->_this (_env);
+          return dp->_this (TAO_IN_ENV);
         }
       case CORBA::tk_struct:
       case CORBA::tk_except:
@@ -576,7 +576,7 @@ TAO_DynAny_i::create_dyn_any (const CORBA_Any& any,
                                 TAO_DynStruct_i (any),
                                 CORBA::NO_MEMORY (),
                                 CORBA_DynStruct::_nil ());
-          return dp->_this (_env);
+          return dp->_this (TAO_IN_ENV);
         }
       case CORBA::tk_sequence:
         {
@@ -585,7 +585,7 @@ TAO_DynAny_i::create_dyn_any (const CORBA_Any& any,
                                 TAO_DynSequence_i (any),
                                 CORBA::NO_MEMORY (),
                                 CORBA_DynSequence::_nil ());
-          return dp->_this (_env);
+          return dp->_this (TAO_IN_ENV);
         }
       case CORBA::tk_union:
         {
@@ -594,7 +594,7 @@ TAO_DynAny_i::create_dyn_any (const CORBA_Any& any,
                                 TAO_DynUnion_i (any),
                                 CORBA::NO_MEMORY (),
                                 CORBA_DynUnion::_nil ());
-          return dp->_this (_env);
+          return dp->_this (TAO_IN_ENV);
         }
       case CORBA::tk_enum:
         {
@@ -603,7 +603,7 @@ TAO_DynAny_i::create_dyn_any (const CORBA_Any& any,
                                 TAO_DynEnum_i (any),
                                 CORBA::NO_MEMORY (),
                                 CORBA_DynEnum::_nil ());
-          return dp->_this (_env);
+          return dp->_this (TAO_IN_ENV);
         }
       case CORBA::tk_array:
         {
@@ -612,7 +612,7 @@ TAO_DynAny_i::create_dyn_any (const CORBA_Any& any,
                                 TAO_DynArray_i (any),
                                 CORBA::NO_MEMORY (),
                                 CORBA_DynArray::_nil ());
-          return dp->_this (_env);
+          return dp->_this (TAO_IN_ENV);
         }
       default:
         break;
@@ -623,74 +623,74 @@ TAO_DynAny_i::create_dyn_any (const CORBA_Any& any,
 
 CORBA_DynAny_ptr
 TAO_DynAny_i::create_basic_dyn_any (CORBA_TypeCode_ptr tc,
-                                    CORBA::Environment& _env)
+                                    CORBA::Environment& TAO_IN_ENV)
 {
   TAO_DynAny_i* dp;
   ACE_NEW_THROW_RETURN (dp,
                         TAO_DynAny_i (tc),
                         CORBA::NO_MEMORY (),
                         CORBA_DynAny::_nil ());
-  return dp->_this (_env);
+  return dp->_this (TAO_IN_ENV);
 }
 
 CORBA_DynStruct_ptr
 TAO_DynAny_i::create_dyn_struct (CORBA_TypeCode_ptr tc,
-                                 CORBA::Environment& _env)
+                                 CORBA::Environment& TAO_IN_ENV)
 {
   TAO_DynStruct_i* dp;
   ACE_NEW_THROW_RETURN (dp,
                         TAO_DynStruct_i (tc),
                         CORBA::NO_MEMORY (),
                         CORBA_DynStruct::_nil ());
-  return dp->_this (_env);
+  return dp->_this (TAO_IN_ENV);
 }
 
 CORBA_DynSequence_ptr
 TAO_DynAny_i::create_dyn_sequence (CORBA_TypeCode_ptr tc,
-                                   CORBA::Environment& _env)
+                                   CORBA::Environment& TAO_IN_ENV)
 {
   TAO_DynSequence_i* dp;
   ACE_NEW_THROW_RETURN (dp,
                         TAO_DynSequence_i (tc),
                         CORBA::NO_MEMORY (),
                         CORBA_DynSequence::_nil ());
-  return dp->_this (_env);
+  return dp->_this (TAO_IN_ENV);
 }
 
 CORBA_DynArray_ptr
 TAO_DynAny_i::create_dyn_array (CORBA_TypeCode_ptr tc,
-                                CORBA::Environment& _env)
+                                CORBA::Environment& TAO_IN_ENV)
 {
   TAO_DynArray_i* dp;
   ACE_NEW_THROW_RETURN (dp,
                         TAO_DynArray_i (tc),
                         CORBA::NO_MEMORY (),
                         CORBA_DynArray::_nil ());
-  return dp->_this (_env);
+  return dp->_this (TAO_IN_ENV);
 }
 
 CORBA_DynUnion_ptr
 TAO_DynAny_i::create_dyn_union (CORBA_TypeCode_ptr tc,
-                                CORBA::Environment& _env)
+                                CORBA::Environment& TAO_IN_ENV)
 {
   TAO_DynUnion_i* dp;
   ACE_NEW_THROW_RETURN (dp,
                         TAO_DynUnion_i (tc),
                         CORBA::NO_MEMORY (),
                         CORBA_DynUnion::_nil ());
-  return dp->_this (_env);
+  return dp->_this (TAO_IN_ENV);
 }
 
 CORBA_DynEnum_ptr
 TAO_DynAny_i::create_dyn_enum (CORBA_TypeCode_ptr tc,
-                               CORBA::Environment& _env)
+                               CORBA::Environment& TAO_IN_ENV)
 {
   TAO_DynEnum_i* dp;
   ACE_NEW_THROW_RETURN (dp,
                         TAO_DynEnum_i (tc),
                         CORBA::NO_MEMORY (),
                         CORBA_DynEnum::_nil ());
-  return dp->_this (_env);
+  return dp->_this (TAO_IN_ENV);
 }
 
 CORBA_DynAny_ptr
diff --git a/TAO/tao/DynArray_i.cpp b/TAO/tao/DynArray_i.cpp
index fb794c4724d..2e05d1cf930 100644
--- a/TAO/tao/DynArray_i.cpp
+++ b/TAO/tao/DynArray_i.cpp
@@ -100,7 +100,7 @@ TAO_DynArray_i::~TAO_DynArray_i (void)
 // Functions specific to DynArray
 
 AnySeq_ptr
-TAO_DynArray_i::get_elements (CORBA::Environment& _env)
+TAO_DynArray_i::get_elements (CORBA::Environment& TAO_IN_ENV)
 {
   CORBA::ULong length = this->da_members_.size ();
 
@@ -121,7 +121,7 @@ TAO_DynArray_i::get_elements (CORBA::Environment& _env)
   // Initialize each Any.
   for (CORBA::ULong i = 0; i < length; i++)
     {
-      CORBA::Any_ptr temp = this->da_members_[i]->to_any (_env);
+      CORBA::Any_ptr temp = this->da_members_[i]->to_any (TAO_IN_ENV);
       (*elements)[i] = *temp;
       delete temp;
     }
@@ -245,23 +245,23 @@ TAO_DynArray_i::from_any (const CORBA_Any& any,
 }
 
 CORBA::Any_ptr
-TAO_DynArray_i::to_any (CORBA::Environment& _env)
+TAO_DynArray_i::to_any (CORBA::Environment& TAO_IN_ENV)
 {
   TAO_OutputCDR out_cdr;
 
-  CORBA_TypeCode_ptr field_tc = this->get_element_type (_env);
+  CORBA_TypeCode_ptr field_tc = this->get_element_type (TAO_IN_ENV);
 
   for (CORBA::ULong i = 0; i < this->da_members_.size (); i++)
     {
       // Each component must have been initialized.
       if (!this->da_members_[i].in ())
         {
-          _env.exception (new CORBA_DynAny::Invalid);
+          TAO_IN_ENV.exception (new CORBA_DynAny::Invalid);
           return 0;
         }
 
       // Recursive step
-      CORBA_Any_ptr field_any = this->da_members_[i]->to_any (_env);
+      CORBA_Any_ptr field_any = this->da_members_[i]->to_any (TAO_IN_ENV);
 
       ACE_Message_Block* field_mb = field_any->_tao_get_cdr ();
 
@@ -269,7 +269,7 @@ TAO_DynArray_i::to_any (CORBA::Environment& _env)
 
       out_cdr.append (field_tc, 
                       &field_cdr, 
-                      _env);
+                      TAO_IN_ENV);
 
       delete field_any;
     }
@@ -278,7 +278,7 @@ TAO_DynArray_i::to_any (CORBA::Environment& _env)
 
   CORBA_Any* retval;
   ACE_NEW_THROW_RETURN (retval,
-                        CORBA_Any (this->type (_env),
+                        CORBA_Any (this->type (TAO_IN_ENV),
                                    in_cdr.start ()),
                         CORBA::NO_MEMORY (),
                         0);
diff --git a/TAO/tao/DynEnum_i.cpp b/TAO/tao/DynEnum_i.cpp
index 8404745e38f..9de79fd0919 100644
--- a/TAO/tao/DynEnum_i.cpp
+++ b/TAO/tao/DynEnum_i.cpp
@@ -154,7 +154,7 @@ TAO_DynEnum_i::from_any (const CORBA_Any& any,
 }
 
 CORBA::Any_ptr
-TAO_DynEnum_i::to_any (CORBA::Environment& _env)
+TAO_DynEnum_i::to_any (CORBA::Environment& TAO_IN_ENV)
 {
   TAO_OutputCDR out_cdr;
 
diff --git a/TAO/tao/DynSequence_i.cpp b/TAO/tao/DynSequence_i.cpp
index 4dfd7220243..67a84b4bc80 100644
--- a/TAO/tao/DynSequence_i.cpp
+++ b/TAO/tao/DynSequence_i.cpp
@@ -109,7 +109,7 @@ TAO_DynSequence_i::length (CORBA::ULong length,
 }
 
 AnySeq_ptr
-TAO_DynSequence_i::get_elements (CORBA::Environment& _env)
+TAO_DynSequence_i::get_elements (CORBA::Environment& TAO_IN_ENV)
 {
   CORBA::ULong length = this->da_members_.size ();
 
@@ -128,7 +128,7 @@ TAO_DynSequence_i::get_elements (CORBA::Environment& _env)
   // Initialize each Any.
   for (CORBA::ULong i = 0; i < length; i++)
     {
-      CORBA::Any_ptr temp = this->da_members_[i]->to_any (_env);
+      CORBA::Any_ptr temp = this->da_members_[i]->to_any (TAO_IN_ENV);
       (*elements)[i] = *temp;
       delete temp;
     }
@@ -262,25 +262,25 @@ TAO_DynSequence_i::from_any (const CORBA_Any& any,
 }
 
 CORBA::Any_ptr
-TAO_DynSequence_i::to_any (CORBA::Environment& _env)
+TAO_DynSequence_i::to_any (CORBA::Environment& TAO_IN_ENV)
 {
   TAO_OutputCDR out_cdr;
 
   out_cdr.write_ulong (this->da_members_.size ());
 
-  CORBA_TypeCode_ptr field_tc = this->get_element_type (_env);
+  CORBA_TypeCode_ptr field_tc = this->get_element_type (TAO_IN_ENV);
 
   for (CORBA::ULong i = 0; i < this->da_members_.size (); i++)
     {
       // Each component must have been initialized.
       if (!this->da_members_[i].in ())
         {
-          _env.exception (new CORBA_DynAny::Invalid);
+          TAO_IN_ENV.exception (new CORBA_DynAny::Invalid);
           return 0;
         }
 
       // Recursive step
-      CORBA_Any_ptr field_any = this->da_members_[i]->to_any (_env);
+      CORBA_Any_ptr field_any = this->da_members_[i]->to_any (TAO_IN_ENV);
 
       ACE_Message_Block* field_mb = field_any->_tao_get_cdr ();
 
@@ -288,7 +288,7 @@ TAO_DynSequence_i::to_any (CORBA::Environment& _env)
 
       out_cdr.append (field_tc,
                       &field_cdr,
-                      _env);
+                      TAO_IN_ENV);
 
       delete field_any;
     }
@@ -297,7 +297,7 @@ TAO_DynSequence_i::to_any (CORBA::Environment& _env)
 
   CORBA_Any* retval;
   ACE_NEW_THROW_RETURN (retval,
-                        CORBA_Any (this->type (_env),
+                        CORBA_Any (this->type (TAO_IN_ENV),
                                    in_cdr.start ()),
                         CORBA::NO_MEMORY (),
                         0);
diff --git a/TAO/tao/DynStruct_i.cpp b/TAO/tao/DynStruct_i.cpp
index 6448d48e47a..558ef90f122 100644
--- a/TAO/tao/DynStruct_i.cpp
+++ b/TAO/tao/DynStruct_i.cpp
@@ -112,7 +112,7 @@ TAO_DynStruct_i::current_member_kind (CORBA::Environment& env)
 }
 
 NameValuePairSeq*
-TAO_DynStruct_i::get_members (CORBA::Environment& _env)
+TAO_DynStruct_i::get_members (CORBA::Environment& TAO_IN_ENV)
 {
   CORBA::ULong length = this->da_members_.size ();
 
@@ -131,7 +131,7 @@ TAO_DynStruct_i::get_members (CORBA::Environment& _env)
       (*members)[i].id =
         CORBA::string_dup (this->type_.in ()->member_name (i));
 
-      CORBA::Any_ptr temp = this->da_members_[i]->to_any (_env);
+      CORBA::Any_ptr temp = this->da_members_[i]->to_any (TAO_IN_ENV);
       (*members)[i].value = *temp;
       delete temp;
     }
@@ -247,7 +247,7 @@ TAO_DynStruct_i::from_any (const CORBA_Any& any,
 }
 
 CORBA::Any_ptr
-TAO_DynStruct_i::to_any (CORBA::Environment& _env)
+TAO_DynStruct_i::to_any (CORBA::Environment& TAO_IN_ENV)
 {
   TAO_OutputCDR out_cdr;
 
@@ -256,14 +256,14 @@ TAO_DynStruct_i::to_any (CORBA::Environment& _env)
       // Each component must have been initialied.
       if (!this->da_members_[i].in ())
         {
-          _env.exception (new CORBA_DynAny::Invalid);
+          TAO_IN_ENV.exception (new CORBA_DynAny::Invalid);
           return 0;
         }
 
-      CORBA_TypeCode_ptr field_tc = this->da_members_[i]->type (_env);
+      CORBA_TypeCode_ptr field_tc = this->da_members_[i]->type (TAO_IN_ENV);
 
       // Recursive step
-      CORBA_Any_ptr field_any = this->da_members_[i]->to_any (_env);
+      CORBA_Any_ptr field_any = this->da_members_[i]->to_any (TAO_IN_ENV);
 
       ACE_Message_Block* field_mb = field_any->_tao_get_cdr ();
 
@@ -271,7 +271,7 @@ TAO_DynStruct_i::to_any (CORBA::Environment& _env)
 
       out_cdr.append (field_tc,
                       &field_cdr,
-                      _env);
+                      TAO_IN_ENV);
 
       delete field_any;
     }
@@ -280,7 +280,7 @@ TAO_DynStruct_i::to_any (CORBA::Environment& _env)
 
   CORBA_Any* retval;
   ACE_NEW_THROW_RETURN (retval,
-                        CORBA_Any (this->type (_env),
+                        CORBA_Any (this->type (TAO_IN_ENV),
                                    in_cdr.start ()),
                         CORBA::NO_MEMORY (),
                         0);
diff --git a/TAO/tao/DynUnion_i.cpp b/TAO/tao/DynUnion_i.cpp
index bf16c24f11f..529105ae2ee 100644
--- a/TAO/tao/DynUnion_i.cpp
+++ b/TAO/tao/DynUnion_i.cpp
@@ -207,12 +207,12 @@ TAO_DynUnion_i::from_any (const CORBA_Any& any,
 }
 
 CORBA::Any_ptr
-TAO_DynUnion_i::to_any (CORBA::Environment& _env)
+TAO_DynUnion_i::to_any (CORBA::Environment& TAO_IN_ENV)
 {
   // Both Dynanys must have been initialied.
   if (this->member_.in () == 0 || this->discriminator_.in () == 0)
     {
-      _env.exception (new CORBA_DynAny::Invalid);
+      TAO_IN_ENV.exception (new CORBA_DynAny::Invalid);
       return 0;
     }
 
@@ -220,9 +220,9 @@ TAO_DynUnion_i::to_any (CORBA::Environment& _env)
 
   // Add the discriminator to the CDR stream.
 
-  CORBA_TypeCode_ptr disc_tc = this->discriminator_->type (_env);
+  CORBA_TypeCode_ptr disc_tc = this->discriminator_->type (TAO_IN_ENV);
 
-  CORBA_Any_ptr disc_any = this->discriminator_->to_any (_env);
+  CORBA_Any_ptr disc_any = this->discriminator_->to_any (TAO_IN_ENV);
 
   ACE_Message_Block* disc_mb = disc_any->_tao_get_cdr ();
 
@@ -230,15 +230,15 @@ TAO_DynUnion_i::to_any (CORBA::Environment& _env)
 
   out_cdr.append (disc_tc,
                   &disc_cdr,
-                  _env);
+                  TAO_IN_ENV);
 
   delete disc_any;
 
   // Add the member to the CDR stream.
 
-  CORBA_TypeCode_ptr member_tc = this->member_->type (_env);
+  CORBA_TypeCode_ptr member_tc = this->member_->type (TAO_IN_ENV);
 
-  CORBA_Any_ptr member_any = this->member_->to_any (_env);
+  CORBA_Any_ptr member_any = this->member_->to_any (TAO_IN_ENV);
 
   ACE_Message_Block* member_mb = member_any->_tao_get_cdr ();
 
@@ -246,7 +246,7 @@ TAO_DynUnion_i::to_any (CORBA::Environment& _env)
 
   out_cdr.append (member_tc,
                   &member_cdr,
-                  _env);
+                  TAO_IN_ENV);
 
   delete member_any;
 
@@ -255,7 +255,7 @@ TAO_DynUnion_i::to_any (CORBA::Environment& _env)
 
   CORBA_Any* retval;
   ACE_NEW_THROW_RETURN (retval,
-                        CORBA_Any (this->type (_env),
+                        CORBA_Any (this->type (TAO_IN_ENV),
                                    in_cdr.start ()),
                         CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
                         0);
@@ -1260,7 +1260,7 @@ TAO_DynUnion_i::Enum_extractor::check_match (const CORBA_Any& inside_any,
 // Functor factory.
 DU_Extractor_base*
 TAO_DynUnion_i::get_extractor (CORBA::TCKind kind,
-                               CORBA::Environment& _env)
+                               CORBA::Environment& TAO_IN_ENV)
 {
   DU_Extractor_base* retval;
 
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index 7f81030446b..d6dad092283 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -262,17 +262,17 @@ public:
                                       const char *name,
                                       char *buffer,
                                       size_t buflen,
-                                      CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                      CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Make the TypeCode for a standard exception.  When used
   // correctly, initializing system exceptions is only an exercise
   // in CPU time; it allocates no new memory.
 
   static void make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp,
-                                          CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Make the TypeCode for the CORBA::UnknownUserException standard
   // exception.
 
-  static void init (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  static void init (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Runtime initialization of all standard exception typecodes.
   // Called from <CORBA::ORB_init>.
 
@@ -280,7 +280,7 @@ public:
   // Runtime finalization of all standard exception typecodes.
 
   static CORBA_Exception *create_system_exception (const char* id,
-                                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Create a CORBA::SystemException given the interface repository
   // ID.
 
@@ -322,10 +322,10 @@ public:
   void add_consume (CORBA::TypeCode_ptr tc);
   // add and consume a TypeCode to the list
 
-  CORBA::TypeCode_ptr item (CORBA::ULong index, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  CORBA::TypeCode_ptr item (CORBA::ULong index, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // return the typecode at index i. Raises the "Bounds" exception
 
-  void remove (CORBA::ULong index, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  void remove (CORBA::ULong index, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // remove the typecode at index i. Raises the "Bounds" exception
 
 private:
diff --git a/TAO/tao/Forwarding_Servant.h b/TAO/tao/Forwarding_Servant.h
index 611f7f9dcb5..0a2df98e6f3 100644
--- a/TAO/tao/Forwarding_Servant.h
+++ b/TAO/tao/Forwarding_Servant.h
@@ -32,14 +32,14 @@ public:
   // Constructor
 
   virtual void invoke (CORBA::ServerRequest_ptr request,
-                       CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                       CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // 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,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // 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.
diff --git a/TAO/tao/GIOP.h b/TAO/tao/GIOP.h
index 779b6547893..ca91fcc9eb0 100644
--- a/TAO/tao/GIOP.h
+++ b/TAO/tao/GIOP.h
@@ -251,7 +251,7 @@ public:
   // Constructor
 
   CORBA::Boolean init (TAO_InputCDR &msg,
-                       CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                       CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Initialize the header from the values found in <msg>.
 
   CORBA::ULong request_id;
diff --git a/TAO/tao/IIOP_Interpreter.h b/TAO/tao/IIOP_Interpreter.h
index dfefb3bf4ca..38a8faf9b3f 100644
--- a/TAO/tao/IIOP_Interpreter.h
+++ b/TAO/tao/IIOP_Interpreter.h
@@ -23,7 +23,7 @@
 // Useful typedefs.
 typedef size_t TAO_attribute_calculator (TAO_InputCDR *stream,
                                          size_t &alignment,
-                                         CORBA_Environment &_env);
+                                         CORBA_Environment &TAO_IN_ENV);
 typedef CORBA::Boolean TAO_param_skip_rtn (TAO_InputCDR *);
 
 class TAO_Export TAO_IIOP_Interpreter
@@ -104,12 +104,12 @@ public:
   static size_t calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc,
                                                 TAO_InputCDR *original_stream,
                                                 size_t &alignment,
-                                                CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   static size_t calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
                                                   TAO_InputCDR *stream,
                                                   CORBA::TCKind kind,
                                                   size_t &alignment,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // For a given typecode, figure out its size and alignment needs.
   // This version is used mostly when traversing other typecodes, and
   // follows these rules:
@@ -142,7 +142,7 @@ public:
   static size_t calc_struct_and_except_attributes (TAO_InputCDR *stream,
                                                    size_t &alignment,
                                                    CORBA::Boolean is_exception,
-                                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Given typecode bytes for a structure (or exception), figure out
   // its alignment and size; return size, alignment is an 'out'
   // parameter.  Only "CORBA::tk_struct" (or "CORBA::tk_except") has
@@ -160,14 +160,14 @@ public:
 
   static size_t calc_struct_attributes (TAO_InputCDR *stream,
                                         size_t &alignment,
-                                        CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Calculate size and alignment for a structure.
 
 
 #if defined (TAO_NO_COPY_OCTET_SEQUENCES)
   static size_t calc_seq_attributes (TAO_InputCDR *stream,
                                      size_t &alignment,
-                                     CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                     CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Calculate size and alignment for a sequence, most of them have
   // the same requirements, but for the sequences of Octets that are
   // optimized to minimize copying.
@@ -175,13 +175,13 @@ public:
 
   static size_t calc_exception_attributes (TAO_InputCDR *stream,
                                            size_t &alignment,
-                                           CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Calculate size and alignment for an exception.
 
 
   static size_t calc_union_attributes (TAO_InputCDR *stream,
                                        size_t &alignment,
-                                       CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                       CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Calculate size and alignment for a CORBA discriminated union.
   //
   // Note that this is really a two-element structure.  The first
@@ -193,12 +193,12 @@ public:
 
   static size_t calc_alias_attributes (TAO_InputCDR *stream,
                                        size_t &alignment,
-                                       CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                       CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Calculate size and alignment for a typedeffed type.
 
   static size_t calc_array_attributes (TAO_InputCDR *stream,
                                        size_t &alignment,
-                                       CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                       CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Calculate size and alignment of an array.  (All such arrays are
   // described as single dimensional, even though the IDL definition
   // may specify a multidimensional array ... such arrays are treated
@@ -207,14 +207,14 @@ public:
   static CORBA::Boolean match_value (CORBA::TCKind kind,
                                      TAO_InputCDR *tc_stream,
                                      const void *value,
-                                     CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                     CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Cast the discriminant values to the right type and compare them.
 
   static size_t
   calc_key_union_attributes (TAO_InputCDR *stream,
                              size_t &overall_alignment,
                              size_t &discrim_size_with_pad,
-                             CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                             CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
 
   // = Utility routine that checks if a union member is a variable sized type
diff --git a/TAO/tao/IIOP_ORB.h b/TAO/tao/IIOP_ORB.h
index 8e3cc155220..669159d0cec 100644
--- a/TAO/tao/IIOP_ORB.h
+++ b/TAO/tao/IIOP_ORB.h
@@ -37,11 +37,11 @@ public:
   // destructor
 
   CORBA::Object_ptr string_to_object (const char *str,
-                                      CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                      CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Get an object reference from the IOR string.
 
   CORBA::String object_to_string (CORBA::Object_ptr obj,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Convert an object reference to an IOR stringified form.
 
   TAO_ServantBase *_get_collocated_servant (STUB_Object *sobj);
diff --git a/TAO/tao/IIOP_Object.h b/TAO/tao/IIOP_Object.h
index 1b9c256baf9..6a1caa914cc 100644
--- a/TAO/tao/IIOP_Object.h
+++ b/TAO/tao/IIOP_Object.h
@@ -127,7 +127,7 @@ public:
                                 CORBA::NamedValue_ptr result,
                                 CORBA::Flags flags,
                                 CORBA::ExceptionList &exceptions,
-                                CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // DII-based invocation analogue of the <do_static_call> above.
   // Differs in how the vararg calling convention is implemented --
   // DII doesn't use the normal call stack with its implicit typing,
@@ -136,11 +136,11 @@ public:
   // = Support for tables keyed by objrefs.
 
   CORBA::ULong hash (CORBA::ULong maximum,
-                     CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                     CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Compute a hash value for the object.
 
   CORBA::Boolean is_equivalent (CORBA::Object_ptr other_obj,
-                                CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // XXX All objref representations should know how to marshal
   // themselves.  That will involve ensuring that the IOR that gets
   // marshaled talks a specific protocol, otherwise the target of a
@@ -167,7 +167,7 @@ public:
   virtual CORBA::ULong _incr_refcnt (void);
   virtual CORBA::ULong _decr_refcnt (void);
 
-  virtual TAO_ObjectKey *key (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual TAO_ObjectKey *key (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Return the object key as an out parameter.  Caller should release
   // return value when finished with it.
 
@@ -209,7 +209,7 @@ protected:
 
   void put_params (TAO_GIOP_Invocation &call,
                    CORBA::NVList_ptr args,
-                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Helper method to factor out common code in dynamic oneway
   // vs. twoway invocations.
 
diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h
index 423bae09e10..1fc0aef9fea 100644
--- a/TAO/tao/Invocation.h
+++ b/TAO/tao/Invocation.h
@@ -50,7 +50,7 @@ public:
 
   void put_param (CORBA::TypeCode_ptr tc,
                   void *value,
-                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Encodes the value into the undelying CDR stream based on the
   // TypeCode parameter
 
@@ -60,13 +60,13 @@ public:
 protected:
   void start (CORBA::Boolean is_roundtrip,
               TAO_GIOP::Message_Type message_type,
-              CORBA_Environment &_env = CORBA_Environment::default_environment ());
+              CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Locates the right Client_Connection_Handler and initializes the
   // CDR stream.
   // The message_type tells how to initialize the output CDR stream
 
   TAO_GIOP_ReplyStatusType invoke (CORBA::Boolean is_roundtrip,
-                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Sends the request, does not wait for the response.
 
   TAO_GIOP_ReplyStatusType close_connection (void);
@@ -74,7 +74,7 @@ protected:
   // we are fowarded (to the same server)
 
   TAO_GIOP_ReplyStatusType location_forward (TAO_InputCDR &inp_stream,
-                                             CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                             CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // do the location forwarding, which means exchanging the profile
 
 
@@ -144,17 +144,17 @@ public:
                               const char *operation,
                               TAO_ORB_Core* orb_core);
 
-  void start (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  void start (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Calls TAO_GIOP_Invocation::start.
 
   TAO_GIOP_ReplyStatusType invoke (CORBA::ExceptionList &exceptions,
-                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Send request, block until any reply comes back, and unmarshal
   // reply parameters as appropriate.
 
   TAO_GIOP_ReplyStatusType invoke (TAO_Exception_Data *excepts,
                                    CORBA::ULong except_count,
-                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Special purpose invoke method used by the interpretive stubs. This
   // accomplishes the same task as the normal invoke except that
   // Exceptions are allocated and decoded here. This keeps the size of
@@ -162,7 +162,7 @@ public:
 
   void get_value (CORBA::TypeCode_ptr tc,
                   void *value,
-                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // No CORBA::Context support (deprecated).
 
   TAO_InputCDR &inp_stream (void);
@@ -184,10 +184,10 @@ public:
                               const char *operation,
                               TAO_ORB_Core* orb_core);
 
-  void start (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  void start (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Call TAO_GIOP_Invocation::start()
 
-  TAO_GIOP_ReplyStatusType invoke (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  TAO_GIOP_ReplyStatusType invoke (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Send request, without blocking for any response.
 };
 
@@ -202,10 +202,10 @@ public:
   TAO_GIOP_Locate_Request_Invocation (IIOP_Object *data,
                                       TAO_ORB_Core* orb_core);
 
-  void start (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  void start (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Calls TAO_GIOP_Invocation::start.
 
-  TAO_GIOP_ReplyStatusType invoke (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  TAO_GIOP_ReplyStatusType invoke (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Send request, without blocking for any response.
 
 private:
diff --git a/TAO/tao/Marshal.h b/TAO/tao/Marshal.h
index bd159f68c3b..4328fdd4836 100644
--- a/TAO/tao/Marshal.h
+++ b/TAO/tao/Marshal.h
@@ -24,13 +24,13 @@ CORBA::TypeCode::traverse_status
 DEEP_COPY (CORBA::TypeCode_ptr  param,
            const void *source,
            const void *dest,
-           CORBA_Environment &_env = CORBA_Environment::default_environment ());
+           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
 CORBA::TypeCode::traverse_status
 DEEP_FREE (CORBA::TypeCode_ptr  param,
            const void *source,
            const void *dest,
-           CORBA_Environment &_env = CORBA_Environment::default_environment ());
+           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
 // = Forward declarations.
 class TAO_Marshal_Object;
@@ -62,7 +62,7 @@ public:
   // destructor
 
   virtual TAO_Marshal_Object *make_marshal_object (CORBA::TypeCode_ptr tc,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Factory method that returns the appropriate marshal object.
 
 private:
@@ -107,25 +107,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
   // encoding operation
 
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
   // decoding operation
 
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+                                                 CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+                                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
   // append operation
 
   TAO_Marshal_Object (void);
@@ -150,25 +150,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // append operation
 
 };
@@ -188,25 +188,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *source,
                                                   const void *,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // append operation
 
 };
@@ -226,25 +226,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // append operation
 
 };
@@ -264,25 +264,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // append operation
 
 };
@@ -302,25 +302,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // append operation
 
 };
@@ -340,25 +340,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // append operation
 
 };
@@ -378,25 +378,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // append operation
 
 };
@@ -416,25 +416,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // append operation
 
 };
@@ -454,25 +454,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // append operation
 
 };
@@ -492,25 +492,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // append operation
 
 };
@@ -530,25 +530,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // append operation
 
 };
@@ -567,25 +567,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // append operation
 
 };
@@ -604,25 +604,25 @@ public:
                                                   const void *data,
                                                   const void *,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *parent_typecode,
                                                   void *context,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
                                                   const void *data,
                                                   const void *,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  void *context,
-                                                 CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // skip operation
 
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest,
-                                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // append operation
 
 };
diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h
index e6cd2ff61b1..911350569a5 100644
--- a/TAO/tao/NVList.h
+++ b/TAO/tao/NVList.h
@@ -168,38 +168,38 @@ public:
   // return the current number of elements in the list
 
   CORBA_NamedValue_ptr add (CORBA::Flags,
-                             CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                             CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // add an element and just initialize the flags
 
   CORBA_NamedValue_ptr add_item (const char *,
                                   CORBA::Flags,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // add an element and initialize its name and flags
 
   CORBA_NamedValue_ptr add_value (const char *,
                                    const CORBA::Any &,
                                    CORBA::Flags,
-                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // initializes a value, name, and flags
 
   CORBA_NamedValue_ptr add_item_consume (char *,
                                           CORBA::Flags,
-                                          CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // just like add_item. In addition, memory management of char * name is taken
   // over by the NVList
 
   CORBA_NamedValue_ptr add_value_consume (char *,
                                            CORBA::Any_ptr,
                                            CORBA::Flags,
-                                           CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // just like add_value. In addition, the NVList controls the memory
   // management of the char *name and Any *value parameter
 
-  CORBA_NamedValue_ptr item (CORBA::ULong n, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  CORBA_NamedValue_ptr item (CORBA::ULong n, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // retrieve the item at the nth location. Raises Bounds
 
   //  CORBA::Status
-  void remove (CORBA::ULong n, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  void remove (CORBA::ULong n, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // remove element at index n. Raises Bounds
 
   // The pseudo object static methods..
@@ -215,7 +215,7 @@ private:
   // constructor - cannot be instantiated directly other than through the
   // ORB::create_list method
 
-  CORBA_NamedValue_ptr add_element (CORBA::Flags, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  CORBA_NamedValue_ptr add_element (CORBA::Flags, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // helper to increase the list size. This is used by all the add_ methods of
   // the NVList class
 
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index ec765609c12..97cedca896a 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -674,15 +674,15 @@ CORBA_ORB::multicast_to_service (TAO_Service_ID service_id,
 
 CORBA_Object_ptr
 CORBA_ORB::resolve_initial_references (CORBA::String name,
-                                       CORBA_Environment &_env)
+                                       CORBA_Environment &TAO_IN_ENV)
 {
-  return this->resolve_initial_references (name, 0, _env);
+  return this->resolve_initial_references (name, 0, TAO_IN_ENV);
 }
 
 CORBA_Object_ptr
 CORBA_ORB::resolve_initial_references (CORBA::String name,
                                        ACE_Time_Value *timeout,
-                                       CORBA_Environment &_env)
+                                       CORBA_Environment &TAO_IN_ENV)
 {
   if (ACE_OS::strcmp (name, TAO_OBJID_NAMESERVICE) == 0)
     return this->resolve_name_service (timeout);
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 54b4ef93b24..f422d615fb1 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -832,12 +832,12 @@ public:
   // can be used for initialization or in comparisons.
 
   virtual CORBA::Object_ptr string_to_object (const char *str,
-                                              CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+                                              CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
   // Turn a string-ified object reference back into an object pointer.
   // Each type of ORB, e.g. an IIOP ORB, must implement this.
   // Typically these strings are created using <object_to_string()>.
   virtual CORBA::String object_to_string (CORBA::Object_ptr obj,
-                                          CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+                                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
   // Turn an object reference into a string.  Each type of ORB,
   // e.g. an IIOP ORB, must implement this.  This can be used by
   // servers to publish their whereabouts to clients.  The output of
@@ -905,11 +905,11 @@ public:
   // currently supported.
 
   CORBA_Object_ptr resolve_initial_references (CORBA::String name,
-                                               CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                               CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   CORBA_Object_ptr resolve_initial_references (CORBA::String name,
                                                ACE_Time_Value *timeout,
-                                               CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                               CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // This method acts as a mini-bootstrapping Naming Service, which is
   // provided by the ORB for certain well-known object references.
   // TAO supports the "NameService", "TradingService", "RootPOA", and
@@ -932,13 +932,13 @@ public:
 
   STUB_Object *create_stub_object (const TAO_ObjectKey &key,
                                    const char *type_id,
-                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Makes sure that the ORB is open and then creates an IIOP object
   // based on the endpoint.
 
   CORBA_Object_ptr key_to_object (const TAO_ObjectKey &key,
                                   const char *type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Convert key into an object reference.  Return Object_ptr as out
   // parameter.  Errors will come through the environment.
   //
@@ -970,7 +970,7 @@ public:
   // previously-specified port for requests.  Returns -1 on failure,
   // else 0.
 
-  static void init_orb_globals (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  static void init_orb_globals (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Initialize the ORB globals correctly, i.e., only when they
   // haven't been initialized yet.
 
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index 92fcf2ba861..b50822365fb 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -41,7 +41,7 @@ public:
   // return a NUL object
 
   static CORBA_Object_ptr _narrow (CORBA_Object_ptr obj,
-                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // no-op it is just here to simplify some templates.
 
   // These calls correspond to over-the-wire operations, or at least
@@ -50,11 +50,11 @@ public:
   // making such calls, but may be overridden when it appears
   // appropriate.
 
-  virtual CORBA::InterfaceDef_ptr _get_interface (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual CORBA::InterfaceDef_ptr _get_interface (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Interface repository related operation
 
   virtual CORBA::Boolean _is_a (const CORBA::Char *logical_type_id,
-                                CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // determine if we are of the type specified by the "logical_type_id"
 
   virtual const char* _interface_repository_id (void) const;
@@ -68,18 +68,18 @@ public:
   // are we collocated with the servant?
 
   virtual CORBA::ImplementationDef_ptr
-      _get_implementation (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+      _get_implementation (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // This method is deprecated in the CORBA 2.2 spec, we just return 0
   // every time.
 
-  virtual CORBA::Boolean _non_existent (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual CORBA::Boolean _non_existent (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void _create_request (const CORBA::Char *operation,
                                 CORBA::NVList_ptr arg_list,
                                 CORBA::NamedValue_ptr result,
                                 CORBA::Request_ptr &request,
                                 CORBA::Flags req_flags,
-                                CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // DII operation to create a request.
   //
   // The mapping for create_request is split into two forms,
@@ -91,11 +91,11 @@ public:
   // calls above ... that's how it can have a default implementation.
 
   virtual CORBA::Request_ptr _request (const CORBA::Char *operation,
-                                       CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                       CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // DII operation to create a request.
 
   virtual CORBA::ULong _hash (CORBA::ULong maximum,
-                              CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                              CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Return a (potentially non-unique) hash value for this object.
   // This method relies on the representation of the object
   // reference's private state.  Since that changes easily (when
@@ -103,7 +103,7 @@ public:
   // implementation.
 
   virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj,
-                                         CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                         CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Try to determine if this object is the same as <other_obj>.  This
   // method relies on the representation of the object reference's
   // private state.  Since that changes easily (when different ORB
@@ -124,7 +124,7 @@ public:
   virtual ~CORBA_Object (void);
   // destructor
 
-  virtual TAO_ObjectKey *_key (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual TAO_ObjectKey *_key (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Return the object key as an out parameter.  Caller should release
   // return value when finished with it.
 
@@ -228,7 +228,7 @@ public:
   // destructor
 
   virtual void _downcast (CORBA_Object* base_ptr,
-                          CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
   virtual CORBA_Object* _upcast (void) = 0;
   virtual void _release (void) = 0;
 };
diff --git a/TAO/tao/POA.h b/TAO/tao/POA.h
index b69d69547b4..d01890bc3db 100644
--- a/TAO/tao/POA.h
+++ b/TAO/tao/POA.h
@@ -75,15 +75,15 @@ public:
 
   TAO_Thread_Policy (const TAO_Thread_Policy &new_policy);
 
-  virtual PortableServer::ThreadPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual PortableServer::ThreadPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual CORBA::Policy_ptr copy (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual CORBA::Policy_ptr copy (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual void destroy (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual void destroy (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual CORBA::PolicyType policy_type (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
 protected:
   PortableServer::ThreadPolicyValue value_;
@@ -99,15 +99,15 @@ public:
 
   TAO_Lifespan_Policy (const TAO_Lifespan_Policy &rhs);
 
-  virtual PortableServer::LifespanPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual PortableServer::LifespanPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual CORBA::Policy_ptr copy (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual CORBA::Policy_ptr copy (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual void destroy (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual void destroy (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual CORBA::PolicyType policy_type (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
 protected:
   PortableServer::LifespanPolicyValue value_;
@@ -123,15 +123,15 @@ public:
 
   TAO_Id_Uniqueness_Policy (const TAO_Id_Uniqueness_Policy &rhs);
 
-  virtual PortableServer::IdUniquenessPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual PortableServer::IdUniquenessPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual CORBA::Policy_ptr copy (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual CORBA::Policy_ptr copy (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual void destroy (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual void destroy (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual CORBA::PolicyType policy_type (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
 protected:
   PortableServer::IdUniquenessPolicyValue value_;
@@ -147,15 +147,15 @@ public:
 
   TAO_Id_Assignment_Policy (const TAO_Id_Assignment_Policy &rhs);
 
-  virtual PortableServer::IdAssignmentPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual PortableServer::IdAssignmentPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual CORBA::Policy_ptr copy (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual CORBA::Policy_ptr copy (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual void destroy (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual void destroy (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual CORBA::PolicyType policy_type (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
 protected:
   PortableServer::IdAssignmentPolicyValue value_;
@@ -171,15 +171,15 @@ public:
 
   TAO_Implicit_Activation_Policy (const TAO_Implicit_Activation_Policy &rhs);
 
-  virtual PortableServer::ImplicitActivationPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual PortableServer::ImplicitActivationPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual CORBA::Policy_ptr copy (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual CORBA::Policy_ptr copy (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual void destroy (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual void destroy (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual CORBA::PolicyType policy_type (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
 protected:
   PortableServer::ImplicitActivationPolicyValue value_;
@@ -195,15 +195,15 @@ public:
 
   TAO_Servant_Retention_Policy (const TAO_Servant_Retention_Policy &rhs);
 
-  virtual PortableServer::ServantRetentionPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual PortableServer::ServantRetentionPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual CORBA::Policy_ptr copy (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual CORBA::Policy_ptr copy (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual void destroy (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual void destroy (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual CORBA::PolicyType policy_type (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
 protected:
   PortableServer::ServantRetentionPolicyValue value_;
@@ -219,15 +219,15 @@ public:
 
   TAO_Request_Processing_Policy (const TAO_Request_Processing_Policy &rhs);
 
-  virtual PortableServer::RequestProcessingPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual PortableServer::RequestProcessingPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual CORBA::Policy_ptr copy (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual CORBA::Policy_ptr copy (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual void destroy (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual void destroy (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual CORBA::PolicyType policy_type (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
 protected:
   PortableServer::RequestProcessingPolicyValue value_;
@@ -249,15 +249,15 @@ public:
 
   TAO_Synchronization_Policy (const TAO_Synchronization_Policy &rhs);
 
-  virtual PortableServer::SynchronizationPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual PortableServer::SynchronizationPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual CORBA::Policy_ptr copy (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual CORBA::Policy_ptr copy (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual void destroy (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual void destroy (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual CORBA::PolicyType policy_type (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
 protected:
   PortableServer::SynchronizationPolicyValue value_;
@@ -302,12 +302,12 @@ public:
   virtual void synchronization (PortableServer::SynchronizationPolicyValue value);
 
   virtual void parse_policies (const CORBA::PolicyList &policies,
-                               CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                               CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
 protected:
 
   virtual void parse_policy (const CORBA::Policy_ptr policy,
-                             CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                             CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual int validity_check (void);
 
@@ -400,36 +400,36 @@ public:
   virtual PortableServer::POA_ptr create_POA (const char *adapter_name,
                                               PortableServer::POAManager_ptr poa_manager,
                                               const CORBA::PolicyList &policies,
-                                              CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                              CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual PortableServer::POA_ptr find_POA (const char *adapter_name,
                                             CORBA::Boolean activate_it,
-                                            CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                            CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void destroy (CORBA::Boolean etherealize_objects,
                         CORBA::Boolean wait_for_completion,
-                        CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value,
-                                                                 CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                                 CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value,
-                                                                     CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                                     CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value,
-                                                                              CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                                              CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value,
-                                                                              CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                                              CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value,
-                                                                                          CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                                                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value,
-                                                                                      CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                                                      CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value,
-                                                                                        CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                                                        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   // **************************************************
   //
@@ -438,66 +438,66 @@ public:
   // **************************************************
 
   virtual PortableServer::SynchronizationPolicy_ptr create_synchronization_policy (PortableServer::SynchronizationPolicyValue value,
-                                                                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual CORBA::String the_name (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual CORBA::String the_name (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual PortableServer::POA_ptr the_parent (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual PortableServer::POA_ptr the_parent (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual PortableServer::POAManager_ptr the_POAManager (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual PortableServer::POAManager_ptr the_POAManager (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual PortableServer::AdapterActivator_ptr the_activator (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual PortableServer::AdapterActivator_ptr the_activator (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void the_activator (PortableServer::AdapterActivator_ptr adapter_activator,
-                              CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                              CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual PortableServer::ServantManager_ptr get_servant_manager (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual PortableServer::ServantManager_ptr get_servant_manager (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void set_servant_manager (PortableServer::ServantManager_ptr imgr,
-                                    CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                    CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual PortableServer::Servant get_servant (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual PortableServer::Servant get_servant (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void set_servant (PortableServer::Servant servant,
-                            CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                            CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant,
-                                                     CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                     CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void activate_object_with_id (const PortableServer::ObjectId &id,
                                         PortableServer::Servant p_servant,
-                                        CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void deactivate_object (const PortableServer::ObjectId &oid,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual CORBA::Object_ptr create_reference (const char *intf,
-                                              CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                              CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid,
                                                       const char *intf,
-                                                      CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                      CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant,
-                                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference,
-                                                        CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference,
-                                                     CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                     CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid,
-                                                 CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                 CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid,
-                                             CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                             CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void forward_object (const PortableServer::ObjectId &oid,
                                CORBA::Object_ptr forward_to,
-                               CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                               CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   // Utility functions for the other
   static void encode_sequence_to_string (CORBA::String &str,
@@ -520,13 +520,13 @@ public:
            TAO_POA_Manager &poa_manager,
            const TAO_POA_Policies &policies,
            TAO_POA *parent,
-           CORBA_Environment &_env = CORBA_Environment::default_environment ());
+           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual TAO_POA *clone (const String &adapter_name,
                           TAO_POA_Manager &poa_manager,
                           const TAO_POA_Policies &policies,
                           TAO_POA *parent,
-                          CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual ~TAO_POA (void);
 
@@ -534,13 +534,13 @@ public:
                                  CORBA::ServerRequest &req,
                                  void *context,
                                  TAO_ORB_Core *orb_core,
-                                 CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                 CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual int locate_servant (const TAO_ObjectKey &key,
-                              CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                              CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual PortableServer::Servant find_servant (const TAO_ObjectKey &key,
-                                                CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   static char name_separator (void);
 
@@ -555,64 +555,64 @@ protected:
   virtual TAO_POA *create_POA (const String &adapter_name,
                                TAO_POA_Manager &poa_manager,
                                const TAO_POA_Policies &policies,
-                               CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                               CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual TAO_POA *create_POA_i (const String &adapter_name,
                                  TAO_POA_Manager &poa_manager,
                                  const TAO_POA_Policies &policies,
-                                 CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                 CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual TAO_POA *find_POA (const String &adapter_name,
                              CORBA::Boolean activate_it,
-                             CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                             CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual TAO_POA *find_POA_i (const String &adapter_name,
                                CORBA::Boolean activate_it,
-                               CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                               CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual TAO_POA *find_POA_i_optimized (const String &adapter_name,
                                          CORBA::Boolean activate_it,
-                                         CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                         CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void destroy_i (CORBA::Boolean etherealize_objects,
                           CORBA::Boolean wait_for_completion,
-                          CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual PortableServer::ServantManager_ptr get_servant_manager_i (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual PortableServer::ServantManager_ptr get_servant_manager_i (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void set_servant_manager_i (PortableServer::ServantManager_ptr imgr,
-                                      CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                      CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-  virtual PortableServer::Servant get_servant_i (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual PortableServer::Servant get_servant_i (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void set_servant_i (PortableServer::Servant servant,
-                              CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                              CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual PortableServer::ObjectId *activate_object_i (PortableServer::Servant p_servant,
-                                                       CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                       CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void activate_object_with_id_i (const PortableServer::ObjectId &id,
                                           PortableServer::Servant p_servant,
-                                          CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void deactivate_object_i (const PortableServer::ObjectId &oid,
-                                    CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                    CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual CORBA::Object_ptr create_reference_i (const char *intf,
-                                                CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant,
-                                                     CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                     CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual PortableServer::Servant id_to_servant_i (const PortableServer::ObjectId &oid,
-                                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual CORBA::Object_ptr id_to_reference_i (const PortableServer::ObjectId &oid,
-                                               CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                               CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void forward_object_i (const PortableServer::ObjectId &oid,
                                  CORBA::Object_ptr forward_to,
-                                 CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                 CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual ACE_Lock &lock (void);
 
@@ -621,25 +621,25 @@ protected:
   virtual TAO_Active_Object_Map &active_object_map (void) const;
 
   virtual void delete_child (const String &child,
-                             CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                             CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void delete_child_i (const String &child,
-                               CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                               CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual String complete_name (void);
 
   virtual void set_complete_name (void);
 
   virtual int leaf_poa_name (const String &adapter_name,
-                             CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                             CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void parse_poa_name (const TAO_POA::String &adapter_name,
                                TAO_POA::String &topmost_poa_name,
                                TAO_POA::String &tail_poa_name,
-                               CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                               CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant,
-                                                      CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                      CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual TAO_ObjectKey *create_object_key (const PortableServer::ObjectId &id);
 
@@ -673,35 +673,35 @@ public:
 protected:
   virtual LOCATION_RESULT locate_servant_i (const TAO_ObjectKey &key,
                                             PortableServer::Servant &servant,
-                                            CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                            CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual PortableServer::Servant locate_poa_and_servant_i (const TAO_ObjectKey &key,
                                                             const char *operation,
                                                             PortableServer::ObjectId &id,
                                                             TAO_POA *&poa_impl,
                                                             TAO_ORB_Core *orb_core,
-                                                            CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                                            CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual TAO_POA *locate_poa_i (const TAO_ObjectKey &key,
                                  PortableServer::ObjectId &id,
-                                 CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                 CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void dispatch_servant_i (const TAO_ObjectKey &key,
                                    CORBA::ServerRequest &req,
                                    void *context,
                                    TAO_ORB_Core *orb_core,
-                                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void pre_invoke (const TAO_ObjectKey &key,
                            const PortableServer::ObjectId &id,
                            PortableServer::Servant servant,
                            TAO_POA_Current *poa_current,
-                           CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void post_invoke (PortableServer::Servant servant,
                             const char *operation,
                             TAO_POA_Current *poa_current,
-                            CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                            CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual const TAO_Creation_Time &creation_time (void);
 
@@ -781,17 +781,17 @@ public:
     UNKNOWN
   };
 
-  virtual void activate (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual void activate (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void hold_requests (CORBA::Boolean wait_for_completion,
-                              CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                              CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void discard_requests (CORBA::Boolean wait_for_completion,
-                                 CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                 CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void deactivate (CORBA::Boolean etherealize_objects,
                            CORBA::Boolean wait_for_completion,
-                           CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   TAO_POA_Manager (void);
 
@@ -799,23 +799,23 @@ public:
 
   virtual ~TAO_POA_Manager (void);
 
-  virtual Processing_State state (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual Processing_State state (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
 protected:
 
   virtual ACE_Lock &lock (void);
 
   virtual void remove_poa (TAO_POA *poa,
-                           CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void remove_poa_i (TAO_POA *poa,
-                             CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                             CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void register_poa (TAO_POA *poa,
-                             CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                             CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual void register_poa_i (TAO_POA *poa,
-                               CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                               CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   Processing_State state_;
 
@@ -834,7 +834,7 @@ public:
 
   virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
                                           const char *name,
-                                          CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 };
 
 class TAO_Export TAO_POA_Current : public POA_PortableServer::Current
@@ -861,11 +861,11 @@ class TAO_Export TAO_POA_Current : public POA_PortableServer::Current
 public:
   // = Specification-mandated methods
 
-  virtual PortableServer::POA_ptr get_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual PortableServer::POA_ptr get_POA (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Return pointer to the invoking POA.  Raises the
   // <CORBA::NoContext> exception.
 
-  virtual PortableServer::ObjectId *get_object_id (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual PortableServer::ObjectId *get_object_id (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Return pointer to the object id through which this was invoked.
   // This may be necessary in cases where a <Servant> is serving under
   // the guise of multiple object ids.  This has _out semantics Raises
diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h
index 45e1a2806aa..a9fd1f7ad85 100644
--- a/TAO/tao/POAC.h
+++ b/TAO/tao/POAC.h
@@ -294,11 +294,11 @@ public:
   public:
     // the static operations
     static ThreadPolicy_ptr _duplicate (ThreadPolicy_ptr obj);
-    static ThreadPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static ThreadPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     static ThreadPolicy_ptr _nil (void);
 
-    virtual ThreadPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ());
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual ThreadPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   protected:
     ThreadPolicy (STUB_Object *objref = 0,
                   TAO_ServantBase *servant = 0,
@@ -391,11 +391,11 @@ public:
   public:
     // the static operations
     static LifespanPolicy_ptr _duplicate (LifespanPolicy_ptr obj);
-    static LifespanPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static LifespanPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     static LifespanPolicy_ptr _nil (void);
 
-    virtual LifespanPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ());
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual LifespanPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   protected:
     LifespanPolicy (
                     STUB_Object *objref = 0,
@@ -490,11 +490,11 @@ public:
   public:
     // the static operations
     static IdUniquenessPolicy_ptr _duplicate (IdUniquenessPolicy_ptr obj);
-    static IdUniquenessPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static IdUniquenessPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     static IdUniquenessPolicy_ptr _nil (void);
 
-    virtual IdUniquenessPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ());
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual IdUniquenessPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   protected:
     IdUniquenessPolicy (
                         STUB_Object *objref = 0,
@@ -589,11 +589,11 @@ public:
   public:
     // the static operations
     static IdAssignmentPolicy_ptr _duplicate (IdAssignmentPolicy_ptr obj);
-    static IdAssignmentPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static IdAssignmentPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     static IdAssignmentPolicy_ptr _nil (void);
 
-    virtual IdAssignmentPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ());
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual IdAssignmentPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   protected:
     IdAssignmentPolicy (
                         STUB_Object *objref = 0,
@@ -688,11 +688,11 @@ public:
   public:
     // the static operations
     static ImplicitActivationPolicy_ptr _duplicate (ImplicitActivationPolicy_ptr obj);
-    static ImplicitActivationPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static ImplicitActivationPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     static ImplicitActivationPolicy_ptr _nil (void);
 
-    virtual ImplicitActivationPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ());
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual ImplicitActivationPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   protected:
     ImplicitActivationPolicy (
                               STUB_Object *objref = 0,
@@ -787,11 +787,11 @@ public:
   public:
     // the static operations
     static ServantRetentionPolicy_ptr _duplicate (ServantRetentionPolicy_ptr obj);
-    static ServantRetentionPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static ServantRetentionPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     static ServantRetentionPolicy_ptr _nil (void);
 
-    virtual ServantRetentionPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ());
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual ServantRetentionPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   protected:
     ServantRetentionPolicy (
                             STUB_Object *objref = 0,
@@ -887,11 +887,11 @@ public:
   public:
     // the static operations
     static RequestProcessingPolicy_ptr _duplicate (RequestProcessingPolicy_ptr obj);
-    static RequestProcessingPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static RequestProcessingPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     static RequestProcessingPolicy_ptr _nil (void);
 
-    virtual RequestProcessingPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ());
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual RequestProcessingPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   protected:
     RequestProcessingPolicy (
                              STUB_Object *objref = 0,
@@ -993,11 +993,11 @@ public:
   public:
     // the static operations
     static SynchronizationPolicy_ptr _duplicate (SynchronizationPolicy_ptr obj);
-    static SynchronizationPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static SynchronizationPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     static SynchronizationPolicy_ptr _nil (void);
 
-    virtual SynchronizationPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ());
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual SynchronizationPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   protected:
     SynchronizationPolicy (
                            STUB_Object *objref = 0,
@@ -1084,7 +1084,7 @@ public:
   public:
     // the static operations
     static POAManager_ptr _duplicate (POAManager_ptr obj);
-    static POAManager_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static POAManager_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     static POAManager_ptr _nil (void);
 
 
@@ -1120,11 +1120,11 @@ public:
 
 #endif /* end #if !defined */
 
-    virtual void  activate (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual void  hold_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual void  discard_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual void  deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual void  activate (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual void  hold_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual void  discard_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual void  deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   protected:
     POAManager (
                 STUB_Object *objref = 0,
@@ -1211,11 +1211,11 @@ public:
   public:
     // the static operations
     static AdapterActivator_ptr _duplicate (AdapterActivator_ptr obj);
-    static AdapterActivator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static AdapterActivator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     static AdapterActivator_ptr _nil (void);
 
-    virtual CORBA::Boolean  unknown_adapter (POA_ptr parent, const char *name, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual CORBA::Boolean  unknown_adapter (POA_ptr parent, const char *name, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   protected:
     AdapterActivator (
                       STUB_Object *objref = 0,
@@ -1303,10 +1303,10 @@ public:
   public:
     // the static operations
     static ServantManager_ptr _duplicate (ServantManager_ptr obj);
-    static ServantManager_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static ServantManager_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     static ServantManager_ptr _nil (void);
 
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   protected:
     ServantManager (
                     STUB_Object *objref = 0,
@@ -1393,12 +1393,12 @@ public:
   public:
     // the static operations
     static ServantActivator_ptr _duplicate (ServantActivator_ptr obj);
-    static ServantActivator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static ServantActivator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     static ServantActivator_ptr _nil (void);
 
-    virtual Servant  incarnate (const ObjectId &oid, POA_ptr adapter, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual void  etherealize (const ObjectId &oid, POA_ptr adapter, Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual Servant  incarnate (const ObjectId &oid, POA_ptr adapter, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual void  etherealize (const ObjectId &oid, POA_ptr adapter, Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   protected:
     ServantActivator (
                       STUB_Object *objref = 0,
@@ -1488,12 +1488,12 @@ public:
 
     // the static operations
     static ServantLocator_ptr _duplicate (ServantLocator_ptr obj);
-    static ServantLocator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static ServantLocator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     static ServantLocator_ptr _nil (void);
 
-    virtual Servant  preinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie & the_cookie, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual void  postinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie the_cookie, Servant the_servant, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual Servant  preinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie & the_cookie, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual void  postinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie the_cookie, Servant the_servant, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   protected:
     ServantLocator (
                     STUB_Object *objref = 0,
@@ -1580,7 +1580,7 @@ public:
   public:
     // the static operations
     static POA_ptr _duplicate (POA_ptr obj);
-    static POA_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static POA_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     static POA_ptr _nil (void);
 
 
@@ -1942,16 +1942,16 @@ public:
 
 #endif /* end #if !defined */
 
-    virtual POA_ptr  create_POA (const char *adapter_name, POAManager_ptr a_POAManager, const CORBA::PolicyList &policies, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual POA_ptr  find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual void  destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual ThreadPolicy_ptr  create_thread_policy (ThreadPolicyValue value, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual LifespanPolicy_ptr  create_lifespan_policy (LifespanPolicyValue value, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual IdUniquenessPolicy_ptr  create_id_uniqueness_policy (IdUniquenessPolicyValue value, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual IdAssignmentPolicy_ptr  create_id_assignment_policy (IdAssignmentPolicyValue value, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual ImplicitActivationPolicy_ptr  create_implicit_activation_policy (ImplicitActivationPolicyValue value, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual ServantRetentionPolicy_ptr  create_servant_retention_policy (ServantRetentionPolicyValue value, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual RequestProcessingPolicy_ptr  create_request_processing_policy (RequestProcessingPolicyValue value, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+    virtual POA_ptr  create_POA (const char *adapter_name, POAManager_ptr a_POAManager, const CORBA::PolicyList &policies, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual POA_ptr  find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual void  destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual ThreadPolicy_ptr  create_thread_policy (ThreadPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual LifespanPolicy_ptr  create_lifespan_policy (LifespanPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual IdUniquenessPolicy_ptr  create_id_uniqueness_policy (IdUniquenessPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual IdAssignmentPolicy_ptr  create_id_assignment_policy (IdAssignmentPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual ImplicitActivationPolicy_ptr  create_implicit_activation_policy (ImplicitActivationPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual ServantRetentionPolicy_ptr  create_servant_retention_policy (ServantRetentionPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual RequestProcessingPolicy_ptr  create_request_processing_policy (RequestProcessingPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
 
     // **************************************************
     //
@@ -1959,29 +1959,29 @@ public:
     //
     // **************************************************
 
-    virtual SynchronizationPolicy_ptr  create_synchronization_policy (SynchronizationPolicyValue value, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-
-    virtual char * the_name (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual POA_ptr  the_parent (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual POAManager_ptr  the_POAManager (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual AdapterActivator_ptr  the_activator (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual void the_activator(AdapterActivator_ptr the_activator, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual ServantManager_ptr  get_servant_manager (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual void  set_servant_manager (ServantManager_ptr imgr, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual Servant  get_servant (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual void  set_servant (Servant p_servant, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual ObjectId * activate_object (Servant p_servant, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual void  activate_object_with_id (const ObjectId &id, Servant p_servant, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual void  deactivate_object (const ObjectId &oid, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual CORBA::Object_ptr  create_reference (const char *intf, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual CORBA::Object_ptr  create_reference_with_id (const ObjectId &oid, const char *intf, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual ObjectId * servant_to_id (Servant p_servant, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual CORBA::Object_ptr  servant_to_reference (Servant p_servant, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual Servant  reference_to_servant (CORBA::Object_ptr reference, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual ObjectId * reference_to_id (CORBA::Object_ptr reference, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual Servant  id_to_servant (const ObjectId &oid, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual CORBA::Object_ptr  id_to_reference (const ObjectId &oid, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual SynchronizationPolicy_ptr  create_synchronization_policy (SynchronizationPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+
+    virtual char * the_name (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual POA_ptr  the_parent (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual POAManager_ptr  the_POAManager (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual AdapterActivator_ptr  the_activator (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual void the_activator(AdapterActivator_ptr the_activator, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual ServantManager_ptr  get_servant_manager (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual void  set_servant_manager (ServantManager_ptr imgr, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual Servant  get_servant (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual void  set_servant (Servant p_servant, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual ObjectId * activate_object (Servant p_servant, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual void  activate_object_with_id (const ObjectId &id, Servant p_servant, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual void  deactivate_object (const ObjectId &oid, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual CORBA::Object_ptr  create_reference (const char *intf, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual CORBA::Object_ptr  create_reference_with_id (const ObjectId &oid, const char *intf, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual ObjectId * servant_to_id (Servant p_servant, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual CORBA::Object_ptr  servant_to_reference (Servant p_servant, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual Servant  reference_to_servant (CORBA::Object_ptr reference, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual ObjectId * reference_to_id (CORBA::Object_ptr reference, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual Servant  id_to_servant (const ObjectId &oid, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual CORBA::Object_ptr  id_to_reference (const ObjectId &oid, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   protected:
     POA (
          STUB_Object *objref = 0,
@@ -2068,7 +2068,7 @@ public:
   public:
     // the static operations
     static Current_ptr _duplicate (Current_ptr obj);
-    static Current_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static Current_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     static Current_ptr _nil (void);
 
 
@@ -2104,9 +2104,9 @@ public:
 
 #endif /* end #if !defined */
 
-    virtual POA_ptr  get_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());
-    virtual ObjectId * get_object_id (CORBA_Environment &_env = CORBA_Environment::default_environment ());
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual POA_ptr  get_POA (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
+    virtual ObjectId * get_object_id (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   protected:
     Current (
              STUB_Object *objref = 0,
diff --git a/TAO/tao/POAS.cpp b/TAO/tao/POAS.cpp
index 7dcd06c1ae3..c62c9816c89 100644
--- a/TAO/tao/POAS.cpp
+++ b/TAO/tao/POAS.cpp
@@ -213,10 +213,10 @@ POA_PortableServer::_tao_collocated_ThreadPolicy::value (
 }
 
 PortableServer::ThreadPolicy*
-POA_PortableServer::ThreadPolicy::_this (CORBA_Environment &_env)
+POA_PortableServer::ThreadPolicy::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_ThreadPolicy (this, stub);
 }
@@ -418,10 +418,10 @@ POA_PortableServer::_tao_collocated_LifespanPolicy::value (
 }
 
 PortableServer::LifespanPolicy*
-POA_PortableServer::LifespanPolicy::_this (CORBA_Environment &_env)
+POA_PortableServer::LifespanPolicy::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_LifespanPolicy (this, stub);
 }
@@ -623,10 +623,10 @@ POA_PortableServer::_tao_collocated_IdUniquenessPolicy::value (
 }
 
 PortableServer::IdUniquenessPolicy*
-POA_PortableServer::IdUniquenessPolicy::_this (CORBA_Environment &_env)
+POA_PortableServer::IdUniquenessPolicy::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_IdUniquenessPolicy (this, stub);
 }
@@ -828,10 +828,10 @@ POA_PortableServer::_tao_collocated_IdAssignmentPolicy::value (
 }
 
 PortableServer::IdAssignmentPolicy*
-POA_PortableServer::IdAssignmentPolicy::_this (CORBA_Environment &_env)
+POA_PortableServer::IdAssignmentPolicy::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_IdAssignmentPolicy (this, stub);
 }
@@ -1033,10 +1033,10 @@ POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::value (
 }
 
 PortableServer::ImplicitActivationPolicy*
-POA_PortableServer::ImplicitActivationPolicy::_this (CORBA_Environment &_env)
+POA_PortableServer::ImplicitActivationPolicy::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_ImplicitActivationPolicy (this, stub);
 }
@@ -1238,10 +1238,10 @@ POA_PortableServer::_tao_collocated_ServantRetentionPolicy::value (
 }
 
 PortableServer::ServantRetentionPolicy*
-POA_PortableServer::ServantRetentionPolicy::_this (CORBA_Environment &_env)
+POA_PortableServer::ServantRetentionPolicy::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_ServantRetentionPolicy (this, stub);
 }
@@ -1443,10 +1443,10 @@ POA_PortableServer::_tao_collocated_RequestProcessingPolicy::value (
 }
 
 PortableServer::RequestProcessingPolicy*
-POA_PortableServer::RequestProcessingPolicy::_this (CORBA_Environment &_env)
+POA_PortableServer::RequestProcessingPolicy::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_RequestProcessingPolicy (this, stub);
 }
@@ -1654,10 +1654,10 @@ POA_PortableServer::_tao_collocated_SynchronizationPolicy::value (
 }
 
 PortableServer::SynchronizationPolicy*
-POA_PortableServer::SynchronizationPolicy::_this (CORBA_Environment &_env)
+POA_PortableServer::SynchronizationPolicy::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_SynchronizationPolicy (this, stub);
 }
@@ -1828,10 +1828,10 @@ void POA_PortableServer::_tao_collocated_POAManager::deactivate (
 
 
 PortableServer::POAManager*
-POA_PortableServer::POAManager::_this (CORBA_Environment &_env)
+POA_PortableServer::POAManager::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_POAManager (this, stub);
 }
@@ -1971,10 +1971,10 @@ CORBA::Boolean POA_PortableServer::_tao_collocated_AdapterActivator::unknown_ada
 
 
 PortableServer::AdapterActivator*
-POA_PortableServer::AdapterActivator::_this (CORBA_Environment &_env)
+POA_PortableServer::AdapterActivator::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_AdapterActivator (this, stub);
 }
@@ -2101,10 +2101,10 @@ CORBA::Boolean POA_PortableServer::_tao_collocated_ServantManager::_is_a (
 
 
 PortableServer::ServantManager*
-POA_PortableServer::ServantManager::_this (CORBA_Environment &_env)
+POA_PortableServer::ServantManager::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_ServantManager (this, stub);
 }
@@ -2267,10 +2267,10 @@ void POA_PortableServer::_tao_collocated_ServantActivator::etherealize (
 
 
 PortableServer::ServantActivator*
-POA_PortableServer::ServantActivator::_this (CORBA_Environment &_env)
+POA_PortableServer::ServantActivator::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_ServantActivator (this, stub);
 }
@@ -2437,10 +2437,10 @@ void POA_PortableServer::_tao_collocated_ServantLocator::postinvoke (
 
 
 PortableServer::ServantLocator*
-POA_PortableServer::ServantLocator::_this (CORBA_Environment &_env)
+POA_PortableServer::ServantLocator::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_ServantLocator (this, stub);
 }
@@ -2907,10 +2907,10 @@ CORBA::Object_ptr POA_PortableServer::_tao_collocated_POA::id_to_reference (
 
 
 PortableServer::POA*
-POA_PortableServer::POA::_this (CORBA_Environment &_env)
+POA_PortableServer::POA::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_POA (this, stub);
 }
@@ -3131,10 +3131,10 @@ PortableServer::ObjectId * POA_PortableServer::_tao_collocated_Current::get_obje
 
 
 PortableServer::Current*
-POA_PortableServer::Current::_this (CORBA_Environment &_env)
+POA_PortableServer::Current::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_Current (this, stub);
 }
diff --git a/TAO/tao/POAS.h b/TAO/tao/POAS.h
index df615265096..eb22b8fac35 100644
--- a/TAO/tao/POAS.h
+++ b/TAO/tao/POAS.h
@@ -35,29 +35,29 @@ public:
     virtual ~ThreadPolicy (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual PortableServer::ThreadPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual PortableServer::ThreadPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
     static void _get_policy_type_skel (
                                        CORBA::ServerRequest &_tao_req,
                                        void *_tao_obj,
                                        void *_tao_context,
-                                       CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                       CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                        );
 
-    PortableServer::ThreadPolicy *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    PortableServer::ThreadPolicy *_this (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -76,19 +76,19 @@ public:
     ThreadPolicy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                   );
     virtual PortableServer::ThreadPolicyValue value (
-                                                     CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                     CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                      );
     virtual CORBA::Policy_ptr copy (
-                                    CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                    CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                     );
     virtual void destroy (
-                          CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                           );
     virtual CORBA::PolicyType policy_type (
-                                           CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                            );
   private:
     ThreadPolicy_ptr servant_;
@@ -108,30 +108,30 @@ public:
     virtual ~LifespanPolicy (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual PortableServer::LifespanPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual PortableServer::LifespanPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
     static void _get_policy_type_skel (
                                        CORBA::ServerRequest &_tao_req,
                                        void *_tao_obj,
                                        void *_tao_context,
-                                       CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                       CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                        );
 
 
-    PortableServer::LifespanPolicy *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    PortableServer::LifespanPolicy *_this (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -150,19 +150,19 @@ public:
     LifespanPolicy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                   );
     virtual PortableServer::LifespanPolicyValue value (
-                                                       CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                       CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                        );
     virtual CORBA::Policy_ptr copy (
-                                    CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                    CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                     );
     virtual void destroy (
-                          CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                           );
     virtual CORBA::PolicyType policy_type (
-                                           CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                            );
 
   private:
@@ -183,30 +183,30 @@ public:
     virtual ~IdUniquenessPolicy (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual PortableServer::IdUniquenessPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual PortableServer::IdUniquenessPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
     static void _get_policy_type_skel (
                                        CORBA::ServerRequest &_tao_req,
                                        void *_tao_obj,
                                        void *_tao_context,
-                                       CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                       CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                        );
 
 
-    PortableServer::IdUniquenessPolicy *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    PortableServer::IdUniquenessPolicy *_this (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -225,19 +225,19 @@ public:
     IdUniquenessPolicy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                   );
     virtual PortableServer::IdUniquenessPolicyValue value (
-                                                           CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                            );
     virtual CORBA::Policy_ptr copy (
-                                    CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                    CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                     );
     virtual void destroy (
-                          CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                           );
     virtual CORBA::PolicyType policy_type (
-                                           CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                            );
 
   private:
@@ -258,30 +258,30 @@ public:
     virtual ~IdAssignmentPolicy (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual PortableServer::IdAssignmentPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual PortableServer::IdAssignmentPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
     static void _get_policy_type_skel (
                                        CORBA::ServerRequest &_tao_req,
                                        void *_tao_obj,
                                        void *_tao_context,
-                                       CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                       CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                        );
 
 
-    PortableServer::IdAssignmentPolicy *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    PortableServer::IdAssignmentPolicy *_this (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -300,19 +300,19 @@ public:
     IdAssignmentPolicy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                   );
     virtual PortableServer::IdAssignmentPolicyValue value (
-                                                           CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                            );
     virtual CORBA::Policy_ptr copy (
-                                    CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                    CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                     );
     virtual void destroy (
-                          CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                           );
     virtual CORBA::PolicyType policy_type (
-                                           CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                            );
 
   private:
@@ -333,30 +333,30 @@ public:
     virtual ~ImplicitActivationPolicy (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual PortableServer::ImplicitActivationPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual PortableServer::ImplicitActivationPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
     static void _get_policy_type_skel (
                                        CORBA::ServerRequest &_tao_req,
                                        void *_tao_obj,
                                        void *_tao_context,
-                                       CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                       CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                        );
 
 
-    PortableServer::ImplicitActivationPolicy *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    PortableServer::ImplicitActivationPolicy *_this (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -375,19 +375,19 @@ public:
     ImplicitActivationPolicy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                   );
     virtual PortableServer::ImplicitActivationPolicyValue value (
-                                                                 CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                                 CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                                  );
     virtual CORBA::Policy_ptr copy (
-                                    CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                    CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                     );
     virtual void destroy (
-                          CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                           );
     virtual CORBA::PolicyType policy_type (
-                                           CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                            );
 
   private:
@@ -408,30 +408,30 @@ public:
     virtual ~ServantRetentionPolicy (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual PortableServer::ServantRetentionPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual PortableServer::ServantRetentionPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
     static void _get_policy_type_skel (
                                        CORBA::ServerRequest &_tao_req,
                                        void *_tao_obj,
                                        void *_tao_context,
-                                       CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                       CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                        );
 
 
-    PortableServer::ServantRetentionPolicy *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    PortableServer::ServantRetentionPolicy *_this (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -450,19 +450,19 @@ public:
     ServantRetentionPolicy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                   );
     virtual PortableServer::ServantRetentionPolicyValue value (
-                                                               CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                               CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                                );
     virtual CORBA::Policy_ptr copy (
-                                    CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                    CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                     );
     virtual void destroy (
-                          CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                           );
     virtual CORBA::PolicyType policy_type (
-                                           CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                            );
 
   private:
@@ -483,30 +483,30 @@ public:
     virtual ~RequestProcessingPolicy (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual PortableServer::RequestProcessingPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual PortableServer::RequestProcessingPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
     static void _get_policy_type_skel (
                                        CORBA::ServerRequest &_tao_req,
                                        void *_tao_obj,
                                        void *_tao_context,
-                                       CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                       CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                        );
 
 
-    PortableServer::RequestProcessingPolicy *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    PortableServer::RequestProcessingPolicy *_this (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -525,19 +525,19 @@ public:
     RequestProcessingPolicy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                   );
     virtual PortableServer::RequestProcessingPolicyValue value (
-                                                                CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                                CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                                 );
     virtual CORBA::Policy_ptr copy (
-                                    CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                    CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                     );
     virtual void destroy (
-                          CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                           );
     virtual CORBA::PolicyType policy_type (
-                                           CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                            );
 
   private:
@@ -564,30 +564,30 @@ public:
     virtual ~SynchronizationPolicy (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual PortableServer::SynchronizationPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
-    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual PortableServer::SynchronizationPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
+    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
     static void _get_policy_type_skel (
                                        CORBA::ServerRequest &_tao_req,
                                        void *_tao_obj,
                                        void *_tao_context,
-                                       CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                       CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                        );
 
 
-    PortableServer::SynchronizationPolicy *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    PortableServer::SynchronizationPolicy *_this (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -606,19 +606,19 @@ public:
     SynchronizationPolicy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                   );
     virtual PortableServer::SynchronizationPolicyValue value (
-                                                              CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                              CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                               );
     virtual CORBA::Policy_ptr copy (
-                                    CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                    CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                     );
     virtual void destroy (
-                          CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                           );
     virtual CORBA::PolicyType policy_type (
-                                           CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                            );
 
   private:
@@ -639,23 +639,23 @@ public:
     virtual ~POAManager (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual void activate ( CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual void activate ( CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual void hold_requests (CORBA::Boolean wait_for_completion,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual void hold_requests (CORBA::Boolean wait_for_completion,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual void discard_requests (CORBA::Boolean wait_for_completion,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual void discard_requests (CORBA::Boolean wait_for_completion,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    PortableServer::POAManager *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    PortableServer::POAManager *_this (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -673,23 +673,23 @@ public:
     POAManager_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                   );
     virtual void activate (
-                           CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                            );
     virtual void hold_requests (
                                 CORBA::Boolean wait_for_completion,
-                                CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                 );
     virtual void discard_requests (
                                    CORBA::Boolean wait_for_completion,
-                                   CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                    );
     virtual void deactivate (
                              CORBA::Boolean etherealize_objects,
                              CORBA::Boolean wait_for_completion,
-                             CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                             CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                              );
 
   private:
@@ -710,17 +710,17 @@ public:
     virtual ~AdapterActivator (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, const char *name,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, const char *name,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    PortableServer::AdapterActivator *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    PortableServer::AdapterActivator *_this (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -738,12 +738,12 @@ public:
     AdapterActivator_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                   );
     virtual CORBA::Boolean unknown_adapter (
                                             PortableServer::POA_ptr  parent,
                                             const char* name,
-                                            CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                            CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                             );
 
   private:
@@ -764,15 +764,15 @@ public:
     virtual ~ServantManager (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    PortableServer::ServantManager *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    PortableServer::ServantManager *_this (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -790,7 +790,7 @@ public:
     ServantManager_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                   );
 
   private:
@@ -811,19 +811,19 @@ public:
     virtual ~ServantActivator (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual void etherealize (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual void etherealize (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    PortableServer::ServantActivator *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    PortableServer::ServantActivator *_this (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -842,12 +842,12 @@ public:
     ServantActivator_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                   );
     virtual PortableServer::Servant incarnate (
                                                const PortableServer::ObjectId & oid,
                                                PortableServer::POA_ptr  adapter,
-                                               CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                               CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                );
     virtual void etherealize (
                               const PortableServer::ObjectId & oid,
@@ -855,7 +855,7 @@ public:
                               PortableServer::Servant serv,
                               CORBA::Boolean cleanup_in_progress,
                               CORBA::Boolean remaining_activations,
-                              CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                              CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                               );
 
   private:
@@ -876,7 +876,7 @@ public:
     virtual ~ServantLocator (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
@@ -884,15 +884,15 @@ public:
                                                PortableServer::POA_ptr adapter,
                                                const char *operation,
                                                PortableServer::ServantLocator::Cookie & the_cookie,
-                                               CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+                                               CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual void postinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual void postinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    PortableServer::ServantLocator *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    PortableServer::ServantLocator *_this (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -911,14 +911,14 @@ public:
     ServantLocator_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                   );
     virtual PortableServer::Servant preinvoke (
                                                const PortableServer::ObjectId & oid,
                                                PortableServer::POA_ptr  adapter,
                                                const char * operation,
                                                PortableServer::ServantLocator::Cookie & the_cookie,
-                                               CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                               CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                );
     virtual void postinvoke (
                              const PortableServer::ObjectId & oid,
@@ -926,7 +926,7 @@ public:
                              const char * operation,
                              PortableServer::ServantLocator::Cookie the_cookie,
                              PortableServer::Servant the_servant,
-                             CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                             CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                              );
 
   private:
@@ -947,29 +947,29 @@ public:
     virtual ~POA (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual PortableServer::POA_ptr  create_POA (const char *adapter_name, PortableServer::POAManager_ptr a_POAManager, const CORBA::PolicyList &policies,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual PortableServer::POA_ptr  create_POA (const char *adapter_name, PortableServer::POAManager_ptr a_POAManager, const CORBA::PolicyList &policies,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::POA_ptr  find_POA (const char *adapter_name, CORBA::Boolean activate_it,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual PortableServer::POA_ptr  find_POA (const char *adapter_name, CORBA::Boolean activate_it,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::ThreadPolicy_ptr  create_thread_policy (PortableServer::ThreadPolicyValue value,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual PortableServer::ThreadPolicy_ptr  create_thread_policy (PortableServer::ThreadPolicyValue value,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::LifespanPolicy_ptr  create_lifespan_policy (PortableServer::LifespanPolicyValue value,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual PortableServer::LifespanPolicy_ptr  create_lifespan_policy (PortableServer::LifespanPolicyValue value,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::IdUniquenessPolicy_ptr  create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual PortableServer::IdUniquenessPolicy_ptr  create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::IdAssignmentPolicy_ptr  create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual PortableServer::IdAssignmentPolicy_ptr  create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::ImplicitActivationPolicy_ptr  create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual PortableServer::ImplicitActivationPolicy_ptr  create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::ServantRetentionPolicy_ptr  create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual PortableServer::ServantRetentionPolicy_ptr  create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::RequestProcessingPolicy_ptr  create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual PortableServer::RequestProcessingPolicy_ptr  create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
     // **************************************************
     //
@@ -977,53 +977,53 @@ public:
     //
     // **************************************************
 
-    virtual PortableServer::SynchronizationPolicy_ptr  create_synchronization_policy (PortableServer::SynchronizationPolicyValue value,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual PortableServer::SynchronizationPolicy_ptr  create_synchronization_policy (PortableServer::SynchronizationPolicyValue value,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual char * the_name (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+    virtual char * the_name (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
 
-    virtual PortableServer::POA_ptr  the_parent (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+    virtual PortableServer::POA_ptr  the_parent (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
 
-    virtual PortableServer::POAManager_ptr  the_POAManager (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+    virtual PortableServer::POAManager_ptr  the_POAManager (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
 
-    virtual PortableServer::AdapterActivator_ptr  the_activator (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+    virtual PortableServer::AdapterActivator_ptr  the_activator (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
 
-    virtual void the_activator(PortableServer::AdapterActivator_ptr the_activator, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+    virtual void the_activator(PortableServer::AdapterActivator_ptr the_activator, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
 
-    virtual PortableServer::ServantManager_ptr  get_servant_manager ( CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual PortableServer::ServantManager_ptr  get_servant_manager ( CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual void set_servant_manager (PortableServer::ServantManager_ptr imgr,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual void set_servant_manager (PortableServer::ServantManager_ptr imgr,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::Servant get_servant ( CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual PortableServer::Servant get_servant ( CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual void set_servant (PortableServer::Servant p_servant,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual void set_servant (PortableServer::Servant p_servant,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::ObjectId * activate_object (PortableServer::Servant p_servant,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual PortableServer::ObjectId * activate_object (PortableServer::Servant p_servant,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual void deactivate_object (const PortableServer::ObjectId &oid,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual void deactivate_object (const PortableServer::ObjectId &oid,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual CORBA::Object_ptr create_reference (const char *intf,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual CORBA::Object_ptr create_reference (const char *intf,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid, const char *intf,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid, const char *intf,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::ObjectId * servant_to_id (PortableServer::Servant p_servant,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual PortableServer::ObjectId * servant_to_id (PortableServer::Servant p_servant,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::ObjectId * reference_to_id (CORBA::Object_ptr reference,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual PortableServer::ObjectId * reference_to_id (CORBA::Object_ptr reference,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    virtual CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid,  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    virtual CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid,  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
 
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    PortableServer::POA *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    PortableServer::POA *_this (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -1041,51 +1041,51 @@ public:
     POA_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                   );
     virtual PortableServer::POA_ptr create_POA (
                                                 const char* adapter_name,
                                                 PortableServer::POAManager_ptr  a_POAManager,
                                                 const CORBA::PolicyList & policies,
-                                                CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                 );
     virtual PortableServer::POA_ptr find_POA (
                                               const char* adapter_name,
                                               CORBA::Boolean activate_it,
-                                              CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                              CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                               );
     virtual void destroy (
                           CORBA::Boolean etherealize_objects,
                           CORBA::Boolean wait_for_completion,
-                          CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                           );
     virtual PortableServer::ThreadPolicy_ptr create_thread_policy (
                                                                    PortableServer::ThreadPolicyValue value,
-                                                                   CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                                    );
     virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy (
                                                                        PortableServer::LifespanPolicyValue value,
-                                                                       CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                                       CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                                        );
     virtual PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (
                                                                                 PortableServer::IdUniquenessPolicyValue value,
-                                                                                CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                                                CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                                                 );
     virtual PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (
                                                                                 PortableServer::IdAssignmentPolicyValue value,
-                                                                                CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                                                CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                                                 );
     virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
                                                                                             PortableServer::ImplicitActivationPolicyValue value,
-                                                                                            CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                                                            CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                                                             );
     virtual PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (
                                                                                         PortableServer::ServantRetentionPolicyValue value,
-                                                                                        CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                                                        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                                                         );
     virtual PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (
                                                                                           PortableServer::RequestProcessingPolicyValue value,
-                                                                                          CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                                                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                                                           );
 
     // **************************************************
@@ -1096,83 +1096,83 @@ public:
 
     virtual PortableServer::SynchronizationPolicy_ptr create_synchronization_policy (
                                                                                      PortableServer::SynchronizationPolicyValue value,
-                                                                                     CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                                                     CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                                                      );
 
     virtual char*  the_name (
-                             CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                             CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                              );
     virtual PortableServer::POA_ptr the_parent (
-                                                CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                 );
     virtual PortableServer::POAManager_ptr the_POAManager (
-                                                           CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                            );
     virtual PortableServer::AdapterActivator_ptr the_activator (
-                                                                CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                                CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                                 );
     virtual void the_activator (PortableServer::AdapterActivator_ptr  _tao_value,
-                                CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                 );
     virtual PortableServer::ServantManager_ptr get_servant_manager (
-                                                                    CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                                    CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                                     );
     virtual void set_servant_manager (
                                       PortableServer::ServantManager_ptr  imgr,
-                                      CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                      CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                       );
     virtual PortableServer::Servant get_servant (
-                                                 CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                 CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                  );
     virtual void set_servant (
                               PortableServer::Servant p_servant,
-                              CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                              CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                               );
     virtual PortableServer::ObjectId * activate_object (
                                                         PortableServer::Servant p_servant,
-                                                        CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                         );
     virtual void activate_object_with_id (
                                           const PortableServer::ObjectId & id,
                                           PortableServer::Servant p_servant,
-                                          CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                           );
     virtual void deactivate_object (
                                     const PortableServer::ObjectId & oid,
-                                    CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                    CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                     );
     virtual CORBA::Object_ptr create_reference (
                                                 const char *intf,
-                                                CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                 );
     virtual CORBA::Object_ptr create_reference_with_id (
                                                         const PortableServer::ObjectId & oid,
                                                         const char *intf,
-                                                        CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                         );
     virtual PortableServer::ObjectId * servant_to_id (
                                                       PortableServer::Servant p_servant,
-                                                      CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                      CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                       );
     virtual CORBA::Object_ptr servant_to_reference (
                                                     PortableServer::Servant p_servant,
-                                                    CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                    CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                     );
     virtual PortableServer::Servant reference_to_servant (
                                                           CORBA::Object_ptr  reference,
-                                                          CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                           );
     virtual PortableServer::ObjectId * reference_to_id (
                                                         CORBA::Object_ptr  reference,
-                                                        CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                         );
     virtual PortableServer::Servant id_to_servant (
                                                    const PortableServer::ObjectId & oid,
-                                                   CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                    );
     virtual CORBA::Object_ptr id_to_reference (
                                                const PortableServer::ObjectId & oid,
-                                               CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                               CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                );
 
   private:
@@ -1193,21 +1193,21 @@ public:
     virtual ~Current (void);
     virtual CORBA::Boolean _is_a (
                                   const char* logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual void* _downcast (
                              const char* logical_type_id
                              );
-    virtual PortableServer::POA_ptr  get_POA ( CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
-    static void get_POA_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual PortableServer::POA_ptr  get_POA ( CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    static void get_POA_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    virtual PortableServer::ObjectId * get_object_id ( CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual
-    static void get_object_id_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual PortableServer::ObjectId * get_object_id ( CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0; // pure virtual
+    static void get_object_id_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    PortableServer::Current *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    PortableServer::Current *_this (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -1226,13 +1226,13 @@ public:
     Current_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
                                   const char *logical_type_id,
-                                  CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                   );
     virtual PortableServer::POA_ptr get_POA (
-                                             CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                             CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                              );
     virtual PortableServer::ObjectId * get_object_id (
-                                                      CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                                      CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                                       );
 
   private:
diff --git a/TAO/tao/POA_CORBA.h b/TAO/tao/POA_CORBA.h
index c7e3272972b..91126170a5a 100644
--- a/TAO/tao/POA_CORBA.h
+++ b/TAO/tao/POA_CORBA.h
@@ -46,45 +46,45 @@ public:
     virtual ~Policy (void);
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id,
-        CORBA_Environment &_env = CORBA_Environment::default_environment ());
+        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual void* _downcast (
         const char* logical_type_id
       );
     virtual CORBA::PolicyType policy_type (
-        CORBA_Environment &_env = CORBA_Environment::default_environment ()
+        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
        ) = 0;
     static void _get_policy_type_skel (
         CORBA::ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_context,
-        CORBA_Environment &_env = CORBA_Environment::default_environment ()
+        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
       );
 
     virtual CORBA::Policy_ptr copy (
-        CORBA_Environment &_env = CORBA_Environment::default_environment ()
+        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
        ) = 0;
     static void copy_skel (
         CORBA::ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_context,
-        CORBA_Environment &_env = CORBA_Environment::default_environment ()
+        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
       );
 
     virtual void destroy (
-        CORBA_Environment &_env = CORBA_Environment::default_environment ()
+        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
        ) = 0;
     static void destroy_skel (
         CORBA::ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_context,
-        CORBA_Environment &_env = CORBA_Environment::default_environment ()
+        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
       );
 
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    virtual void _dispatch (CORBA::ServerRequest &_tao_req, void *_tao_context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual void _dispatch (CORBA::ServerRequest &_tao_req, void *_tao_context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    ACE_CORBA_1(Policy) *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    ACE_CORBA_1(Policy) *_this (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -102,16 +102,16 @@ public:
     Policy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
         const char *logical_type_id,
-        CORBA_Environment &_env = CORBA_Environment::default_environment ()
+        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
       );
     virtual CORBA::PolicyType policy_type (
-        CORBA_Environment &_env = CORBA_Environment::default_environment ()
+        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
        );
     virtual CORBA::Policy_ptr copy (
-        CORBA_Environment &_env = CORBA_Environment::default_environment ()
+        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
        );
     virtual void destroy (
-        CORBA_Environment &_env = CORBA_Environment::default_environment ()
+        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
        );
 
   private:
@@ -137,15 +137,15 @@ public:
     virtual ~Current (void);
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id,
-        CORBA_Environment &_env = CORBA_Environment::default_environment ());
+        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual void* _downcast (
         const char* logical_type_id
       );
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    virtual void _dispatch (CORBA::ServerRequest &_tao_req, void *_tao_context, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    virtual void _dispatch (CORBA::ServerRequest &_tao_req, void *_tao_context, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
-    ACE_CORBA_1(Current) *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+    ACE_CORBA_1(Current) *_this (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
@@ -163,7 +163,7 @@ public:
     Current_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
         const char *logical_type_id,
-        CORBA_Environment &_env = CORBA_Environment::default_environment ()
+        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
       );
 
   private:
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index 6b08397481f..f831bb2a75d 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -84,20 +84,20 @@ class TAO_Export  CORBA_Policy : public virtual ACE_CORBA_1 (Object)
 public:
   // the static operations
   static CORBA_Policy_ptr _duplicate (CORBA_Policy_ptr obj);
-  static CORBA_Policy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  static CORBA_Policy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   static CORBA_Policy_ptr _nil (void);
 
   virtual CORBA::PolicyType policy_type (
-                                         CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                         CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                          );
   virtual CORBA_Policy_ptr copy (
-                                 CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                 CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                  );
   virtual void destroy (
-                        CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                         );
   virtual CORBA::Boolean _is_a (const CORBA::Char *type_id,
-                                CORBA_Environment &_env = CORBA_Environment::default_environment ()
+                                CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()
                                 );
   virtual const char* _interface_repository_id (void) const;
 protected:
diff --git a/TAO/tao/PolicyS.cpp b/TAO/tao/PolicyS.cpp
index 1043461f678..37a3ee74d00 100644
--- a/TAO/tao/PolicyS.cpp
+++ b/TAO/tao/PolicyS.cpp
@@ -272,10 +272,10 @@ void POA_CORBA::_tao_collocated_Policy::destroy  (
 
 
 CORBA::Policy*
-POA_CORBA::Policy::_this (CORBA_Environment &_env)
+POA_CORBA::Policy::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_CORBA::_tao_collocated_Policy (this, stub);
 }
diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h
index 4a3d3dd36e9..1080046d383 100644
--- a/TAO/tao/Sequence.h
+++ b/TAO/tao/Sequence.h
@@ -60,7 +60,7 @@ public:
 
   virtual void _downcast (void *target,
                           CORBA_Object *src,
-                          CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Used for sequences of objects to downcast a recently demarshalled
   // object reference into the right type.
 
diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h
index 5ef43768610..18e93f79a2f 100644
--- a/TAO/tao/Sequence_T.h
+++ b/TAO/tao/Sequence_T.h
@@ -426,7 +426,7 @@ public:
                                CORBA::ULong old_length);
   virtual void _downcast (void* target,
                           CORBA_Object* src,
-                          CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA_Object* _upcast (void* src) const;
 };
 
@@ -482,7 +482,7 @@ public:
                                CORBA::ULong old_length);
   virtual void _downcast (void* target,
                           CORBA_Object* src,
-                          CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA_Object* _upcast (void* src) const;
 };
 
diff --git a/TAO/tao/Servant_Base.h b/TAO/tao/Servant_Base.h
index 459d59fd7e6..898c8f89085 100644
--- a/TAO/tao/Servant_Base.h
+++ b/TAO/tao/Servant_Base.h
@@ -35,13 +35,13 @@ public:
   TAO_ServantBase &operator= (const TAO_ServantBase &);
   // assignment operator.
 
-  virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Returns the default POA for this servant.
 
   virtual void *_downcast (const char *repository_id) = 0;
   // Get the correct vtable.
 
-  virtual STUB_Object *_create_stub (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual STUB_Object *_create_stub (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // This is an auxiliar method for _this() and _narrow().
 
 protected:
@@ -52,12 +52,12 @@ protected:
   // Copy constructor, protected so no instances can be created.
 
   virtual CORBA::Boolean _is_a (const char* logical_type_id,
-                                CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Local implementation of the CORBA::Object::_is_a method.
 
   virtual void _dispatch (CORBA::ServerRequest &request,
                           void *context,
-                          CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 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
@@ -92,7 +92,7 @@ class TAO_Export TAO_Local_ServantBase : public TAO_ServantBase
   // = TITLE
   //   Base class for local skeletons and servants.
 protected:
-  STUB_Object *_create_stub (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  STUB_Object *_create_stub (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // This is an auxiliar method for _this().  Make sure *not* to
   // register with the default POA
 };
@@ -109,19 +109,19 @@ class TAO_Export TAO_DynamicImplementation : public virtual TAO_ServantBase
   //   circumstances may lead to unpredictable results.
 public:
   virtual void invoke (CORBA::ServerRequest_ptr request,
-                       CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+                       CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 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.
 
   virtual CORBA::RepositoryId _primary_interface (const PortableServer::ObjectId &oid,
                                                   PortableServer::POA_ptr poa,
-                                                  CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 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 (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  CORBA::Object_ptr _this (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Returns a CORBA::Object_ptr for the target object.
 
 protected:
@@ -132,12 +132,12 @@ protected:
   virtual void *_downcast (const char *repository_id);
   // Simply returns "this"
 
-  virtual STUB_Object *_create_stub (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual STUB_Object *_create_stub (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // This is an auxiliar method for _this() and _narrow().
 
   virtual void _dispatch (CORBA::ServerRequest &request,
                           void *context,
-                          CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Turns around and calls invoke.
 };
 
diff --git a/TAO/tao/Server_Request.h b/TAO/tao/Server_Request.h
index 3665a9a8952..c5aa25c4b25 100644
--- a/TAO/tao/Server_Request.h
+++ b/TAO/tao/Server_Request.h
@@ -105,13 +105,13 @@ public:
   // the standard _nil method on pseudo objects
 
   virtual void arguments (CORBA::NVList_ptr &list,
-                          CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
   // 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.
 
   virtual void set_result (const CORBA::Any &value,
-                           CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+                           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
   // Implementation uses this to provide the operation result
   // ... illegal if exception() was called or params() was not called.
   //
@@ -119,7 +119,7 @@ public:
   // sent when this returns, and reclaim memory it allocated.
 
   virtual void set_exception (const CORBA::Any &value,
-                              CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+                              CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
   // Implementation uses this to provide the exception value which is
   // the only result of this particular invocation.
   //
@@ -160,10 +160,10 @@ public:
                         ...) = 0;
   // marshal outgoing parameters
 
-  virtual void dsi_marshal (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+  virtual void dsi_marshal (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
   // marshal outgoing parameters. Used by DSI
 
-  virtual void init_reply (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+  virtual void init_reply (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
   // Start a Reply message.
 
   virtual TAO_InputCDR &incoming (void) = 0;
@@ -185,7 +185,7 @@ public:
   IIOP_ServerRequest (TAO_InputCDR &input,
                       TAO_OutputCDR &output,
                       TAO_ORB_Core *orb_core,
-                      CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                      CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Constructor
   IIOP_ServerRequest (CORBA::ULong &request_id,
                       CORBA::Boolean &response_expected,
@@ -193,20 +193,20 @@ public:
                       char* operation,
                       TAO_OutputCDR &output,
                       TAO_ORB_Core *orb_core,
-                      CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                      CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual ~IIOP_ServerRequest (void);
   // Destructor.
 
   // = General ServerRequest operations
   void arguments (CORBA::NVList_ptr &list,
-                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   void set_result (const CORBA::Any &value,
-                   CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   void set_exception (const CORBA::Any &value,
-                      CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                      CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   // = Request attributes.
 
@@ -242,11 +242,11 @@ public:
   // marshal outgoing parameters and return value. This is used by the SSI
   // i.e., by the IDL compiler generated skeletons.
 
-  virtual void dsi_marshal (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual void dsi_marshal (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // does the marshaling of outgoing parameters and is used by the DSI based
   // scheme
 
-  virtual void init_reply (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual void init_reply (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // start a Reply message
 
   virtual TAO_InputCDR &incoming (void);
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index d1ab1b7f991..8b0cabfb710 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -223,7 +223,7 @@ public:
                                 CORBA::NamedValue_ptr result,
                                 CORBA::Flags flags,
                                 CORBA::ExceptionList &exceptions,
-                                CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+                                CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
   // Dynamic invocations use a more costly "varargs" calling
   // convention; it's got the same input data as the (static)
   // stub-oriented one, but the data is represented somewhat
@@ -246,7 +246,7 @@ public:
   // All objref representations carry around a type ID.
 
   virtual CORBA::ULong hash (CORBA::ULong maximum,
-                             CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+                             CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
   // All objref representations know how to hash themselves and
   // compare themselves for equivalence to others.  It's easily
   // possible to have two objrefs that are distinct copies of data
@@ -254,7 +254,7 @@ public:
   // equivalent).
 
   virtual CORBA::Boolean is_equivalent (CORBA::Object_ptr other_obj,
-                                        CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+                                        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
   // check for equivalence
 
   STUB_Object (CORBA::String p = 0);
@@ -269,7 +269,7 @@ public:
   // only supports one protocol -- the problem won't show up.
   // "Multiprotocol ORBs" will need to solve that problem though.  ]
 
-  virtual TAO_ObjectKey *key (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0;
+  virtual TAO_ObjectKey *key (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) = 0;
   // Return the object key as an out parameter.  Caller should release
   // return value when finished with it.
 
diff --git a/TAO/tao/TAO.h b/TAO/tao/TAO.h
index 9db16411fe0..795a261c3e5 100644
--- a/TAO/tao/TAO.h
+++ b/TAO/tao/TAO.h
@@ -44,27 +44,27 @@ public:
 
   int init (int& argc,
             char *argv[],
-            CORBA_Environment &_env = CORBA_Environment::default_environment ());
+            CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Initialize the ORB/root POA, using the supplied command line
   // arguments or the default ORB components.  Returns -1 on failure.
 
   int init_child_poa (int& argc,
                       char *argv[],
                       char *poa_name,
-                      CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                      CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Creates a child poa under the root poa with PERSISTENT and
   // USER_ID policies.  Call this if you want a <child_poa> with the
   // above policies, otherwise call init.  Returns -1 on failure.
 
   CORBA::String activate (PortableServer::Servant servant,
-                          CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Activate <servant>, using the POA <activate_object> call.  Users
   // can call this method multiple times to activate multiple objects.
   // Returns 0 on failure.
 
   CORBA::String activate_under_child_poa (const char *servant_name,
                                           PortableServer::Servant servant,
-                                          CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Precondition: init_child_poa has been called.  Activate <servant>
   // using the POA <activate_object_with_id> created from the string
   // servant_name. Users should call this to activate objects under
diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h
index ec6f8e48991..76813e3f05d 100644
--- a/TAO/tao/Typecode.h
+++ b/TAO/tao/Typecode.h
@@ -87,56 +87,56 @@ public:
   // Returns a NULL typecode.
 
   CORBA::Boolean equal (const CORBA::TypeCode_ptr,
-                        CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+                        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // Compares two typecodes.
 
   CORBA::Boolean equivalent (CORBA::TypeCode_ptr,
-                             CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+                             CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // Unaliases receiver and argument before comparing.
 
-  CORBA::TCKind kind (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+  CORBA::TCKind kind (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // For all TypeCode kinds, returns the "kind" of the typecode.
 
-  const char *id (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+  const char *id (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // For tk_{objref,struct,union,enum,alias,except}. Returns the
   // repository ID, raises BadKind.
 
-  const char *name (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+  const char *name (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // Returns name (), raises (BadKind).
 
-  CORBA::ULong member_count (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+  CORBA::ULong member_count (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // Returns member_count (), raises (BadKind). Useful for tk_struct,
   // tk_union, tk_enum, tk_alias, and tk_except.
 
   const char *member_name (CORBA::ULong index,
-                           CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+                           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // Returns member_name (...), raises (BadKind, Bounds); Useful for
   // tk_struct, tk_union, tk_enum, tk_alias, and tk_except.
 
   CORBA::TypeCode_ptr member_type (CORBA::ULong index,
-                                   CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+                                   CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // Returns member_type (...), raises (BadKind, Bounds); Useful for
   // tk_struct, tk_union, and tk_except.
 
   CORBA::Any_ptr member_label (CORBA::ULong n,
-                               CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+                               CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // For tk_union. Returns the label. Raises BadKind, Bounds.
 
-  CORBA::TypeCode_ptr discriminator_type (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+  CORBA::TypeCode_ptr discriminator_type (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // Returns the discriminator type for tk_union. raises (BadKind).
 
-  CORBA::Long default_index (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+  CORBA::Long default_index (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // Returns the default index for the tk_union. Raises (BadKind).
 
-  CORBA::ULong length (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+  CORBA::ULong length (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // Returns length, raises (BadKind). Used for tk_string,
   // tk_sequence, and tk_array.
 
-  CORBA::TypeCode_ptr content_type (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+  CORBA::TypeCode_ptr content_type (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // Returns the content type (element type). Raises (BadKind); Useful
   // for tk_sequence, tk_array, and tk_alias.
 
-  CORBA::ULong TAO_discrim_pad_size (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  CORBA::ULong TAO_discrim_pad_size (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Calculates the padded size of discriminant type TAO Extension.
 
   // = Creation/refcounting
@@ -179,10 +179,10 @@ public:
   };
   // these are used to indicate the status of marshaling
 
-  size_t size (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  size_t size (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // returns the size. Used by the IIOP marshaling engine.
 
-  size_t alignment (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  size_t alignment (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // returns the alignment requirements for this typecode. used by the
   // IIOP marshaling engine.
 
@@ -192,15 +192,15 @@ public:
 
   // = Following three are deprecated
 
-  CORBA::ULong param_count (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+  CORBA::ULong param_count (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // Deprecated, CORBA 1.2, not fully usable. Returns the number of
   // parameters that the typecode takes.
 
   CORBA::ULong ulong_param (CORBA::ULong n,
-                            CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+                            CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
 
   CORBA::TypeCode_ptr typecode_param (CORBA::ULong n,
-                                      CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+                                      CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // Internal utilities, pending CORBA 2.0 IFR APIs; just enough to
   // make array and sequence typecode interpretation cheap
 
@@ -236,98 +236,98 @@ private:
   // = All the private/helper methods
 
   CORBA::Boolean private_equal (CORBA::TypeCode_ptr tc,
-                                CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+                                CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // Compares the typecodes.
 
-  const char *private_id (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+  const char *private_id (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // For tk_{objref,struct,union,enum,alias,except}. Returns the
   // repository ID, raises BadKind.
 
-  const char *private_name (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+  const char *private_name (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // returns name (), raises (BadKind)
 
-  CORBA::ULong private_member_count (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+  CORBA::ULong private_member_count (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // returns member_count (), raises (BadKind). Useful for tk_struct,
   // tk_union, tk_enum, tk_alias, and tk_except.
 
   CORBA::TypeCode_ptr private_member_type (CORBA::ULong index,
-                                           CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+                                           CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // returns member_type (...), raises (BadKind, Bounds); Useful for
   // tk_struct, tk_union, and tk_except
 
   const char *private_member_name (CORBA::ULong index,
-                                    CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+                                    CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // returns member_name (...), raises (BadKind, Bounds); Useful for tk_union,
   // tk_struct, tk_except, and tk_enum
 
   CORBA::Any_ptr private_member_label (CORBA::ULong n,
-                                       CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+                                       CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // For tk_union. Returns the label. Raises BadKind, Bounds.
 
-  CORBA::TypeCode_ptr private_discriminator_type (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+  CORBA::TypeCode_ptr private_discriminator_type (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // returns the discriminator type for tk_union. raises (BadKind);
 
-  CORBA::Long private_default_index (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+  CORBA::Long private_default_index (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // returns the default index for the tk_union. Raises (BadKind);
 
-  CORBA::Long private_length (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+  CORBA::Long private_length (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // returns length, raises (BadKind). Used for tk_string,
   // tk_sequence, and tk_array
 
-  CORBA::TypeCode_ptr private_content_type (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+  CORBA::TypeCode_ptr private_content_type (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // returns the content type (element type). Raises (BadKind); Useful
   // for tk_sequence, tk_array, and tk_alias
 
-  size_t private_size (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  size_t private_size (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // returns the size. Used by the IIOP marshaling engine.
 
-  size_t private_alignment (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  size_t private_alignment (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // returns the alignment requirements for this typecode. used by the
   // IIOP marshaling engine.
 
-  CORBA::ULong private_discrim_pad_size (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  CORBA::ULong private_discrim_pad_size (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   // Calculates the padded size of discriminant type TAO Extension
 
   // = All the private helpers testing for equality of typecodes
 
   CORBA::Boolean private_equal_objref (CORBA::TypeCode_ptr tc,
-                                       CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+                                       CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // test equality for typecodes of objrefs
 
   CORBA::Boolean private_equal_struct (CORBA::TypeCode_ptr tc,
-                                       CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+                                       CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // test equality for typecodes of structs
 
   CORBA::Boolean private_equal_union (CORBA::TypeCode_ptr tc,
-                                      CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+                                      CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // test equality for typecodes of unions
 
   CORBA::Boolean private_equal_enum (CORBA::TypeCode_ptr tc,
-                                     CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+                                     CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // test equality for typecodes of enums
 
   CORBA::Boolean private_equal_string (CORBA::TypeCode_ptr tc,
-                                       CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+                                       CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // test equality for typecodes of strings
 
   CORBA::Boolean private_equal_wstring (CORBA::TypeCode_ptr tc,
-                                        CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+                                        CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // test equality for typecodes of wide strings
 
   CORBA::Boolean private_equal_sequence (CORBA::TypeCode_ptr tc,
-                                         CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+                                         CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // test equality for typecodes of sequences
 
   CORBA::Boolean private_equal_array (CORBA::TypeCode_ptr tc,
-                                      CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+                                      CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // test equality for typecodes of array
 
   CORBA::Boolean private_equal_alias (CORBA::TypeCode_ptr tc,
-                                      CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+                                      CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // test equality for typecodes of typedefs
 
   CORBA::Boolean private_equal_except (CORBA::TypeCode_ptr tc,
-                                       CORBA_Environment &_env = CORBA_Environment::default_environment ()) const;
+                                       CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ()) const;
   // test equality for typecodes of exceptions
 
   CORBA::ULong refcount_;
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index b67d4dc3bb1..3eacdc5b6d1 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -166,7 +166,7 @@ typedef void (*TAO_Skeleton)(
     CORBA_ServerRequest &,
     void *,
     void *,
-    CORBA_Environment &_env
+    CORBA_Environment &TAO_IN_ENV
   );
 
 // NOTE: stub APIs are nonportable, and must be explicitly #included
diff --git a/TAO/tao/poa_T.h b/TAO/tao/poa_T.h
index fd30a5b6402..89e77666fa6 100644
--- a/TAO/tao/poa_T.h
+++ b/TAO/tao/poa_T.h
@@ -13,13 +13,13 @@ public:
                   PortableServer::POAManager_ptr poa_manager,
                   TAO_POA_Policies &policies,
                   PortableServer::POA_ptr parent,
-                  CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                  CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
   virtual TAO_POA *clone (const char *adapter_name,
                           PortableServer::POAManager_ptr poa_manager,
                           TAO_POA_Policies &policies,
                           PortableServer::POA_ptr parent,
-                          CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
 
 protected:
 
diff --git a/TAO/tao/varout.h b/TAO/tao/varout.h
index ba36b396a7b..ce04d519e67 100644
--- a/TAO/tao/varout.h
+++ b/TAO/tao/varout.h
@@ -85,7 +85,7 @@ public:
   // TAO extension for access to the underlying pointer.
 
   virtual void _downcast (CORBA_Object* base_ptr,
-                          CORBA_Environment &_env = CORBA_Environment::default_environment ());
+                          CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
   virtual CORBA_Object* _upcast (void);
   virtual void _release (void);
   // Implement the TAO_Object_Field methods.