@@ -147,24 +147,24 @@
 {
 	return [[[self alloc] initWithCString: str] autorelease];
 }
 
 + stringWithCString: (const char*)str
-	  andLength: (size_t)len
+	     length: (size_t)len
 {
 	return [[[self alloc] initWithCString: str
-				    andLength: len] autorelease];
+				       length: len] autorelease];
 }
 
 + stringWithFormat: (OFString*)fmt, ...
 {
 	id ret;
 	va_list args;
 
 	va_start(args, fmt);
 	ret = [[[self alloc] initWithFormat: fmt
-			       andArguments: args] autorelease];
+				  arguments: args] autorelease];
 	va_end(args);
 
 	return ret;
 }
 
@@ -217,11 +217,11 @@
 
 	return self;
 }
 
 - initWithCString: (const char*)str
-	andLength: (size_t)len
+	   length: (size_t)len
 {
 	Class c;
 
 	self = [super init];
 
@@ -265,18 +265,18 @@
 	id ret;
 	va_list args;
 
 	va_start(args, fmt);
 	ret = [self initWithFormat: fmt
-		      andArguments: args];
+			 arguments: args];
 	va_end(args);
 
 	return ret;
 }
 
 - initWithFormat: (OFString*)fmt
-    andArguments: (va_list)args
+       arguments: (va_list)args
 {
 	int t;
 	Class c;
 
 	self = [super init];
@@ -370,11 +370,11 @@
 
 - (int)compare: (id)obj
 {
 	if (![obj isKindOfClass: [OFString class]])
 		@throw [OFInvalidArgumentException newWithClass: isa
-						    andSelector: _cmd];
+						       selector: _cmd];
 
 	return strcmp(string, [obj cString]);
 }
 
 - (uint32_t)hash
@@ -434,17 +434,17 @@
 - (OFString*)substringFromIndex: (size_t)start
 			toIndex: (size_t)end
 {
 	if (start > end)
 		@throw [OFInvalidArgumentException newWithClass: isa
-						    andSelector: _cmd];
+						       selector: _cmd];
 
 	if (end > length)
 		@throw [OFOutOfRangeException newWithClass: isa];
 
 	return [OFString stringWithCString: string + start
-				 andLength: end - start];
+				    length: end - start];
 }
 
 - (OFString*)stringByAppendingString: (OFString*)str
 {
 	return [[OFMutableString stringWithString: self] appendString: str];
@@ -492,11 +492,11 @@
 	for (i = 0, last = 0; i <= length - delim_len; i++) {
 		if (memcmp(string + i, delim, delim_len))
 			continue;
 
 		[array addObject: [OFString stringWithCString: string + last
-						    andLength: i - last]];
+						       length: i - last]];
 		i += delim_len - 1;
 		last = i + 1;
 	}
 	[array addObject: [OFString stringWithCString: string + last]];
 
@@ -506,96 +506,96 @@
 }
 
 - setToCString: (const char*)str
 {
 	@throw [OFNotImplementedException newWithClass: isa
-					   andSelector: _cmd];
+					      selector: _cmd];
 }
 
 - appendCString: (const char*)str
 {
 	@throw [OFNotImplementedException newWithClass: isa
-					   andSelector: _cmd];
+					      selector: _cmd];
 }
 
 - appendCString: (const char*)str
      withLength: (size_t)len
 {
 	@throw [OFNotImplementedException newWithClass: isa
-					   andSelector: _cmd];
+					      selector: _cmd];
 }
 
 - appendCStringWithoutUTF8Checking: (const char*)str
 {
 	@throw [OFNotImplementedException newWithClass: isa
-					   andSelector: _cmd];
+					      selector: _cmd];
 }
 
 - appendCStringWithoutUTF8Checking: (const char*)str
-			 andLength: (size_t)len
+			    length: (size_t)len
 {
 	@throw [OFNotImplementedException newWithClass: isa
-					   andSelector: _cmd];
+					      selector: _cmd];
 }
 
 - appendString: (OFString*)str
 {
 	@throw [OFNotImplementedException newWithClass: isa
-					   andSelector: _cmd];
+					      selector: _cmd];
 }
 
 - appendWithFormat: (OFString*)fmt, ...
 {
 	@throw [OFNotImplementedException newWithClass: isa
-					   andSelector: _cmd];
+					      selector: _cmd];
 }
 
 - appendWithFormat: (OFString*)fmt
-      andArguments: (va_list)args
+	 arguments: (va_list)args
 {
 	@throw [OFNotImplementedException newWithClass: isa
-					   andSelector: _cmd];
+					      selector: _cmd];
 }
 
 - reverse
 {
 	@throw [OFNotImplementedException newWithClass: isa
-					   andSelector: _cmd];
+					      selector: _cmd];
 }
 
 - upper
 {
 	@throw [OFNotImplementedException newWithClass: isa
-					   andSelector: _cmd];
+					      selector: _cmd];
 }
 
 - lower
 {
 	@throw [OFNotImplementedException newWithClass: isa
-					   andSelector: _cmd];
+					      selector: _cmd];
 }
 
 - replaceOccurrencesOfString: (OFString*)str
 		  withString: (OFString*)repl
 {
 	@throw [OFNotImplementedException newWithClass: isa
-					   andSelector: _cmd];
+					      selector: _cmd];
 }
 
 - removeLeadingWhitespaces
 {
 	@throw [OFNotImplementedException newWithClass: isa
-					   andSelector: _cmd];
+					      selector: _cmd];
 }
 
 - removeTrailingWhitespaces
 {
 	@throw [OFNotImplementedException newWithClass: isa
-					   andSelector: _cmd];
+					      selector: _cmd];
 }
 
 - removeLeadingAndTrailingWhitespaces
 {
 	@throw [OFNotImplementedException newWithClass: isa
-					   andSelector: _cmd];
+					      selector: _cmd];
 }
 @end