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

	* gnu/CORBA/universalHolder.java
	gnu/CORBA/stubFinder.java
	gnu/CORBA/typeNamer.java
	gnu/CORBA/streamRequest.java
	gnu/CORBA/streamReadyHolder.java
	gnu/CORBA/binaryReply.java
	gnu/CORBA/bufferedResponseHandler.java
	gnu/CORBA/cdrEncapsCodec.java
	gnu/CORBA/corbaArrayList.java: Removed.
	* gnu/CORBA/CdrEncapsCodecImpl.java,
	gnu/CORBA/CorbaList.java,
	gnu/CORBA/GeneralHolder.java,
	gnu/CORBA/RawReply.java,
	gnu/CORBA/ResponseHandlerImpl.java,
	gnu/CORBA/StreamBasedRequest.java,
	gnu/CORBA/StreamHolder.java,
	gnu/CORBA/StubLocator.java,
	gnu/CORBA/TypeKindNamer.java: New files.
	* gnu/CORBA/CDR/cdrInput.java,
	gnu/CORBA/DynAn/abstractDynAny.java,
	gnu/CORBA/DynAn/anyDivideable.java,
	gnu/CORBA/DynAn/gnuDynAny.java,
	gnu/CORBA/DynAn/gnuDynAnyFactory.java,
	gnu/CORBA/Functional_ORB.java,
	gnu/CORBA/IOR_Delegate.java,
	gnu/CORBA/ObjectCreator.java,
	gnu/CORBA/Poa/LocalDelegate.java,
	gnu/CORBA/Poa/LocalRequest.java,
	gnu/CORBA/Poa/gnuServantObject.java,
	gnu/CORBA/Restricted_ORB.java,
	gnu/CORBA/ServiceRequestAdapter.java,
	gnu/CORBA/gnuAny.java,
	gnu/CORBA/gnuCodecFactory.java,
	gnu/CORBA/gnuContextList.java,
	gnu/CORBA/gnuExceptionList.java,
	gnu/CORBA/gnuNVList.java,
	gnu/CORBA/gnuRequest.java,
	gnu/CORBA/typecodes/RecordTypeCode.java:
	References updated.

29 files changed, 87 insertions, 87 deletions

diff --git a/gnu/CORBA/CDR/cdrInput.java b/gnu/CORBA/CDR/cdrInput.java
index 31b4a222f..e48803203 100644
--- a/gnu/CORBA/CDR/cdrInput.java
+++ b/gnu/CORBA/CDR/cdrInput.java
@@ -49,7 +49,7 @@ import gnu.CORBA.TypeCodeHelper;
 import gnu.CORBA.Unexpected;
 import gnu.CORBA.Version;
 import gnu.CORBA.gnuAny;
-import gnu.CORBA.stubFinder;
+import gnu.CORBA.StubLocator;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.AnySeqHolder;
@@ -425,7 +425,7 @@ public abstract class cdrInput
           }
 
         // Search for the available stubs.
-        ObjectImpl impl = stubFinder.search(orb, ior);
+        ObjectImpl impl = StubLocator.search(orb, ior);
         try
           {
             if (impl._get_delegate() == null)
diff --git a/gnu/CORBA/cdrEncapsCodec.java b/gnu/CORBA/CdrEncapsCodecImpl.java
index f3fc0001e..9d35c8a78 100644
--- a/gnu/CORBA/cdrEncapsCodec.java
+++ b/gnu/CORBA/CdrEncapsCodecImpl.java
@@ -1,4 +1,4 @@
-/* cdrEncapsCodec.java --
+/* CdrEncapsCodecImpl.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -62,7 +62,7 @@ import org.omg.IOP.CodecPackage.TypeMismatch;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class cdrEncapsCodec
+public class CdrEncapsCodecImpl
   extends LocalObject
   implements Codec
 {
@@ -99,7 +99,7 @@ public class cdrEncapsCodec
   /**
    * Create an instance of this Codec, encoding following the given version.
    */
-  public cdrEncapsCodec(ORB _orb, Version _version)
+  public CdrEncapsCodecImpl(ORB _orb, Version _version)
   {
     orb = _orb;
     version = _version;
diff --git a/gnu/CORBA/corbaArrayList.java b/gnu/CORBA/CorbaList.java
index 1690f0583..25bea9230 100644
--- a/gnu/CORBA/corbaArrayList.java
+++ b/gnu/CORBA/CorbaList.java
@@ -1,4 +1,4 @@
-/* corbaArrayList.java --
+/* CorbaList.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -52,7 +52,7 @@ import org.omg.CORBA.Bounds;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class corbaArrayList
+public class CorbaList
   extends ArrayList
   implements Serializable
 {
@@ -64,7 +64,7 @@ public class corbaArrayList
   /**
    * Creates the list with the given initial size.
    */
-  public corbaArrayList(int initial_size)
+  public CorbaList(int initial_size)
   {
     super(initial_size);
   }
@@ -72,7 +72,7 @@ public class corbaArrayList
   /**
    * Creates the list with the default size.
    */
-  public corbaArrayList()
+  public CorbaList()
   {
   }
 
diff --git a/gnu/CORBA/DynAn/abstractDynAny.java b/gnu/CORBA/DynAn/abstractDynAny.java
index 47176c4b5..78b5973dc 100644
--- a/gnu/CORBA/DynAn/abstractDynAny.java
+++ b/gnu/CORBA/DynAn/abstractDynAny.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package gnu.CORBA.DynAn;
 
-import gnu.CORBA.typeNamer;
+import gnu.CORBA.TypeKindNamer;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.LocalObject;
@@ -163,8 +163,8 @@ public abstract class abstractDynAny
    */
   String typeMismatch(TypeCode expected, TypeCode actual)
   {
-    return typeNamer.nameIt(expected) + " expected " +
-           typeNamer.nameIt(actual);
+    return TypeKindNamer.nameIt(expected) + " expected " +
+           TypeKindNamer.nameIt(actual);
   }
 
   /**
diff --git a/gnu/CORBA/DynAn/anyDivideable.java b/gnu/CORBA/DynAn/anyDivideable.java
index 5f52c8078..ebc44a2e8 100644
--- a/gnu/CORBA/DynAn/anyDivideable.java
+++ b/gnu/CORBA/DynAn/anyDivideable.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package gnu.CORBA.DynAn;
 
-import gnu.CORBA.typeNamer;
+import gnu.CORBA.TypeKindNamer;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.CompletionStatus;
diff --git a/gnu/CORBA/DynAn/gnuDynAny.java b/gnu/CORBA/DynAn/gnuDynAny.java
index 015628ebf..3d00fdacc 100644
--- a/gnu/CORBA/DynAn/gnuDynAny.java
+++ b/gnu/CORBA/DynAn/gnuDynAny.java
@@ -44,8 +44,8 @@ import gnu.CORBA.Unexpected;
 import gnu.CORBA.WCharHolder;
 import gnu.CORBA.WStringHolder;
 import gnu.CORBA.holderFactory;
-import gnu.CORBA.typeNamer;
-import gnu.CORBA.universalHolder;
+import gnu.CORBA.TypeKindNamer;
+import gnu.CORBA.GeneralHolder;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.AnyHolder;
@@ -165,7 +165,7 @@ public class gnuDynAny extends abstractDynAny implements DynAny, Serializable
   public DynAny current_component() throws TypeMismatch
   {
     throw new TypeMismatch("Not applicable for " +
-      typeNamer.nameIt(final_type)
+      TypeKindNamer.nameIt(final_type)
     );
   }
 
@@ -193,14 +193,14 @@ public class gnuDynAny extends abstractDynAny implements DynAny, Serializable
       {
         throw new InvalidValue(ISNULL);
       }
-    else if (a_holder instanceof universalHolder)
+    else if (a_holder instanceof GeneralHolder)
       {
         holder = holderFactory.createHolder(official_type);
         if (holder == null)
           holder = holderFactory.createHolder(final_type);
 
         if (holder == null)
-          holder = ((universalHolder) a_holder).Clone();
+          holder = ((GeneralHolder) a_holder).Clone();
         else
           {
             InputStream in = an_any.create_input_stream();
diff --git a/gnu/CORBA/DynAn/gnuDynAnyFactory.java b/gnu/CORBA/DynAn/gnuDynAnyFactory.java
index dd1762890..f2696f109 100644
--- a/gnu/CORBA/DynAn/gnuDynAnyFactory.java
+++ b/gnu/CORBA/DynAn/gnuDynAnyFactory.java
@@ -41,7 +41,7 @@ package gnu.CORBA.DynAn;
 import gnu.CORBA.Poa.ORB_1_4;
 import gnu.CORBA.Unexpected;
 import gnu.CORBA.holderFactory;
-import gnu.CORBA.typeNamer;
+import gnu.CORBA.TypeKindNamer;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.LocalObject;
@@ -314,7 +314,7 @@ public class gnuDynAnyFactory
             case TCKind._tk_Principal :
             case TCKind._tk_abstract_interface :
               throw new InconsistentTypeCode("Following API, the " +
-                                             typeNamer.nameIt(type) +
+                                             TypeKindNamer.nameIt(type) +
                                              " must not be supported."
                                             );
 
diff --git a/gnu/CORBA/Functional_ORB.java b/gnu/CORBA/Functional_ORB.java
index e474c3055..84cc84bb6 100644
--- a/gnu/CORBA/Functional_ORB.java
+++ b/gnu/CORBA/Functional_ORB.java
@@ -1029,7 +1029,7 @@ public class Functional_ORB extends Restricted_ORB
     org.omg.CORBA.Object object = find_local_object(ior);
     if (object == null)
       {
-        ObjectImpl impl = stubFinder.search(this, ior);
+        ObjectImpl impl = StubLocator.search(this, ior);
         try
           {
             if (impl._get_delegate() == null)
@@ -1272,7 +1272,7 @@ public class Functional_ORB extends Restricted_ORB
    */
   private void respond_to_client(OutputStream net_out,
     MessageHeader msh_request, RequestHeader rh_request,
-    bufferedResponseHandler handler, SystemException sysEx
+    ResponseHandlerImpl handler, SystemException sysEx
   ) throws IOException
   {
     // Set the reply header properties.
@@ -1476,7 +1476,7 @@ public class Functional_ORB extends Restricted_ORB
                 ReplyHeader rh_reply = msh_request.create_reply_header();
 
                 // TODO log errors about not existing objects and methods.
-                bufferedResponseHandler handler = new bufferedResponseHandler(
+                ResponseHandlerImpl handler = new ResponseHandlerImpl(
                   this, msh_request, rh_reply, rh_request);
 
                 SystemException sysEx = null;
diff --git a/gnu/CORBA/universalHolder.java b/gnu/CORBA/GeneralHolder.java
index 05a406746..0a14afd00 100644
--- a/gnu/CORBA/universalHolder.java
+++ b/gnu/CORBA/GeneralHolder.java
@@ -60,7 +60,7 @@ import java.io.IOException;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class universalHolder
+public class GeneralHolder
   implements Streamable
 {
   /**
@@ -71,7 +71,7 @@ public class universalHolder
   /**
    * Create the universal holder that uses the given buffer to store the data.
    */
-  public universalHolder(cdrBufOutput buffer)
+  public GeneralHolder(cdrBufOutput buffer)
   {
     value = buffer;
   }
@@ -162,13 +162,13 @@ public class universalHolder
   /**
    * Clone.
    */
-  public universalHolder Clone()
+  public GeneralHolder Clone()
   {
     try
       {
         cdrBufOutput nb = new cdrBufOutput(value.buffer.size());
         value.buffer.writeTo(nb);
-        return new universalHolder(nb);
+        return new GeneralHolder(nb);
       }
     catch (IOException ex)
       {
diff --git a/gnu/CORBA/IOR_Delegate.java b/gnu/CORBA/IOR_Delegate.java
index 61ab6f1bf..bf63e70ce 100644
--- a/gnu/CORBA/IOR_Delegate.java
+++ b/gnu/CORBA/IOR_Delegate.java
@@ -174,14 +174,14 @@ public class IOR_Delegate extends Simple_delegate
   public InputStream invoke(org.omg.CORBA.Object target, OutputStream output)
     throws ApplicationException, RemarshalException
   {
-    streamRequest request = (streamRequest) output;
+    StreamBasedRequest request = (StreamBasedRequest) output;
     Forwardings: while (true)
       {
         try
           {
             if (request.response_expected)
               {
-                binaryReply response = request.request.submit();
+                RawReply response = request.request.submit();
 
                 // Read reply header.
                 ReplyHeader rh = response.header.create_reply_header();
@@ -338,7 +338,7 @@ public class IOR_Delegate extends Simple_delegate
   /**
    * Show exception to interceptor.
    */
-  void showException(streamRequest request, cdrBufInput input)
+  void showException(StreamBasedRequest request, cdrBufInput input)
     throws ForwardRequest
   {
     input.mark(2048);
@@ -390,7 +390,7 @@ public class IOR_Delegate extends Simple_delegate
     request.set_target(target);
     request.setOperation(operation);
 
-    streamRequest out = request.getParameterStream();
+    StreamBasedRequest out = request.getParameterStream();
     out.response_expected = response_expected;
     request.setORB(orb);
     out.setOrb(orb);
diff --git a/gnu/CORBA/ObjectCreator.java b/gnu/CORBA/ObjectCreator.java
index bade69278..57c47cb89 100644
--- a/gnu/CORBA/ObjectCreator.java
+++ b/gnu/CORBA/ObjectCreator.java
@@ -472,7 +472,7 @@ public class ObjectCreator
 
         String name = getDefaultName(m_exception_id);
 
-        universalHolder h = new universalHolder(output);
+        GeneralHolder h = new GeneralHolder(output);
 
         into.insert_Streamable(h);
 
diff --git a/gnu/CORBA/Poa/LocalDelegate.java b/gnu/CORBA/Poa/LocalDelegate.java
index 630fcaf29..0ca6225cd 100644
--- a/gnu/CORBA/Poa/LocalDelegate.java
+++ b/gnu/CORBA/Poa/LocalDelegate.java
@@ -41,7 +41,7 @@ package gnu.CORBA.Poa;
 import gnu.CORBA.CDR.cdrOutput;
 import gnu.CORBA.IOR;
 import gnu.CORBA.IorProvider;
-import gnu.CORBA.streamRequest;
+import gnu.CORBA.StreamBasedRequest;
 
 import org.omg.CORBA.ARG_INOUT;
 import org.omg.CORBA.Bounds;
@@ -301,7 +301,7 @@ public class LocalDelegate
   {
     try
       {
-        streamRequest sr = (streamRequest) output;
+        StreamBasedRequest sr = (StreamBasedRequest) output;
 
         LocalRequest lr = (LocalRequest) sr.request;
         InvokeHandler handler = lr.object.getHandler(lr.operation(), lr.cookie,
diff --git a/gnu/CORBA/Poa/LocalRequest.java b/gnu/CORBA/Poa/LocalRequest.java
index 5d9282913..05dde8f62 100644
--- a/gnu/CORBA/Poa/LocalRequest.java
+++ b/gnu/CORBA/Poa/LocalRequest.java
@@ -49,8 +49,8 @@ import gnu.CORBA.ObjectCreator;
 import gnu.CORBA.Unexpected;
 import gnu.CORBA.gnuAny;
 import gnu.CORBA.gnuRequest;
-import gnu.CORBA.streamReadyHolder;
-import gnu.CORBA.streamRequest;
+import gnu.CORBA.StreamHolder;
+import gnu.CORBA.StreamBasedRequest;
 
 import org.omg.CORBA.ARG_OUT;
 import org.omg.CORBA.Any;
@@ -368,7 +368,7 @@ public class LocalRequest extends gnuRequest implements ResponseHandler,
                       {
                         // Failed due any reason, insert without
                         // helper.
-                        a.insert_Streamable(new streamReadyHolder(
+                        a.insert_Streamable(new StreamHolder(
                             buf.create_input_stream()
                           )
                         );
@@ -589,7 +589,7 @@ public class LocalRequest extends gnuRequest implements ResponseHandler,
             // Prepare an Any that will hold the exception.
             gnuAny exc = new gnuAny();
 
-            exc.insert_Streamable(new streamReadyHolder(input));
+            exc.insert_Streamable(new StreamHolder(input));
 
             UnknownUserException unuex = new UnknownUserException(exc);
             m_environment.exception(unuex);
@@ -664,9 +664,9 @@ public class LocalRequest extends gnuRequest implements ResponseHandler,
    * Get the parameter stream, where the invocation arguments should be written
    * if they are written into the stream directly.
    */
-  public streamRequest getParameterStream()
+  public StreamBasedRequest getParameterStream()
   {
-    m_parameter_buffer = new streamRequest();
+    m_parameter_buffer = new StreamBasedRequest();
     m_parameter_buffer.request = this;
     m_parameter_buffer.setOrb(poa.orb());
     return m_parameter_buffer;
diff --git a/gnu/CORBA/Poa/gnuServantObject.java b/gnu/CORBA/Poa/gnuServantObject.java
index f2b86bde2..14cb03d45 100644
--- a/gnu/CORBA/Poa/gnuServantObject.java
+++ b/gnu/CORBA/Poa/gnuServantObject.java
@@ -48,8 +48,8 @@ import gnu.CORBA.IorProvider;
 import gnu.CORBA.Minor;
 import gnu.CORBA.ObjectCreator;
 import gnu.CORBA.Unexpected;
-import gnu.CORBA.bufferedResponseHandler;
-import gnu.CORBA.streamReadyHolder;
+import gnu.CORBA.ResponseHandlerImpl;
+import gnu.CORBA.StreamHolder;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -412,17 +412,17 @@ public class gnuServantObject extends ObjectImpl
     boolean intercept = false;
     ServerRequestInterceptorOperations interceptor = null;
     gnuServerRequestInfo info = null;
-    bufferedResponseHandler i_handler = null;
+    ResponseHandlerImpl i_handler = null;
 
     try
       {
         if (orb.iServer != null &&
-          r_handler instanceof bufferedResponseHandler
+          r_handler instanceof ResponseHandlerImpl
         )
           {
             interceptor = orb.iServer;
 
-            i_handler = (bufferedResponseHandler) r_handler;
+            i_handler = (ResponseHandlerImpl) r_handler;
 
             info =
               new gnuServerRequestInfo(this, i_handler.request_header,
@@ -546,7 +546,7 @@ public class gnuServantObject extends ObjectImpl
                                     {
                                       // Failed due any reason, insert without
                                       // helper.
-                                      a.insert_Streamable(new streamReadyHolder(
+                                      a.insert_Streamable(new StreamHolder(
                                           buf.create_input_stream()
                                         )
                                       );
diff --git a/gnu/CORBA/binaryReply.java b/gnu/CORBA/RawReply.java
index 71afa3776..fbf60bbea 100644
--- a/gnu/CORBA/binaryReply.java
+++ b/gnu/CORBA/RawReply.java
@@ -1,4 +1,4 @@
-/* binaryReply.java --
+/* RawReply.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -48,7 +48,7 @@ import org.omg.CORBA.ORB;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-class binaryReply
+class RawReply
 {
   /**
    * The message header.
@@ -71,7 +71,7 @@ class binaryReply
    * @param an_header the message header
    * @param a_data the message data.
    */
-  binaryReply(ORB an_orb, MessageHeader an_header, byte[] a_data)
+  RawReply(ORB an_orb, MessageHeader an_header, byte[] a_data)
   {
     orb = an_orb;
     header = an_header;
diff --git a/gnu/CORBA/bufferedResponseHandler.java b/gnu/CORBA/ResponseHandlerImpl.java
index 0fe945ca1..2c46b2748 100644
--- a/gnu/CORBA/bufferedResponseHandler.java
+++ b/gnu/CORBA/ResponseHandlerImpl.java
@@ -1,4 +1,4 @@
-/* bufferedResponseHandler.java --
+/* ResponseHandlerImpl.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -53,7 +53,7 @@ import org.omg.CORBA.portable.ResponseHandler;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class bufferedResponseHandler
+public class ResponseHandlerImpl
   implements ResponseHandler
 {
   /**
@@ -96,7 +96,7 @@ public class bufferedResponseHandler
    * @param m_header a message header.
    * @param r_header a reply header.
    */
-  bufferedResponseHandler(ORB an_orb, MessageHeader m_header,
+  ResponseHandlerImpl(ORB an_orb, MessageHeader m_header,
                           ReplyHeader r_header, RequestHeader rq_header)
   {
     message_header = m_header;
diff --git a/gnu/CORBA/Restricted_ORB.java b/gnu/CORBA/Restricted_ORB.java
index 86f120514..7c061051a 100644
--- a/gnu/CORBA/Restricted_ORB.java
+++ b/gnu/CORBA/Restricted_ORB.java
@@ -304,7 +304,7 @@ public class Restricted_ORB extends org.omg.CORBA_2_3.ORB
   {
     try
       {
-        return typeNamer.getPrimitveTC(tcKind);
+        return TypeKindNamer.getPrimitveTC(tcKind);
       }
     catch (BadKind ex)
       {
diff --git a/gnu/CORBA/ServiceRequestAdapter.java b/gnu/CORBA/ServiceRequestAdapter.java
index 7f40fc84d..4212874e6 100644
--- a/gnu/CORBA/ServiceRequestAdapter.java
+++ b/gnu/CORBA/ServiceRequestAdapter.java
@@ -127,7 +127,7 @@ public class ServiceRequestAdapter
           {
             // Write the exception information
             gnuAny exc = new gnuAny();
-            universalHolder uku = new universalHolder(h.reply);
+            GeneralHolder uku = new GeneralHolder(h.reply);
             exc.insert_Streamable(uku);
             request.set_exception(exc);
           }
@@ -146,7 +146,7 @@ public class ServiceRequestAdapter
               {
                 // Use the universal holder otherwise.
                 gnuAny r = new gnuAny();
-                r.insert_Streamable(new streamReadyHolder(in));
+                r.insert_Streamable(new StreamHolder(in));
               }
 
             // Unpack the arguments
diff --git a/gnu/CORBA/streamRequest.java b/gnu/CORBA/StreamBasedRequest.java
index a0f7eb099..18abdfc2b 100644
--- a/gnu/CORBA/streamRequest.java
+++ b/gnu/CORBA/StreamBasedRequest.java
@@ -45,7 +45,7 @@ import gnu.CORBA.CDR.cdrBufOutput;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class streamRequest
+public class StreamBasedRequest
   extends cdrBufOutput
 {
   /**
diff --git a/gnu/CORBA/streamReadyHolder.java b/gnu/CORBA/StreamHolder.java
index 9f30530c4..de2fda0ba 100644
--- a/gnu/CORBA/streamReadyHolder.java
+++ b/gnu/CORBA/StreamHolder.java
@@ -1,4 +1,4 @@
-/* streamReadyHolder.java --
+/* StreamHolder.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -52,7 +52,7 @@ import java.io.IOException;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class streamReadyHolder
+public class StreamHolder
   implements Streamable
 {
   /**
@@ -65,7 +65,7 @@ public class streamReadyHolder
    *
    * @param a_stream a stream.
    */
-  public streamReadyHolder(InputStream a_stream)
+  public StreamHolder(InputStream a_stream)
   {
     stream = a_stream;
   }
diff --git a/gnu/CORBA/stubFinder.java b/gnu/CORBA/StubLocator.java
index 52516927a..f3e5dec7d 100644
--- a/gnu/CORBA/stubFinder.java
+++ b/gnu/CORBA/StubLocator.java
@@ -1,4 +1,4 @@
-/* stubFinder.java --
+/* StubLocator.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -52,7 +52,7 @@ import org.omg.CORBA.portable.ObjectImpl;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class stubFinder
+public class StubLocator
 {
   /**
    * Search for the possibly available default stub.
diff --git a/gnu/CORBA/typeNamer.java b/gnu/CORBA/TypeKindNamer.java
index 65a5043d1..3296db360 100644
--- a/gnu/CORBA/typeNamer.java
+++ b/gnu/CORBA/TypeKindNamer.java
@@ -51,7 +51,7 @@ import org.omg.CORBA.TypeCodePackage.BadKind;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class typeNamer
+public class TypeKindNamer
 {
   /**
    * Names of the primitve types.
diff --git a/gnu/CORBA/gnuAny.java b/gnu/CORBA/gnuAny.java
index 808d526a9..42a9da6ea 100644
--- a/gnu/CORBA/gnuAny.java
+++ b/gnu/CORBA/gnuAny.java
@@ -154,9 +154,9 @@ public class gnuAny
    */
   public org.omg.CORBA.portable.InputStream create_input_stream()
   {
-    if (has instanceof universalHolder)
+    if (has instanceof GeneralHolder)
       {
-        universalHolder u = (universalHolder) has;
+        GeneralHolder u = (GeneralHolder) has;
         return u.getInputStream();
       }
     else
@@ -789,12 +789,12 @@ public class gnuAny
                 // Helper.
                 cdrBufOutput buffer = new cdrBufOutput();
                 buffer.setOrb(orb);
-                has = new universalHolder(buffer);
+                has = new GeneralHolder(buffer);
               }
           }
         type(a_type);
 
-        if (!(has instanceof universalHolder) &&
+        if (!(has instanceof GeneralHolder) &&
             (kind == TCKind._tk_value_box))
           {
             // The streamable only contains operations for
@@ -876,8 +876,8 @@ public class gnuAny
           if (!(xKind == TCKind._tk_alias && has._type().kind().value() == kind))
             {
               BAD_OPERATION bad = new BAD_OPERATION("Extracting "
-                + typeNamer.nameIt(kind) + " when stored "
-                + typeNamer.nameIt(xKind));
+                + TypeKindNamer.nameIt(kind) + " when stored "
+                + TypeKindNamer.nameIt(xKind));
               bad.minor = Minor.Any;
               throw bad;
             }
@@ -888,8 +888,8 @@ public class gnuAny
           if (!(type().kind().value() == TCKind._tk_alias && has._type().kind().value() == kind))
             {
               BAD_OPERATION bad = new BAD_OPERATION("Extracting "
-                + typeNamer.nameIt(kind) + " stored "
-                + typeNamer.nameIt(type()));
+                + TypeKindNamer.nameIt(kind) + " stored "
+                + TypeKindNamer.nameIt(type()));
               bad.minor = Minor.Any;
               throw bad;
             }
diff --git a/gnu/CORBA/gnuCodecFactory.java b/gnu/CORBA/gnuCodecFactory.java
index 067de498c..8cf9ccf7b 100644
--- a/gnu/CORBA/gnuCodecFactory.java
+++ b/gnu/CORBA/gnuCodecFactory.java
@@ -83,7 +83,7 @@ public class gnuCodecFactory extends LocalObject implements CodecFactory
         "supported by this factory."
       );
 
-    return new cdrEncapsCodec(orb,
+    return new CdrEncapsCodecImpl(orb,
       new Version(for_encoding.major_version, for_encoding.minor_version)
     );
   }
diff --git a/gnu/CORBA/gnuContextList.java b/gnu/CORBA/gnuContextList.java
index 2a26437de..68584c389 100644
--- a/gnu/CORBA/gnuContextList.java
+++ b/gnu/CORBA/gnuContextList.java
@@ -53,7 +53,7 @@ public class gnuContextList
   /**
    * The collection, holding the actual list of strings.
    */
-  corbaArrayList strings = new corbaArrayList();
+  CorbaList strings = new CorbaList();
 
   /** {@inheritDoc} */
   public void add(String name)
diff --git a/gnu/CORBA/gnuExceptionList.java b/gnu/CORBA/gnuExceptionList.java
index b684ec928..5f0c0c9f5 100644
--- a/gnu/CORBA/gnuExceptionList.java
+++ b/gnu/CORBA/gnuExceptionList.java
@@ -54,7 +54,7 @@ public class gnuExceptionList
   /**
    * A list to store the objects.
    */
-  protected corbaArrayList list = new corbaArrayList();
+  protected CorbaList list = new CorbaList();
 
   /** {@inheritDoc} */
   public void add(TypeCode an_exception)
diff --git a/gnu/CORBA/gnuNVList.java b/gnu/CORBA/gnuNVList.java
index e436c332c..3645a3e8d 100644
--- a/gnu/CORBA/gnuNVList.java
+++ b/gnu/CORBA/gnuNVList.java
@@ -53,14 +53,14 @@ public class gnuNVList
   /**
    * The list of the named values.
    */
-  protected corbaArrayList list;
+  protected CorbaList list;
 
   /**
    * Creates the list with the default initial size.
    */
   public gnuNVList()
   {
-    list = new corbaArrayList();
+    list = new CorbaList();
   }
 
   /**
@@ -68,7 +68,7 @@ public class gnuNVList
    */
   public gnuNVList(int initial_size)
   {
-    list = new corbaArrayList(initial_size);
+    list = new CorbaList(initial_size);
   }
 
   /** {@inheritDoc} */
diff --git a/gnu/CORBA/gnuRequest.java b/gnu/CORBA/gnuRequest.java
index 0a2b3656c..43d6ff589 100644
--- a/gnu/CORBA/gnuRequest.java
+++ b/gnu/CORBA/gnuRequest.java
@@ -135,8 +135,8 @@ public class gnuRequest extends Request implements Cloneable
   /**
    * The empty byte array.
    */
-  private static final binaryReply EMPTY =
-    new binaryReply(null, new MessageHeader(), new byte[ 0 ]);
+  private static final RawReply EMPTY =
+    new RawReply(null, new MessageHeader(), new byte[ 0 ]);
 
   /**
    * The context holder for methods ctx(Context) and ctx().
@@ -223,7 +223,7 @@ public class gnuRequest extends Request implements Cloneable
    * The request arguments in the case when they are directly written into the
    * parameter buffer.
    */
-  protected streamRequest m_parameter_buffer;
+  protected StreamBasedRequest m_parameter_buffer;
 
   /**
    * The array of slots.
@@ -333,9 +333,9 @@ public class gnuRequest extends Request implements Cloneable
    * Get the parameter stream, where the invocation arguments should be written
    * if they are written into the stream directly.
    */
-  public streamRequest getParameterStream()
+  public StreamBasedRequest getParameterStream()
   {
-    m_parameter_buffer = new streamRequest();
+    m_parameter_buffer = new StreamBasedRequest();
     m_parameter_buffer.request = this;
     m_parameter_buffer.setVersion(ior.Internet.version);
     m_parameter_buffer.setCodeSet(cxCodeSet.negotiate(ior.Internet.CodeSets));
@@ -722,7 +722,7 @@ public class gnuRequest extends Request implements Cloneable
    * 
    * @return the server response in binary form.
    */
-  public synchronized binaryReply submit()
+  public synchronized RawReply submit()
     throws ForwardRequest
   {
     gnu.CORBA.GIOP.MessageHeader header = new gnu.CORBA.GIOP.MessageHeader();
@@ -849,7 +849,7 @@ public class gnuRequest extends Request implements Cloneable
             else
               r = response_header.readMessage(socketInput, null, 0, 0);
 
-            return new binaryReply(orb, response_header, r);
+            return new RawReply(orb, response_header, r);
           }
         else
           return EMPTY;
@@ -936,7 +936,7 @@ public class gnuRequest extends Request implements Cloneable
   private void p_invoke()
     throws SystemException, ForwardRequest
   {
-    binaryReply response = submit();
+    RawReply response = submit();
 
     if (m_rph == null)
       m_rph = response.header.create_reply_header();
@@ -1026,7 +1026,7 @@ public class gnuRequest extends Request implements Cloneable
           gnuAny exc = new gnuAny();
           exc.setOrb(orb);
 
-          exc.insert_Streamable(new streamReadyHolder(input));
+          exc.insert_Streamable(new StreamHolder(input));
 
           UnknownUserException unuex = new UnknownUserException(exc);
           m_environment.exception(unuex);
diff --git a/gnu/CORBA/typecodes/RecordTypeCode.java b/gnu/CORBA/typecodes/RecordTypeCode.java
index b02d41af2..89f342546 100644
--- a/gnu/CORBA/typecodes/RecordTypeCode.java
+++ b/gnu/CORBA/typecodes/RecordTypeCode.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package gnu.CORBA.typecodes;
 
-import gnu.CORBA.corbaArrayList;
+import gnu.CORBA.CorbaList;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.StructMember;
@@ -92,7 +92,7 @@ public class RecordTypeCode
   /**
    * The members of this data structure.
    */
-  protected corbaArrayList members = new corbaArrayList();
+  protected CorbaList members = new CorbaList();
   private TypeCode discriminator_type;
   private int default_index = UNSET;