Index: src/OFMutableString.h
==================================================================
--- src/OFMutableString.h
+++ src/OFMutableString.h
@@ -42,20 +42,20 @@
  *
  * \param UTF8String A UTF-8 encoded C string to append
  * \param UTF8StringLength The length of the UTF-8 encoded C string
  */
 - (void)appendUTF8String: (const char*)UTF8String
-	      withLength: (size_t)UTF8StringLength;
+		  length: (size_t)UTF8StringLength;
 
 /**
  * \brief Appends a C string with the specified encoding to the OFMutableString.
  *
  * \param cString A C string to append
  * \param encoding The encoding of the C string
  */
 - (void)appendCString: (const char*)cString
-	 withEncoding: (of_string_encoding_t)encoding;
+	     encoding: (of_string_encoding_t)encoding;
 
 /**
  * \brief Appends a C string with the specified encoding and length to the
  *	  OFMutableString.
  *
@@ -62,11 +62,11 @@
  * \param cString A C string to append
  * \param encoding The encoding of the C string
  * \param cStringLength The length of the UTF-8 encoded C string
  */
 - (void)appendCString: (const char*)cString
-	 withEncoding: (of_string_encoding_t)encoding
+	     encoding: (of_string_encoding_t)encoding
 	       length: (size_t)cStringLength;
 
 /**
  * \brief Appends another OFString to the OFMutableString.
  *
@@ -92,11 +92,11 @@
  *
  * \param format A format string which generates the string to append
  * \param arguments The arguments used in the format string
  */
 - (void)appendFormat: (OFConstantString*)format
-       withArguments: (va_list)arguments;
+	   arguments: (va_list)arguments;
 
 /**
  * \brief Prepends another OFString to the OFMutableString.
  *
  * \param string An OFString to prepend

Index: src/OFMutableString.m
==================================================================
--- src/OFMutableString.m
+++ src/OFMutableString.m
@@ -313,11 +313,11 @@
 
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)appendUTF8String: (const char*)UTF8String
-	      withLength: (size_t)UTF8StringLength
+		  length: (size_t)UTF8StringLength
 {
 	void *pool = objc_autoreleasePoolPush();
 
 	[self appendString: [OFString stringWithUTF8String: UTF8String
 						    length: UTF8StringLength]];
@@ -324,11 +324,11 @@
 
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)appendCString: (const char*)cString
-	 withEncoding: (of_string_encoding_t)encoding
+	     encoding: (of_string_encoding_t)encoding
 {
 	void *pool = objc_autoreleasePoolPush();
 
 	[self appendString: [OFString stringWithCString: cString
 					       encoding: encoding]];
@@ -335,11 +335,11 @@
 
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)appendCString: (const char*)cString
-	 withEncoding: (of_string_encoding_t)encoding
+	     encoding: (of_string_encoding_t)encoding
 	       length: (size_t)cStringLength
 {
 	void *pool = objc_autoreleasePoolPush();
 
 	[self appendString: [OFString stringWithCString: cString
@@ -359,16 +359,16 @@
 {
 	va_list arguments;
 
 	va_start(arguments, format);
 	[self appendFormat: format
-	     withArguments: arguments];
+		 arguments: arguments];
 	va_end(arguments);
 }
 
 - (void)appendFormat: (OFConstantString*)format
-       withArguments: (va_list)arguments
+	   arguments: (va_list)arguments
 {
 	char *UTF8String;
 	int UTF8StringLength;
 
 	if (format == nil)
@@ -381,11 +381,11 @@
 		@throw [OFInvalidFormatException
 		    exceptionWithClass: [self class]];
 
 	@try {
 		[self appendUTF8String: UTF8String
-			    withLength: UTF8StringLength];
+				length: UTF8StringLength];
 	} @finally {
 		free(UTF8String);
 	}
 }
 

Index: src/OFString+XMLUnescaping.m
==================================================================
--- src/OFString+XMLUnescaping.m
+++ src/OFString+XMLUnescaping.m
@@ -98,39 +98,39 @@
 	inEntity = NO;
 
 	for (i = 0; i < length; i++) {
 		if (!inEntity && string[i] == '&') {
 			[ret appendUTF8String: string + last
-				   withLength: i - last];
+				       length: i - last];
 
 			last = i + 1;
 			inEntity = YES;
 		} else if (inEntity && string[i] == ';') {
 			const char *entity = string + last;
 			size_t entityLength = i - last;
 
 			if (entityLength == 2 && !memcmp(entity, "lt", 2))
 				[ret appendCString: "<"
-				      withEncoding: OF_STRING_ENCODING_ASCII
+					  encoding: OF_STRING_ENCODING_ASCII
 					    length: 1];
 			else if (entityLength == 2 && !memcmp(entity, "gt", 2))
 				[ret appendCString: ">"
-				      withEncoding: OF_STRING_ENCODING_ASCII
+					  encoding: OF_STRING_ENCODING_ASCII
 					    length: 1];
 			else if (entityLength == 4 &&
 			    !memcmp(entity, "quot", 4))
 				[ret appendCString: "\""
-				      withEncoding: OF_STRING_ENCODING_ASCII
+					  encoding: OF_STRING_ENCODING_ASCII
 					    length: 1];
 			else if (entityLength == 4 &&
 			    !memcmp(entity, "apos", 4))
 				[ret appendCString: "'"
-				      withEncoding: OF_STRING_ENCODING_ASCII
+					  encoding: OF_STRING_ENCODING_ASCII
 					    length: 1];
 			else if (entityLength == 3 && !memcmp(entity, "amp", 3))
 				[ret appendCString: "&"
-				      withEncoding: OF_STRING_ENCODING_ASCII
+					  encoding: OF_STRING_ENCODING_ASCII
 					    length: 1];
 			else if (entity[0] == '#') {
 				void *pool;
 				OFString *tmp;
 
@@ -174,11 +174,11 @@
 	if (inEntity)
 		@throw [OFInvalidEncodingException
 		    exceptionWithClass: [self class]];
 
 	[ret appendUTF8String: string + last
-		   withLength: i - last];
+		       length: i - last];
 
 	[ret makeImmutable];
 
 	return ret;
 }
@@ -201,39 +201,39 @@
 	inEntity = NO;
 
 	for (i = 0; i < length; i++) {
 		if (!inEntity && string[i] == '&') {
 			[ret appendUTF8String: string + last
-				   withLength: i - last];
+				       length: i - last];
 
 			last = i + 1;
 			inEntity = YES;
 		} else if (inEntity && string[i] == ';') {
 			const char *entity = string + last;
 			size_t entityLength = i - last;
 
 			if (entityLength == 2 && !memcmp(entity, "lt", 2))
 				[ret appendCString: "<"
-				      withEncoding: OF_STRING_ENCODING_ASCII
+					  encoding: OF_STRING_ENCODING_ASCII
 					    length: 1];
 			else if (entityLength == 2 && !memcmp(entity, "gt", 2))
 				[ret appendCString: ">"
-				      withEncoding: OF_STRING_ENCODING_ASCII
+					  encoding: OF_STRING_ENCODING_ASCII
 					    length: 1];
 			else if (entityLength == 4 &&
 			    !memcmp(entity, "quot", 4))
 				[ret appendCString: "\""
-				      withEncoding: OF_STRING_ENCODING_ASCII
+					  encoding: OF_STRING_ENCODING_ASCII
 					    length: 1];
 			else if (entityLength == 4 &&
 			    !memcmp(entity, "apos", 4))
 				[ret appendCString: "'"
-				      withEncoding: OF_STRING_ENCODING_ASCII
+					  encoding: OF_STRING_ENCODING_ASCII
 					    length: 1];
 			else if (entityLength == 3 && !memcmp(entity, "amp", 3))
 				[ret appendCString: "&"
-				      withEncoding: OF_STRING_ENCODING_ASCII
+					  encoding: OF_STRING_ENCODING_ASCII
 					    length: 1];
 			else if (entity[0] == '#') {
 				void *pool;
 				OFString *tmp;
 
@@ -274,13 +274,13 @@
 	if (inEntity)
 		@throw [OFInvalidEncodingException
 		    exceptionWithClass: [self class]];
 
 	[ret appendUTF8String: string + last
-		   withLength: i - last];
+		       length: i - last];
 
 	[ret makeImmutable];
 
 	return ret;
 }
 #endif
 @end

Index: src/base64.m
==================================================================
--- src/base64.m
+++ src/base64.m
@@ -58,11 +58,11 @@
 		tb[1] = of_base64_encode_table[(sb & 0x03F000) >> 12];
 		tb[2] = of_base64_encode_table[(sb & 0x000FC0) >> 6];
 		tb[3] = of_base64_encode_table[sb & 0x00003F];
 
 		[ret appendCString: tb
-		      withEncoding: OF_STRING_ENCODING_ASCII
+			  encoding: OF_STRING_ENCODING_ASCII
 			    length: 4];
 	}
 
 	switch (rest) {
 	case 1:
@@ -69,11 +69,11 @@
 		tb[0] = of_base64_encode_table[buffer[i] >> 2];
 		tb[1] = of_base64_encode_table[(buffer[i] & 3) << 4];
 		tb[2] = tb[3] = '=';
 
 		[ret appendCString: tb
-		      withEncoding: OF_STRING_ENCODING_ASCII
+			  encoding: OF_STRING_ENCODING_ASCII
 			    length: 4];
 
 		break;
 	case 2:
 		sb = (buffer[i] << 16) | (buffer[i + 1] << 8);
@@ -82,11 +82,11 @@
 		tb[1] = of_base64_encode_table[(sb & 0x03F000) >> 12];
 		tb[2] = of_base64_encode_table[(sb & 0x000FC0) >> 6];
 		tb[3] = '=';
 
 		[ret appendCString: tb
-		      withEncoding: OF_STRING_ENCODING_ASCII
+			  encoding: OF_STRING_ENCODING_ASCII
 			    length: 4];
 
 		break;
 	}
 

Index: tests/OFStringTests.m
==================================================================
--- tests/OFStringTests.m
+++ tests/OFStringTests.m
@@ -178,13 +178,13 @@
 	    stringWithContentsOfURL: [OFURL URLWithString:
 					 @"file://testfile.txt"]
 			   encoding: OF_STRING_ENCODING_ISO_8859_1]) &&
 	    [is isEqual: @"testäöü"])
 
-	TEST(@"-[appendUTFString:withLength:]",
+	TEST(@"-[appendUTFString:length:]",
 	    R([s[0] appendUTF8String: "foo\xEF\xBB\xBF" "barqux" + 3
-			  withLength: 6]) && [s[0] isEqual: @"foobar"])
+			      length: 6]) && [s[0] isEqual: @"foobar"])
 
 	EXPECT_EXCEPTION(@"Detection of invalid UTF-8 encoding #1",
 	    OFInvalidEncodingException,
 	    [OFString stringWithUTF8String: "\xE0\x80"])
 	EXPECT_EXCEPTION(@"Detection of invalid UTF-8 encoding #2",