@@ -69,15 +69,15 @@
 }
 
 @implementation OFString (XMLUnescaping)
 - (OFString*)stringByXMLUnescaping
 {
-	return [self stringByXMLUnescapingWithHandler: nil];
+	return [self stringByXMLUnescapingWithDelegate: nil];
 }
 
-- (OFString*)stringByXMLUnescapingWithHandler:
-    (OFObject <OFStringXMLUnescapingDelegate>*)h
+- (OFString*)stringByXMLUnescapingWithDelegate:
+    (OFObject <OFStringXMLUnescapingDelegate>*)delegate
 {
 	size_t i, last;
 	BOOL in_entity;
 	OFMutableString *ret;
 
@@ -130,19 +130,20 @@
 					@throw [OFInvalidEncodingException
 					    newWithClass: isa];
 
 				[ret appendString: tmp];
 				[pool release];
-			} else if (h != nil) {
+			} else if (delegate != nil) {
 				OFAutoreleasePool *pool;
 				OFString *n, *tmp;
 
 				pool = [[OFAutoreleasePool alloc] init];
 
 				n = [OFString stringWithCString: entity
 							 length: len];
-				tmp = [h didFindUnknownEntityNamed: n];
+				tmp =	  [delegate string: self
+				containsUnknownEntityNamed: n];
 
 				if (tmp == nil)
 					@throw [OFInvalidEncodingException
 					    newWithClass: isa];