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.

49 files changed, 212 insertions, 153 deletions

diff --git a/ChangeLog b/ChangeLog
index 5a96cd6d7..7b12e4859 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,64 @@
 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. 
+
+2005-10-28  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
+
 	* gnu/CORBA/universalHolder.java
 	gnu/CORBA/stubFinder.java
 	gnu/CORBA/typeNamer.java
diff --git a/gnu/CORBA/CDR/cdrInput.java b/gnu/CORBA/CDR/cdrInput.java
index e48803203..ddc8132ba 100644
--- a/gnu/CORBA/CDR/cdrInput.java
+++ b/gnu/CORBA/CDR/cdrInput.java
@@ -39,11 +39,11 @@ exception statement from your version. */
 package gnu.CORBA.CDR;
 
 import gnu.CORBA.BigDecimalHelper;
-import gnu.CORBA.Functional_ORB;
+import gnu.CORBA.OrbFunctional;
 import gnu.CORBA.GIOP.CharSets_OSF;
 import gnu.CORBA.GIOP.cxCodeSet;
 import gnu.CORBA.IOR;
-import gnu.CORBA.IOR_Delegate;
+import gnu.CORBA.IorDelegate;
 import gnu.CORBA.Minor;
 import gnu.CORBA.TypeCodeHelper;
 import gnu.CORBA.Unexpected;
@@ -416,9 +416,9 @@ public abstract class cdrInput
         // Check maybe this is a remote reference to the local object.
         // This is only possible if we access the repository of the
         // connected object.
-        if (orb instanceof Functional_ORB)
+        if (orb instanceof OrbFunctional)
           {
-            Functional_ORB forb = (Functional_ORB) orb;
+            OrbFunctional forb = (OrbFunctional) orb;
             org.omg.CORBA.Object local = forb.find_local_object(ior);
             if (local != null)
               return local;
@@ -429,13 +429,13 @@ public abstract class cdrInput
         try
           {
             if (impl._get_delegate() == null)
-              impl._set_delegate(new IOR_Delegate(orb, ior));
+              impl._set_delegate(new IorDelegate(orb, ior));
           }
         catch (BAD_OPERATION ex)
           {
             // Some colaborants may throw this exception
             // in response to the attempt to get the unset delegate.
-            impl._set_delegate(new IOR_Delegate(orb, ior));
+            impl._set_delegate(new IorDelegate(orb, ior));
           }
 
         return impl;
diff --git a/gnu/CORBA/DynAn/abstractRecord.java b/gnu/CORBA/DynAn/abstractRecord.java
index 8d8b7a559..ed0462d8d 100644
--- a/gnu/CORBA/DynAn/abstractRecord.java
+++ b/gnu/CORBA/DynAn/abstractRecord.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package gnu.CORBA.DynAn;
 
 import gnu.CORBA.Unexpected;
-import gnu.CORBA.holderFactory;
+import gnu.CORBA.HolderLocator;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.ORB;
@@ -297,7 +297,7 @@ public abstract class abstractRecord
   {
     try
       {
-        Streamable sHolder = holderFactory.createHolder(official_type);
+        Streamable sHolder = HolderLocator.createHolder(official_type);
 
         Class sHolderClass = sHolder.getClass();
         Field sHolderValue = sHolderClass.getField("value");
@@ -371,7 +371,7 @@ public abstract class abstractRecord
             fField = structure.getClass().getField(fNames [ i ]);
             field = fField.get(structure);
             fType = array [ i ].type();
-            holder = holderFactory.createHolder(fType);
+            holder = HolderLocator.createHolder(fType);
 
             member = createAny();
             holder.getClass().getField("value").set(holder, field);
diff --git a/gnu/CORBA/DynAn/gnuDynAny.java b/gnu/CORBA/DynAn/gnuDynAny.java
index 3d00fdacc..c80c2b7f1 100644
--- a/gnu/CORBA/DynAn/gnuDynAny.java
+++ b/gnu/CORBA/DynAn/gnuDynAny.java
@@ -43,7 +43,7 @@ import gnu.CORBA.OctetHolder;
 import gnu.CORBA.Unexpected;
 import gnu.CORBA.WCharHolder;
 import gnu.CORBA.WStringHolder;
-import gnu.CORBA.holderFactory;
+import gnu.CORBA.HolderLocator;
 import gnu.CORBA.TypeKindNamer;
 import gnu.CORBA.GeneralHolder;
 
@@ -195,9 +195,9 @@ public class gnuDynAny extends abstractDynAny implements DynAny, Serializable
       }
     else if (a_holder instanceof GeneralHolder)
       {
-        holder = holderFactory.createHolder(official_type);
+        holder = HolderLocator.createHolder(official_type);
         if (holder == null)
-          holder = holderFactory.createHolder(final_type);
+          holder = HolderLocator.createHolder(final_type);
 
         if (holder == null)
           holder = ((GeneralHolder) a_holder).Clone();
diff --git a/gnu/CORBA/DynAn/gnuDynAnyFactory.java b/gnu/CORBA/DynAn/gnuDynAnyFactory.java
index f2696f109..b8b39bfbc 100644
--- a/gnu/CORBA/DynAn/gnuDynAnyFactory.java
+++ b/gnu/CORBA/DynAn/gnuDynAnyFactory.java
@@ -40,7 +40,7 @@ package gnu.CORBA.DynAn;
 
 import gnu.CORBA.Poa.ORB_1_4;
 import gnu.CORBA.Unexpected;
-import gnu.CORBA.holderFactory;
+import gnu.CORBA.HolderLocator;
 import gnu.CORBA.TypeKindNamer;
 
 import org.omg.CORBA.Any;
@@ -227,7 +227,7 @@ public class gnuDynAnyFactory
    */
   public DynAny create_simple(TypeCode official, TypeCode type)
   {
-    Streamable holder = holderFactory.createHolder(type);
+    Streamable holder = HolderLocator.createHolder(type);
     return new gnuDynAny(holder, official, type, this, orb);
   }
 
diff --git a/gnu/CORBA/DynAn/gnuDynArray.java b/gnu/CORBA/DynAn/gnuDynArray.java
index 1c08496d4..b1965fd84 100644
--- a/gnu/CORBA/DynAn/gnuDynArray.java
+++ b/gnu/CORBA/DynAn/gnuDynArray.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package gnu.CORBA.DynAn;
 
 import gnu.CORBA.Unexpected;
-import gnu.CORBA.holderFactory;
+import gnu.CORBA.HolderLocator;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_PARAM;
@@ -238,10 +238,10 @@ public class gnuDynArray
     try
       {
         Streamable memberHolder =
-          holderFactory.createHolder(official_components);
+          HolderLocator.createHolder(official_components);
 
         if (memberHolder == null)
-          memberHolder = holderFactory.createHolder(final_components);
+          memberHolder = HolderLocator.createHolder(final_components);
 
         Class memberHolderClass = memberHolder.getClass();
         Class memberClass = memberHolderClass.getField("value").getType();
@@ -260,7 +260,7 @@ public class gnuDynArray
             Array.set(members, i, member);
           }
 
-        Streamable arrayHolder = holderFactory.createHolder(official_type);
+        Streamable arrayHolder = HolderLocator.createHolder(official_type);
         arrayHolder.getClass().getField("value").set(arrayHolder, members);
 
         Any g = createAny();
@@ -296,9 +296,9 @@ public class gnuDynArray
           {
             if (holderClass == null)
               {
-                holder = holderFactory.createHolder(official_components);
+                holder = HolderLocator.createHolder(official_components);
                 if (holder == null)
-                  holder = holderFactory.createHolder(final_components);
+                  holder = HolderLocator.createHolder(final_components);
                 holderClass = holder.getClass();
               }
             else
diff --git a/gnu/CORBA/DynAn/gnuDynValueBox.java b/gnu/CORBA/DynAn/gnuDynValueBox.java
index 66e18f3b2..37bc9fffc 100644
--- a/gnu/CORBA/DynAn/gnuDynValueBox.java
+++ b/gnu/CORBA/DynAn/gnuDynValueBox.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package gnu.CORBA.DynAn;
 
 import gnu.CORBA.Unexpected;
-import gnu.CORBA.holderFactory;
+import gnu.CORBA.HolderLocator;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.ORB;
@@ -208,7 +208,7 @@ public class gnuDynValueBox
       {
         try
           {
-            Streamable holder = holderFactory.createHolder(content);
+            Streamable holder = HolderLocator.createHolder(content);
             Field v = holder.getClass().getField("value");
             v.set(holder, s);
 
diff --git a/gnu/CORBA/GIOP/ErrorMessage.java b/gnu/CORBA/GIOP/ErrorMessage.java
index e6dcc7a5f..99942fee3 100644
--- a/gnu/CORBA/GIOP/ErrorMessage.java
+++ b/gnu/CORBA/GIOP/ErrorMessage.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package gnu.CORBA.GIOP;
 
-import gnu.CORBA.Functional_ORB;
+import gnu.CORBA.OrbFunctional;
 import gnu.CORBA.IOR;
 import gnu.CORBA.Minor;
 
@@ -92,8 +92,8 @@ public class ErrorMessage
       {
         Socket socket;
         
-        if (orb instanceof Functional_ORB)
-          socket = ((Functional_ORB) orb).socketFactory.createClientSocket(
+        if (orb instanceof OrbFunctional)
+          socket = ((OrbFunctional) orb).socketFactory.createClientSocket(
             ior.Internet.host, ior.Internet.port);
         else
           socket = new Socket(ior.Internet.host, ior.Internet.port);
diff --git a/gnu/CORBA/holderFactory.java b/gnu/CORBA/HolderLocator.java
index 159d22332..edd4d2cf7 100644
--- a/gnu/CORBA/holderFactory.java
+++ b/gnu/CORBA/HolderLocator.java
@@ -1,4 +1,4 @@
-/* holderFactory.java --
+/* HolderLocator.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -75,7 +75,7 @@ import org.omg.CORBA.ObjectHolder;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class holderFactory
+public class HolderLocator
 {
   /**
    * The array, sufficiently large to use any {@link TCKind}._tk* constant as
diff --git a/gnu/CORBA/IOR_Delegate.java b/gnu/CORBA/IorDelegate.java
index bf63e70ce..90ffb8cc7 100644
--- a/gnu/CORBA/IOR_Delegate.java
+++ b/gnu/CORBA/IorDelegate.java
@@ -69,12 +69,12 @@ import java.net.Socket;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class IOR_Delegate extends Simple_delegate
+public class IorDelegate extends SimpleDelegate
 {
   /**
    * Contructs an instance of object using the given IOR.
    */
-  public IOR_Delegate(ORB an_orb, IOR an_ior)
+  public IorDelegate(ORB an_orb, IOR an_ior)
   {
     super(an_orb, an_ior);
   }
@@ -261,7 +261,7 @@ public class IOR_Delegate extends Simple_delegate
 
                       r.setIor(forwarded);
 
-                      IOR_contructed_object it = new IOR_contructed_object(orb,
+                      IorObject it = new IorObject(orb,
                         forwarded);
 
                       r.m_target = it;
diff --git a/gnu/CORBA/IOR_contructed_object.java b/gnu/CORBA/IorObject.java
index 747b157b2..02f5a495d 100644
--- a/gnu/CORBA/IOR_contructed_object.java
+++ b/gnu/CORBA/IorObject.java
@@ -1,4 +1,4 @@
-/* IOR_contructed_object.java --
+/* IorObject.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -46,7 +46,7 @@ import org.omg.CORBA.portable.ObjectImpl;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class IOR_contructed_object
+public class IorObject
   extends ObjectImpl
   implements IorProvider
 {
@@ -65,10 +65,10 @@ public class IOR_contructed_object
    *
    * @param an_ior the IOR.
    */
-  public IOR_contructed_object(ORB orb, IOR an_ior)
+  public IorObject(ORB orb, IOR an_ior)
   {
     ior = an_ior;
-    _set_delegate(new IOR_Delegate(orb, ior));
+    _set_delegate(new IorDelegate(orb, ior));
     id = new String[] { ior.Id };
   }
 
@@ -77,10 +77,10 @@ public class IOR_contructed_object
    *
    * @param an_ior the IOR in the string form.
    */
-  public IOR_contructed_object(Functional_ORB orb, String an_ior)
+  public IorObject(OrbFunctional orb, String an_ior)
   {
     ior = IOR.parse(an_ior);
-    _set_delegate(new IOR_Delegate(orb, ior));
+    _set_delegate(new IorDelegate(orb, ior));
     id = new String[] { ior.Id };
   }
   
diff --git a/gnu/CORBA/NamingService/NameParser.java b/gnu/CORBA/NamingService/NameParser.java
index efdce21d8..5ba233a08 100644
--- a/gnu/CORBA/NamingService/NameParser.java
+++ b/gnu/CORBA/NamingService/NameParser.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package gnu.CORBA.NamingService;
 
-import gnu.CORBA.Functional_ORB;
+import gnu.CORBA.OrbFunctional;
 import gnu.CORBA.IOR;
 import gnu.CORBA.Unexpected;
 import gnu.CORBA.Version;
@@ -141,7 +141,7 @@ public class NameParser
    * @return the resolved object.
    */
   public synchronized org.omg.CORBA.Object corbaloc(String corbaloc,
-    Functional_ORB orb)
+    OrbFunctional orb)
     throws BAD_PARAM
   {
     boolean corbaname;
@@ -378,7 +378,7 @@ public class NameParser
 
   static NameParser n = new NameParser();
 
-  static void corbalocT(String ior, Functional_ORB orb)
+  static void corbalocT(String ior, OrbFunctional orb)
   {
     System.out.println(ior);
     System.out.println(n.corbaloc(ior, orb));
@@ -389,7 +389,7 @@ public class NameParser
   {
     try
       {
-        Functional_ORB orb = (Functional_ORB) ORB.init(args, null);
+        OrbFunctional orb = (OrbFunctional) ORB.init(args, null);
         corbalocT("corbaloc:iiop:1.3@155axyz.com/Prod/aTradingService", orb);
         corbalocT("corbaloc:iiop:2.7@255bxyz.com/Prod/bTradingService", orb);
         corbalocT("corbaloc:iiop:355cxyz.com/Prod/cTradingService", orb);
diff --git a/gnu/CORBA/NamingService/NamingServiceTransient.java b/gnu/CORBA/NamingService/NamingServiceTransient.java
index 8b9d62b00..bf72637d7 100644
--- a/gnu/CORBA/NamingService/NamingServiceTransient.java
+++ b/gnu/CORBA/NamingService/NamingServiceTransient.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package gnu.CORBA.NamingService;
 
-import gnu.CORBA.Functional_ORB;
+import gnu.CORBA.OrbFunctional;
 import gnu.CORBA.IOR;
 
 import org.omg.CosNaming.NamingContextExt;
@@ -102,7 +102,7 @@ public class NamingServiceTransient
     try
       {
         // Create and initialize the ORB
-        final Functional_ORB orb = new Functional_ORB();
+        final OrbFunctional orb = new OrbFunctional();
 
         if (args.length > 1)
           for (int i = 0; i < args.length - 1; i++)
@@ -114,7 +114,7 @@ public class NamingServiceTransient
                 iorf = args[i + 1];
             }
 
-        Functional_ORB.setPort(port);
+        OrbFunctional.setPort(port);
 
         // Create the servant and register it with the ORB
         NamingContextExt namer = new Ext(new TransientContext());
@@ -159,6 +159,6 @@ public class NamingServiceTransient
 
     // Restore the default value for allocating ports for the subsequent
     // objects.
-    Functional_ORB.setPort(Functional_ORB.DEFAULT_INITIAL_PORT);
+    OrbFunctional.setPort(OrbFunctional.DEFAULT_INITIAL_PORT);
   }
 }
diff --git a/gnu/CORBA/Focused_ORB.java b/gnu/CORBA/OrbFocused.java
index a895ce441..a0f9993c1 100644
--- a/gnu/CORBA/Focused_ORB.java
+++ b/gnu/CORBA/OrbFocused.java
@@ -1,4 +1,4 @@
-/* Focused_ORB.java --
+/* OrbFocused.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -74,7 +74,7 @@ import java.util.StringTokenizer;
  * 
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class Focused_ORB
+public class OrbFocused
   extends ORB_1_4
 {
   /**
diff --git a/gnu/CORBA/Functional_ORB.java b/gnu/CORBA/OrbFunctional.java
index 84cc84bb6..be46a89b5 100644
--- a/gnu/CORBA/Functional_ORB.java
+++ b/gnu/CORBA/OrbFunctional.java
@@ -1,4 +1,4 @@
-/* Functional_ORB.java --
+/* OrbFunctional.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -97,7 +97,7 @@ import java.util.TreeMap;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class Functional_ORB extends Restricted_ORB
+public class OrbFunctional extends OrbRestricted
 {
   /**
    * A server, responsible for listening on requests on some local port. The ORB
@@ -150,7 +150,7 @@ public class Functional_ORB extends Restricted_ORB
 
     /**
      * Enter the serving loop (get request/process it). All portServer normally
-     * terminate thy threads when the Functional_ORB.running is set to false.
+     * terminate thy threads when the OrbFunctional.running is set to false.
      */
     public void run()
     {
@@ -455,7 +455,7 @@ public class Functional_ORB extends Restricted_ORB
   /**
    * Create the instance of the Functional ORB.
    */
-  public Functional_ORB()
+  public OrbFunctional()
   {
     try
       {
@@ -725,9 +725,9 @@ public class Functional_ORB extends Restricted_ORB
     if (object instanceof ObjectImpl)
       {
         Delegate delegate = ((ObjectImpl) object)._get_delegate();
-        if (delegate instanceof Simple_delegate)
+        if (delegate instanceof SimpleDelegate)
           {
-            byte[] key = ((Simple_delegate) delegate).getIor().key;
+            byte[] key = ((SimpleDelegate) delegate).getIor().key;
             rmKey = connected_objects.get(key);
           }
       }
@@ -850,8 +850,8 @@ public class Functional_ORB extends Restricted_ORB
     if (forObject instanceof ObjectImpl)
       {
         Delegate delegate = ((ObjectImpl) forObject)._get_delegate();
-        if (delegate instanceof Simple_delegate)
-          return ((Simple_delegate) delegate).getIor().toStringifiedReference();
+        if (delegate instanceof SimpleDelegate)
+          return ((SimpleDelegate) delegate).getIor().toStringifiedReference();
       }
 
     // Handle the case when the object is local.
@@ -968,7 +968,7 @@ public class Functional_ORB extends Restricted_ORB
    */
   public void ensureRunning()
   {
-    final Functional_ORB THIS = this;
+    final OrbFunctional THIS = this;
     
     if (!running)
       {
@@ -1033,13 +1033,13 @@ public class Functional_ORB extends Restricted_ORB
         try
           {
             if (impl._get_delegate() == null)
-              impl._set_delegate(new IOR_Delegate(this, ior));
+              impl._set_delegate(new IorDelegate(this, ior));
           }
         catch (BAD_OPERATION ex)
           {
             // Some colaborants may throw this exception
             // in response to the attempt to get the unset delegate.
-            impl._set_delegate(new IOR_Delegate(this, ior));
+            impl._set_delegate(new IorDelegate(this, ior));
           }
 
         object = impl;
@@ -1064,7 +1064,7 @@ public class Functional_ORB extends Restricted_ORB
     ior.Internet.port = ns_port;
     ior.key = NamingServiceTransient.getDefaultKey();
 
-    IOR_contructed_object iorc = new IOR_contructed_object(this, ior);
+    IorObject iorc = new IorObject(this, ior);
     NamingContextExt namer = NamingContextExtHelper.narrow(iorc);
     initial_references.put(NAME_SERVICE, namer);
     return namer;
@@ -1247,12 +1247,12 @@ public class Functional_ORB extends Restricted_ORB
         try
           {
             if (impl._get_delegate() == null)
-              impl._set_delegate(new Simple_delegate(this, ior));
+              impl._set_delegate(new SimpleDelegate(this, ior));
           }
         catch (BAD_OPERATION ex)
           {
             // Some colaborants may throw this exception.
-            impl._set_delegate(new Simple_delegate(this, ior));
+            impl._set_delegate(new SimpleDelegate(this, ior));
           }
       }
   }
diff --git a/gnu/CORBA/Restricted_ORB.java b/gnu/CORBA/OrbRestricted.java
index 7c061051a..9005cc771 100644
--- a/gnu/CORBA/Restricted_ORB.java
+++ b/gnu/CORBA/OrbRestricted.java
@@ -86,12 +86,12 @@ import java.util.Properties;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class Restricted_ORB extends org.omg.CORBA_2_3.ORB
+public class OrbRestricted extends org.omg.CORBA_2_3.ORB
 {
   /**
    * The singleton instance of this ORB.
    */
-  public static final ORB Singleton = new Restricted_ORB();
+  public static final ORB Singleton = new OrbRestricted();
 
   /**
    * The cumulated listener for all IOR interceptors. Interceptors are used by
@@ -130,7 +130,7 @@ public class Restricted_ORB extends org.omg.CORBA_2_3.ORB
        * Create a new instance of the RestrictedORB. This is used in derived classes
    * only.
    */
-  protected Restricted_ORB()
+  protected OrbRestricted()
   {
   }
 
diff --git a/gnu/CORBA/Poa/ForwardedServant.java b/gnu/CORBA/Poa/ForwardedServant.java
index 80c1e5f53..132bf6e3b 100644
--- a/gnu/CORBA/Poa/ForwardedServant.java
+++ b/gnu/CORBA/Poa/ForwardedServant.java
@@ -39,8 +39,8 @@ exception statement from your version. */
 package gnu.CORBA.Poa;
 
 import gnu.CORBA.IOR;
-import gnu.CORBA.IOR_Delegate;
-import gnu.CORBA.IOR_contructed_object;
+import gnu.CORBA.IorDelegate;
+import gnu.CORBA.IorObject;
 import gnu.CORBA.Minor;
 
 import org.omg.CORBA.BAD_PARAM;
@@ -102,9 +102,9 @@ public class ForwardedServant
         ObjectImpl fto = (ObjectImpl) a_ref;
 
         // Check maybe the remote side forwarded back to our local object.
-        if (fto instanceof IOR_contructed_object)
+        if (fto instanceof IorObject)
           {
-            IOR_contructed_object iref = (IOR_contructed_object) fto;
+            IorObject iref = (IorObject) fto;
 
             // Check maybe the IOR is local.
             ORB t_orb = iref._orb();
@@ -112,9 +112,9 @@ public class ForwardedServant
               {
                 ORB_1_4 orb = (ORB_1_4) t_orb;
                 Delegate d = iref._get_delegate();
-                if (d instanceof IOR_Delegate)
+                if (d instanceof IorDelegate)
                   {
-                    IOR_Delegate ird = (IOR_Delegate) iref._get_delegate();
+                    IorDelegate ird = (IorDelegate) iref._get_delegate();
                     IOR ior = ird.getIor();
                     if (orb.LOCAL_HOST.equalsIgnoreCase(ior.Internet.host))
                       {
diff --git a/gnu/CORBA/Poa/ORB_1_4.java b/gnu/CORBA/Poa/ORB_1_4.java
index 2ed62e841..af4c68ff9 100644
--- a/gnu/CORBA/Poa/ORB_1_4.java
+++ b/gnu/CORBA/Poa/ORB_1_4.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package gnu.CORBA.Poa;
 
-import gnu.CORBA.Functional_ORB;
+import gnu.CORBA.OrbFunctional;
 import gnu.CORBA.IOR;
 import gnu.CORBA.Connected_objects.cObject;
 import gnu.CORBA.DynAn.gnuDynAnyFactory;
@@ -72,7 +72,7 @@ import java.util.Properties;
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public class ORB_1_4
-  extends Functional_ORB
+  extends OrbFunctional
 {
   /**
    * The root POA.
diff --git a/gnu/CORBA/Poa/gnuServantObject.java b/gnu/CORBA/Poa/gnuServantObject.java
index 14cb03d45..a78316b54 100644
--- a/gnu/CORBA/Poa/gnuServantObject.java
+++ b/gnu/CORBA/Poa/gnuServantObject.java
@@ -39,8 +39,8 @@ exception statement from your version. */
 package gnu.CORBA.Poa;
 
 import gnu.CORBA.GIOP.ReplyHeader;
-import gnu.CORBA.IOR_Delegate;
-import gnu.CORBA.IOR_contructed_object;
+import gnu.CORBA.IorDelegate;
+import gnu.CORBA.IorObject;
 import gnu.CORBA.Interceptor.gnuServerRequestInfo;
 import gnu.CORBA.typecodes.RecordTypeCode;
 import gnu.CORBA.IOR;
@@ -784,12 +784,12 @@ public class gnuServantObject extends ObjectImpl
         gnuServantObject g = (gnuServantObject) other;
         return orb == g.orb && poa == g.poa && Arrays.equals(Id, g.Id);
       }
-    else if (other instanceof IOR_contructed_object)
+    else if (other instanceof IorObject)
       {
-        IOR_contructed_object ir = ((IOR_contructed_object) other);
+        IorObject ir = ((IorObject) other);
         try
           {
-            IOR_Delegate ird = (IOR_Delegate) ir._get_delegate();
+            IorDelegate ird = (IorDelegate) ir._get_delegate();
             byte[] ior_id = poa.idFormIor(ird.getIor().key);
             if (ior_id != null && Arrays.equals(ior_id, Id))
               {
diff --git a/gnu/CORBA/Simple_delegate.java b/gnu/CORBA/SimpleDelegate.java
index 29ec9f50d..3b5e1d81c 100644
--- a/gnu/CORBA/Simple_delegate.java
+++ b/gnu/CORBA/SimpleDelegate.java
@@ -57,7 +57,7 @@ import org.omg.CORBA.portable.ObjectImpl;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class Simple_delegate
+public class SimpleDelegate
   extends Delegate
   implements IorProvider
 {
@@ -71,7 +71,7 @@ public class Simple_delegate
    */
   protected IOR ior;
 
-  public Simple_delegate(ORB an_orb, IOR an_ior)
+  public SimpleDelegate(ORB an_orb, IOR an_ior)
   {
     orb = an_orb;
     ior = an_ior;
@@ -270,9 +270,9 @@ public class Simple_delegate
    */
   public Request request(org.omg.CORBA.Object target, String operation)
   {
-    if (orb instanceof Functional_ORB)
+    if (orb instanceof OrbFunctional)
       {
-        ((Functional_ORB) orb).ensureRunning();
+        ((OrbFunctional) orb).ensureRunning();
       }
     gnuRequest g = new gnuRequest();
     g.setORB(orb);
diff --git a/gnu/CORBA/StubLocator.java b/gnu/CORBA/StubLocator.java
index f3e5dec7d..d9e5ee471 100644
--- a/gnu/CORBA/StubLocator.java
+++ b/gnu/CORBA/StubLocator.java
@@ -105,6 +105,6 @@ public class StubLocator
    */
   protected static ObjectImpl createDefaultStub(ORB orb, IOR ior)
   {
-    return new IOR_contructed_object(orb, ior);
+    return new IorObject(orb, ior);
   }
 }
diff --git a/gnu/CORBA/gnuAny.java b/gnu/CORBA/gnuAny.java
index 42a9da6ea..946f1dc8e 100644
--- a/gnu/CORBA/gnuAny.java
+++ b/gnu/CORBA/gnuAny.java
@@ -781,7 +781,7 @@ public class gnuAny
           }
         else
           {
-            has = holderFactory.createHolder(a_type);
+            has = HolderLocator.createHolder(a_type);
             if (has == null)
               {
                 // Use the Universal Holder that reads till the end of stream.
diff --git a/gnu/CORBA/gnuRequest.java b/gnu/CORBA/gnuRequest.java
index 43d6ff589..2175aa2cf 100644
--- a/gnu/CORBA/gnuRequest.java
+++ b/gnu/CORBA/gnuRequest.java
@@ -295,8 +295,8 @@ public class gnuRequest extends Request implements Cloneable
     orb = an_orb;
 
     // Take the interceptor from the ORB.
-    if (orb instanceof Restricted_ORB)
-      m_interceptor = ((Restricted_ORB) orb).iClient;
+    if (orb instanceof OrbRestricted)
+      m_interceptor = ((OrbRestricted) orb).iClient;
 
     if (m_interceptor != null && orb instanceof ORB_1_4)
       {
@@ -514,8 +514,8 @@ public class gnuRequest extends Request implements Cloneable
                 try
                   {
                     ObjectImpl impl = (ObjectImpl) e.forward;
-                    Simple_delegate delegate =
-                      (Simple_delegate) impl._get_delegate();
+                    SimpleDelegate delegate =
+                      (SimpleDelegate) impl._get_delegate();
                     ior = delegate.getIor();
                   }
                 catch (Exception ex)
@@ -794,8 +794,8 @@ public class gnuRequest extends Request implements Cloneable
               {
                 try
                   {
-                    if (orb instanceof Functional_ORB)
-                      socket = ((Functional_ORB) orb).socketFactory.createClientSocket(
+                    if (orb instanceof OrbFunctional)
+                      socket = ((OrbFunctional) orb).socketFactory.createClientSocket(
                         ior.Internet.host, ior.Internet.port);
                     else
                       socket = new Socket(ior.Internet.host, ior.Internet.port);
@@ -840,9 +840,9 @@ public class gnuRequest extends Request implements Cloneable
             response_header.read(socketInput);
 
             byte[] r;
-            if (orb instanceof Functional_ORB)
+            if (orb instanceof OrbFunctional)
               {
-                Functional_ORB fo = (Functional_ORB) orb;
+                OrbFunctional fo = (OrbFunctional) orb;
                 r = response_header.readMessage(socketInput, socket,
                   fo.TOUT_WHILE_READING, fo.TOUT_AFTER_RECEIVING);
               }
@@ -868,7 +868,7 @@ public class gnuRequest extends Request implements Cloneable
           {
             if (socket != null && !socket.isClosed())
               {
-                socket.setSoTimeout(Functional_ORB.TANDEM_REQUESTS);
+                socket.setSoTimeout(OrbFunctional.TANDEM_REQUESTS);
                 SocketRepository.put_socket(key, socket);
               }
           }
@@ -1182,7 +1182,7 @@ public class gnuRequest extends Request implements Cloneable
    */
   public org.omg.CORBA.Object effective_target()
   {
-    return new IOR_contructed_object(orb, ior);
+    return new IorObject(orb, ior);
   }
 
   /**
@@ -1295,7 +1295,7 @@ public class gnuRequest extends Request implements Cloneable
       return m_forwarding_target;
 
     if (m_forward_ior != null)
-      return new IOR_contructed_object(orb, m_forward_ior);
+      return new IorObject(orb, m_forward_ior);
     else
       return null;
   }
diff --git a/gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.java b/gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.java
index 98197040a..074c3fd81 100644
--- a/gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.java
+++ b/gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package gnu.javax.rmi.CORBA;
 
-import gnu.CORBA.Simple_delegate;
+import gnu.CORBA.SimpleDelegate;
 import gnu.CORBA.Unexpected;
 import gnu.CORBA.Poa.LocalDelegate;
 import gnu.CORBA.Poa.ORB_1_4;
@@ -124,9 +124,9 @@ public class PortableRemoteObjectDelegateImpl
                         LocalDelegate l = (LocalDelegate) d;
                         poa = l.poa;
                       }
-                    else if (d instanceof Simple_delegate)
+                    else if (d instanceof SimpleDelegate)
                       {
-                        byte[] ior_key = ((Simple_delegate) d).getIor().key;
+                        byte[] ior_key = ((SimpleDelegate) d).getIor().key;
                         activeObjectMap.Obj ref = xorb.rootPOA.findIorKey(ior_key);
                         if (ref != null)
                           poa = ref.poa;
diff --git a/gnu/javax/rmi/CORBA/gnuRmiUtil.java b/gnu/javax/rmi/CORBA/gnuRmiUtil.java
index 487ce023a..41316ffaf 100644
--- a/gnu/javax/rmi/CORBA/gnuRmiUtil.java
+++ b/gnu/javax/rmi/CORBA/gnuRmiUtil.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package gnu.javax.rmi.CORBA;
 
-import gnu.CORBA.Functional_ORB;
+import gnu.CORBA.OrbFunctional;
 import gnu.CORBA.Minor;
 import gnu.CORBA.Unexpected;
 import gnu.CORBA.CDR.Vio;
@@ -526,9 +526,9 @@ public class gnuRmiUtil
   void ensureOrbRunning(org.omg.CORBA_2_3.portable.OutputStream output)
   {
     // Ensure ORB is running.
-    if (output.orb() instanceof Functional_ORB)
+    if (output.orb() instanceof OrbFunctional)
       {
-        ((Functional_ORB) output.orb()).ensureRunning();
+        ((OrbFunctional) output.orb()).ensureRunning();
       }
   }
 
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));
   }