diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index dbdac321c76..df40a146d12 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2004-05-06  Bryce McKinlay  <mckinlay@redhat.com>
+
+	* defineclass.cc (_Jv_ClassReader::prepare_pool_entry): Use 
+	verify_field_signature and verify_method_signature, not 
+	_Jv_VerifyFieldSignature and _Jv_VerifyMethodSigntature.
+	(_Jv_ClassReader::handleField): Likewise.
+	(_Jv_ClassReader::handleMethod): Likewise.
+
 2004-05-06  Michael Koch  <konqueror@gmx.de>
 
 	* javax/swing/table/TableColumn.java:
diff --git a/libjava/defineclass.cc b/libjava/defineclass.cc
index 156efb5b1d7..26606815836 100644
--- a/libjava/defineclass.cc
+++ b/libjava/defineclass.cc
@@ -776,9 +776,9 @@ _Jv_ClassReader::prepare_pool_entry (int index, unsigned char this_tag)
 			   name_index, type_index);
 
 	  if (this_tag == JV_CONSTANT_Fieldref)
-	    _Jv_VerifyFieldSignature (pool_data[type_index].utf8);
+	    verify_field_signature (pool_data[type_index].utf8);
 	  else
-	    _Jv_VerifyMethodSignature (pool_data[type_index].utf8);
+	    verify_method_signature (pool_data[type_index].utf8);
 
 	  _Jv_Utf8Const* name = pool_data[name_index].utf8;
 
@@ -1107,7 +1107,7 @@ void _Jv_ClassReader::handleField (int field_no,
     }
 
   if (verify)
-    _Jv_VerifyFieldSignature (sig);
+    verify_field_signature (sig);
 
   // field->type is really a jclass, but while it is still
   // unresolved we keep an _Jv_Utf8Const* instead.
@@ -1244,7 +1244,7 @@ void _Jv_ClassReader::handleMethod
       else
 	verify_identifier (method->name);
 
-      _Jv_VerifyMethodSignature (method->signature);
+      verify_method_signature (method->signature);
 
       for (int i = 0; i < mth_index; ++i)
 	{