@@ -26,14 +26,14 @@
 {
 	return [[[self alloc] initWithName: name_] autorelease];
 }
 
 + elementWithName: (OFString*)name_
-   andStringValue: (OFString*)stringval_
+      stringValue: (OFString*)stringval_
 {
 	return [[[self alloc] initWithName: name_
-			    andStringValue: stringval_] autorelease];
+			       stringValue: stringval_] autorelease];
 }
 
 - initWithName: (OFString*)name_
 {
 	self = [super init];
@@ -41,12 +41,12 @@
 	name = [name_ retain];
 
 	return self;
 }
 
--   initWithName: (OFString*)name_
-  andStringValue: (OFString*)stringval_
+- initWithName: (OFString*)name_
+   stringValue: (OFString*)stringval_
 {
 	self = [super init];
 
 	name = [name_ retain];
 	stringval = [stringval_ retain];
@@ -158,11 +158,11 @@
 
 	return ret;
 }
 
 - addAttributeWithName: (OFString*)name_
-	      andValue: (OFString*)value_
+	   stringValue: (OFString*)value_
 {
 	if (attrs == nil)
 		attrs = [[OFMutableDictionary alloc] init];
 
 	[attrs setObject: value_
@@ -173,11 +173,11 @@
 
 - addChild: (OFXMLElement*)child
 {
 	if (stringval != nil)
 		@throw [OFInvalidArgumentException newWithClass: isa
-						    andSelector: _cmd];
+						       selector: _cmd];
 
 	if (children == nil)
 		children = [[OFMutableArray alloc] init];
 
 	[children addObject: child];
@@ -210,11 +210,11 @@
 	/*
 	 * We can't use allocMemoryWithSize: here as it might be a @"" literal
 	 */
 	if ((str_c = malloc(len + 1)) == NULL)
 		@throw [OFOutOfMemoryException newWithClass: isa
-						    andSize: len];
+						       size: len];
 
 	for (i = 0; i < length; i++) {
 		switch (string[i]) {
 			case '<':
 				append = "&lt;";
@@ -244,11 +244,11 @@
 		if (append != NULL) {
 			if ((tmp = realloc(str_c, len + append_len)) == NULL) {
 				free(str_c);
 				@throw [OFOutOfMemoryException
 				    newWithClass: isa
-					 andSize: len + append_len];
+					    size: len + append_len];
 			}
 			str_c = tmp;
 			len += append_len - 1;
 
 			memcpy(str_c + j, append, append_len);