2005-10-28 Audrius Meskauskas <AudriusA@Bioinformatics.org>

	* gnu/CORBA/holderFactory.java,
	gnu/CORBA/IOR_contructed_object.java,
	gnu/CORBA/IOR_Delegate.java,
	gnu/CORBA/Simple_delegate.java,
	gnu/CORBA/Restricted_ORB.java,
	gnu/CORBA/Functional_ORB.java,
	gnu/CORBA/Focused_ORB.java: Removed.
	* gnu/CORBA/HolderLocator.java
	gnu/CORBA/IorDelegate.java
	gnu/CORBA/IorObject.java
	gnu/CORBA/OrbFocused.java
	gnu/CORBA/OrbFunctional.java
	gnu/CORBA/OrbRestricted.java
	gnu/CORBA/SimpleDelegate.java: New files.
	* gnu/CORBA/CDR/cdrInput.java,
	gnu/CORBA/DynAn/abstractRecord.java,
	gnu/CORBA/DynAn/gnuDynAny.java,
	gnu/CORBA/DynAn/gnuDynAnyFactory.java,
	gnu/CORBA/DynAn/gnuDynArray.java,
	gnu/CORBA/DynAn/gnuDynValueBox.java,
	gnu/CORBA/GIOP/ErrorMessage.java,
	gnu/CORBA/NamingService/NameParser.java,
	gnu/CORBA/NamingService/NamingServiceTransient.java,
	gnu/CORBA/Poa/ForwardedServant.java,
	gnu/CORBA/Poa/ORB_1_4.java,
	gnu/CORBA/Poa/gnuServantObject.java,
	gnu/CORBA/StubLocator.java,
	gnu/CORBA/gnuAny.java,
	gnu/CORBA/gnuRequest.java,
	gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.java,
	gnu/javax/rmi/CORBA/gnuRmiUtil.java,
	org/omg/CORBA/CompletionStatusHelper.java,
	org/omg/CORBA/DefinitionKindHelper.java,
	org/omg/CORBA/FieldNameHelper.java,
	org/omg/CORBA/IDLTypeHelper.java,
	org/omg/CORBA/IdentifierHelper.java,
	org/omg/CORBA/ORB.java,
	org/omg/CORBA/ParameterModeHelper.java,
	org/omg/CORBA/RepositoryIdHelper.java,
	org/omg/CORBA/SetOverrideTypeHelper.java,
	org/omg/CORBA/StringValueHelper.java,
	org/omg/CORBA/StructMemberHelper.java,
	org/omg/CORBA/UnionMemberHelper.java,
	org/omg/CORBA/ValueMemberHelper.java,
	org/omg/CORBA/VersionSpecHelper.java,
	org/omg/CORBA/VisibilityHelper.java,
	org/omg/CORBA/WStringValueHelper.java,
	org/omg/CORBA/_IDLTypeStub.java,
	org/omg/CosNaming/IstringHelper.java,
	org/omg/DynamicAny/FieldNameHelper.java,
	org/omg/PortableInterceptor/AdapterNameHelper.java,
	org/omg/PortableInterceptor/ORBIdHelper.java,
	org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java,
	org/omg/PortableInterceptor/ObjectIdHelper.java,
	org/omg/PortableInterceptor/ServerIdHelper.java:
	References updated.

24 files changed, 54 insertions, 54 deletions

diff --git a/org/omg/CORBA/CompletionStatusHelper.java b/org/omg/CORBA/CompletionStatusHelper.java
index f62857448..43b6b8c10 100644
--- a/org/omg/CORBA/CompletionStatusHelper.java
+++ b/org/omg/CORBA/CompletionStatusHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.Restricted_ORB;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -131,7 +131,7 @@ public abstract class CompletionStatusHelper
           new String[] { "COMPLETED_YES", "COMPLETED_NO", "COMPLETED_MAYBE" };
 
         typeCode =
-          Restricted_ORB.Singleton.create_enum_tc(id(), "CompletionStatus",
+          OrbRestricted.Singleton.create_enum_tc(id(), "CompletionStatus",
                                                   members
                                                  );
       }
diff --git a/org/omg/CORBA/DefinitionKindHelper.java b/org/omg/CORBA/DefinitionKindHelper.java
index 8a48bc5e9..fddbb585a 100644
--- a/org/omg/CORBA/DefinitionKindHelper.java
+++ b/org/omg/CORBA/DefinitionKindHelper.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package org.omg.CORBA;
 
 import gnu.CORBA.DefinitionKindHolder;
-import gnu.CORBA.Restricted_ORB;
+import gnu.CORBA.OrbRestricted;
 import gnu.CORBA.gnuAny;
 import gnu.CORBA.typecodes.PrimitiveTypeCode;
 
@@ -97,7 +97,7 @@ public abstract class DefinitionKindHelper
           };
 
         typeCode =
-          Restricted_ORB.Singleton.create_enum_tc(id(), "DefinitionKind",
+          OrbRestricted.Singleton.create_enum_tc(id(), "DefinitionKind",
                                                   members
                                                  );
       }
diff --git a/org/omg/CORBA/FieldNameHelper.java b/org/omg/CORBA/FieldNameHelper.java
index a35df4f35..6d6de43da 100644
--- a/org/omg/CORBA/FieldNameHelper.java
+++ b/org/omg/CORBA/FieldNameHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.Restricted_ORB;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.ORB;
@@ -80,7 +80,7 @@ public abstract class FieldNameHelper
    */
   public static TypeCode type()
   {
-    ORB orb = Restricted_ORB.Singleton;
+    ORB orb = OrbRestricted.Singleton;
     return orb.create_alias_tc(id(), "FieldName", orb.create_string_tc(0));
   }
 
diff --git a/org/omg/CORBA/IDLTypeHelper.java b/org/omg/CORBA/IDLTypeHelper.java
index d9ca36496..635168eb8 100644
--- a/org/omg/CORBA/IDLTypeHelper.java
+++ b/org/omg/CORBA/IDLTypeHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.Restricted_ORB;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.portable.Delegate;
 import org.omg.CORBA.portable.InputStream;
@@ -84,7 +84,7 @@ public abstract class IDLTypeHelper
     if (typeCode == null)
       {
         typeCode =
-          Restricted_ORB.Singleton.create_interface_tc(IDLTypeHelper.id(),
+          OrbRestricted.Singleton.create_interface_tc(IDLTypeHelper.id(),
                                                        "IDLType"
                                                       );
       }
diff --git a/org/omg/CORBA/IdentifierHelper.java b/org/omg/CORBA/IdentifierHelper.java
index fa2044841..5c055f812 100644
--- a/org/omg/CORBA/IdentifierHelper.java
+++ b/org/omg/CORBA/IdentifierHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.Restricted_ORB;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.ORB;
@@ -80,7 +80,7 @@ public abstract class IdentifierHelper
    */
   public static TypeCode type()
   {
-    ORB orb = Restricted_ORB.Singleton;
+    ORB orb = OrbRestricted.Singleton;
     return orb.create_alias_tc(id(), "Identifier", orb.create_string_tc(0));
   }
 
diff --git a/org/omg/CORBA/ORB.java b/org/omg/CORBA/ORB.java
index 6d6839a9c..98120ac16 100644
--- a/org/omg/CORBA/ORB.java
+++ b/org/omg/CORBA/ORB.java
@@ -38,9 +38,9 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.Focused_ORB;
+import gnu.CORBA.OrbFocused;
 import gnu.CORBA.ObjectCreator;
-import gnu.CORBA.Restricted_ORB;
+import gnu.CORBA.OrbRestricted;
 import gnu.CORBA.gnuContext;
 import gnu.CORBA.typecodes.FixedTypeCode;
 import gnu.CORBA.typecodes.GeneralTypeCode;
@@ -143,7 +143,7 @@ public abstract class ORB
     "org.omg.CORBA.ORBSingletonClass";
   
   private static final String LISTENER_PORT =
-    Focused_ORB.LISTENER_PORT;
+    OrbFocused.LISTENER_PORT;
   
   /**
    * The class, implementing the default fully functional ORB.
@@ -152,7 +152,7 @@ public abstract class ORB
     gnu.CORBA.Poa.ORB_1_4.class.getName();
   
   private static final String DEFAULT_FOCUSED_ORB =
-    gnu.CORBA.Focused_ORB.class.getName();
+    gnu.CORBA.OrbFocused.class.getName();
   
   // There is no need for name of the default restricted ORB as it is 
   // singleton and it is more effectively referred directly.
@@ -811,7 +811,7 @@ public abstract class ORB
   {
     String orb_cn = getCumulatedProperty(null, RESTRICTED_ORB);
     if (orb_cn == null)
-      return Restricted_ORB.Singleton;
+      return OrbRestricted.Singleton;
     else
       return createORB(null, orb_cn);
   }
diff --git a/org/omg/CORBA/ParameterModeHelper.java b/org/omg/CORBA/ParameterModeHelper.java
index ec75b2bcf..ac17a9235 100644
--- a/org/omg/CORBA/ParameterModeHelper.java
+++ b/org/omg/CORBA/ParameterModeHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.Restricted_ORB;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -87,7 +87,7 @@ public abstract class ParameterModeHelper
           new String[] { "PARAM_IN", "PARAM_OUT", "PARAM_INOUT" };
 
         typeCode =
-          Restricted_ORB.Singleton.create_enum_tc(id(), "ParameterMode", members);
+          OrbRestricted.Singleton.create_enum_tc(id(), "ParameterMode", members);
       }
     return typeCode;
   }
diff --git a/org/omg/CORBA/RepositoryIdHelper.java b/org/omg/CORBA/RepositoryIdHelper.java
index 42fb00852..a392002fd 100644
--- a/org/omg/CORBA/RepositoryIdHelper.java
+++ b/org/omg/CORBA/RepositoryIdHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.Restricted_ORB;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.ORB;
@@ -80,7 +80,7 @@ public abstract class RepositoryIdHelper
    */
   public static TypeCode type()
   {
-    ORB orb = Restricted_ORB.Singleton;
+    ORB orb = OrbRestricted.Singleton;
     return orb.create_alias_tc(id(), "RepositoryId", orb.create_string_tc(0));
   }
 
diff --git a/org/omg/CORBA/SetOverrideTypeHelper.java b/org/omg/CORBA/SetOverrideTypeHelper.java
index bfdad683e..1fa1ef868 100644
--- a/org/omg/CORBA/SetOverrideTypeHelper.java
+++ b/org/omg/CORBA/SetOverrideTypeHelper.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package org.omg.CORBA;
 
 import gnu.CORBA.SetOverrideTypeHolder;
-import gnu.CORBA.Restricted_ORB;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -88,7 +88,7 @@ public abstract class SetOverrideTypeHelper
           };
 
         typeCode =
-          Restricted_ORB.Singleton.create_enum_tc(id(), "SetOverrideType",
+          OrbRestricted.Singleton.create_enum_tc(id(), "SetOverrideType",
                                                   members
                                                  );
       }
diff --git a/org/omg/CORBA/StringValueHelper.java b/org/omg/CORBA/StringValueHelper.java
index bda48c36e..24e79ce57 100644
--- a/org/omg/CORBA/StringValueHelper.java
+++ b/org/omg/CORBA/StringValueHelper.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package org.omg.CORBA;
 
 import gnu.CORBA.Minor;
-import gnu.CORBA.Restricted_ORB;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.portable.BoxedValueHelper;
 import org.omg.CORBA.portable.InputStream;
@@ -74,7 +74,7 @@ public class StringValueHelper
    * The String typecode.
    */
   private static final TypeCode tString =
-    Restricted_ORB.Singleton.create_string_tc(0);
+    OrbRestricted.Singleton.create_string_tc(0);
 
   /**
    * Returns the String Value repository Id.
@@ -182,7 +182,7 @@ public class StringValueHelper
   {
     if (typecode == null)
       {
-        ORB orb = Restricted_ORB.Singleton;
+        ORB orb = OrbRestricted.Singleton;
         typecode =
           orb.create_value_box_tc(id(), "StringValue", tString);
       }
diff --git a/org/omg/CORBA/StructMemberHelper.java b/org/omg/CORBA/StructMemberHelper.java
index 37e185772..01445129b 100644
--- a/org/omg/CORBA/StructMemberHelper.java
+++ b/org/omg/CORBA/StructMemberHelper.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package org.omg.CORBA;
 
 import gnu.CORBA.Minor;
-import gnu.CORBA.Restricted_ORB;
+import gnu.CORBA.OrbRestricted;
 import gnu.CORBA.TypeCodeHelper;
 
 import org.omg.CORBA.portable.InputStream;
@@ -88,7 +88,7 @@ public abstract class StructMemberHelper
   {
     if (typeCode == null)
       {
-        ORB orb = Restricted_ORB.Singleton;
+        ORB orb = OrbRestricted.Singleton;
 
         synchronized (TypeCode.class)
           {
diff --git a/org/omg/CORBA/UnionMemberHelper.java b/org/omg/CORBA/UnionMemberHelper.java
index 15bfb248d..c599542fb 100644
--- a/org/omg/CORBA/UnionMemberHelper.java
+++ b/org/omg/CORBA/UnionMemberHelper.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package org.omg.CORBA;
 
 import gnu.CORBA.Minor;
-import gnu.CORBA.Restricted_ORB;
+import gnu.CORBA.OrbRestricted;
 import gnu.CORBA.TypeCodeHelper;
 
 import org.omg.CORBA.portable.InputStream;
@@ -98,7 +98,7 @@ public abstract class UnionMemberHelper
                   }
                 active = true;
 
-                ORB orb = Restricted_ORB.Singleton;
+                ORB orb = OrbRestricted.Singleton;
 
                 StructMember[] members = new StructMember[ 4 ];
                 TypeCode member;
diff --git a/org/omg/CORBA/ValueMemberHelper.java b/org/omg/CORBA/ValueMemberHelper.java
index ea148f7d2..3150af2aa 100644
--- a/org/omg/CORBA/ValueMemberHelper.java
+++ b/org/omg/CORBA/ValueMemberHelper.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package org.omg.CORBA;
 
 import gnu.CORBA.Minor;
-import gnu.CORBA.Restricted_ORB;
+import gnu.CORBA.OrbRestricted;
 import gnu.CORBA.TypeCodeHelper;
 
 import org.omg.CORBA.portable.InputStream;
@@ -92,7 +92,7 @@ public abstract class ValueMemberHelper
           {
             if (typeCode == null)
               {
-                ORB orb = Restricted_ORB.Singleton;
+                ORB orb = OrbRestricted.Singleton;
 
                 if (active)
                   {
diff --git a/org/omg/CORBA/VersionSpecHelper.java b/org/omg/CORBA/VersionSpecHelper.java
index dcdad34e4..984570298 100644
--- a/org/omg/CORBA/VersionSpecHelper.java
+++ b/org/omg/CORBA/VersionSpecHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.Restricted_ORB;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.ORB;
@@ -80,7 +80,7 @@ public abstract class VersionSpecHelper
    */
   public static TypeCode type()
   {
-    ORB orb = Restricted_ORB.Singleton;
+    ORB orb = OrbRestricted.Singleton;
     return orb.create_alias_tc(id(), "VersionSpec", orb.create_string_tc(0));
   }
 
diff --git a/org/omg/CORBA/VisibilityHelper.java b/org/omg/CORBA/VisibilityHelper.java
index 71b572d99..a09e5b686 100644
--- a/org/omg/CORBA/VisibilityHelper.java
+++ b/org/omg/CORBA/VisibilityHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.Restricted_ORB;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -83,9 +83,9 @@ public abstract class VisibilityHelper
     if (typeCode == null)
       {
         TypeCode tshort =
-          Restricted_ORB.Singleton.get_primitive_tc(TCKind.tk_short);
+          OrbRestricted.Singleton.get_primitive_tc(TCKind.tk_short);
         typeCode =
-          Restricted_ORB.Singleton.create_alias_tc(id(), "Visibility", tshort);
+          OrbRestricted.Singleton.create_alias_tc(id(), "Visibility", tshort);
       }
     return typeCode;
   }
diff --git a/org/omg/CORBA/WStringValueHelper.java b/org/omg/CORBA/WStringValueHelper.java
index 7b71b0b7e..1c63a408e 100644
--- a/org/omg/CORBA/WStringValueHelper.java
+++ b/org/omg/CORBA/WStringValueHelper.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package org.omg.CORBA;
 
 import gnu.CORBA.Minor;
-import gnu.CORBA.Restricted_ORB;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.portable.BoxedValueHelper;
 import org.omg.CORBA.portable.InputStream;
@@ -74,7 +74,7 @@ public class WStringValueHelper
    * The Wide String typecode.
    */
   private static final TypeCode twString =
-    Restricted_ORB.Singleton.create_wstring_tc(0);
+    OrbRestricted.Singleton.create_wstring_tc(0);
 
   /**
    * Returns the String Value repository Id.
@@ -182,7 +182,7 @@ public class WStringValueHelper
   {
     if (typecode == null)
       {
-        ORB orb = Restricted_ORB.Singleton;
+        ORB orb = OrbRestricted.Singleton;
         typecode =
           orb.create_value_box_tc(id(), "WStringValue", twString);
       }
diff --git a/org/omg/CORBA/_IDLTypeStub.java b/org/omg/CORBA/_IDLTypeStub.java
index 7790e2e7e..6661b0c47 100644
--- a/org/omg/CORBA/_IDLTypeStub.java
+++ b/org/omg/CORBA/_IDLTypeStub.java
@@ -53,7 +53,7 @@ import java.io.Serializable;
 /**
  * The stub for the IDL type. This stub can be used to access the
  * remote IDL type object, if its IOR is known. To create the
- * working instance with the known IOR, pass {@link gnu.CORBA.IOR_Delegate}
+ * working instance with the known IOR, pass {@link gnu.CORBA.IorDelegate}
  * to the constructor.
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
@@ -79,7 +79,7 @@ public class _IDLTypeStub
   /**
    * Create an instance with the given delegate.
    *
-   * @see gnu.CORBA.IOR_Delegate
+   * @see gnu.CORBA.IorDelegate
    */
   public _IDLTypeStub(Delegate delegate)
   {
diff --git a/org/omg/CosNaming/IstringHelper.java b/org/omg/CosNaming/IstringHelper.java
index 83bbecee5..b90b452e6 100644
--- a/org/omg/CosNaming/IstringHelper.java
+++ b/org/omg/CosNaming/IstringHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CosNaming;
 
-import gnu.CORBA.Restricted_ORB;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.ORB;
@@ -84,7 +84,7 @@ public abstract class IstringHelper
    */
   public static TypeCode type()
   {
-    ORB orb = Restricted_ORB.Singleton;
+    ORB orb = OrbRestricted.Singleton;
     return orb.create_alias_tc(id(), "Istring", orb.create_string_tc(0));
   }
 
diff --git a/org/omg/DynamicAny/FieldNameHelper.java b/org/omg/DynamicAny/FieldNameHelper.java
index 7c4cdbf49..f15b8adfa 100644
--- a/org/omg/DynamicAny/FieldNameHelper.java
+++ b/org/omg/DynamicAny/FieldNameHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.DynamicAny;
 
-import gnu.CORBA.Restricted_ORB;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.ORB;
@@ -84,7 +84,7 @@ public abstract class FieldNameHelper
    */
   public static TypeCode type()
   {
-    ORB orb = Restricted_ORB.Singleton;
+    ORB orb = OrbRestricted.Singleton;
     return orb.create_alias_tc(id(), "FieldName", orb.create_string_tc(0));
   }
 
diff --git a/org/omg/PortableInterceptor/AdapterNameHelper.java b/org/omg/PortableInterceptor/AdapterNameHelper.java
index 134d87d49..1cda311b2 100644
--- a/org/omg/PortableInterceptor/AdapterNameHelper.java
+++ b/org/omg/PortableInterceptor/AdapterNameHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.PortableInterceptor;
 
-import gnu.CORBA.Restricted_ORB;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.ORB;
@@ -123,7 +123,7 @@ public abstract class AdapterNameHelper
   {
     if (typecode == null)
       {
-        ORB orb = Restricted_ORB.Singleton;
+        ORB orb = OrbRestricted.Singleton;
         
         TypeCode component = orb.create_string_tc(0);
         typecode = orb.create_alias_tc(id(), "AdapterName", component);
diff --git a/org/omg/PortableInterceptor/ORBIdHelper.java b/org/omg/PortableInterceptor/ORBIdHelper.java
index e561669f7..8332845a6 100644
--- a/org/omg/PortableInterceptor/ORBIdHelper.java
+++ b/org/omg/PortableInterceptor/ORBIdHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.PortableInterceptor;
 
-import gnu.CORBA.Restricted_ORB;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.ORB;
@@ -83,7 +83,7 @@ public abstract class ORBIdHelper
    */
   public static TypeCode type()
   {
-    ORB orb = Restricted_ORB.Singleton;
+    ORB orb = OrbRestricted.Singleton;
     return orb.create_alias_tc(id(), "ORBId", orb.create_string_tc(0));
   }
 
diff --git a/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java b/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java
index 17ad95d78..c22d14a11 100644
--- a/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java
+++ b/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.PortableInterceptor.ORBInitInfoPackage;
 
-import gnu.CORBA.Restricted_ORB;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.ORB;
@@ -81,7 +81,7 @@ public class ObjectIdHelper
    */
   public static TypeCode type()
   {
-    ORB orb = Restricted_ORB.Singleton;
+    ORB orb = OrbRestricted.Singleton;
     return orb.create_alias_tc(id(), "ObjectId", orb.create_string_tc(0));
   }
 
diff --git a/org/omg/PortableInterceptor/ObjectIdHelper.java b/org/omg/PortableInterceptor/ObjectIdHelper.java
index 4c8351773..600d0a0fb 100644
--- a/org/omg/PortableInterceptor/ObjectIdHelper.java
+++ b/org/omg/PortableInterceptor/ObjectIdHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.PortableInterceptor;
 
-import gnu.CORBA.Restricted_ORB;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.ORB;
@@ -85,7 +85,7 @@ public abstract class ObjectIdHelper
    */
   public static TypeCode type()
   {
-    ORB orb = Restricted_ORB.Singleton;
+    ORB orb = OrbRestricted.Singleton;
     return orb.create_alias_tc(id(), "ObjectId", OctetSeqHelper.type());
   }
 
diff --git a/org/omg/PortableInterceptor/ServerIdHelper.java b/org/omg/PortableInterceptor/ServerIdHelper.java
index 55f9aff9c..e4f8fe9c2 100644
--- a/org/omg/PortableInterceptor/ServerIdHelper.java
+++ b/org/omg/PortableInterceptor/ServerIdHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.PortableInterceptor;
 
-import gnu.CORBA.Restricted_ORB;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.ORB;
@@ -83,7 +83,7 @@ public abstract class ServerIdHelper
    */
   public static TypeCode type()
   {
-    ORB orb = Restricted_ORB.Singleton;
+    ORB orb = OrbRestricted.Singleton;
     return orb.create_alias_tc(id(), "ServerId", orb.create_string_tc(0));
   }