@@ -276,13 +276,13 @@
 
 	length = strlen(UTF8String);
 	string = of_alloc_object([OFString_UTF8 class],
 	    length + 1, 1, &storage);
 
-	return (id)[string _initWithUTF8String: UTF8String
-					length: length
-				       storage: storage];
+	return (id)[string OF_initWithUTF8String: UTF8String
+					  length: length
+					 storage: storage];
 }
 
 - initWithUTF8String: (const char*)UTF8String
 	      length: (size_t)UTF8StringLength
 {
@@ -290,13 +290,13 @@
 	void *storage;
 
 	string = of_alloc_object([OFString_UTF8 class],
 	    UTF8StringLength + 1, 1, &storage);
 
-	return (id)[string _initWithUTF8String: UTF8String
-					length: UTF8StringLength
-				       storage: storage];
+	return (id)[string OF_initWithUTF8String: UTF8String
+					  length: UTF8StringLength
+					 storage: storage];
 }
 
 - initWithUTF8StringNoCopy: (const char*)UTF8String
 	      freeWhenDone: (BOOL)freeWhenDone
 {
@@ -315,13 +315,13 @@
 
 		length = strlen(cString);
 		string = of_alloc_object([OFString_UTF8 class],
 		    length + 1, 1, &storage);
 
-		return (id)[string _initWithUTF8String: cString
-						length: length
-					       storage: storage];
+		return (id)[string OF_initWithUTF8String: cString
+						  length: length
+						 storage: storage];
 	}
 
 	return (id)[[OFString_UTF8 alloc] initWithCString: cString
 						 encoding: encoding];
 }
@@ -335,13 +335,13 @@
 		void *storage;
 
 		string = of_alloc_object([OFString_UTF8 class],
 		    cStringLength + 1, 1, &storage);
 
-		return (id)[string _initWithUTF8String: cString
-						length: cStringLength
-					       storage: storage];
+		return (id)[string OF_initWithUTF8String: cString
+						  length: cStringLength
+						 storage: storage];
 	}
 
 	return (id)[[OFString_UTF8 alloc] initWithCString: cString
 						 encoding: encoding
 						   length: cStringLength];