--- orig/IFR_BaseS.cpp	Mon Apr 30 22:22:30 2001
+++ IFR_BaseS.cpp	Fri May 11 00:03:12 2001
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// IFR_BaseS.cpp.diff,v 1.2 2001/05/11 01:29:39 parsons Exp
+// IFR_BaseS.cpp.diff,v 1.2 2001/05/11 01:29:39 parsons Exp
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_IFR_BASES_CPP_
-#define _TAO_IDL_IFR_BASES_CPP_
+#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASES_CPP_
+#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASES_CPP_
 
 #include "IFR_BaseS.h"
 
@@ -36,6 +36,7 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #include "ace/Dynamic_Service.h"
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
 #endif /* __BORLANDC__ */
@@ -51,7 +52,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:29 */
+/* starting time is 12:14:19 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IRObject_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -147,7 +148,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:29 */
+/* ending time is 12:14:19 */
 static TAO_CORBA_IRObject_Perfect_Hash_OpTable tao_CORBA_IRObject_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -528,7 +529,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_IRObject_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_IRObject:1.0"
+          "IDL:omg.org/CORBA/IRObject:1.0"
         )
     )->def_kind (
         ACE_TRY_ENV
@@ -557,7 +558,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_IRObject_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_IRObject:1.0"
+          "IDL:omg.org/CORBA/IRObject:1.0"
         )
     )->destroy (
         ACE_TRY_ENV
@@ -831,7 +832,7 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -842,7 +843,7 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -856,7 +857,7 @@
 
 const char* POA_CORBA_IRObject::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_IRObject:1.0";
+  return "IDL:omg.org/CORBA/IRObject:1.0";
 }
 
 CORBA_IRObject*
@@ -884,7 +885,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:29 */
+/* starting time is 12:14:19 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Contained_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -1011,7 +1012,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:29 */
+/* ending time is 12:14:19 */
 static TAO_CORBA_Contained_Perfect_Hash_OpTable tao_CORBA_Contained_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -2526,7 +2527,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Contained:1.0"
+          "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->id (
         ACE_TRY_ENV
@@ -2556,7 +2557,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Contained:1.0"
+          "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->id (
         id,
@@ -2589,7 +2590,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Contained:1.0"
+          "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->name (
         ACE_TRY_ENV
@@ -2619,7 +2620,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Contained:1.0"
+          "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->name (
         name,
@@ -2652,7 +2653,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Contained:1.0"
+          "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->version (
         ACE_TRY_ENV
@@ -2682,7 +2683,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Contained:1.0"
+          "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->version (
         version,
@@ -2715,7 +2716,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Contained:1.0"
+          "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->defined_in (
         ACE_TRY_ENV
@@ -2746,7 +2747,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Contained:1.0"
+          "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->absolute_name (
         ACE_TRY_ENV
@@ -2777,7 +2778,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Contained:1.0"
+          "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->containing_repository (
         ACE_TRY_ENV
@@ -2808,7 +2809,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Contained:1.0"
+          "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->describe (
         ACE_TRY_ENV
@@ -2840,7 +2841,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Contained:1.0"
+          "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->move (
         new_container,
@@ -3853,8 +3854,8 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -3865,9 +3866,9 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -3881,7 +3882,7 @@
 
 const char* POA_CORBA_Contained::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_Contained:1.0";
+  return "IDL:omg.org/CORBA/Contained:1.0";
 }
 
 CORBA_Contained*
@@ -3909,7 +3910,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:29 */
+/* starting time is 12:14:19 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Container_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -4042,7 +4043,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:29 */
+/* ending time is 12:14:19 */
 static TAO_CORBA_Container_Perfect_Hash_OpTable tao_CORBA_Container_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -6945,7 +6946,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->lookup (
         search_name,
@@ -6979,7 +6980,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->contents (
         limit_type,
@@ -7016,7 +7017,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->lookup_name (
         search_name,
@@ -7054,7 +7055,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->describe_contents (
         limit_type,
@@ -7091,7 +7092,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_module (
         id,
@@ -7130,7 +7131,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_constant (
         id,
@@ -7170,7 +7171,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_struct (
         id,
@@ -7210,7 +7211,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_union (
         id,
@@ -7250,7 +7251,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_enum (
         id,
@@ -7289,7 +7290,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_alias (
         id,
@@ -7328,7 +7329,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_interface (
         id,
@@ -7373,7 +7374,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_value (
         id,
@@ -7418,7 +7419,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_value_box (
         id,
@@ -7457,7 +7458,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_exception (
         id,
@@ -7495,7 +7496,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_native (
         id,
@@ -7533,7 +7534,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_abstract_interface (
         id,
@@ -7572,7 +7573,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_local_interface (
         id,
@@ -9418,8 +9419,8 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -9430,9 +9431,9 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Container_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -9446,7 +9447,7 @@
 
 const char* POA_CORBA_Container::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_Container:1.0";
+  return "IDL:omg.org/CORBA/Container:1.0";
 }
 
 CORBA_Container*
@@ -9474,7 +9475,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:30 */
+/* starting time is 12:14:19 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IDLType_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -9571,7 +9572,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:30 */
+/* ending time is 12:14:19 */
 static TAO_CORBA_IDLType_Perfect_Hash_OpTable tao_CORBA_IDLType_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -9841,7 +9842,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_IDLType_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_IDLType:1.0"
+          "IDL:omg.org/CORBA/IDLType:1.0"
         )
     )->type (
         ACE_TRY_ENV
@@ -10046,8 +10047,8 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -10058,9 +10059,9 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -10074,7 +10075,7 @@
 
 const char* POA_CORBA_IDLType::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_IDLType:1.0";
+  return "IDL:omg.org/CORBA/IDLType:1.0";
 }
 
 CORBA_IDLType*
@@ -10102,7 +10103,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:30 */
+/* starting time is 12:14:19 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_TypedefDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -10230,7 +10231,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:30 */
+/* ending time is 12:14:19 */
 static TAO_CORBA_TypedefDef_Perfect_Hash_OpTable tao_CORBA_TypedefDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -10473,10 +10474,10 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -10487,13 +10488,13 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -10507,7 +10508,7 @@
 
 const char* POA_CORBA_TypedefDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_TypedefDef:1.0";
+  return "IDL:omg.org/CORBA/TypedefDef:1.0";
 }
 
 CORBA_TypedefDef*