libjava

	* Regenerated headers with new gjavah.
libjava/classpath
	* tools/gnu/classpath/tools/javah/MethodHelper.java (print):
	Changed arguments.  Directly print method name.
	* tools/gnu/classpath/tools/javah/ClassWrapper.java
	(methodNameMap): New field.
	(makeVtable): Initialize it.
	(printMethods): Compute name for bridge targets.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123965 138bc75d-0d04-0410-961f-82ee72b054a4

62 files changed, 129 insertions, 129 deletions

diff --git a/libjava/java/io/CharArrayWriter.h b/libjava/java/io/CharArrayWriter.h
index 35f49d23b78..d5d2de3a167 100644
--- a/libjava/java/io/CharArrayWriter.h
+++ b/libjava/java/io/CharArrayWriter.h
@@ -26,18 +26,18 @@ public:
   virtual void write(JArray< jchar > *, jint, jint);
   virtual void write(::java::lang::String *, jint, jint);
   virtual void writeTo(::java::io::Writer *);
-  virtual ::java::io::CharArrayWriter * target$append(jchar);
-  virtual ::java::io::CharArrayWriter * target$append(::java::lang::CharSequence *);
-  virtual ::java::io::CharArrayWriter * target$append(::java::lang::CharSequence *, jint, jint);
+  virtual ::java::io::CharArrayWriter * CharArrayWriter$append(jchar);
+  virtual ::java::io::CharArrayWriter * CharArrayWriter$append(::java::lang::CharSequence *);
+  virtual ::java::io::CharArrayWriter * CharArrayWriter$append(::java::lang::CharSequence *, jint, jint);
 private:
   void resize(jint);
 public:
   virtual ::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint);
-  virtual ::java::io::Writer * target$append(::java::lang::CharSequence *, jint, jint);
+  virtual ::java::io::Writer * CharArrayWriter$append(::java::lang::CharSequence *, jint, jint);
   virtual ::java::lang::Appendable * append(::java::lang::CharSequence *);
-  virtual ::java::io::Writer * target$append(::java::lang::CharSequence *);
+  virtual ::java::io::Writer * CharArrayWriter$append(::java::lang::CharSequence *);
   virtual ::java::lang::Appendable * append(jchar);
-  virtual ::java::io::Writer * target$append(jchar);
+  virtual ::java::io::Writer * CharArrayWriter$append(jchar);
 private:
   static const jint DEFAULT_INITIAL_BUFFER_SIZE = 32;
 public: // actually protected
diff --git a/libjava/java/io/PrintStream.h b/libjava/java/io/PrintStream.h
index 3740fc78596..b76912e34ef 100644
--- a/libjava/java/io/PrintStream.h
+++ b/libjava/java/io/PrintStream.h
@@ -63,9 +63,9 @@ public:
   virtual void println(JArray< jchar > *);
   virtual void write(jint);
   virtual void write(JArray< jbyte > *, jint, jint);
-  virtual ::java::io::PrintStream * target$append(jchar);
-  virtual ::java::io::PrintStream * target$append(::java::lang::CharSequence *);
-  virtual ::java::io::PrintStream * target$append(::java::lang::CharSequence *, jint, jint);
+  virtual ::java::io::PrintStream * PrintStream$append(jchar);
+  virtual ::java::io::PrintStream * PrintStream$append(::java::lang::CharSequence *);
+  virtual ::java::io::PrintStream * PrintStream$append(::java::lang::CharSequence *, jint, jint);
   virtual ::java::io::PrintStream * printf(::java::lang::String *, JArray< ::java::lang::Object * > *);
   virtual ::java::io::PrintStream * printf(::java::util::Locale *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
   virtual ::java::io::PrintStream * format(::java::lang::String *, JArray< ::java::lang::Object * > *);
diff --git a/libjava/java/io/PrintWriter.h b/libjava/java/io/PrintWriter.h
index 2cbbd042dd9..cf1fb324a9c 100644
--- a/libjava/java/io/PrintWriter.h
+++ b/libjava/java/io/PrintWriter.h
@@ -52,19 +52,19 @@ public:
   virtual void write(::java::lang::String *, jint, jint);
   virtual void write(JArray< jchar > *);
   virtual void write(::java::lang::String *);
-  virtual ::java::io::PrintWriter * target$append(jchar);
-  virtual ::java::io::PrintWriter * target$append(::java::lang::CharSequence *);
-  virtual ::java::io::PrintWriter * target$append(::java::lang::CharSequence *, jint, jint);
+  virtual ::java::io::PrintWriter * PrintWriter$append(jchar);
+  virtual ::java::io::PrintWriter * PrintWriter$append(::java::lang::CharSequence *);
+  virtual ::java::io::PrintWriter * PrintWriter$append(::java::lang::CharSequence *, jint, jint);
   virtual ::java::io::PrintWriter * printf(::java::lang::String *, JArray< ::java::lang::Object * > *);
   virtual ::java::io::PrintWriter * printf(::java::util::Locale *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
   virtual ::java::io::PrintWriter * format(::java::lang::String *, JArray< ::java::lang::Object * > *);
   virtual ::java::io::PrintWriter * format(::java::util::Locale *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
   virtual ::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint);
-  virtual ::java::io::Writer * target$append(::java::lang::CharSequence *, jint, jint);
+  virtual ::java::io::Writer * Writer$append(::java::lang::CharSequence *, jint, jint);
   virtual ::java::lang::Appendable * append(::java::lang::CharSequence *);
-  virtual ::java::io::Writer * target$append(::java::lang::CharSequence *);
+  virtual ::java::io::Writer * Writer$append(::java::lang::CharSequence *);
   virtual ::java::lang::Appendable * append(jchar);
-  virtual ::java::io::Writer * target$append(jchar);
+  virtual ::java::io::Writer * Writer$append(jchar);
 private:
   jboolean __attribute__((aligned(__alignof__( ::java::io::Writer)))) autoflush;
   jboolean error;
diff --git a/libjava/java/io/StringWriter.h b/libjava/java/io/StringWriter.h
index 16e6de52b73..c2933e7aff6 100644
--- a/libjava/java/io/StringWriter.h
+++ b/libjava/java/io/StringWriter.h
@@ -24,15 +24,15 @@ public:
   virtual void write(JArray< jchar > *, jint, jint);
   virtual void write(::java::lang::String *);
   virtual void write(::java::lang::String *, jint, jint);
-  virtual ::java::io::StringWriter * target$append(jchar);
-  virtual ::java::io::StringWriter * target$append(::java::lang::CharSequence *);
-  virtual ::java::io::StringWriter * target$append(::java::lang::CharSequence *, jint, jint);
+  virtual ::java::io::StringWriter * StringWriter$append(jchar);
+  virtual ::java::io::StringWriter * StringWriter$append(::java::lang::CharSequence *);
+  virtual ::java::io::StringWriter * StringWriter$append(::java::lang::CharSequence *, jint, jint);
   virtual ::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint);
-  virtual ::java::io::Writer * target$append(::java::lang::CharSequence *, jint, jint);
+  virtual ::java::io::Writer * Writer$append(::java::lang::CharSequence *, jint, jint);
   virtual ::java::lang::Appendable * append(::java::lang::CharSequence *);
-  virtual ::java::io::Writer * target$append(::java::lang::CharSequence *);
+  virtual ::java::io::Writer * Writer$append(::java::lang::CharSequence *);
   virtual ::java::lang::Appendable * append(jchar);
-  virtual ::java::io::Writer * target$append(jchar);
+  virtual ::java::io::Writer * Writer$append(jchar);
 private:
   static const jint DEFAULT_BUFFER_SIZE = 16;
   ::java::lang::StringBuffer * __attribute__((aligned(__alignof__( ::java::io::Writer)))) buffer;
diff --git a/libjava/java/io/Writer.h b/libjava/java/io/Writer.h
index 611566470ba..148501ac6e6 100644
--- a/libjava/java/io/Writer.h
+++ b/libjava/java/io/Writer.h
@@ -24,9 +24,9 @@ public:
   virtual void write(JArray< jchar > *, jint, jint) = 0;
   virtual void write(::java::lang::String *);
   virtual void write(::java::lang::String *, jint, jint);
-  virtual ::java::io::Writer * target$append(jchar);
-  virtual ::java::io::Writer * target$append(::java::lang::CharSequence *);
-  virtual ::java::io::Writer * target$append(::java::lang::CharSequence *, jint, jint);
+  virtual ::java::io::Writer * Writer$append(jchar);
+  virtual ::java::io::Writer * Writer$append(::java::lang::CharSequence *);
+  virtual ::java::io::Writer * Writer$append(::java::lang::CharSequence *, jint, jint);
   virtual ::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint);
   virtual ::java::lang::Appendable * append(::java::lang::CharSequence *);
   virtual ::java::lang::Appendable * append(jchar);
diff --git a/libjava/java/lang/Boolean.h b/libjava/java/lang/Boolean.h
index a8476f7b8b1..0ead5b527e4 100644
--- a/libjava/java/lang/Boolean.h
+++ b/libjava/java/lang/Boolean.h
@@ -22,7 +22,7 @@ public:
   jint hashCode();
   jboolean equals(::java::lang::Object *);
   static jboolean getBoolean(::java::lang::String *);
-  jint target$compareTo(::java::lang::Boolean *);
+  jint Boolean$compareTo(::java::lang::Boolean *);
   static jboolean parseBoolean(::java::lang::String *);
   jint compareTo(::java::lang::Object *);
 private:
diff --git a/libjava/java/lang/Byte.h b/libjava/java/lang/Byte.h
index 2caccd7be5c..fc9e3b33f67 100644
--- a/libjava/java/lang/Byte.h
+++ b/libjava/java/lang/Byte.h
@@ -32,7 +32,7 @@ public:
   ::java::lang::String * toString();
   jint hashCode();
   jboolean equals(::java::lang::Object *);
-  jint target$compareTo(::java::lang::Byte *);
+  jint Byte$compareTo(::java::lang::Byte *);
   jint compareTo(::java::lang::Object *);
 private:
   static const jlong serialVersionUID = -7183698231559129828LL;
diff --git a/libjava/java/lang/Character.h b/libjava/java/lang/Character.h
index 7c3a4b9ae3f..a2144709853 100644
--- a/libjava/java/lang/Character.h
+++ b/libjava/java/lang/Character.h
@@ -76,7 +76,7 @@ public:
   static jbyte getDirectionality(jint);
   static jboolean isMirrored(jchar);
   static jboolean isMirrored(jint);
-  jint target$compareTo(::java::lang::Character *);
+  jint Character$compareTo(::java::lang::Character *);
   static ::java::lang::Character * valueOf(jchar);
   static jchar reverseBytes(jchar);
   static JArray< jchar > * toChars(jint);
diff --git a/libjava/java/lang/Double.h b/libjava/java/lang/Double.h
index 5fb99da4a99..7808acc4659 100644
--- a/libjava/java/lang/Double.h
+++ b/libjava/java/lang/Double.h
@@ -35,7 +35,7 @@ public:
   static jlong doubleToLongBits(jdouble);
   static jlong doubleToRawLongBits(jdouble);
   static jdouble longBitsToDouble(jlong);
-  jint target$compareTo(::java::lang::Double *);
+  jint Double$compareTo(::java::lang::Double *);
   static jint compare(jdouble, jdouble);
   jint compareTo(::java::lang::Object *);
 private:
diff --git a/libjava/java/lang/Enum.h b/libjava/java/lang/Enum.h
index cb3aabc94e4..a75f2766c93 100644
--- a/libjava/java/lang/Enum.h
+++ b/libjava/java/lang/Enum.h
@@ -18,7 +18,7 @@ public:
   virtual jboolean equals(::java::lang::Object *);
   virtual jint hashCode();
   virtual ::java::lang::String * toString();
-  virtual jint target$compareTo(::java::lang::Enum *);
+  virtual jint Enum$compareTo(::java::lang::Enum *);
 public: // actually protected
   virtual ::java::lang::Object * clone();
 public:
diff --git a/libjava/java/lang/Float.h b/libjava/java/lang/Float.h
index 87859cb28c0..0069df44bff 100644
--- a/libjava/java/lang/Float.h
+++ b/libjava/java/lang/Float.h
@@ -36,7 +36,7 @@ public:
   static jint floatToIntBits(jfloat);
   static jint floatToRawIntBits(jfloat);
   static jfloat intBitsToFloat(jint);
-  jint target$compareTo(::java::lang::Float *);
+  jint Float$compareTo(::java::lang::Float *);
   static jint compare(jfloat, jfloat);
   jint compareTo(::java::lang::Object *);
 private:
diff --git a/libjava/java/lang/Integer.h b/libjava/java/lang/Integer.h
index e33c78f2cc2..aebcd0a164f 100644
--- a/libjava/java/lang/Integer.h
+++ b/libjava/java/lang/Integer.h
@@ -39,7 +39,7 @@ public:
   static ::java::lang::Integer * getInteger(::java::lang::String *, jint);
   static ::java::lang::Integer * getInteger(::java::lang::String *, ::java::lang::Integer *);
   static ::java::lang::Integer * decode(::java::lang::String *);
-  jint target$compareTo(::java::lang::Integer *);
+  jint Integer$compareTo(::java::lang::Integer *);
   static jint bitCount(jint);
   static jint rotateLeft(jint, jint);
   static jint rotateRight(jint, jint);
diff --git a/libjava/java/lang/Long.h b/libjava/java/lang/Long.h
index da04281a659..b0358e6d729 100644
--- a/libjava/java/lang/Long.h
+++ b/libjava/java/lang/Long.h
@@ -37,7 +37,7 @@ public:
   static ::java::lang::Long * getLong(::java::lang::String *);
   static ::java::lang::Long * getLong(::java::lang::String *, jlong);
   static ::java::lang::Long * getLong(::java::lang::String *, ::java::lang::Long *);
-  jint target$compareTo(::java::lang::Long *);
+  jint Long$compareTo(::java::lang::Long *);
   static jint bitCount(jlong);
   static jlong rotateLeft(jlong, jint);
   static jlong rotateRight(jlong, jint);
diff --git a/libjava/java/lang/Short.h b/libjava/java/lang/Short.h
index 42671174cfc..4858db52f4a 100644
--- a/libjava/java/lang/Short.h
+++ b/libjava/java/lang/Short.h
@@ -32,7 +32,7 @@ public:
   ::java::lang::String * toString();
   jint hashCode();
   jboolean equals(::java::lang::Object *);
-  jint target$compareTo(::java::lang::Short *);
+  jint Short$compareTo(::java::lang::Short *);
   static jshort reverseBytes(jshort);
   jint compareTo(::java::lang::Object *);
 private:
diff --git a/libjava/java/lang/String$CaseInsensitiveComparator.h b/libjava/java/lang/String$CaseInsensitiveComparator.h
index b0c3d620973..8a1b121bc2b 100644
--- a/libjava/java/lang/String$CaseInsensitiveComparator.h
+++ b/libjava/java/lang/String$CaseInsensitiveComparator.h
@@ -14,7 +14,7 @@ class java::lang::String$CaseInsensitiveComparator : public ::java::lang::Object
 public: // actually package-private
   String$CaseInsensitiveComparator();
 public:
-  jint target$compare(::java::lang::String *, ::java::lang::String *);
+  jint String$CaseInsensitiveComparator$compare(::java::lang::String *, ::java::lang::String *);
   jint compare(::java::lang::Object *, ::java::lang::Object *);
 private:
   static const jlong serialVersionUID = 8575799808933029326LL;
diff --git a/libjava/java/lang/String.h b/libjava/java/lang/String.h
index eea80fb9e16..5fa06de982b 100644
--- a/libjava/java/lang/String.h
+++ b/libjava/java/lang/String.h
@@ -62,7 +62,7 @@ public:
   jboolean contentEquals(::java::lang::StringBuffer *);
   jboolean contentEquals(::java::lang::CharSequence *);
   jboolean equalsIgnoreCase(::java::lang::String *);
-  jint target$compareTo(::java::lang::String *);
+  jint String$compareTo(::java::lang::String *);
 private:
   jint nativeCompareTo(::java::lang::String *);
 public:
diff --git a/libjava/java/lang/StringBuffer.h b/libjava/java/lang/StringBuffer.h
index 07400f78060..983ef98d73c 100644
--- a/libjava/java/lang/StringBuffer.h
+++ b/libjava/java/lang/StringBuffer.h
@@ -34,9 +34,9 @@ public:
   ::java::lang::StringBuffer * append(JArray< jchar > *, jint, jint);
   ::java::lang::StringBuffer * appendCodePoint(jint);
   ::java::lang::StringBuffer * append(jboolean);
-  ::java::lang::StringBuffer * target$append(jchar);
-  ::java::lang::StringBuffer * target$append(::java::lang::CharSequence *);
-  ::java::lang::StringBuffer * target$append(::java::lang::CharSequence *, jint, jint);
+  ::java::lang::StringBuffer * StringBuffer$append(jchar);
+  ::java::lang::StringBuffer * StringBuffer$append(::java::lang::CharSequence *);
+  ::java::lang::StringBuffer * StringBuffer$append(::java::lang::CharSequence *, jint, jint);
   ::java::lang::StringBuffer * append(jint);
   ::java::lang::StringBuffer * append(jlong);
   ::java::lang::StringBuffer * append(jfloat);
diff --git a/libjava/java/lang/StringBuilder.h b/libjava/java/lang/StringBuilder.h
index d34cd86c0a6..b8b504a995d 100644
--- a/libjava/java/lang/StringBuilder.h
+++ b/libjava/java/lang/StringBuilder.h
@@ -31,9 +31,9 @@ public:
   ::java::lang::StringBuilder * append(JArray< jchar > *);
   ::java::lang::StringBuilder * append(JArray< jchar > *, jint, jint);
   ::java::lang::StringBuilder * append(jboolean);
-  ::java::lang::StringBuilder * target$append(jchar);
-  ::java::lang::StringBuilder * target$append(::java::lang::CharSequence *);
-  ::java::lang::StringBuilder * target$append(::java::lang::CharSequence *, jint, jint);
+  ::java::lang::StringBuilder * StringBuilder$append(jchar);
+  ::java::lang::StringBuilder * StringBuilder$append(::java::lang::CharSequence *);
+  ::java::lang::StringBuilder * StringBuilder$append(::java::lang::CharSequence *, jint, jint);
   ::java::lang::StringBuilder * appendCodePoint(jint);
   ::java::lang::StringBuilder * append(jint);
   ::java::lang::StringBuilder * append(jlong);
diff --git a/libjava/java/lang/System$EnvironmentMap.h b/libjava/java/lang/System$EnvironmentMap.h
index 1220f57e28f..c8ef8aade07 100644
--- a/libjava/java/lang/System$EnvironmentMap.h
+++ b/libjava/java/lang/System$EnvironmentMap.h
@@ -18,10 +18,10 @@ public:
   virtual jboolean containsKey(::java::lang::Object *);
   virtual jboolean containsValue(::java::lang::Object *);
   virtual ::java::util::Set * entrySet();
-  virtual ::java::lang::String * target$get(::java::lang::Object *);
+  virtual ::java::lang::String * System$EnvironmentMap$get(::java::lang::Object *);
   virtual ::java::util::Set * keySet();
-  virtual ::java::lang::String * target$put(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * target$remove(::java::lang::Object *);
+  virtual ::java::lang::String * System$EnvironmentMap$put(::java::lang::String *, ::java::lang::String *);
+  virtual ::java::lang::String * System$EnvironmentMap$remove(::java::lang::Object *);
   virtual ::java::util::Collection * values();
   virtual ::java::lang::Object * get(::java::lang::Object *);
   virtual ::java::lang::Object * remove(::java::lang::Object *);
diff --git a/libjava/java/math/BigDecimal.h b/libjava/java/math/BigDecimal.h
index 72b877e85f4..aeeab25236d 100644
--- a/libjava/java/math/BigDecimal.h
+++ b/libjava/java/math/BigDecimal.h
@@ -62,7 +62,7 @@ public:
 private:
   ::java::math::BigDecimal * floor();
 public:
-  virtual jint target$compareTo(::java::math::BigDecimal *);
+  virtual jint BigDecimal$compareTo(::java::math::BigDecimal *);
   virtual jboolean equals(::java::lang::Object *);
   virtual jint hashCode();
   virtual ::java::math::BigDecimal * max(::java::math::BigDecimal *);
diff --git a/libjava/java/math/BigInteger.h b/libjava/java/math/BigInteger.h
index e1d4461e850..eaf03268224 100644
--- a/libjava/java/math/BigInteger.h
+++ b/libjava/java/math/BigInteger.h
@@ -48,7 +48,7 @@ public:
 private:
   static jint compareTo(::java::math::BigInteger *, ::java::math::BigInteger *);
 public:
-  virtual jint target$compareTo(::java::math::BigInteger *);
+  virtual jint BigInteger$compareTo(::java::math::BigInteger *);
   virtual ::java::math::BigInteger * min(::java::math::BigInteger *);
   virtual ::java::math::BigInteger * max(::java::math::BigInteger *);
 private:
diff --git a/libjava/java/net/URI.h b/libjava/java/net/URI.h
index 9c8f4f2d1fc..d955dce503c 100644
--- a/libjava/java/net/URI.h
+++ b/libjava/java/net/URI.h
@@ -69,7 +69,7 @@ public:
   ::java::lang::String * getFragment();
   jboolean equals(::java::lang::Object *);
   jint hashCode();
-  jint target$compareTo(::java::net::URI *);
+  jint URI$compareTo(::java::net::URI *);
 private:
   jint compareFragments(::java::net::URI *);
 public:
diff --git a/libjava/java/nio/ByteBuffer.h b/libjava/java/nio/ByteBuffer.h
index 08f821b2825..7836894bde7 100644
--- a/libjava/java/nio/ByteBuffer.h
+++ b/libjava/java/nio/ByteBuffer.h
@@ -47,7 +47,7 @@ public:
   virtual jint arrayOffset();
   virtual jint hashCode();
   virtual jboolean equals(::java::lang::Object *);
-  virtual jint target$compareTo(::java::nio::ByteBuffer *);
+  virtual jint ByteBuffer$compareTo(::java::nio::ByteBuffer *);
   virtual ::java::nio::ByteOrder * order();
   virtual ::java::nio::ByteBuffer * order(::java::nio::ByteOrder *);
   virtual jbyte get() = 0;
diff --git a/libjava/java/nio/CharBuffer.h b/libjava/java/nio/CharBuffer.h
index 9ab6d7e21f1..3d3356041ea 100644
--- a/libjava/java/nio/CharBuffer.h
+++ b/libjava/java/nio/CharBuffer.h
@@ -43,7 +43,7 @@ public:
   virtual jint arrayOffset();
   virtual jint hashCode();
   virtual jboolean equals(::java::lang::Object *);
-  virtual jint target$compareTo(::java::nio::CharBuffer *);
+  virtual jint CharBuffer$compareTo(::java::nio::CharBuffer *);
   virtual ::java::nio::ByteOrder * order() = 0;
   virtual jchar get() = 0;
   virtual ::java::nio::CharBuffer * put(jchar) = 0;
@@ -60,9 +60,9 @@ public:
   virtual ::java::nio::CharBuffer * put(::java::lang::String *, jint, jint);
   virtual ::java::nio::CharBuffer * put(::java::lang::String *);
   virtual jchar charAt(jint);
-  virtual ::java::nio::CharBuffer * target$append(jchar);
-  virtual ::java::nio::CharBuffer * target$append(::java::lang::CharSequence *);
-  virtual ::java::nio::CharBuffer * target$append(::java::lang::CharSequence *, jint, jint);
+  virtual ::java::nio::CharBuffer * CharBuffer$append(jchar);
+  virtual ::java::nio::CharBuffer * CharBuffer$append(::java::lang::CharSequence *);
+  virtual ::java::nio::CharBuffer * CharBuffer$append(::java::lang::CharSequence *, jint, jint);
   virtual ::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint);
   virtual ::java::lang::Appendable * append(::java::lang::CharSequence *);
   virtual ::java::lang::Appendable * append(jchar);
diff --git a/libjava/java/nio/DoubleBuffer.h b/libjava/java/nio/DoubleBuffer.h
index 4fb0ef033e2..e201a4f2761 100644
--- a/libjava/java/nio/DoubleBuffer.h
+++ b/libjava/java/nio/DoubleBuffer.h
@@ -40,7 +40,7 @@ public:
   virtual jint arrayOffset();
   virtual jint hashCode();
   virtual jboolean equals(::java::lang::Object *);
-  virtual jint target$compareTo(::java::nio::DoubleBuffer *);
+  virtual jint DoubleBuffer$compareTo(::java::nio::DoubleBuffer *);
   virtual ::java::nio::ByteOrder * order() = 0;
   virtual jdouble get() = 0;
   virtual ::java::nio::DoubleBuffer * put(jdouble) = 0;
diff --git a/libjava/java/nio/FloatBuffer.h b/libjava/java/nio/FloatBuffer.h
index 61c02144b98..18348f2ea4b 100644
--- a/libjava/java/nio/FloatBuffer.h
+++ b/libjava/java/nio/FloatBuffer.h
@@ -40,7 +40,7 @@ public:
   virtual jint arrayOffset();
   virtual jint hashCode();
   virtual jboolean equals(::java::lang::Object *);
-  virtual jint target$compareTo(::java::nio::FloatBuffer *);
+  virtual jint FloatBuffer$compareTo(::java::nio::FloatBuffer *);
   virtual ::java::nio::ByteOrder * order() = 0;
   virtual jfloat get() = 0;
   virtual ::java::nio::FloatBuffer * put(jfloat) = 0;
diff --git a/libjava/java/nio/IntBuffer.h b/libjava/java/nio/IntBuffer.h
index 0922342cb25..e099d4a0b23 100644
--- a/libjava/java/nio/IntBuffer.h
+++ b/libjava/java/nio/IntBuffer.h
@@ -40,7 +40,7 @@ public:
   virtual jint arrayOffset();
   virtual jint hashCode();
   virtual jboolean equals(::java::lang::Object *);
-  virtual jint target$compareTo(::java::nio::IntBuffer *);
+  virtual jint IntBuffer$compareTo(::java::nio::IntBuffer *);
   virtual ::java::nio::ByteOrder * order() = 0;
   virtual jint get() = 0;
   virtual ::java::nio::IntBuffer * put(jint) = 0;
diff --git a/libjava/java/nio/LongBuffer.h b/libjava/java/nio/LongBuffer.h
index f100e050e7f..0e6ad30ef07 100644
--- a/libjava/java/nio/LongBuffer.h
+++ b/libjava/java/nio/LongBuffer.h
@@ -40,7 +40,7 @@ public:
   virtual jint arrayOffset();
   virtual jint hashCode();
   virtual jboolean equals(::java::lang::Object *);
-  virtual jint target$compareTo(::java::nio::LongBuffer *);
+  virtual jint LongBuffer$compareTo(::java::nio::LongBuffer *);
   virtual ::java::nio::ByteOrder * order() = 0;
   virtual jlong get() = 0;
   virtual ::java::nio::LongBuffer * put(jlong) = 0;
diff --git a/libjava/java/nio/ShortBuffer.h b/libjava/java/nio/ShortBuffer.h
index 27b9814a811..ddcfc093ee2 100644
--- a/libjava/java/nio/ShortBuffer.h
+++ b/libjava/java/nio/ShortBuffer.h
@@ -40,7 +40,7 @@ public:
   virtual jint arrayOffset();
   virtual jint hashCode();
   virtual jboolean equals(::java::lang::Object *);
-  virtual jint target$compareTo(::java::nio::ShortBuffer *);
+  virtual jint ShortBuffer$compareTo(::java::nio::ShortBuffer *);
   virtual ::java::nio::ByteOrder * order() = 0;
   virtual jshort get() = 0;
   virtual ::java::nio::ShortBuffer * put(jshort) = 0;
diff --git a/libjava/java/nio/charset/Charset.h b/libjava/java/nio/charset/Charset.h
index a2f3b3ead16..dabf4671d4f 100644
--- a/libjava/java/nio/charset/Charset.h
+++ b/libjava/java/nio/charset/Charset.h
@@ -62,7 +62,7 @@ public:
   virtual ::java::nio::ByteBuffer * encode(::java::nio::CharBuffer *);
   virtual ::java::nio::ByteBuffer * encode(::java::lang::String *);
   virtual ::java::nio::CharBuffer * decode(::java::nio::ByteBuffer *);
-  virtual jint target$compareTo(::java::nio::charset::Charset *);
+  virtual jint Charset$compareTo(::java::nio::charset::Charset *);
   virtual jint hashCode();
   virtual jboolean equals(::java::lang::Object *);
   virtual ::java::lang::String * toString();
diff --git a/libjava/java/sql/Timestamp.h b/libjava/java/sql/Timestamp.h
index 2b27498c843..5b85eff3537 100644
--- a/libjava/java/sql/Timestamp.h
+++ b/libjava/java/sql/Timestamp.h
@@ -39,7 +39,7 @@ public:
   virtual jboolean equals(::java::lang::Object *);
   virtual jboolean equals(::java::sql::Timestamp *);
   virtual jint compareTo(::java::sql::Timestamp *);
-  virtual jint target$compareTo(::java::util::Date *);
+  virtual jint Timestamp$compareTo(::java::util::Date *);
 public: // actually package-private
   static const jlong serialVersionUID = 2745179027874758501LL;
 private:
diff --git a/libjava/java/text/CollationKey.h b/libjava/java/text/CollationKey.h
index 83a6c5ae5dd..ac110813f14 100644
--- a/libjava/java/text/CollationKey.h
+++ b/libjava/java/text/CollationKey.h
@@ -27,7 +27,7 @@ class java::text::CollationKey : public ::java::lang::Object
 public: // actually package-private
   CollationKey(::java::text::Collator *, ::java::lang::String *, JArray< jbyte > *);
 public:
-  virtual jint target$compareTo(::java::text::CollationKey *);
+  virtual jint CollationKey$compareTo(::java::text::CollationKey *);
   virtual jboolean equals(::java::lang::Object *);
   virtual ::java::lang::String * getSourceString();
   virtual jint hashCode();
diff --git a/libjava/java/util/ArrayDeque.h b/libjava/java/util/ArrayDeque.h
index 6154213dd7e..d1ac9e514d2 100644
--- a/libjava/java/util/ArrayDeque.h
+++ b/libjava/java/util/ArrayDeque.h
@@ -55,7 +55,7 @@ public:
   virtual void clear();
   virtual JArray< ::java::lang::Object * > * toArray();
   virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-  virtual ::java::util::ArrayDeque * target$clone();
+  virtual ::java::util::ArrayDeque * ArrayDeque$clone();
 private:
   void writeObject(::java::io::ObjectOutputStream *);
   void readObject(::java::io::ObjectInputStream *);
diff --git a/libjava/java/util/Calendar.h b/libjava/java/util/Calendar.h
index bde84d5558a..3a46dc03793 100644
--- a/libjava/java/util/Calendar.h
+++ b/libjava/java/util/Calendar.h
@@ -66,7 +66,7 @@ public:
   virtual jint getLeastMaximum(jint) = 0;
   virtual jint getActualMinimum(jint);
   virtual jint getActualMaximum(jint);
-  virtual jint target$compareTo(::java::util::Calendar *);
+  virtual jint Calendar$compareTo(::java::util::Calendar *);
   virtual ::java::lang::Object * clone();
   virtual ::java::lang::String * toString();
 private:
diff --git a/libjava/java/util/Collections$4.h b/libjava/java/util/Collections$4.h
index eb7699b0da2..11c7d205243 100644
--- a/libjava/java/util/Collections$4.h
+++ b/libjava/java/util/Collections$4.h
@@ -14,7 +14,7 @@ class java::util::Collections$4 : public ::java::util::Collections$SynchronizedI
 public: // actually package-private
   Collections$4(::java::util::Collections$3 *, ::java::lang::Object *, ::java::util::Iterator *);
 public:
-  ::java::util::Map$Entry * target$next();
+  ::java::util::Map$Entry * Collections$4$next();
   ::java::lang::Object * next();
 public: // actually package-private
   ::java::util::Collections$3 * __attribute__((aligned(__alignof__( ::java::util::Collections$SynchronizedIterator)))) this$2;
diff --git a/libjava/java/util/Collections$5.h b/libjava/java/util/Collections$5.h
index b57ee4f03cc..a5cf8b690e6 100644
--- a/libjava/java/util/Collections$5.h
+++ b/libjava/java/util/Collections$5.h
@@ -14,7 +14,7 @@ class java::util::Collections$5 : public ::java::util::Collections$UnmodifiableI
 public: // actually package-private
   Collections$5(::java::util::Collections$UnmodifiableMap$UnmodifiableEntrySet *, ::java::util::Iterator *);
 public:
-  ::java::util::Map$Entry * target$next();
+  ::java::util::Map$Entry * Collections$5$next();
   ::java::lang::Object * next();
 public: // actually package-private
   ::java::util::Collections$UnmodifiableMap$UnmodifiableEntrySet * __attribute__((aligned(__alignof__( ::java::util::Collections$UnmodifiableIterator)))) this$2;
diff --git a/libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h b/libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h
index 24daec69337..1128060de45 100644
--- a/libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h
+++ b/libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h
@@ -17,7 +17,7 @@ public: // actually package-private
   Collections$UnmodifiableMap$UnmodifiableEntrySet(::java::util::Set *);
 public:
   ::java::util::Iterator * iterator();
-  JArray< ::java::util::Map$Entry * > * target$toArray();
+  JArray< ::java::util::Map$Entry * > * Collections$UnmodifiableMap$UnmodifiableEntrySet$toArray();
   JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
   JArray< ::java::lang::Object * > * toArray();
 private:
diff --git a/libjava/java/util/Date.h b/libjava/java/util/Date.h
index e9814834457..0f801d87aa0 100644
--- a/libjava/java/util/Date.h
+++ b/libjava/java/util/Date.h
@@ -28,7 +28,7 @@ public:
   virtual jboolean after(::java::util::Date *);
   virtual jboolean before(::java::util::Date *);
   virtual jboolean equals(::java::lang::Object *);
-  virtual jint target$compareTo(::java::util::Date *);
+  virtual jint Date$compareTo(::java::util::Date *);
   virtual jint hashCode();
   virtual ::java::lang::String * toString();
   virtual ::java::lang::String * toLocaleString();
diff --git a/libjava/java/util/EnumMap$2.h b/libjava/java/util/EnumMap$2.h
index 325d8ad583d..6ab63d39069 100644
--- a/libjava/java/util/EnumMap$2.h
+++ b/libjava/java/util/EnumMap$2.h
@@ -15,7 +15,7 @@ public: // actually package-private
   EnumMap$2(::java::util::EnumMap$1 *);
 public:
   jboolean hasNext();
-  ::java::lang::Enum * target$next();
+  ::java::lang::Enum * EnumMap$2$next();
   void remove();
   ::java::lang::Object * next();
 public: // actually package-private
diff --git a/libjava/java/util/EnumMap$6.h b/libjava/java/util/EnumMap$6.h
index fde1cbd4d82..eaa36b04c9e 100644
--- a/libjava/java/util/EnumMap$6.h
+++ b/libjava/java/util/EnumMap$6.h
@@ -15,7 +15,7 @@ public: // actually package-private
   EnumMap$6(::java::util::EnumMap$5 *);
 public:
   jboolean hasNext();
-  ::java::util::Map$Entry * target$next();
+  ::java::util::Map$Entry * EnumMap$6$next();
   void remove();
   ::java::lang::Object * next();
 public: // actually package-private
diff --git a/libjava/java/util/EnumMap.h b/libjava/java/util/EnumMap.h
index 0c303d82529..074f8783917 100644
--- a/libjava/java/util/EnumMap.h
+++ b/libjava/java/util/EnumMap.h
@@ -21,7 +21,7 @@ public:
   virtual jboolean containsValue(::java::lang::Object *);
   virtual jboolean containsKey(::java::lang::Object *);
   virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual ::java::lang::Object * target$put(::java::lang::Enum *, ::java::lang::Object *);
+  virtual ::java::lang::Object * EnumMap$put(::java::lang::Enum *, ::java::lang::Object *);
   virtual ::java::lang::Object * remove(::java::lang::Object *);
   virtual void putAll(::java::util::Map *);
   virtual void clear();
@@ -29,7 +29,7 @@ public:
   virtual ::java::util::Collection * values();
   virtual ::java::util::Set * entrySet();
   virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::util::EnumMap * target$clone();
+  virtual ::java::util::EnumMap * EnumMap$clone();
   virtual ::java::lang::Object * clone();
   virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
 private:
diff --git a/libjava/java/util/EnumSet$1.h b/libjava/java/util/EnumSet$1.h
index 38088dc013f..55e1c91d248 100644
--- a/libjava/java/util/EnumSet$1.h
+++ b/libjava/java/util/EnumSet$1.h
@@ -15,7 +15,7 @@ public: // actually package-private
   EnumSet$1(::java::util::EnumSet *);
 public:
   jboolean hasNext();
-  ::java::lang::Enum * target$next();
+  ::java::lang::Enum * EnumSet$1$next();
   void remove();
   ::java::lang::Object * next();
 public: // actually package-private
diff --git a/libjava/java/util/EnumSet.h b/libjava/java/util/EnumSet.h
index f0e2a7af3a6..200868ae876 100644
--- a/libjava/java/util/EnumSet.h
+++ b/libjava/java/util/EnumSet.h
@@ -16,10 +16,10 @@ class java::util::EnumSet : public ::java::util::AbstractSet
 public: // actually package-private
   EnumSet();
 public:
-  virtual ::java::util::EnumSet * target$clone();
+  virtual ::java::util::EnumSet * EnumSet$clone();
   virtual jint size();
   virtual ::java::util::Iterator * iterator();
-  virtual jboolean target$add(::java::lang::Enum *);
+  virtual jboolean EnumSet$add(::java::lang::Enum *);
   virtual jboolean addAll(::java::util::Collection *);
   virtual void clear();
   virtual jboolean contains(::java::lang::Object *);
diff --git a/libjava/java/util/Hashtable$EntryEnumerator.h b/libjava/java/util/Hashtable$EntryEnumerator.h
index 1480d182e3b..a0f16015312 100644
--- a/libjava/java/util/Hashtable$EntryEnumerator.h
+++ b/libjava/java/util/Hashtable$EntryEnumerator.h
@@ -15,7 +15,7 @@ public: // actually package-private
   Hashtable$EntryEnumerator(::java::util::Hashtable *);
 public:
   virtual jboolean hasMoreElements();
-  virtual ::java::util::Map$Entry * target$nextElement();
+  virtual ::java::util::Map$Entry * Hashtable$EntryEnumerator$nextElement();
   virtual ::java::lang::Object * nextElement();
 public: // actually package-private
   jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count;
diff --git a/libjava/java/util/Hashtable$EntryIterator.h b/libjava/java/util/Hashtable$EntryIterator.h
index d70d486c70a..7927391ef4a 100644
--- a/libjava/java/util/Hashtable$EntryIterator.h
+++ b/libjava/java/util/Hashtable$EntryIterator.h
@@ -15,7 +15,7 @@ public: // actually package-private
   Hashtable$EntryIterator(::java::util::Hashtable *);
 public:
   virtual jboolean hasNext();
-  virtual ::java::util::Map$Entry * target$next();
+  virtual ::java::util::Map$Entry * Hashtable$EntryIterator$next();
   virtual void remove();
   virtual ::java::lang::Object * next();
 public: // actually package-private
diff --git a/libjava/java/util/UUID.h b/libjava/java/util/UUID.h
index 86cb4bc476e..0eda9d67bbb 100644
--- a/libjava/java/util/UUID.h
+++ b/libjava/java/util/UUID.h
@@ -16,7 +16,7 @@ class java::util::UUID : public ::java::lang::Object
 public:
   UUID(jlong, jlong);
   jint clockSequence();
-  jint target$compareTo(::java::util::UUID *);
+  jint UUID$compareTo(::java::util::UUID *);
   jboolean equals(::java::lang::Object *);
   static ::java::util::UUID * fromString(::java::lang::String *);
   ::java::lang::String * toString();
diff --git a/libjava/java/util/concurrent/ConcurrentHashMap$EntryIterator.h b/libjava/java/util/concurrent/ConcurrentHashMap$EntryIterator.h
index 5044f070ab8..4c4c191b51b 100644
--- a/libjava/java/util/concurrent/ConcurrentHashMap$EntryIterator.h
+++ b/libjava/java/util/concurrent/ConcurrentHashMap$EntryIterator.h
@@ -14,7 +14,7 @@ class java::util::concurrent::ConcurrentHashMap$EntryIterator : public ::java::u
 public: // actually package-private
   ConcurrentHashMap$EntryIterator(::java::util::concurrent::ConcurrentHashMap *);
 public:
-  ::java::util::Map$Entry * target$next();
+  ::java::util::Map$Entry * ConcurrentHashMap$EntryIterator$next();
   ::java::lang::Object * next();
 public: // actually package-private
   ::java::util::concurrent::ConcurrentHashMap * __attribute__((aligned(__alignof__( ::java::util::concurrent::ConcurrentHashMap$HashIterator)))) this$0;
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$EntryIterator.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$EntryIterator.h
index 1949e5ac617..67d71928f54 100644
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$EntryIterator.h
+++ b/libjava/java/util/concurrent/ConcurrentSkipListMap$EntryIterator.h
@@ -14,7 +14,7 @@ class java::util::concurrent::ConcurrentSkipListMap$EntryIterator : public ::jav
 public: // actually package-private
   ConcurrentSkipListMap$EntryIterator(::java::util::concurrent::ConcurrentSkipListMap *);
 public:
-  ::java::util::Map$Entry * target$next();
+  ::java::util::Map$Entry * ConcurrentSkipListMap$EntryIterator$next();
   ::java::lang::Object * next();
 public: // actually package-private
   ::java::util::concurrent::ConcurrentSkipListMap * __attribute__((aligned(__alignof__( ::java::util::concurrent::ConcurrentSkipListMap$Iter)))) this$0;
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$KeySet.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$KeySet.h
index c2372f8b491..e52b30ea14d 100644
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$KeySet.h
+++ b/libjava/java/util/concurrent/ConcurrentSkipListMap$KeySet.h
@@ -38,9 +38,9 @@ public:
   ::java::util::NavigableSet * subSet(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
   ::java::util::NavigableSet * headSet(::java::lang::Object *, jboolean);
   ::java::util::NavigableSet * tailSet(::java::lang::Object *, jboolean);
-  ::java::util::NavigableSet * target$subSet(::java::lang::Object *, ::java::lang::Object *);
-  ::java::util::NavigableSet * target$headSet(::java::lang::Object *);
-  ::java::util::NavigableSet * target$tailSet(::java::lang::Object *);
+  ::java::util::NavigableSet * ConcurrentSkipListMap$KeySet$subSet(::java::lang::Object *, ::java::lang::Object *);
+  ::java::util::NavigableSet * ConcurrentSkipListMap$KeySet$headSet(::java::lang::Object *);
+  ::java::util::NavigableSet * ConcurrentSkipListMap$KeySet$tailSet(::java::lang::Object *);
   ::java::util::NavigableSet * descendingSet();
   ::java::util::SortedSet * subSet(::java::lang::Object *, ::java::lang::Object *);
   ::java::util::SortedSet * tailSet(::java::lang::Object *);
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapEntryIterator.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapEntryIterator.h
index 8b01d994082..0c0c9e55248 100644
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapEntryIterator.h
+++ b/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapEntryIterator.h
@@ -14,7 +14,7 @@ class java::util::concurrent::ConcurrentSkipListMap$SubMap$SubMapEntryIterator :
 public: // actually package-private
   ConcurrentSkipListMap$SubMap$SubMapEntryIterator(::java::util::concurrent::ConcurrentSkipListMap$SubMap *);
 public:
-  ::java::util::Map$Entry * target$next();
+  ::java::util::Map$Entry * ConcurrentSkipListMap$SubMap$SubMapEntryIterator$next();
   ::java::lang::Object * next();
 public: // actually package-private
   ::java::util::concurrent::ConcurrentSkipListMap$SubMap * __attribute__((aligned(__alignof__( ::java::util::concurrent::ConcurrentSkipListMap$SubMap$SubMapIter)))) this$1;
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap.h
index e065dbe6caa..345fb255173 100644
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap.h
+++ b/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap.h
@@ -46,13 +46,13 @@ public:
 private:
   ::java::util::concurrent::ConcurrentSkipListMap$SubMap * newSubMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
 public:
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$headMap(::java::lang::Object *, jboolean);
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$tailMap(::java::lang::Object *, jboolean);
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$subMap(::java::lang::Object *, ::java::lang::Object *);
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$headMap(::java::lang::Object *);
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$tailMap(::java::lang::Object *);
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$descendingMap();
+  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
+  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$headMap(::java::lang::Object *, jboolean);
+  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$tailMap(::java::lang::Object *, jboolean);
+  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$subMap(::java::lang::Object *, ::java::lang::Object *);
+  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$headMap(::java::lang::Object *);
+  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$tailMap(::java::lang::Object *);
+  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$descendingMap();
   ::java::util::Map$Entry * ceilingEntry(::java::lang::Object *);
   ::java::lang::Object * ceilingKey(::java::lang::Object *);
   ::java::util::Map$Entry * lowerEntry(::java::lang::Object *);
@@ -67,7 +67,7 @@ public:
   ::java::util::Map$Entry * lastEntry();
   ::java::util::Map$Entry * pollFirstEntry();
   ::java::util::Map$Entry * pollLastEntry();
-  ::java::util::NavigableSet * target$keySet();
+  ::java::util::NavigableSet * ConcurrentSkipListMap$SubMap$keySet();
   ::java::util::NavigableSet * navigableKeySet();
   ::java::util::Collection * values();
   ::java::util::Set * entrySet();
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap.h b/libjava/java/util/concurrent/ConcurrentSkipListMap.h
index be9beb80ca9..2f4da898b7c 100644
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap.h
+++ b/libjava/java/util/concurrent/ConcurrentSkipListMap.h
@@ -51,7 +51,7 @@ public:
   ConcurrentSkipListMap(::java::util::Comparator *);
   ConcurrentSkipListMap(::java::util::Map *);
   ConcurrentSkipListMap(::java::util::SortedMap *);
-  virtual ::java::util::concurrent::ConcurrentSkipListMap * target$clone();
+  virtual ::java::util::concurrent::ConcurrentSkipListMap * ConcurrentSkipListMap$clone();
 private:
   void buildFromSorted(::java::util::SortedMap *);
   void writeObject(::java::io::ObjectOutputStream *);
@@ -65,11 +65,11 @@ public:
   virtual jint size();
   virtual jboolean isEmpty();
   virtual void clear();
-  virtual ::java::util::NavigableSet * target$keySet();
+  virtual ::java::util::NavigableSet * ConcurrentSkipListMap$keySet();
   virtual ::java::util::NavigableSet * navigableKeySet();
   virtual ::java::util::Collection * values();
   virtual ::java::util::Set * entrySet();
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * target$descendingMap();
+  virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$descendingMap();
   virtual ::java::util::NavigableSet * descendingKeySet();
   virtual jboolean equals(::java::lang::Object *);
   virtual ::java::lang::Object * putIfAbsent(::java::lang::Object *, ::java::lang::Object *);
@@ -79,12 +79,12 @@ public:
   virtual ::java::util::Comparator * comparator();
   virtual ::java::lang::Object * firstKey();
   virtual ::java::lang::Object * lastKey();
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * target$subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * target$headMap(::java::lang::Object *, jboolean);
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * target$tailMap(::java::lang::Object *, jboolean);
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * target$subMap(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * target$headMap(::java::lang::Object *);
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * target$tailMap(::java::lang::Object *);
+  virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
+  virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$headMap(::java::lang::Object *, jboolean);
+  virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$tailMap(::java::lang::Object *, jboolean);
+  virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$subMap(::java::lang::Object *, ::java::lang::Object *);
+  virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$headMap(::java::lang::Object *);
+  virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$tailMap(::java::lang::Object *);
   virtual ::java::util::Map$Entry * lowerEntry(::java::lang::Object *);
   virtual ::java::lang::Object * lowerKey(::java::lang::Object *);
   virtual ::java::util::Map$Entry * floorEntry(::java::lang::Object *);
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListSet.h b/libjava/java/util/concurrent/ConcurrentSkipListSet.h
index 75afde92de6..65ea1a9a932 100644
--- a/libjava/java/util/concurrent/ConcurrentSkipListSet.h
+++ b/libjava/java/util/concurrent/ConcurrentSkipListSet.h
@@ -29,7 +29,7 @@ public:
 public: // actually package-private
   ConcurrentSkipListSet(::java::util::concurrent::ConcurrentNavigableMap *);
 public:
-  virtual ::java::util::concurrent::ConcurrentSkipListSet * target$clone();
+  virtual ::java::util::concurrent::ConcurrentSkipListSet * ConcurrentSkipListSet$clone();
   virtual jint size();
   virtual jboolean isEmpty();
   virtual jboolean contains(::java::lang::Object *);
@@ -52,9 +52,9 @@ public:
   virtual ::java::util::NavigableSet * subSet(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
   virtual ::java::util::NavigableSet * headSet(::java::lang::Object *, jboolean);
   virtual ::java::util::NavigableSet * tailSet(::java::lang::Object *, jboolean);
-  virtual ::java::util::NavigableSet * target$subSet(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::util::NavigableSet * target$headSet(::java::lang::Object *);
-  virtual ::java::util::NavigableSet * target$tailSet(::java::lang::Object *);
+  virtual ::java::util::NavigableSet * ConcurrentSkipListSet$subSet(::java::lang::Object *, ::java::lang::Object *);
+  virtual ::java::util::NavigableSet * ConcurrentSkipListSet$headSet(::java::lang::Object *);
+  virtual ::java::util::NavigableSet * ConcurrentSkipListSet$tailSet(::java::lang::Object *);
   virtual ::java::util::NavigableSet * descendingSet();
 private:
   void setMap(::java::util::concurrent::ConcurrentNavigableMap *);
diff --git a/libjava/java/util/concurrent/DelayQueue$Itr.h b/libjava/java/util/concurrent/DelayQueue$Itr.h
index ab7af20e87b..cdcc1bf20b3 100644
--- a/libjava/java/util/concurrent/DelayQueue$Itr.h
+++ b/libjava/java/util/concurrent/DelayQueue$Itr.h
@@ -17,7 +17,7 @@ public: // actually package-private
   DelayQueue$Itr(::java::util::concurrent::DelayQueue *, JArray< ::java::lang::Object * > *);
 public:
   virtual jboolean hasNext();
-  virtual ::java::util::concurrent::Delayed * target$next();
+  virtual ::java::util::concurrent::Delayed * DelayQueue$Itr$next();
   virtual void remove();
   virtual ::java::lang::Object * next();
 public: // actually package-private
diff --git a/libjava/java/util/concurrent/DelayQueue.h b/libjava/java/util/concurrent/DelayQueue.h
index 76dd489f298..b97f32248cc 100644
--- a/libjava/java/util/concurrent/DelayQueue.h
+++ b/libjava/java/util/concurrent/DelayQueue.h
@@ -16,14 +16,14 @@ class java::util::concurrent::DelayQueue : public ::java::util::AbstractQueue
 public:
   DelayQueue();
   DelayQueue(::java::util::Collection *);
-  virtual jboolean target$add(::java::util::concurrent::Delayed *);
-  virtual jboolean target$offer(::java::util::concurrent::Delayed *);
-  virtual void target$put(::java::util::concurrent::Delayed *);
-  virtual jboolean target$offer(::java::util::concurrent::Delayed *, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::util::concurrent::Delayed * target$poll();
-  virtual ::java::util::concurrent::Delayed * target$take();
-  virtual ::java::util::concurrent::Delayed * target$poll(jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::util::concurrent::Delayed * target$peek();
+  virtual jboolean DelayQueue$add(::java::util::concurrent::Delayed *);
+  virtual jboolean DelayQueue$offer(::java::util::concurrent::Delayed *);
+  virtual void DelayQueue$put(::java::util::concurrent::Delayed *);
+  virtual jboolean DelayQueue$offer(::java::util::concurrent::Delayed *, jlong, ::java::util::concurrent::TimeUnit *);
+  virtual ::java::util::concurrent::Delayed * DelayQueue$poll();
+  virtual ::java::util::concurrent::Delayed * DelayQueue$take();
+  virtual ::java::util::concurrent::Delayed * DelayQueue$poll(jlong, ::java::util::concurrent::TimeUnit *);
+  virtual ::java::util::concurrent::Delayed * DelayQueue$peek();
   virtual jint size();
   virtual jint drainTo(::java::util::Collection *);
   virtual jint drainTo(::java::util::Collection *, jint);
diff --git a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$1.h b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$1.h
index cd6608f955e..5ae31075595 100644
--- a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$1.h
+++ b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$1.h
@@ -15,7 +15,7 @@ public: // actually package-private
   ScheduledThreadPoolExecutor$1(::java::util::concurrent::ScheduledThreadPoolExecutor$DelayedWorkQueue *);
 public:
   jboolean hasNext();
-  ::java::lang::Runnable * target$next();
+  ::java::lang::Runnable * ScheduledThreadPoolExecutor$1$next();
   void remove();
   ::java::lang::Object * next();
 private:
diff --git a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$DelayedWorkQueue.h b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$DelayedWorkQueue.h
index fd5871a6a72..26fac62545c 100644
--- a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$DelayedWorkQueue.h
+++ b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$DelayedWorkQueue.h
@@ -15,16 +15,16 @@ class java::util::concurrent::ScheduledThreadPoolExecutor$DelayedWorkQueue : pub
 
   ScheduledThreadPoolExecutor$DelayedWorkQueue();
 public:
-  virtual ::java::lang::Runnable * target$poll();
-  virtual ::java::lang::Runnable * target$peek();
-  virtual ::java::lang::Runnable * target$take();
-  virtual ::java::lang::Runnable * target$poll(jlong, ::java::util::concurrent::TimeUnit *);
-  virtual jboolean target$add(::java::lang::Runnable *);
-  virtual jboolean target$offer(::java::lang::Runnable *);
-  virtual void target$put(::java::lang::Runnable *);
-  virtual jboolean target$offer(::java::lang::Runnable *, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::lang::Runnable * target$remove();
-  virtual ::java::lang::Runnable * target$element();
+  virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$DelayedWorkQueue$poll();
+  virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$DelayedWorkQueue$peek();
+  virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$DelayedWorkQueue$take();
+  virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$DelayedWorkQueue$poll(jlong, ::java::util::concurrent::TimeUnit *);
+  virtual jboolean ScheduledThreadPoolExecutor$DelayedWorkQueue$add(::java::lang::Runnable *);
+  virtual jboolean ScheduledThreadPoolExecutor$DelayedWorkQueue$offer(::java::lang::Runnable *);
+  virtual void ScheduledThreadPoolExecutor$DelayedWorkQueue$put(::java::lang::Runnable *);
+  virtual jboolean ScheduledThreadPoolExecutor$DelayedWorkQueue$offer(::java::lang::Runnable *, jlong, ::java::util::concurrent::TimeUnit *);
+  virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$DelayedWorkQueue$remove();
+  virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$DelayedWorkQueue$element();
   virtual void clear();
   virtual jint drainTo(::java::util::Collection *);
   virtual jint drainTo(::java::util::Collection *, jint);
diff --git a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$ScheduledFutureTask.h b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$ScheduledFutureTask.h
index 1bd4e3bdacb..ba9ad31a4a6 100644
--- a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$ScheduledFutureTask.h
+++ b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$ScheduledFutureTask.h
@@ -17,7 +17,7 @@ public: // actually package-private
   ScheduledThreadPoolExecutor$ScheduledFutureTask(::java::util::concurrent::ScheduledThreadPoolExecutor *, ::java::util::concurrent::Callable *, jlong);
 public:
   virtual jlong getDelay(::java::util::concurrent::TimeUnit *);
-  virtual jint target$compareTo(::java::util::concurrent::Delayed *);
+  virtual jint ScheduledThreadPoolExecutor$ScheduledFutureTask$compareTo(::java::util::concurrent::Delayed *);
   virtual jboolean isPeriodic();
 private:
   void runPeriodic();
diff --git a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.h b/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.h
index c9dedf0df50..10f87c92202 100644
--- a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.h
+++ b/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.h
@@ -14,7 +14,7 @@ class java::util::concurrent::locks::ReentrantReadWriteLock$Sync$ThreadLocalHold
 public: // actually package-private
   ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter();
 public:
-  ::java::util::concurrent::locks::ReentrantReadWriteLock$Sync$HoldCounter * target$initialValue();
+  ::java::util::concurrent::locks::ReentrantReadWriteLock$Sync$HoldCounter * ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter$initialValue();
   ::java::lang::Object * initialValue();
   static ::java::lang::Class class$;
 };
diff --git a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock.h b/libjava/java/util/concurrent/locks/ReentrantReadWriteLock.h
index 3bea3cc54a1..e7da50a750b 100644
--- a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock.h
+++ b/libjava/java/util/concurrent/locks/ReentrantReadWriteLock.h
@@ -14,8 +14,8 @@ class java::util::concurrent::locks::ReentrantReadWriteLock : public ::java::lan
 public:
   ReentrantReadWriteLock();
   ReentrantReadWriteLock(jboolean);
-  virtual ::java::util::concurrent::locks::ReentrantReadWriteLock$WriteLock * target$writeLock();
-  virtual ::java::util::concurrent::locks::ReentrantReadWriteLock$ReadLock * target$readLock();
+  virtual ::java::util::concurrent::locks::ReentrantReadWriteLock$WriteLock * ReentrantReadWriteLock$writeLock();
+  virtual ::java::util::concurrent::locks::ReentrantReadWriteLock$ReadLock * ReentrantReadWriteLock$readLock();
   virtual jboolean isFair();
 public: // actually protected
   virtual ::java::lang::Thread * getOwner();
diff --git a/libjava/java/util/jar/JarFile$JarEnumeration.h b/libjava/java/util/jar/JarFile$JarEnumeration.h
index 8916b5bf14b..60aea699679 100644
--- a/libjava/java/util/jar/JarFile$JarEnumeration.h
+++ b/libjava/java/util/jar/JarFile$JarEnumeration.h
@@ -15,7 +15,7 @@ public: // actually package-private
   JarFile$JarEnumeration(::java::util::Enumeration *, ::java::util::jar::JarFile *);
 public:
   virtual jboolean hasMoreElements();
-  virtual ::java::util::jar::JarEntry * target$nextElement();
+  virtual ::java::util::jar::JarEntry * JarFile$JarEnumeration$nextElement();
   virtual ::java::lang::Object * nextElement();
 private:
   ::java::util::Enumeration * __attribute__((aligned(__alignof__( ::java::lang::Object)))) entries;
diff --git a/libjava/java/util/zip/ZipFile$ZipEntryEnumeration.h b/libjava/java/util/zip/ZipFile$ZipEntryEnumeration.h
index 40a7e975b2e..f041ae04a4f 100644
--- a/libjava/java/util/zip/ZipFile$ZipEntryEnumeration.h
+++ b/libjava/java/util/zip/ZipFile$ZipEntryEnumeration.h
@@ -14,7 +14,7 @@ class java::util::zip::ZipFile$ZipEntryEnumeration : public ::java::lang::Object
 public:
   ZipFile$ZipEntryEnumeration(::java::util::Iterator *);
   virtual jboolean hasMoreElements();
-  virtual ::java::util::zip::ZipEntry * target$nextElement();
+  virtual ::java::util::zip::ZipEntry * ZipFile$ZipEntryEnumeration$nextElement();
   virtual ::java::lang::Object * nextElement();
 private:
   ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) elements;