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

* gnu/CORBA/typecodes/AliasTypeCode.java,
gnu/CORBA/typecodes/ArrayTypeCode.java,
gnu/CORBA/typecodes/FixedTypeCode.java,
gnu/CORBA/typecodes/GeneralTypeCode.java,
gnu/CORBA/typecodes/PrimitiveTypeCode.java,
gnu/CORBA/typecodes/RecordTypeCode.java,
gnu/CORBA/typecodes/RecursiveTypeCode.java,
gnu/CORBA/typecodes/StringTypeCode.java,
gnu/CORBA/typecodes/package.html: New files.
* gnu/CORBA/aliasTypeCode.java,
gnu/CORBA/primitiveArrayTypeCode.java,
gnu/CORBA/fixedTypeCode.java,
gnu/CORBA/generalTypeCode.java,
gnu/CORBA/primitiveTypeCode.java,
gnu/CORBA/recordTypeCode.java,
gnu/CORBA/recursiveTypeCode.java,
gnu/CORBA/stringTypeCode.java: Deleted.
* gnu/CORBA/CDR/cdrOutput.java,
gnu/CORBA/ObjectCreator.java,
gnu/CORBA/OctetHolder.java,
gnu/CORBA/Poa/LocalRequest.java,
gnu/CORBA/Poa/gnuServantObject.java,
gnu/CORBA/Restricted_ORB.java,
gnu/CORBA/TypeCodeHelper.java,
gnu/CORBA/WCharHolder.java,
gnu/CORBA/WStringHolder.java,
gnu/CORBA/gnuAny.java,
gnu/CORBA/typeNamer.java,
gnu/javax/rmi/CORBA/UtilDelegateImpl.java,
org/omg/CORBA/AnyHolder.java,
org/omg/CORBA/AnySeqHelper.java,
org/omg/CORBA/AnySeqHolder.java,
org/omg/CORBA/BooleanHolder.java,
org/omg/CORBA/BooleanSeqHelper.java,
org/omg/CORBA/BooleanSeqHolder.java,
org/omg/CORBA/ByteHolder.java,
org/omg/CORBA/CharHolder.java,
org/omg/CORBA/CharSeqHelper.java,
org/omg/CORBA/CharSeqHolder.java,
org/omg/CORBA/DefinitionKindHelper.java,
org/omg/CORBA/DoubleHolder.java,
org/omg/CORBA/DoubleSeqHelper.java,
org/omg/CORBA/DoubleSeqHolder.java,
org/omg/CORBA/FixedHolder.java,
org/omg/CORBA/FloatHolder.java,
org/omg/CORBA/FloatSeqHelper.java,
org/omg/CORBA/FloatSeqHolder.java,
org/omg/CORBA/IntHolder.java,
org/omg/CORBA/LongHolder.java,
org/omg/CORBA/LongLongSeqHelper.java,
org/omg/CORBA/LongLongSeqHolder.java,
org/omg/CORBA/LongSeqHelper.java,
org/omg/CORBA/LongSeqHolder.java,
org/omg/CORBA/NameValuePairHelper.java,
org/omg/CORBA/ORB.java,
org/omg/CORBA/ObjectHelper.java,
org/omg/CORBA/ObjectHolder.java,
org/omg/CORBA/OctetSeqHelper.java,
org/omg/CORBA/OctetSeqHolder.java,
org/omg/CORBA/PolicyErrorCodeHelper.java,
org/omg/CORBA/PrincipalHolder.java,
org/omg/CORBA/ShortHolder.java,
org/omg/CORBA/ShortSeqHelper.java,
org/omg/CORBA/ShortSeqHolder.java,
org/omg/CORBA/StringHolder.java,
org/omg/CORBA/StringSeqHelper.java,
org/omg/CORBA/StringSeqHolder.java,
org/omg/CORBA/TypeCodeHolder.java,
org/omg/CORBA/ULongLongSeqHelper.java,
org/omg/CORBA/ULongLongSeqHolder.java,
org/omg/CORBA/ULongSeqHelper.java,
org/omg/CORBA/ULongSeqHolder.java,
org/omg/CORBA/UShortSeqHelper.java,
org/omg/CORBA/UShortSeqHolder.java,
org/omg/CORBA/ValueBaseHelper.java,
org/omg/CORBA/WCharSeqHelper.java,
org/omg/CORBA/WCharSeqHolder.java,
org/omg/CORBA/WStringSeqHelper.java,
org/omg/CORBA/WStringSeqHolder.java,
org/omg/Messaging/SyncScopeHelper.java: References modified.

51 files changed, 137 insertions, 137 deletions

diff --git a/org/omg/CORBA/AnyHolder.java b/org/omg/CORBA/AnyHolder.java
index 0055fdd74..10f828aab 100644
--- a/org/omg/CORBA/AnyHolder.java
+++ b/org/omg/CORBA/AnyHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveTypeCode;
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -55,7 +55,7 @@ public final class AnyHolder
   /**
    * The default type code for this holder.
    */
-  private static final TypeCode t_any = new primitiveTypeCode(TCKind.tk_any);
+  private static final TypeCode t_any = new PrimitiveTypeCode(TCKind.tk_any);
 
   /**
    * The instance of {@link Any} (not the "any value"), held by this holder.
diff --git a/org/omg/CORBA/AnySeqHelper.java b/org/omg/CORBA/AnySeqHelper.java
index 5c45bb3d8..8ebae7a19 100644
--- a/org/omg/CORBA/AnySeqHelper.java
+++ b/org/omg/CORBA/AnySeqHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.TypeCodePackage.BadKind;
 import org.omg.CORBA.portable.InputStream;
@@ -130,7 +130,7 @@ public abstract class AnySeqHelper
    */
   public static TypeCode type()
   {
-    return new primitiveArrayTypeCode(TCKind.tk_any);
+    return new ArrayTypeCode(TCKind.tk_any);
   }
 
   /**
diff --git a/org/omg/CORBA/AnySeqHolder.java b/org/omg/CORBA/AnySeqHolder.java
index 905e05c8b..b18a1457b 100644
--- a/org/omg/CORBA/AnySeqHolder.java
+++ b/org/omg/CORBA/AnySeqHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -62,8 +62,8 @@ public final class AnySeqHolder
   /**
    * The type code for this holder. Each holder has a different instance.
    */
-  private final primitiveArrayTypeCode typecode =
-    new primitiveArrayTypeCode(TCKind.tk_any);
+  private final ArrayTypeCode typecode =
+    new ArrayTypeCode(TCKind.tk_any);
 
   /**
    * Constructs an instance of AnySeqHolder,
diff --git a/org/omg/CORBA/BooleanHolder.java b/org/omg/CORBA/BooleanHolder.java
index eddc62933..73cfeb296 100644
--- a/org/omg/CORBA/BooleanHolder.java
+++ b/org/omg/CORBA/BooleanHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveTypeCode;
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -62,7 +62,7 @@ public final class BooleanHolder
    * The default type code for this holder.
    */
   private static final TypeCode t_boolean =
-    new primitiveTypeCode(TCKind.tk_boolean);
+    new PrimitiveTypeCode(TCKind.tk_boolean);
 
   /**
    * The <code>boolean</code> (CORBA <code>boolean</code>) value,
diff --git a/org/omg/CORBA/BooleanSeqHelper.java b/org/omg/CORBA/BooleanSeqHelper.java
index d1fde8b77..41f93d10d 100644
--- a/org/omg/CORBA/BooleanSeqHelper.java
+++ b/org/omg/CORBA/BooleanSeqHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.TypeCodePackage.BadKind;
 import org.omg.CORBA.portable.InputStream;
@@ -125,7 +125,7 @@ public abstract class BooleanSeqHelper
    */
   public static TypeCode type()
   {
-    return new primitiveArrayTypeCode(TCKind.tk_boolean);
+    return new ArrayTypeCode(TCKind.tk_boolean);
   }
 
   /**
diff --git a/org/omg/CORBA/BooleanSeqHolder.java b/org/omg/CORBA/BooleanSeqHolder.java
index ac8224f92..bdec3b792 100644
--- a/org/omg/CORBA/BooleanSeqHolder.java
+++ b/org/omg/CORBA/BooleanSeqHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -62,8 +62,8 @@ public final class BooleanSeqHolder
   /**
    * The type code for this holder. Each holder has a different instance.
    */
-  private final primitiveArrayTypeCode typecode =
-    new primitiveArrayTypeCode(TCKind.tk_boolean);
+  private final ArrayTypeCode typecode =
+    new ArrayTypeCode(TCKind.tk_boolean);
 
   /**
    * Constructs an instance of BooleanSeqHolder,
diff --git a/org/omg/CORBA/ByteHolder.java b/org/omg/CORBA/ByteHolder.java
index 0cfd8f03c..c440822e5 100644
--- a/org/omg/CORBA/ByteHolder.java
+++ b/org/omg/CORBA/ByteHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveTypeCode;
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -62,7 +62,7 @@ public final class ByteHolder
    * The default type code for this holder.
    */
   private static final TypeCode t_octet =
-    new primitiveTypeCode(TCKind.tk_octet);
+    new PrimitiveTypeCode(TCKind.tk_octet);
 
   /**
    * The <code>byte</code> (CORBA <code>octet</code>) value,
diff --git a/org/omg/CORBA/CharHolder.java b/org/omg/CORBA/CharHolder.java
index 67eb2ee87..b8d0a3d6a 100644
--- a/org/omg/CORBA/CharHolder.java
+++ b/org/omg/CORBA/CharHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveTypeCode;
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -61,7 +61,7 @@ public final class CharHolder
   /**
    * The default type code for this holder.
    */
-  private static final TypeCode t_char = new primitiveTypeCode(TCKind.tk_char);
+  private static final TypeCode t_char = new PrimitiveTypeCode(TCKind.tk_char);
 
   /**
    * The <code>char</code> (CORBA <code>char</code>) value,
diff --git a/org/omg/CORBA/CharSeqHelper.java b/org/omg/CORBA/CharSeqHelper.java
index b91306c2c..08406058c 100644
--- a/org/omg/CORBA/CharSeqHelper.java
+++ b/org/omg/CORBA/CharSeqHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.TypeCodePackage.BadKind;
 import org.omg.CORBA.portable.InputStream;
@@ -125,7 +125,7 @@ public abstract class CharSeqHelper
    */
   public static TypeCode type()
   {
-    return new primitiveArrayTypeCode(TCKind.tk_char);
+    return new ArrayTypeCode(TCKind.tk_char);
   }
 
   /**
diff --git a/org/omg/CORBA/CharSeqHolder.java b/org/omg/CORBA/CharSeqHolder.java
index dc7d0a840..a60483b5f 100644
--- a/org/omg/CORBA/CharSeqHolder.java
+++ b/org/omg/CORBA/CharSeqHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -62,8 +62,8 @@ public final class CharSeqHolder
   /**
    * The type code for this holder. Each holder has a different instance.
    */
-  private final primitiveArrayTypeCode typecode =
-    new primitiveArrayTypeCode(TCKind.tk_char);
+  private final ArrayTypeCode typecode =
+    new ArrayTypeCode(TCKind.tk_char);
 
   /**
    * Constructs an instance of CharSeqHolder,
diff --git a/org/omg/CORBA/DefinitionKindHelper.java b/org/omg/CORBA/DefinitionKindHelper.java
index d9c7cc15a..8a48bc5e9 100644
--- a/org/omg/CORBA/DefinitionKindHelper.java
+++ b/org/omg/CORBA/DefinitionKindHelper.java
@@ -41,7 +41,7 @@ package org.omg.CORBA;
 import gnu.CORBA.DefinitionKindHolder;
 import gnu.CORBA.Restricted_ORB;
 import gnu.CORBA.gnuAny;
-import gnu.CORBA.primitiveTypeCode;
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
 
 import org.omg.CORBA.TypeCodePackage.BadKind;
 import org.omg.CORBA.portable.InputStream;
diff --git a/org/omg/CORBA/DoubleHolder.java b/org/omg/CORBA/DoubleHolder.java
index efee74b0f..65c8ebaf5 100644
--- a/org/omg/CORBA/DoubleHolder.java
+++ b/org/omg/CORBA/DoubleHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveTypeCode;
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -62,7 +62,7 @@ public final class DoubleHolder
    * The default type code for this holder.
    */
   private static final TypeCode t_double =
-    new primitiveTypeCode(TCKind.tk_double);
+    new PrimitiveTypeCode(TCKind.tk_double);
 
   /**
    * The <code>double</code> (CORBA <code>double</code>) value,
diff --git a/org/omg/CORBA/DoubleSeqHelper.java b/org/omg/CORBA/DoubleSeqHelper.java
index d8dffbf4c..2d9423fd0 100644
--- a/org/omg/CORBA/DoubleSeqHelper.java
+++ b/org/omg/CORBA/DoubleSeqHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.TypeCodePackage.BadKind;
 import org.omg.CORBA.portable.InputStream;
@@ -125,7 +125,7 @@ public abstract class DoubleSeqHelper
    */
   public static TypeCode type()
   {
-    return new primitiveArrayTypeCode(TCKind.tk_double);
+    return new ArrayTypeCode(TCKind.tk_double);
   }
 
   /**
diff --git a/org/omg/CORBA/DoubleSeqHolder.java b/org/omg/CORBA/DoubleSeqHolder.java
index a6828e1c1..619e9215b 100644
--- a/org/omg/CORBA/DoubleSeqHolder.java
+++ b/org/omg/CORBA/DoubleSeqHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -62,8 +62,8 @@ public final class DoubleSeqHolder
   /**
    * The type code for this holder. Each holder has a different instance.
    */
-  private final primitiveArrayTypeCode typecode =
-    new primitiveArrayTypeCode(TCKind.tk_double);
+  private final ArrayTypeCode typecode =
+    new ArrayTypeCode(TCKind.tk_double);
 
   /**
    * Constructs an instance of DoubleSeqHolder,
diff --git a/org/omg/CORBA/FixedHolder.java b/org/omg/CORBA/FixedHolder.java
index c3918a08d..8913acc17 100644
--- a/org/omg/CORBA/FixedHolder.java
+++ b/org/omg/CORBA/FixedHolder.java
@@ -38,8 +38,8 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.fixedTypeCode;
-import gnu.CORBA.primitiveTypeCode;
+import gnu.CORBA.typecodes.FixedTypeCode;
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
 
 import java.math.BigDecimal;
 
@@ -108,7 +108,7 @@ public final class FixedHolder
    */
   public TypeCode _type()
   {
-    return new fixedTypeCode(value);
+    return new FixedTypeCode(value);
   }
 
   /**
diff --git a/org/omg/CORBA/FloatHolder.java b/org/omg/CORBA/FloatHolder.java
index 059953faf..1d6de16a1 100644
--- a/org/omg/CORBA/FloatHolder.java
+++ b/org/omg/CORBA/FloatHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveTypeCode;
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -62,7 +62,7 @@ public final class FloatHolder
    * The default type code for this holder.
    */
   private static final TypeCode t_float =
-    new primitiveTypeCode(TCKind.tk_float);
+    new PrimitiveTypeCode(TCKind.tk_float);
 
   /**
    * The <code>float</code> (CORBA <code>float</code>) value,
diff --git a/org/omg/CORBA/FloatSeqHelper.java b/org/omg/CORBA/FloatSeqHelper.java
index 9f7630c3f..1656dae44 100644
--- a/org/omg/CORBA/FloatSeqHelper.java
+++ b/org/omg/CORBA/FloatSeqHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.TypeCodePackage.BadKind;
 import org.omg.CORBA.portable.InputStream;
@@ -125,7 +125,7 @@ public abstract class FloatSeqHelper
    */
   public static TypeCode type()
   {
-    return new primitiveArrayTypeCode(TCKind.tk_float);
+    return new ArrayTypeCode(TCKind.tk_float);
   }
 
   /**
diff --git a/org/omg/CORBA/FloatSeqHolder.java b/org/omg/CORBA/FloatSeqHolder.java
index 24c760333..dbab1ec08 100644
--- a/org/omg/CORBA/FloatSeqHolder.java
+++ b/org/omg/CORBA/FloatSeqHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -62,8 +62,8 @@ public final class FloatSeqHolder
   /**
    * The type code for this holder. Each holder has a different instance.
    */
-  private final primitiveArrayTypeCode typecode =
-    new primitiveArrayTypeCode(TCKind.tk_float);
+  private final ArrayTypeCode typecode =
+    new ArrayTypeCode(TCKind.tk_float);
 
   /**
    * Constructs an instance of FloatSeqHolder,
diff --git a/org/omg/CORBA/IntHolder.java b/org/omg/CORBA/IntHolder.java
index 19822ef76..4729535a7 100644
--- a/org/omg/CORBA/IntHolder.java
+++ b/org/omg/CORBA/IntHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveTypeCode;
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -61,7 +61,7 @@ public final class IntHolder
   /**
    * The default type code for this holder.
    */
-  private static final TypeCode t_long = new primitiveTypeCode(TCKind.tk_long);
+  private static final TypeCode t_long = new PrimitiveTypeCode(TCKind.tk_long);
 
   /**
    * The <code>int</code> (CORBA <code>long</code>) value,
diff --git a/org/omg/CORBA/LongHolder.java b/org/omg/CORBA/LongHolder.java
index c0b14d33b..ac249fed3 100644
--- a/org/omg/CORBA/LongHolder.java
+++ b/org/omg/CORBA/LongHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveTypeCode;
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -62,7 +62,7 @@ public final class LongHolder
    * The default type code for this holder.
    */
   private static final TypeCode t_longlong =
-    new primitiveTypeCode(TCKind.tk_longlong);
+    new PrimitiveTypeCode(TCKind.tk_longlong);
 
   /**
    * The <code>long</code> (CORBA <code>long long</code>) value,
diff --git a/org/omg/CORBA/LongLongSeqHelper.java b/org/omg/CORBA/LongLongSeqHelper.java
index 1d7cde01c..0e31c7136 100644
--- a/org/omg/CORBA/LongLongSeqHelper.java
+++ b/org/omg/CORBA/LongLongSeqHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.TypeCodePackage.BadKind;
 import org.omg.CORBA.portable.InputStream;
@@ -125,7 +125,7 @@ public abstract class LongLongSeqHelper
    */
   public static TypeCode type()
   {
-    return new primitiveArrayTypeCode(TCKind.tk_long);
+    return new ArrayTypeCode(TCKind.tk_long);
   }
 
   /**
diff --git a/org/omg/CORBA/LongLongSeqHolder.java b/org/omg/CORBA/LongLongSeqHolder.java
index 955790296..e56acd4ad 100644
--- a/org/omg/CORBA/LongLongSeqHolder.java
+++ b/org/omg/CORBA/LongLongSeqHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -62,8 +62,8 @@ public final class LongLongSeqHolder
   /**
    * The type code for this holder. Each holder has a different instance.
    */
-  private final primitiveArrayTypeCode typecode =
-    new primitiveArrayTypeCode(TCKind.tk_longlong);
+  private final ArrayTypeCode typecode =
+    new ArrayTypeCode(TCKind.tk_longlong);
 
   /**
    * Constructs an instance of LongLongSeqHolder,
diff --git a/org/omg/CORBA/LongSeqHelper.java b/org/omg/CORBA/LongSeqHelper.java
index e98c77920..26b4e91c2 100644
--- a/org/omg/CORBA/LongSeqHelper.java
+++ b/org/omg/CORBA/LongSeqHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.TypeCodePackage.BadKind;
 import org.omg.CORBA.portable.InputStream;
@@ -125,7 +125,7 @@ public abstract class LongSeqHelper
    */
   public static TypeCode type()
   {
-    return new primitiveArrayTypeCode(TCKind.tk_long);
+    return new ArrayTypeCode(TCKind.tk_long);
   }
 
   /**
diff --git a/org/omg/CORBA/LongSeqHolder.java b/org/omg/CORBA/LongSeqHolder.java
index ac571decd..2359eb0b2 100644
--- a/org/omg/CORBA/LongSeqHolder.java
+++ b/org/omg/CORBA/LongSeqHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -56,8 +56,8 @@ public final class LongSeqHolder
   /**
    * The type code for this holder. Each holder has a different instance.
    */
-  private final primitiveArrayTypeCode typecode = 
-    new primitiveArrayTypeCode(TCKind.tk_long);
+  private final ArrayTypeCode typecode = 
+    new ArrayTypeCode(TCKind.tk_long);
   
   /**
    * The <code>int[]</code> (CORBA <code>LongSeq</code>) value,
diff --git a/org/omg/CORBA/NameValuePairHelper.java b/org/omg/CORBA/NameValuePairHelper.java
index 4a77a0339..5d2430b23 100644
--- a/org/omg/CORBA/NameValuePairHelper.java
+++ b/org/omg/CORBA/NameValuePairHelper.java
@@ -39,10 +39,10 @@ exception statement from your version. */
 package org.omg.CORBA;
 
 import gnu.CORBA.DynAn.NameValuePairHolder;
+import gnu.CORBA.typecodes.AliasTypeCode;
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
+import gnu.CORBA.typecodes.StringTypeCode;
 import gnu.CORBA.Minor;
-import gnu.CORBA.aliasTypeCode;
-import gnu.CORBA.primitiveTypeCode;
-import gnu.CORBA.stringTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -120,12 +120,12 @@ public abstract class NameValuePairHelper
         StructMember[] members = new StructMember[ 2 ];
 
         TypeCode t_id =
-          new aliasTypeCode(new stringTypeCode(TCKind.tk_string), "", "id");
+          new AliasTypeCode(new StringTypeCode(TCKind.tk_string), "", "id");
 
         members [ 0 ] = new StructMember("id", t_id, null);
 
         members [ 1 ] =
-          new StructMember("value", new primitiveTypeCode(TCKind.tk_any), null);
+          new StructMember("value", new PrimitiveTypeCode(TCKind.tk_any), null);
 
         typeCode = ORB.init().create_struct_tc(id(), "NameValuePair", members);
       }
diff --git a/org/omg/CORBA/ORB.java b/org/omg/CORBA/ORB.java
index 57d7cce2c..6d6839a9c 100644
--- a/org/omg/CORBA/ORB.java
+++ b/org/omg/CORBA/ORB.java
@@ -41,12 +41,12 @@ package org.omg.CORBA;
 import gnu.CORBA.Focused_ORB;
 import gnu.CORBA.ObjectCreator;
 import gnu.CORBA.Restricted_ORB;
-import gnu.CORBA.fixedTypeCode;
-import gnu.CORBA.generalTypeCode;
 import gnu.CORBA.gnuContext;
-import gnu.CORBA.primitiveTypeCode;
-import gnu.CORBA.recordTypeCode;
-import gnu.CORBA.recursiveTypeCode;
+import gnu.CORBA.typecodes.FixedTypeCode;
+import gnu.CORBA.typecodes.GeneralTypeCode;
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
+import gnu.CORBA.typecodes.RecordTypeCode;
+import gnu.CORBA.typecodes.RecursiveTypeCode;
 
 import org.omg.CORBA.ORBPackage.InconsistentTypeCode;
 
@@ -389,7 +389,7 @@ public abstract class ORB
    */
   public TypeCode create_fixed_tc(short digits, short scale)
   {
-    fixedTypeCode r = new fixedTypeCode();
+    FixedTypeCode r = new FixedTypeCode();
     r.setDigits(digits);
     r.setScale(scale);
     return r;
@@ -609,7 +609,7 @@ public abstract class ORB
    */
   public TypeCode create_abstract_interface_tc(String id, String name)
   {
-    generalTypeCode t = new generalTypeCode(TCKind.tk_abstract_interface);
+    GeneralTypeCode t = new GeneralTypeCode(TCKind.tk_abstract_interface);
     t.setName(name);
     t.setId(id);
     return t;
@@ -625,7 +625,7 @@ public abstract class ORB
    */
   public TypeCode create_native_tc(String id, String name)
   {
-    generalTypeCode t = new generalTypeCode(TCKind.tk_native);
+    GeneralTypeCode t = new GeneralTypeCode(TCKind.tk_native);
     t.setName(name);
     t.setId(id);
     return t;
@@ -659,11 +659,11 @@ public abstract class ORB
    */
   public TypeCode create_recursive_sequence_tc(int bound, int offset)
   {
-    recordTypeCode r = new recordTypeCode(TCKind.tk_struct);
+    RecordTypeCode r = new RecordTypeCode(TCKind.tk_struct);
     for (int i = 0; i < offset; i++)
       r.add(new StructMember());
 
-    TypeCode recurs = new primitiveTypeCode(TCKind.tk_sequence);
+    TypeCode recurs = new PrimitiveTypeCode(TCKind.tk_sequence);
 
     r.add(new StructMember("", recurs, null));
     return r;
@@ -678,7 +678,7 @@ public abstract class ORB
    */
   public TypeCode create_recursive_tc(String id)
   {
-    return new recursiveTypeCode(id);
+    return new RecursiveTypeCode(id);
   }
 
   /**
@@ -688,7 +688,7 @@ public abstract class ORB
                                       TypeCode boxed_type
                                      )
   {
-    generalTypeCode t = new generalTypeCode(TCKind.tk_value_box);
+    GeneralTypeCode t = new GeneralTypeCode(TCKind.tk_value_box);
     t.setName(name);
     t.setId(id);
     t.setContentType(boxed_type);
@@ -702,7 +702,7 @@ public abstract class ORB
                                   TypeCode concrete_base, ValueMember[] members
                                  )
   {
-    recordTypeCode r = new recordTypeCode(TCKind.tk_value);
+    RecordTypeCode r = new RecordTypeCode(TCKind.tk_value);
     r.setId(id);
     r.setName(name);
     r.setTypeModifier(type_modifier);
diff --git a/org/omg/CORBA/ObjectHelper.java b/org/omg/CORBA/ObjectHelper.java
index 6c17fe4c8..220f2dace 100644
--- a/org/omg/CORBA/ObjectHelper.java
+++ b/org/omg/CORBA/ObjectHelper.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package org.omg.CORBA;
 
 import gnu.CORBA.Minor;
-import gnu.CORBA.primitiveTypeCode;
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
diff --git a/org/omg/CORBA/ObjectHolder.java b/org/omg/CORBA/ObjectHolder.java
index 27ae67416..f79a89bef 100644
--- a/org/omg/CORBA/ObjectHolder.java
+++ b/org/omg/CORBA/ObjectHolder.java
@@ -38,8 +38,8 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveTypeCode;
-import gnu.CORBA.recordTypeCode;
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
+import gnu.CORBA.typecodes.RecordTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -63,11 +63,11 @@ public final class ObjectHolder
    * The default type code for this holder if the object type code with
    * the zero length string as id.
    */
-  private static final recordTypeCode t_object;
+  private static final RecordTypeCode t_object;
 
   static
   {
-    t_object = new recordTypeCode(TCKind.tk_objref);
+    t_object = new RecordTypeCode(TCKind.tk_objref);
     t_object.setId("");
   }
 
diff --git a/org/omg/CORBA/OctetSeqHelper.java b/org/omg/CORBA/OctetSeqHelper.java
index 0612ae4e2..df7b22ff5 100644
--- a/org/omg/CORBA/OctetSeqHelper.java
+++ b/org/omg/CORBA/OctetSeqHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.TypeCodePackage.BadKind;
 import org.omg.CORBA.portable.InputStream;
@@ -125,7 +125,7 @@ public abstract class OctetSeqHelper
    */
   public static TypeCode type()
   {
-    return new primitiveArrayTypeCode(TCKind.tk_octet);
+    return new ArrayTypeCode(TCKind.tk_octet);
   }
 
   /**
diff --git a/org/omg/CORBA/OctetSeqHolder.java b/org/omg/CORBA/OctetSeqHolder.java
index 5092d707e..62ea73819 100644
--- a/org/omg/CORBA/OctetSeqHolder.java
+++ b/org/omg/CORBA/OctetSeqHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -62,8 +62,8 @@ public final class OctetSeqHolder
   /**
    * The type code for this holder. Each holder has a different instance.
    */
-  private final primitiveArrayTypeCode typecode =
-    new primitiveArrayTypeCode(TCKind.tk_octet);
+  private final ArrayTypeCode typecode =
+    new ArrayTypeCode(TCKind.tk_octet);
 
   /**
    * Constructs an instance of OctetSeqHolder,
diff --git a/org/omg/CORBA/PolicyErrorCodeHelper.java b/org/omg/CORBA/PolicyErrorCodeHelper.java
index 1fb24d57c..ab7ac9547 100644
--- a/org/omg/CORBA/PolicyErrorCodeHelper.java
+++ b/org/omg/CORBA/PolicyErrorCodeHelper.java
@@ -37,8 +37,8 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveTypeCode;
-import gnu.CORBA.recordTypeCode;
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
+import gnu.CORBA.typecodes.RecordTypeCode;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.TCKind;
@@ -98,10 +98,10 @@ public abstract class PolicyErrorCodeHelper
    */
   public static TypeCode type()
   {
-    recordTypeCode r = new recordTypeCode(TCKind.tk_alias);
+    RecordTypeCode r = new RecordTypeCode(TCKind.tk_alias);
     r.setName("PolicyErrorCode");
     r.setId(id());
-    r.setContentType(new primitiveTypeCode(TCKind.tk_short));
+    r.setContentType(new PrimitiveTypeCode(TCKind.tk_short));
     return r;
   }
 
diff --git a/org/omg/CORBA/PrincipalHolder.java b/org/omg/CORBA/PrincipalHolder.java
index 22501a0f7..270427f3f 100644
--- a/org/omg/CORBA/PrincipalHolder.java
+++ b/org/omg/CORBA/PrincipalHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveTypeCode;
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -58,7 +58,7 @@ public final class PrincipalHolder
    * The default type code for this holder.
    */
   private static final TypeCode t_any =
-    new primitiveTypeCode(TCKind.tk_Principal);
+    new PrimitiveTypeCode(TCKind.tk_Principal);
 
   /**
    * The instance of {@link Principal}, held by this holder.
diff --git a/org/omg/CORBA/ShortHolder.java b/org/omg/CORBA/ShortHolder.java
index c2e18cb2a..dfc4721f3 100644
--- a/org/omg/CORBA/ShortHolder.java
+++ b/org/omg/CORBA/ShortHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveTypeCode;
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -62,7 +62,7 @@ public final class ShortHolder
    * The default type code for this holder.
    */
   private static final TypeCode t_short =
-    new primitiveTypeCode(TCKind.tk_short);
+    new PrimitiveTypeCode(TCKind.tk_short);
 
   /**
    * The <code>short</code> (CORBA <code>short</code>) value,
diff --git a/org/omg/CORBA/ShortSeqHelper.java b/org/omg/CORBA/ShortSeqHelper.java
index 21eda87d1..40124f216 100644
--- a/org/omg/CORBA/ShortSeqHelper.java
+++ b/org/omg/CORBA/ShortSeqHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.TypeCodePackage.BadKind;
 import org.omg.CORBA.portable.InputStream;
@@ -125,7 +125,7 @@ public abstract class ShortSeqHelper
    */
   public static TypeCode type()
   {
-    return new primitiveArrayTypeCode(TCKind.tk_short);
+    return new ArrayTypeCode(TCKind.tk_short);
   }
 
   /**
diff --git a/org/omg/CORBA/ShortSeqHolder.java b/org/omg/CORBA/ShortSeqHolder.java
index 183db3a57..246d1ecf4 100644
--- a/org/omg/CORBA/ShortSeqHolder.java
+++ b/org/omg/CORBA/ShortSeqHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -62,8 +62,8 @@ public final class ShortSeqHolder
   /**
    * The type code for this holder. Each holder has a different instance.
    */
-  private final primitiveArrayTypeCode typecode =
-    new primitiveArrayTypeCode(TCKind.tk_short);
+  private final ArrayTypeCode typecode =
+    new ArrayTypeCode(TCKind.tk_short);
 
   /**
    * Constructs an instance of ShortSeqHolder,
diff --git a/org/omg/CORBA/StringHolder.java b/org/omg/CORBA/StringHolder.java
index 8a637c8e5..ac45c562c 100644
--- a/org/omg/CORBA/StringHolder.java
+++ b/org/omg/CORBA/StringHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.stringTypeCode;
+import gnu.CORBA.typecodes.StringTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -61,8 +61,8 @@ public final class StringHolder
   /**
    * The default type code for this holder.
    */
-  private static final stringTypeCode t_string =
-    new stringTypeCode(TCKind.tk_string);
+  private static final StringTypeCode t_string =
+    new StringTypeCode(TCKind.tk_string);
 
   /**
    * The <code>String</code> (CORBA <code>string</code>) value,
diff --git a/org/omg/CORBA/StringSeqHelper.java b/org/omg/CORBA/StringSeqHelper.java
index 0ae264679..4225c0bd1 100644
--- a/org/omg/CORBA/StringSeqHelper.java
+++ b/org/omg/CORBA/StringSeqHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.TypeCodePackage.BadKind;
 import org.omg.CORBA.portable.InputStream;
@@ -125,7 +125,7 @@ public abstract class StringSeqHelper
    */
   public static TypeCode type()
   {
-    return new primitiveArrayTypeCode(TCKind.tk_string);
+    return new ArrayTypeCode(TCKind.tk_string);
   }
 
   /**
diff --git a/org/omg/CORBA/StringSeqHolder.java b/org/omg/CORBA/StringSeqHolder.java
index 8e419d233..71ac887e2 100755
--- a/org/omg/CORBA/StringSeqHolder.java
+++ b/org/omg/CORBA/StringSeqHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -62,8 +62,8 @@ public final class StringSeqHolder
   /**
    * The type code for this holder. Each holder has a different instance.
    */
-  private final primitiveArrayTypeCode typecode =
-    new primitiveArrayTypeCode(TCKind.tk_char);
+  private final ArrayTypeCode typecode =
+    new ArrayTypeCode(TCKind.tk_char);
 
   /**
    * Constructs an instance of StringSeqHolder,
diff --git a/org/omg/CORBA/TypeCodeHolder.java b/org/omg/CORBA/TypeCodeHolder.java
index 276e8bf16..bb293376d 100644
--- a/org/omg/CORBA/TypeCodeHolder.java
+++ b/org/omg/CORBA/TypeCodeHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveTypeCode;
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -58,7 +58,7 @@ public class TypeCodeHolder
    * The default type code for this holder.
    */
   private static final TypeCode t_TypeCode =
-    new primitiveTypeCode(TCKind.tk_TypeCode);
+    new PrimitiveTypeCode(TCKind.tk_TypeCode);
 
   /**
    * The <code>TypeCode</code> (CORBA <code>TypeCode</code>) value,
diff --git a/org/omg/CORBA/ULongLongSeqHelper.java b/org/omg/CORBA/ULongLongSeqHelper.java
index e92409bb0..1148cb408 100644
--- a/org/omg/CORBA/ULongLongSeqHelper.java
+++ b/org/omg/CORBA/ULongLongSeqHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.TypeCodePackage.BadKind;
 import org.omg.CORBA.portable.InputStream;
@@ -125,7 +125,7 @@ public abstract class ULongLongSeqHelper
    */
   public static TypeCode type()
   {
-    return new primitiveArrayTypeCode(TCKind.tk_ulong);
+    return new ArrayTypeCode(TCKind.tk_ulong);
   }
 
   /**
diff --git a/org/omg/CORBA/ULongLongSeqHolder.java b/org/omg/CORBA/ULongLongSeqHolder.java
index 2d0fcf0b3..70b43bf7f 100644
--- a/org/omg/CORBA/ULongLongSeqHolder.java
+++ b/org/omg/CORBA/ULongLongSeqHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -62,8 +62,8 @@ public final class ULongLongSeqHolder
   /**
    * The type code for this holder. Each holder has a different instance.
    */
-  private final primitiveArrayTypeCode typecode =
-    new primitiveArrayTypeCode(TCKind.tk_ulonglong);
+  private final ArrayTypeCode typecode =
+    new ArrayTypeCode(TCKind.tk_ulonglong);
 
   /**
    * Constructs an instance of ULongLongSeqHolder,
diff --git a/org/omg/CORBA/ULongSeqHelper.java b/org/omg/CORBA/ULongSeqHelper.java
index 846833c2a..dddc1323d 100644
--- a/org/omg/CORBA/ULongSeqHelper.java
+++ b/org/omg/CORBA/ULongSeqHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.TypeCodePackage.BadKind;
 import org.omg.CORBA.portable.InputStream;
@@ -125,7 +125,7 @@ public abstract class ULongSeqHelper
    */
   public static TypeCode type()
   {
-    return new primitiveArrayTypeCode(TCKind.tk_long);
+    return new ArrayTypeCode(TCKind.tk_long);
   }
 
   /**
diff --git a/org/omg/CORBA/ULongSeqHolder.java b/org/omg/CORBA/ULongSeqHolder.java
index 8810e2159..64d9db6ce 100644
--- a/org/omg/CORBA/ULongSeqHolder.java
+++ b/org/omg/CORBA/ULongSeqHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -62,8 +62,8 @@ public final class ULongSeqHolder
   /**
    * The type code for this holder. Each holder has a different instance.
    */
-  private final primitiveArrayTypeCode typecode =
-    new primitiveArrayTypeCode(TCKind.tk_ulong);
+  private final ArrayTypeCode typecode =
+    new ArrayTypeCode(TCKind.tk_ulong);
 
   /**
    * Constructs an instance of ULongSeqHolder,
diff --git a/org/omg/CORBA/UShortSeqHelper.java b/org/omg/CORBA/UShortSeqHelper.java
index 76371bc30..d1fc440a9 100644
--- a/org/omg/CORBA/UShortSeqHelper.java
+++ b/org/omg/CORBA/UShortSeqHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.TypeCodePackage.BadKind;
 import org.omg.CORBA.portable.InputStream;
@@ -125,7 +125,7 @@ public abstract class UShortSeqHelper
    */
   public static TypeCode type()
   {
-    return new primitiveArrayTypeCode(TCKind.tk_short);
+    return new ArrayTypeCode(TCKind.tk_short);
   }
 
   /**
diff --git a/org/omg/CORBA/UShortSeqHolder.java b/org/omg/CORBA/UShortSeqHolder.java
index 8c6f7d190..47e33b9be 100644
--- a/org/omg/CORBA/UShortSeqHolder.java
+++ b/org/omg/CORBA/UShortSeqHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -62,8 +62,8 @@ public final class UShortSeqHolder
   /**
    * The type code for this holder. Each holder has a different instance.
    */
-  private final primitiveArrayTypeCode typecode =
-    new primitiveArrayTypeCode(TCKind.tk_ushort);
+  private final ArrayTypeCode typecode =
+    new ArrayTypeCode(TCKind.tk_ushort);
 
   /**
    * Constructs an instance of UShortSeqHolder,
diff --git a/org/omg/CORBA/ValueBaseHelper.java b/org/omg/CORBA/ValueBaseHelper.java
index 941e9d740..1699d912d 100644
--- a/org/omg/CORBA/ValueBaseHelper.java
+++ b/org/omg/CORBA/ValueBaseHelper.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package org.omg.CORBA;
 
 import gnu.CORBA.CDR.Vio;
-import gnu.CORBA.recordTypeCode;
+import gnu.CORBA.typecodes.RecordTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -109,7 +109,7 @@ public abstract class ValueBaseHelper
    */
   public static TypeCode type()
   {
-    recordTypeCode r = new recordTypeCode(TCKind.tk_value);
+    RecordTypeCode r = new RecordTypeCode(TCKind.tk_value);
     return r;
   }
 
diff --git a/org/omg/CORBA/WCharSeqHelper.java b/org/omg/CORBA/WCharSeqHelper.java
index c12c3de1c..4bb92989d 100644
--- a/org/omg/CORBA/WCharSeqHelper.java
+++ b/org/omg/CORBA/WCharSeqHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.TypeCodePackage.BadKind;
 import org.omg.CORBA.portable.InputStream;
@@ -125,7 +125,7 @@ public abstract class WCharSeqHelper
    */
   public static TypeCode type()
   {
-    return new primitiveArrayTypeCode(TCKind.tk_char);
+    return new ArrayTypeCode(TCKind.tk_char);
   }
 
   /**
diff --git a/org/omg/CORBA/WCharSeqHolder.java b/org/omg/CORBA/WCharSeqHolder.java
index 1b11506a2..72a9cc8c1 100644
--- a/org/omg/CORBA/WCharSeqHolder.java
+++ b/org/omg/CORBA/WCharSeqHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -62,8 +62,8 @@ public final class WCharSeqHolder
   /**
    * The type code for this holder. Each holder has a different instance.
    */
-  private final primitiveArrayTypeCode typecode =
-    new primitiveArrayTypeCode(TCKind.tk_wchar);
+  private final ArrayTypeCode typecode =
+    new ArrayTypeCode(TCKind.tk_wchar);
 
   /**
    * Constructs an instance of WCharSeqHolder,
diff --git a/org/omg/CORBA/WStringSeqHelper.java b/org/omg/CORBA/WStringSeqHelper.java
index 916c6a250..356cf0dd2 100644
--- a/org/omg/CORBA/WStringSeqHelper.java
+++ b/org/omg/CORBA/WStringSeqHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.TypeCodePackage.BadKind;
 import org.omg.CORBA.portable.InputStream;
@@ -127,7 +127,7 @@ public abstract class WStringSeqHelper
    */
   public static TypeCode type()
   {
-    return new primitiveArrayTypeCode(TCKind.tk_string);
+    return new ArrayTypeCode(TCKind.tk_string);
   }
 
   /**
diff --git a/org/omg/CORBA/WStringSeqHolder.java b/org/omg/CORBA/WStringSeqHolder.java
index 474d69a47..68b77ff6a 100755
--- a/org/omg/CORBA/WStringSeqHolder.java
+++ b/org/omg/CORBA/WStringSeqHolder.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.CORBA;
 
-import gnu.CORBA.primitiveArrayTypeCode;
+import gnu.CORBA.typecodes.ArrayTypeCode;
 
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -62,8 +62,8 @@ public final class WStringSeqHolder
   /**
    * The type code for this holder. Each holder has a different instance.
    */
-  private final primitiveArrayTypeCode typecode =
-    new primitiveArrayTypeCode(TCKind.tk_wchar);
+  private final ArrayTypeCode typecode =
+    new ArrayTypeCode(TCKind.tk_wchar);
 
   /**
    * Constructs an instance of WStringSeqHolder,
diff --git a/org/omg/Messaging/SyncScopeHelper.java b/org/omg/Messaging/SyncScopeHelper.java
index 7d8b412fe..1d482c579 100644
--- a/org/omg/Messaging/SyncScopeHelper.java
+++ b/org/omg/Messaging/SyncScopeHelper.java
@@ -38,8 +38,8 @@ exception statement from your version. */
 
 package org.omg.Messaging;
 
-import gnu.CORBA.primitiveTypeCode;
-import gnu.CORBA.recordTypeCode;
+import gnu.CORBA.typecodes.PrimitiveTypeCode;
+import gnu.CORBA.typecodes.RecordTypeCode;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.TCKind;
@@ -104,10 +104,10 @@ public class SyncScopeHelper
    */
   public static TypeCode type()
   {
-    recordTypeCode r = new recordTypeCode(TCKind.tk_alias);
+    RecordTypeCode r = new RecordTypeCode(TCKind.tk_alias);
     r.setName("SyncScope");
     r.setId(id());
-    r.setContentType(new primitiveTypeCode(TCKind.tk_short));
+    r.setContentType(new PrimitiveTypeCode(TCKind.tk_short));
     return r;
   }