@@ -62,11 +62,11 @@
 
 	if ((i = of_string_unicode_to_utf8(c, buf)) == 0)
 		return nil;
 
 	return [OFString stringWithCString: buf
-				 andLength: i];
+				    length: i];
 }
 
 @implementation OFXMLParser
 + xmlParser
 {
@@ -177,38 +177,38 @@
 
 				if ((tmp = memchr(cache_c, ':',
 				    cache_len)) != NULL) {
 					prefix = [[OFString alloc]
 					    initWithCString: cache_c
-						  andLength: tmp - cache_c];
+						     length: tmp - cache_c];
 					name = [[OFString alloc]
 					    initWithCString: tmp + 1
-						  andLength: cache_len - (tmp -
+						     length: cache_len - (tmp -
 							     cache_c) - 1];
 				} else {
 					prefix = nil;
 					name = [[OFString alloc]
 					    initWithCString: cache_c
-						  andLength: cache_len];
+						     length: cache_len];
 				}
 
 				[cache setToCString: ""];
 
 				if (buf[i] == '>' || buf[i] == '/') {
 					pool = [[OFAutoreleasePool alloc] init];
 
 					[delegate xmlParser: self
 					didStartTagWithName: name
-						  andPrefix: prefix
-					       andNamespace: ns
-					      andAttributes: nil];
+						     prefix: prefix
+						  namespace: ns
+						 attributes: nil];
 
 					if (buf[i] == '/')
 						[delegate xmlParser: self
 						  didEndTagWithName: name
-							  andPrefix: prefix
-						       andNamespace: ns];
+							     prefix: prefix
+							  namespace: ns];
 
 					[pool release];
 
 					[name release];
 					[prefix release];
@@ -239,30 +239,30 @@
 
 				if ((tmp = memchr(cache_c, ':',
 				    cache_len)) != NULL) {
 					prefix = [[OFString alloc]
 					    initWithCString: cache_c
-						  andLength: tmp - cache_c];
+						     length: tmp - cache_c];
 					name = [[OFString alloc]
 					    initWithCString: tmp + 1
-						  andLength: cache_len - (tmp -
+						     length: cache_len - (tmp -
 							     cache_c) - 1];
 				} else {
 					prefix = nil;
 					name = [[OFString alloc]
 					    initWithCString: cache_c
-						  andLength: cache_len];
+						     length: cache_len];
 				}
 
 				[cache setToCString: ""];
 
 				pool = [[OFAutoreleasePool alloc] init];
 
 				[delegate xmlParser: self
 				  didEndTagWithName: name
-					  andPrefix: prefix
-				       andNamespace: ns];
+					     prefix: prefix
+					  namespace: ns];
 
 				[pool release];
 
 				[name release];
 				[prefix release];
@@ -280,19 +280,19 @@
 			if (buf[i] == '>' || buf[i] == '/') {
 				pool = [[OFAutoreleasePool alloc] init];
 
 				[delegate xmlParser: self
 				didStartTagWithName: name
-					  andPrefix: prefix
-				       andNamespace: ns
-				      andAttributes: attrs];
+					     prefix: prefix
+					  namespace: ns
+					 attributes: attrs];
 
 				if (buf[i] == '/')
 					[delegate xmlParser: self
 					  didEndTagWithName: name
-						  andPrefix: prefix
-					       andNamespace: ns];
+						     prefix: prefix
+						  namespace: ns];
 
 				[pool release];
 
 				[name release];
 				[prefix release];
@@ -413,11 +413,11 @@
 	ret = [OFMutableString string];
 
 	for (i = 0; i < length; i++) {
 		if (!in_entity && string[i] == '&') {
 			[ret appendCStringWithoutUTF8Checking: string + last
-						    andLength: i - last];
+						    length: i - last];
 
 			last = i + 1;
 			in_entity = YES;
 		} else if (in_entity && string[i] == ';') {
 			char *entity = string + last;
@@ -451,11 +451,11 @@
 				OFString *n, *tmp;
 
 				pool = [[OFAutoreleasePool alloc] init];
 
 				n = [OFString stringWithCString: entity
-						      andLength: len];
+							 length: len];
 				tmp = [h foundUnknownEntityNamed: n];
 
 				if (tmp == nil)
 					@throw [OFInvalidEncodingException
 					    newWithClass: isa];
@@ -473,10 +473,10 @@
 
 	if (in_entity)
 		@throw [OFInvalidEncodingException newWithClass: isa];
 
 	[ret appendCStringWithoutUTF8Checking: string + last
-				    andLength: i - last];
+				       length: i - last];
 
 	return ret;
 }
 @end