@@ -18,17 +18,17 @@
 @class OFXMLParser;
 
 @protocol OFXMLParserDelegate
 -     (BOOL)xmlParser: (OFXMLParser*)parser
   didStartTagWithName: (OFString*)name
-	    andPrefix: (OFString*)prefix
-	 andNamespace: (OFString*)ns
-	andAttributes: (OFDictionary*)attrs;
+	       prefix: (OFString*)prefix
+	    namespace: (OFString*)ns
+	   attributes: (OFDictionary*)attrs;
 -   (BOOL)xmlParser: (OFXMLParser*)parser
   didEndTagWithName: (OFString*)name
-	  andPrefix: (OFString*)prefix
-       andNamespace: (OFString*)ns;
+	     prefix: (OFString*)prefix
+	  namespace: (OFString*)ns;
 - (BOOL)xmlParser: (OFXMLParser*)parser
       foundString: (OFString*)string;
 @end
 
 @interface OFXMLParser: OFObject