--- orig/IFR_BasicS.cpp	Mon Apr 30 22:22:33 2001
+++ IFR_BasicS.cpp	Fri May 11 00:01:55 2001
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id$
+// $Id$
 
 // ****  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_BASICS_CPP_
-#define _TAO_IDL_IFR_BASICS_CPP_
+#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASICS_CPP_
+#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASICS_CPP_
 
 #include "IFR_BasicS.h"
 
@@ -51,7 +51,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:32 */
+/* starting time is 13:56:20 */
 /* 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_Repository_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -194,7 +194,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:32 */
+/* ending time is 13:56:20 */
 static TAO_CORBA_Repository_Perfect_Hash_OpTable tao_CORBA_Repository_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -1444,7 +1444,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Repository_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Repository:1.0"
+          "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->lookup_id (
         search_id,
@@ -1477,7 +1477,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Repository_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Repository:1.0"
+          "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->get_canonical_typecode (
         tc,
@@ -1510,7 +1510,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Repository_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Repository:1.0"
+          "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->get_primitive (
         kind,
@@ -1543,7 +1543,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Repository_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Repository:1.0"
+          "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->create_string (
         bound,
@@ -1576,7 +1576,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Repository_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Repository:1.0"
+          "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->create_wstring (
         bound,
@@ -1610,7 +1610,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Repository_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Repository:1.0"
+          "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->create_sequence (
         bound,
@@ -1645,7 +1645,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Repository_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Repository:1.0"
+          "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->create_array (
         length,
@@ -1680,7 +1680,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_Repository_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Repository:1.0"
+          "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->create_fixed (
         digits,
@@ -2532,9 +2532,9 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Repository: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, "IDL:omg.org/CORBA/Repository: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
@@ -2545,11 +2545,11 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Repository:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Repository:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Repository_ptr, this);
-  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);
@@ -2563,7 +2563,7 @@
 
 const char* POA_CORBA_Repository::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_Repository:1.0";
+  return "IDL:omg.org/CORBA/Repository:1.0";
 }
 
 CORBA_Repository*
@@ -2591,7 +2591,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:32 */
+/* starting time is 13:56:21 */
 /* 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_ModuleDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -2737,7 +2737,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:32 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_ModuleDef_Perfect_Hash_OpTable tao_CORBA_ModuleDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -2980,10 +2980,10 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ModuleDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container: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, "IDL:omg.org/CORBA/ModuleDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container: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
@@ -2994,13 +2994,13 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ModuleDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ModuleDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_ModuleDef_ptr, this);
-  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_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);
@@ -3014,7 +3014,7 @@
 
 const char* POA_CORBA_ModuleDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_ModuleDef:1.0";
+  return "IDL:omg.org/CORBA/ModuleDef:1.0";
 }
 
 CORBA_ModuleDef*
@@ -3042,7 +3042,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:32 */
+/* starting time is 13:56:21 */
 /* 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_ConstantDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -3174,7 +3174,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:32 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_ConstantDef_Perfect_Hash_OpTable tao_CORBA_ConstantDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -3935,7 +3935,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_ConstantDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ConstantDef:1.0"
+          "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->type (
         ACE_TRY_ENV
@@ -3966,7 +3966,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_ConstantDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ConstantDef:1.0"
+          "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->type_def (
         ACE_TRY_ENV
@@ -3996,7 +3996,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_ConstantDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ConstantDef:1.0"
+          "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->type_def (
         type_def,
@@ -4029,7 +4029,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_ConstantDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ConstantDef:1.0"
+          "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->value (
         ACE_TRY_ENV
@@ -4059,7 +4059,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_ConstantDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ConstantDef:1.0"
+          "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->value (
         value,
@@ -4585,9 +4585,9 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ConstantDef: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, "IDL:omg.org/CORBA/ConstantDef: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
@@ -4598,11 +4598,11 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ConstantDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ConstantDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_ConstantDef_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_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);
@@ -4616,7 +4616,7 @@
 
 const char* POA_CORBA_ConstantDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_ConstantDef:1.0";
+  return "IDL:omg.org/CORBA/ConstantDef:1.0";
 }
 
 CORBA_ConstantDef*
@@ -4644,7 +4644,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:33 */
+/* starting time is 13:56:21 */
 /* 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_StructDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -4793,7 +4793,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:33 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_StructDef_Perfect_Hash_OpTable tao_CORBA_StructDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -5186,7 +5186,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_StructDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_StructDef:1.0"
+          "IDL:omg.org/CORBA/StructDef:1.0"
         )
     )->members (
         ACE_TRY_ENV
@@ -5216,7 +5216,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_StructDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_StructDef:1.0"
+          "IDL:omg.org/CORBA/StructDef:1.0"
         )
     )->members (
         members,
@@ -5506,12 +5506,12 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_StructDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container: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/StructDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container: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
@@ -5522,17 +5522,17 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_StructDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/StructDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_StructDef_ptr, this);
-  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_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_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);
@@ -5546,7 +5546,7 @@
 
 const char* POA_CORBA_StructDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_StructDef:1.0";
+  return "IDL:omg.org/CORBA/StructDef:1.0";
 }
 
 CORBA_StructDef*
@@ -5574,7 +5574,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:33 */
+/* starting time is 13:56:21 */
 /* 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_UnionDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -5726,7 +5726,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:33 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_UnionDef_Perfect_Hash_OpTable tao_CORBA_UnionDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -6488,7 +6488,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_UnionDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_UnionDef:1.0"
+          "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->discriminator_type (
         ACE_TRY_ENV
@@ -6519,7 +6519,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_UnionDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_UnionDef:1.0"
+          "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->discriminator_type_def (
         ACE_TRY_ENV
@@ -6549,7 +6549,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_UnionDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_UnionDef:1.0"
+          "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->discriminator_type_def (
         discriminator_type_def,
@@ -6582,7 +6582,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_UnionDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_UnionDef:1.0"
+          "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->members (
         ACE_TRY_ENV
@@ -6612,7 +6612,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_UnionDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_UnionDef:1.0"
+          "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->members (
         members,
@@ -7141,12 +7141,12 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_UnionDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container: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/UnionDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container: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
@@ -7157,17 +7157,17 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_UnionDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/UnionDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_UnionDef_ptr, this);
-  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_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_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);
@@ -7181,7 +7181,7 @@
 
 const char* POA_CORBA_UnionDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_UnionDef:1.0";
+  return "IDL:omg.org/CORBA/UnionDef:1.0";
 }
 
 CORBA_UnionDef*
@@ -7209,7 +7209,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:33 */
+/* starting time is 13:56:21 */
 /* 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_EnumDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -7339,7 +7339,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:33 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_EnumDef_Perfect_Hash_OpTable tao_CORBA_EnumDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -7732,7 +7732,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_EnumDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_EnumDef:1.0"
+          "IDL:omg.org/CORBA/EnumDef:1.0"
         )
     )->members (
         ACE_TRY_ENV
@@ -7762,7 +7762,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_EnumDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_EnumDef:1.0"
+          "IDL:omg.org/CORBA/EnumDef:1.0"
         )
     )->members (
         members,
@@ -8051,11 +8051,11 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_EnumDef: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, "IDL:omg.org/CORBA/EnumDef: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
@@ -8066,15 +8066,15 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_EnumDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/EnumDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_EnumDef_ptr, this);
-  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);
@@ -8088,7 +8088,7 @@
 
 const char* POA_CORBA_EnumDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_EnumDef:1.0";
+  return "IDL:omg.org/CORBA/EnumDef:1.0";
 }
 
 CORBA_EnumDef*
@@ -8116,7 +8116,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:33 */
+/* starting time is 13:56:21 */
 /* 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_AliasDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -8246,7 +8246,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:33 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_AliasDef_Perfect_Hash_OpTable tao_CORBA_AliasDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -8639,7 +8639,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_AliasDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_AliasDef:1.0"
+          "IDL:omg.org/CORBA/AliasDef:1.0"
         )
     )->original_type_def (
         ACE_TRY_ENV
@@ -8669,7 +8669,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_AliasDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_AliasDef:1.0"
+          "IDL:omg.org/CORBA/AliasDef:1.0"
         )
     )->original_type_def (
         original_type_def,
@@ -8958,11 +8958,11 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_AliasDef: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, "IDL:omg.org/CORBA/AliasDef: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
@@ -8973,15 +8973,15 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_AliasDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/AliasDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_AliasDef_ptr, this);
-  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);
@@ -8995,7 +8995,7 @@
 
 const char* POA_CORBA_AliasDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_AliasDef:1.0";
+  return "IDL:omg.org/CORBA/AliasDef:1.0";
 }
 
 CORBA_AliasDef*
@@ -9023,7 +9023,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:33 */
+/* starting time is 13:56:21 */
 /* 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_NativeDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -9151,7 +9151,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:33 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_NativeDef_Perfect_Hash_OpTable tao_CORBA_NativeDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -9395,11 +9395,11 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_NativeDef: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, "IDL:omg.org/CORBA/NativeDef: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
@@ -9410,15 +9410,15 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_NativeDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/NativeDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_NativeDef_ptr, this);
-  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);
@@ -9432,7 +9432,7 @@
 
 const char* POA_CORBA_NativeDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_NativeDef:1.0";
+  return "IDL:omg.org/CORBA/NativeDef:1.0";
 }
 
 CORBA_NativeDef*
@@ -9460,7 +9460,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:33 */
+/* starting time is 13:56:21 */
 /* 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_PrimitiveDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -9558,7 +9558,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:33 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable tao_CORBA_PrimitiveDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -9828,7 +9828,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_PrimitiveDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_PrimitiveDef:1.0"
+          "IDL:omg.org/CORBA/PrimitiveDef:1.0"
         )
     )->kind (
         ACE_TRY_ENV
@@ -10033,9 +10033,9 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_PrimitiveDef: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/PrimitiveDef: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
@@ -10046,11 +10046,11 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_PrimitiveDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/PrimitiveDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_PrimitiveDef_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);
@@ -10064,7 +10064,7 @@
 
 const char* POA_CORBA_PrimitiveDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_PrimitiveDef:1.0";
+  return "IDL:omg.org/CORBA/PrimitiveDef:1.0";
 }
 
 CORBA_PrimitiveDef*
@@ -10092,7 +10092,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:33 */
+/* starting time is 13:56:21 */
 /* 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_StringDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -10210,7 +10210,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:33 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_StringDef_Perfect_Hash_OpTable tao_CORBA_StringDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -10602,7 +10602,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_StringDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_StringDef:1.0"
+          "IDL:omg.org/CORBA/StringDef:1.0"
         )
     )->bound (
         ACE_TRY_ENV
@@ -10632,7 +10632,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_StringDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_StringDef:1.0"
+          "IDL:omg.org/CORBA/StringDef:1.0"
         )
     )->bound (
         bound,
@@ -10918,9 +10918,9 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_StringDef: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/StringDef: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
@@ -10931,11 +10931,11 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_StringDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/StringDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_StringDef_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);
@@ -10949,7 +10949,7 @@
 
 const char* POA_CORBA_StringDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_StringDef:1.0";
+  return "IDL:omg.org/CORBA/StringDef:1.0";
 }
 
 CORBA_StringDef*
@@ -10977,7 +10977,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:33 */
+/* starting time is 13:56:21 */
 /* 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_WstringDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -11095,7 +11095,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:33 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_WstringDef_Perfect_Hash_OpTable tao_CORBA_WstringDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -11487,7 +11487,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_WstringDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_WstringDef:1.0"
+          "IDL:omg.org/CORBA/WstringDef:1.0"
         )
     )->bound (
         ACE_TRY_ENV
@@ -11517,7 +11517,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_WstringDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_WstringDef:1.0"
+          "IDL:omg.org/CORBA/WstringDef:1.0"
         )
     )->bound (
         bound,
@@ -11803,9 +11803,9 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_WstringDef: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/WstringDef: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
@@ -11816,11 +11816,11 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_WstringDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/WstringDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_WstringDef_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);
@@ -11834,7 +11834,7 @@
 
 const char* POA_CORBA_WstringDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_WstringDef:1.0";
+  return "IDL:omg.org/CORBA/WstringDef:1.0";
 }
 
 CORBA_WstringDef*
@@ -11862,7 +11862,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:33 */
+/* starting time is 13:56:21 */
 /* 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_SequenceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -11871,46 +11871,46 @@
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23,  0,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23,  0,
-     23, 23,  0,  5,  0, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23,  5, 23, 23, 23, 23,  0, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22,  0,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22,  0,
+     22, 22,  5,  0,  0, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22,  0, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22,
 #else
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23,  0, 23,  0, 23, 23,
-      0,  5,  0, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23,  5, 23, 23, 23,
-     23,  0, 23, 23, 23, 23, 23, 23,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22,  0, 22,  0, 22, 22,
+      5,  0,  0, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22,  0, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22,
 #endif /* ACE_MVS */
     };
   return len + asso_values[str[len - 1]] + asso_values[str[0]];
@@ -11921,12 +11921,12 @@
 {
   enum
     {
-      TOTAL_KEYWORDS = 11,
+      TOTAL_KEYWORDS = 8,
       MIN_WORD_LENGTH = 5,
       MAX_WORD_LENGTH = 21,
       MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 22,
-      HASH_VALUE_RANGE = 18,
+      MAX_HASH_VALUE = 21,
+      HASH_VALUE_RANGE = 17,
       DUPLICATES = 3
     };
 
@@ -11934,22 +11934,19 @@
     {
       {"",0},{"",0},{"",0},{"",0},{"",0},
       {"_is_a",  &POA_CORBA_SequenceDef::_is_a_skel},
-      {"destroy", 	&POA_CORBA_SequenceDef::destroy_skel},
-      {"_get_bound", 	&POA_CORBA_SequenceDef::_get_bound_skel},
-      {"_set_bound", 	&POA_CORBA_SequenceDef::_set_bound_skel},
-      {"_get_def_kind", 	&POA_CORBA_SequenceDef::_get_def_kind_skel},
-      {"_get_type", 	&POA_CORBA_SequenceDef::_get_type_skel},
       {"_interface",  &POA_CORBA_SequenceDef::_interface_skel},
       {"_non_existent",  &POA_CORBA_SequenceDef::_non_existent_skel},
+      {"_get_bound", 	&POA_CORBA_SequenceDef::_get_bound_skel},
+      {"_set_bound", 	&POA_CORBA_SequenceDef::_set_bound_skel},
+      {"_get_element_type", 	&POA_CORBA_SequenceDef::_get_element_type_skel},
       {"_get_element_type_def", 	&POA_CORBA_SequenceDef::_get_element_type_def_skel},
       {"_set_element_type_def", 	&POA_CORBA_SequenceDef::_set_element_type_def_skel},
-      {"_get_element_type", 	&POA_CORBA_SequenceDef::_get_element_type_skel},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -24,  -1,  -1,   9, 
-       10,  11,  -1,  -1,  12, -13,  -2, -24,  15, 
+       -1,  -1,  -1,  -1,  -1,   5,  -1,  -1,  -1,  -1,   6,  -8,  -2,   7, 
+       -1, -25,  -1,  10,  -1, -11,  -2, -23, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -11983,7 +11980,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:33 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_SequenceDef_Perfect_Hash_OpTable tao_CORBA_SequenceDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -12744,7 +12741,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_SequenceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_SequenceDef:1.0"
+          "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->bound (
         ACE_TRY_ENV
@@ -12774,7 +12771,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_SequenceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_SequenceDef:1.0"
+          "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->bound (
         bound,
@@ -12807,7 +12804,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_SequenceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_SequenceDef:1.0"
+          "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->element_type (
         ACE_TRY_ENV
@@ -12838,7 +12835,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_SequenceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_SequenceDef:1.0"
+          "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->element_type_def (
         ACE_TRY_ENV
@@ -12868,7 +12865,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_SequenceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_SequenceDef:1.0"
+          "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->element_type_def (
         element_type_def,
@@ -13393,9 +13390,9 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_SequenceDef: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/SequenceDef: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
@@ -13406,11 +13403,11 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_SequenceDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/SequenceDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_SequenceDef_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);
@@ -13424,7 +13421,7 @@
 
 const char* POA_CORBA_SequenceDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_SequenceDef:1.0";
+  return "IDL:omg.org/CORBA/SequenceDef:1.0";
 }
 
 CORBA_SequenceDef*
@@ -13452,7 +13449,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:33 */
+/* starting time is 13:56:21 */
 /* 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_ArrayDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -13573,7 +13570,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:33 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_ArrayDef_Perfect_Hash_OpTable tao_CORBA_ArrayDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -14334,7 +14331,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_ArrayDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ArrayDef:1.0"
+          "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->length (
         ACE_TRY_ENV
@@ -14364,7 +14361,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_ArrayDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ArrayDef:1.0"
+          "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->length (
         length,
@@ -14397,7 +14394,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_ArrayDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ArrayDef:1.0"
+          "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->element_type (
         ACE_TRY_ENV
@@ -14428,7 +14425,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_ArrayDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ArrayDef:1.0"
+          "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->element_type_def (
         ACE_TRY_ENV
@@ -14458,7 +14455,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_ArrayDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ArrayDef:1.0"
+          "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->element_type_def (
         element_type_def,
@@ -14983,9 +14980,9 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ArrayDef: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/ArrayDef: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
@@ -14996,11 +14993,11 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ArrayDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ArrayDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_ArrayDef_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);
@@ -15014,7 +15011,7 @@
 
 const char* POA_CORBA_ArrayDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_ArrayDef:1.0";
+  return "IDL:omg.org/CORBA/ArrayDef:1.0";
 }
 
 CORBA_ArrayDef*
@@ -15042,7 +15039,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:33 */
+/* starting time is 13:56:21 */
 /* 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_ExceptionDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -15191,7 +15188,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:33 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable tao_CORBA_ExceptionDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -15707,7 +15704,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_ExceptionDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ExceptionDef:1.0"
+          "IDL:omg.org/CORBA/ExceptionDef:1.0"
         )
     )->type (
         ACE_TRY_ENV
@@ -15738,7 +15735,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_ExceptionDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ExceptionDef:1.0"
+          "IDL:omg.org/CORBA/ExceptionDef:1.0"
         )
     )->members (
         ACE_TRY_ENV
@@ -15768,7 +15765,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_ExceptionDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ExceptionDef:1.0"
+          "IDL:omg.org/CORBA/ExceptionDef:1.0"
         )
     )->members (
         members,
@@ -16136,10 +16133,10 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ExceptionDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained: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, "IDL:omg.org/CORBA/ExceptionDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained: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
@@ -16150,13 +16147,13 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ExceptionDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ExceptionDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_ExceptionDef_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_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);
@@ -16170,7 +16167,7 @@
 
 const char* POA_CORBA_ExceptionDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_ExceptionDef:1.0";
+  return "IDL:omg.org/CORBA/ExceptionDef:1.0";
 }
 
 CORBA_ExceptionDef*
@@ -16198,7 +16195,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:33 */
+/* starting time is 13:56:21 */
 /* 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_AttributeDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -16330,7 +16327,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:33 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_AttributeDef_Perfect_Hash_OpTable tao_CORBA_AttributeDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -17092,7 +17089,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_AttributeDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_AttributeDef:1.0"
+          "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->type (
         ACE_TRY_ENV
@@ -17123,7 +17120,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_AttributeDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_AttributeDef:1.0"
+          "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->type_def (
         ACE_TRY_ENV
@@ -17153,7 +17150,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_AttributeDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_AttributeDef:1.0"
+          "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->type_def (
         type_def,
@@ -17186,7 +17183,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_AttributeDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_AttributeDef:1.0"
+          "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->mode (
         ACE_TRY_ENV
@@ -17216,7 +17213,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_AttributeDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_AttributeDef:1.0"
+          "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->mode (
         mode,
@@ -17741,9 +17738,9 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_AttributeDef: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, "IDL:omg.org/CORBA/AttributeDef: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
@@ -17754,11 +17751,11 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_AttributeDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/AttributeDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_AttributeDef_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_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);
@@ -17772,7 +17769,7 @@
 
 const char* POA_CORBA_AttributeDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_AttributeDef:1.0";
+  return "IDL:omg.org/CORBA/AttributeDef:1.0";
 }
 
 CORBA_AttributeDef*
@@ -17800,7 +17797,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:33 */
+/* starting time is 13:56:21 */
 /* 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_OperationDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -17989,7 +17986,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:33 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_OperationDef_Perfect_Hash_OpTable tao_CORBA_OperationDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -19489,7 +19486,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_OperationDef:1.0"
+          "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->result (
         ACE_TRY_ENV
@@ -19520,7 +19517,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_OperationDef:1.0"
+          "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->result_def (
         ACE_TRY_ENV
@@ -19550,7 +19547,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_OperationDef:1.0"
+          "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->result_def (
         result_def,
@@ -19583,7 +19580,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_OperationDef:1.0"
+          "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->params (
         ACE_TRY_ENV
@@ -19613,7 +19610,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_OperationDef:1.0"
+          "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->params (
         params,
@@ -19646,7 +19643,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_OperationDef:1.0"
+          "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->mode (
         ACE_TRY_ENV
@@ -19676,7 +19673,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_OperationDef:1.0"
+          "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->mode (
         mode,
@@ -19709,7 +19706,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_OperationDef:1.0"
+          "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->contexts (
         ACE_TRY_ENV
@@ -19739,7 +19736,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_OperationDef:1.0"
+          "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->contexts (
         contexts,
@@ -19772,7 +19769,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_OperationDef:1.0"
+          "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->exceptions (
         ACE_TRY_ENV
@@ -19802,7 +19799,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_OperationDef:1.0"
+          "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->exceptions (
         exceptions,
@@ -20804,9 +20801,9 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef: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, "IDL:omg.org/CORBA/OperationDef: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
@@ -20817,11 +20814,11 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_OperationDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/OperationDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_OperationDef_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_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);
@@ -20835,7 +20832,7 @@
 
 const char* POA_CORBA_OperationDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_OperationDef:1.0";
+  return "IDL:omg.org/CORBA/OperationDef:1.0";
 }
 
 CORBA_OperationDef*
@@ -20863,7 +20860,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:33 */
+/* starting time is 13:56:21 */
 /* 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_InterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -21017,7 +21014,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:33 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable tao_CORBA_InterfaceDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -22041,7 +22038,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_InterfaceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_InterfaceDef:1.0"
+          "IDL:omg.org/CORBA/InterfaceDef:1.0"
         )
     )->base_interfaces (
         ACE_TRY_ENV
@@ -22071,7 +22068,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_InterfaceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_InterfaceDef:1.0"
+          "IDL:omg.org/CORBA/InterfaceDef:1.0"
         )
     )->base_interfaces (
         base_interfaces,
@@ -22105,7 +22102,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_InterfaceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_InterfaceDef:1.0"
+          "IDL:omg.org/CORBA/InterfaceDef:1.0"
         )
     )->is_a (
         interface_id,
@@ -22137,7 +22134,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_InterfaceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_InterfaceDef:1.0"
+          "IDL:omg.org/CORBA/InterfaceDef:1.0"
         )
     )->describe_interface (
         ACE_TRY_ENV
@@ -22173,7 +22170,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_InterfaceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_InterfaceDef:1.0"
+          "IDL:omg.org/CORBA/InterfaceDef:1.0"
         )
     )->create_attribute (
         id,
@@ -22217,7 +22214,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_InterfaceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_InterfaceDef:1.0"
+          "IDL:omg.org/CORBA/InterfaceDef:1.0"
         )
     )->create_operation (
         id,
@@ -22902,11 +22899,11 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container: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/InterfaceDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container: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
@@ -22917,15 +22914,15 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this);
-  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_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);
@@ -22939,7 +22936,7 @@
 
 const char* POA_CORBA_InterfaceDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_InterfaceDef:1.0";
+  return "IDL:omg.org/CORBA/InterfaceDef:1.0";
 }
 
 CORBA_InterfaceDef*
@@ -22967,7 +22964,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:33 */
+/* starting time is 13:56:21 */
 /* 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_AbstractInterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -23121,7 +23118,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:33 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable tao_CORBA_AbstractInterfaceDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -23366,12 +23363,12 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_AbstractInterfaceDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container: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/AbstractInterfaceDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container: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
@@ -23382,17 +23379,17 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_AbstractInterfaceDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_AbstractInterfaceDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this);
-  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_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);
@@ -23406,7 +23403,7 @@
 
 const char* POA_CORBA_AbstractInterfaceDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_AbstractInterfaceDef:1.0";
+  return "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0";
 }
 
 CORBA_AbstractInterfaceDef*
@@ -23434,7 +23431,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:33 */
+/* starting time is 13:56:22 */
 /* 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_LocalInterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -23588,7 +23585,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:33 */
+/* ending time is 13:56:22 */
 static TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable tao_CORBA_LocalInterfaceDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -23833,12 +23830,12 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_LocalInterfaceDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container: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/LocalInterfaceDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container: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
@@ -23849,17 +23846,17 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_LocalInterfaceDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/LocalInterfaceDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_LocalInterfaceDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this);
-  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_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);
@@ -23873,7 +23870,7 @@
 
 const char* POA_CORBA_LocalInterfaceDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_LocalInterfaceDef:1.0";
+  return "IDL:omg.org/CORBA/LocalInterfaceDef:1.0";
 }
 
 CORBA_LocalInterfaceDef*