--- orig/IFR_ExtendedS.cpp	Mon Apr 30 22:22:36 2001
+++ IFR_ExtendedS.cpp	Fri May 11 00:03:12 2001
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// IFR_ExtendedS.cpp.diff,v 1.2 2001/05/11 01:29:39 parsons Exp
+// IFR_ExtendedS.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_EXTENDEDS_CPP_
-#define _TAO_IDL_IFR_EXTENDEDS_CPP_
+#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_EXTENDEDS_CPP_
+#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_EXTENDEDS_CPP_
 
 #include "IFR_ExtendedS.h"
 
@@ -51,7 +51,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:35 */
+/* starting time is 13:56:24 */
 /* 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_FixedDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -171,7 +171,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:35 */
+/* ending time is 13:56:24 */
 static TAO_CORBA_FixedDef_Perfect_Hash_OpTable tao_CORBA_FixedDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -808,7 +808,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_FixedDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_FixedDef:1.0"
+          "IDL:omg.org/CORBA/FixedDef:1.0"
         )
     )->digits (
         ACE_TRY_ENV
@@ -838,7 +838,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_FixedDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_FixedDef:1.0"
+          "IDL:omg.org/CORBA/FixedDef:1.0"
         )
     )->digits (
         digits,
@@ -871,7 +871,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_FixedDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_FixedDef:1.0"
+          "IDL:omg.org/CORBA/FixedDef:1.0"
         )
     )->scale (
         ACE_TRY_ENV
@@ -901,7 +901,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_FixedDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_FixedDef:1.0"
+          "IDL:omg.org/CORBA/FixedDef:1.0"
         )
     )->scale (
         scale,
@@ -1345,9 +1345,9 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_FixedDef: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/FixedDef: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
@@ -1358,11 +1358,11 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_FixedDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/FixedDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_FixedDef_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);
@@ -1376,7 +1376,7 @@
 
 const char* POA_CORBA_FixedDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_FixedDef:1.0";
+  return "IDL:omg.org/CORBA/FixedDef:1.0";
 }
 
 CORBA_FixedDef*
@@ -1404,7 +1404,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:35 */
+/* starting time is 13:56:24 */
 /* 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_ValueMemberDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -1536,7 +1536,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:35 */
+/* ending time is 13:56:24 */
 static TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable tao_CORBA_ValueMemberDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -2297,7 +2297,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_ValueMemberDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
+          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->type (
         ACE_TRY_ENV
@@ -2328,7 +2328,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_ValueMemberDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
+          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->type_def (
         ACE_TRY_ENV
@@ -2358,7 +2358,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_ValueMemberDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
+          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->type_def (
         type_def,
@@ -2391,7 +2391,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_ValueMemberDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
+          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->access (
         ACE_TRY_ENV
@@ -2421,7 +2421,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_ValueMemberDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
+          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->access (
         access,
@@ -2946,9 +2946,9 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ValueMemberDef: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/ValueMemberDef: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
@@ -2959,11 +2959,11 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ValueMemberDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ValueMemberDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_ValueMemberDef_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);
@@ -2977,7 +2977,7 @@
 
 const char* POA_CORBA_ValueMemberDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_ValueMemberDef:1.0";
+  return "IDL:omg.org/CORBA/ValueMemberDef:1.0";
 }
 
 CORBA_ValueMemberDef*
@@ -3005,7 +3005,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:35 */
+/* starting time is 13:56:24 */
 /* 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_ValueDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -3173,7 +3173,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:35 */
+/* ending time is 13:56:24 */
 static TAO_CORBA_ValueDef_Perfect_Hash_OpTable tao_CORBA_ValueDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -5841,7 +5841,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->supported_interfaces (
         ACE_TRY_ENV
@@ -5871,7 +5871,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->supported_interfaces (
         supported_interfaces,
@@ -5904,7 +5904,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->initializers (
         ACE_TRY_ENV
@@ -5934,7 +5934,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->initializers (
         initializers,
@@ -5967,7 +5967,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->base_value (
         ACE_TRY_ENV
@@ -5997,7 +5997,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->base_value (
         base_value,
@@ -6030,7 +6030,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->abstract_base_values (
         ACE_TRY_ENV
@@ -6060,7 +6060,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->abstract_base_values (
         abstract_base_values,
@@ -6093,7 +6093,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_abstract (
         ACE_TRY_ENV
@@ -6123,7 +6123,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_abstract (
         is_abstract,
@@ -6156,7 +6156,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_custom (
         ACE_TRY_ENV
@@ -6186,7 +6186,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_custom (
         is_custom,
@@ -6219,7 +6219,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_truncatable (
         ACE_TRY_ENV
@@ -6249,7 +6249,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_truncatable (
         is_truncatable,
@@ -6283,7 +6283,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_a (
         id,
@@ -6315,7 +6315,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->describe_value (
         ACE_TRY_ENV
@@ -6351,7 +6351,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->create_value_member (
         id,
@@ -6392,7 +6392,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->create_attribute (
         id,
@@ -6436,7 +6436,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->create_operation (
         id,
@@ -8177,11 +8177,11 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ValueDef: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/ValueDef: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
@@ -8192,15 +8192,15 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ValueDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ValueDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_ValueDef_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);
@@ -8214,7 +8214,7 @@
 
 const char* POA_CORBA_ValueDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_ValueDef:1.0";
+  return "IDL:omg.org/CORBA/ValueDef:1.0";
 }
 
 CORBA_ValueDef*
@@ -8242,7 +8242,7 @@
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 17:22:35 */
+/* starting time is 13:56:24 */
 /* 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_ValueBoxDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -8372,7 +8372,7 @@
     }
   return 0;
 }
-/* ending time is 17:22:35 */
+/* ending time is 13:56:24 */
 static TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable tao_CORBA_ValueBoxDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -8765,7 +8765,7 @@
     return ACE_reinterpret_cast (
       POA_CORBA_ValueBoxDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueBoxDef:1.0"
+          "IDL:omg.org/CORBA/ValueBoxDef:1.0"
         )
     )->original_type_def (
         ACE_TRY_ENV
@@ -8795,7 +8795,7 @@
     ACE_reinterpret_cast (
       POA_CORBA_ValueBoxDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueBoxDef:1.0"
+          "IDL:omg.org/CORBA/ValueBoxDef:1.0"
         )
     )->original_type_def (
         original_type_def,
@@ -9084,11 +9084,11 @@
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ValueBoxDef: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/ValueBoxDef: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
@@ -9099,15 +9099,15 @@
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ValueBoxDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ValueBoxDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_ValueBoxDef_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);
@@ -9121,7 +9121,7 @@
 
 const char* POA_CORBA_ValueBoxDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_ValueBoxDef:1.0";
+  return "IDL:omg.org/CORBA/ValueBoxDef:1.0";
 }
 
 CORBA_ValueBoxDef*