@@ -82,51 +82,25 @@
 - initWithString: (OFString*)string
 {
 	return (id)[[OFMutableString_UTF8 alloc] initWithString: string];
 }
 
-- initWithUnicodeString: (const of_unichar_t*)string
-{
-	return (id)[[OFMutableString_UTF8 alloc] initWithUnicodeString: string];
-}
-
-- initWithUnicodeString: (const of_unichar_t*)string
-	      byteOrder: (of_byte_order_t)byteOrder
-{
-	return (id)[[OFMutableString_UTF8 alloc]
-	    initWithUnicodeString: string
-			byteOrder: byteOrder];
-}
-
-- initWithUnicodeString: (const of_unichar_t*)string
-		 length: (size_t)length
-{
-	return (id)[[OFMutableString_UTF8 alloc] initWithUnicodeString: string
-								length: length];
-}
-
-- initWithUnicodeString: (const of_unichar_t*)string
-	      byteOrder: (of_byte_order_t)byteOrder
-		 length: (size_t)length
-{
-	return (id)[[OFMutableString_UTF8 alloc]
-	    initWithUnicodeString: string
-			byteOrder: byteOrder
-			   length: length];
-}
-
-- initWithUTF16String: (const uint16_t*)string
-{
-	return (id)[[OFMutableString_UTF8 alloc] initWithUTF16String: string];
-}
-
-- initWithUTF16String: (const uint16_t*)string
-	    byteOrder: (of_byte_order_t)byteOrder
-{
-	return (id)[[OFMutableString_UTF8 alloc]
-	    initWithUTF16String: string
-		      byteOrder: byteOrder];
+- initWithCharacters: (const of_unichar_t*)characters
+	      length: (size_t)length
+{
+	return (id)[[OFMutableString_UTF8 alloc] initWithCharacters: characters
+							     length: length];
+}
+
+- initWithCharacters: (const of_unichar_t*)characters
+	      length: (size_t)length
+	   byteOrder: (of_byte_order_t)byteOrder
+{
+	return (id)[[OFMutableString_UTF8 alloc]
+	    initWithCharacters: characters
+			length: length
+		     byteOrder: byteOrder];
 }
 
 - initWithUTF16String: (const uint16_t*)string
 	       length: (size_t)length
 {
@@ -133,17 +107,17 @@
 	return (id)[[OFMutableString_UTF8 alloc] initWithUTF16String: string
 							      length: length];
 }
 
 - initWithUTF16String: (const uint16_t*)string
-	    byteOrder: (of_byte_order_t)byteOrder
 	       length: (size_t)length
+	    byteOrder: (of_byte_order_t)byteOrder
 {
 	return (id)[[OFMutableString_UTF8 alloc]
 	    initWithUTF16String: string
-		      byteOrder: byteOrder
-			 length: length];
+			 length: length
+		      byteOrder: byteOrder];
 }
 
 - initWithFormat: (OFConstantString*)format, ...
 {
 	id ret;
@@ -259,18 +233,18 @@
 		     wordMiddleTable: (const of_unichar_t *const[])middleTable
 		  wordStartTableSize: (size_t)startTableSize
 		 wordMiddleTableSize: (size_t)middleTableSize
 {
 	void *pool = objc_autoreleasePoolPush();
-	const of_unichar_t *string = [self unicodeString];
+	const of_unichar_t *characters = [self characters];
 	size_t i, length = [self length];
 	BOOL isStart = YES;
 
 	for (i = 0; i < length; i++) {
 		const of_unichar_t *const *table;
 		size_t tableSize;
-		of_unichar_t c = string[i];
+		of_unichar_t c = characters[i];
 
 		if (isStart) {
 			table = startTable;
 			tableSize = middleTableSize;
 		} else {
@@ -302,12 +276,12 @@
 	     atIndex: (size_t)index
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFString *string;
 
-	string = [OFString stringWithUnicodeString: &character
-					    length: 1];
+	string = [OFString stringWithCharacters: &character
+					 length: 1];
 
 	[self replaceCharactersInRange: of_range(index, 1)
 			    withString: string];
 
 	objc_autoreleasePoolPop(pool);
@@ -473,12 +447,12 @@
 			withString: (OFString*)replacement
 			   options: (int)options
 			     range: (of_range_t)range
 {
 	void *pool = objc_autoreleasePoolPush(), *pool2;
-	const of_unichar_t *unicodeString;
-	const of_unichar_t *searchString = [string unicodeString];
+	const of_unichar_t *characters;
+	const of_unichar_t *searchCharacters = [string characters];
 	size_t searchLength = [string length];
 	size_t replacementLength = [replacement length];
 	size_t i;
 
 	if (range.length > SIZE_MAX - range.location ||
@@ -489,14 +463,14 @@
 		objc_autoreleasePoolPop(pool);
 		return;
 	}
 
 	pool2 = objc_autoreleasePoolPush();
-	unicodeString = [self unicodeString];
+	characters = [self characters];
 
 	for (i = range.location; i <= range.length - searchLength; i++) {
-		if (memcmp(unicodeString + i, searchString,
+		if (memcmp(characters + i, searchCharacters,
 		    searchLength * sizeof(of_unichar_t)))
 			continue;
 
 		[self replaceCharactersInRange: of_range(i, searchLength)
 				    withString: replacement];
@@ -507,11 +481,11 @@
 		i += replacementLength - 1;
 
 		objc_autoreleasePoolPop(pool2);
 		pool2 = objc_autoreleasePoolPush();
 
-		unicodeString = [self unicodeString];
+		characters = [self characters];
 	}
 
 	objc_autoreleasePoolPop(pool);
 }