diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 0b188193f2c0..0117684f1412 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-15  Michael Koch  <konqueror@gmx.de>
+
+	* java/text/RuleBasedCollator.java
+	(CollationElement): Renamed from RBCElement and moved into
+	RuledBasedCollator as inner class.
+
 2003-10-15  Michael Koch  <konqueror@gmx.de>
 
 	* java/text/CollationElementIterator.java
diff --git a/libjava/java/text/RuleBasedCollator.java b/libjava/java/text/RuleBasedCollator.java
index 2db63881ce2f..a23abe29fad7 100644
--- a/libjava/java/text/RuleBasedCollator.java
+++ b/libjava/java/text/RuleBasedCollator.java
@@ -137,20 +137,21 @@ import java.util.Vector;
  * @date March 25, 1999
  */
 
-final class RBCElement
-{
-  String key;
-  char relation;
-
-  RBCElement (String key, char relation)
-  {
-    this.key = key;
-    this.relation = relation;
-  }
-}
-
 public class RuleBasedCollator extends Collator
 {
+  final class CollationElement
+  {
+    String key;
+    char relation;
+
+    CollationElement (String key, char relation)
+    {
+      this.key = key;
+      this.relation = relation;
+    }
+
+  } // inner class CollationElement
+
   // True if we are using French-style accent ordering.
   private boolean frenchAccents;
 
@@ -426,7 +427,7 @@ public class RuleBasedCollator extends Collator
 		if (insertion_index >= item_index)
 		  --insertion_index;
 	      }
-	    RBCElement r = new RBCElement (arg, c);
+	    CollationElement r = new CollationElement (arg, c);
 	    vec.insertElementAt(r, insertion_index);
 	    ++insertion_index;
 	  }
@@ -456,7 +457,7 @@ public class RuleBasedCollator extends Collator
     Enumeration e = vec.elements();
     while (e.hasMoreElements())
       {
-	RBCElement r = (RBCElement) e.nextElement();
+	CollationElement r = (CollationElement) e.nextElement();
 	switch (r.relation)
 	  {
 	  case '<':