@@ -853,11 +853,11 @@
 	struct stat st;
 
 	@try {
 		OFFile *file;
 
-		if (stat([path cStringUsingEncoding: OF_STRING_ENCODING_NATIVE],
+		if (stat([path cStringWithEncoding: OF_STRING_ENCODING_NATIVE],
 		    &st) == -1)
 			@throw [OFOpenFileFailedException
 			    exceptionWithClass: [self class]
 					  path: path
 					  mode: @"rb"];
@@ -987,11 +987,11 @@
 	}
 
 	return self;
 }
 
-- (const char*)cStringUsingEncoding: (of_string_encoding_t)encoding
+- (const char*)cStringWithEncoding: (of_string_encoding_t)encoding
 {
 	const of_unichar_t *characters = [self characters];
 	size_t i, length = [self length];
 	OFObject *object = [[[OFObject alloc] init] autorelease];
 	char *cString;
@@ -1088,20 +1088,20 @@
 	return cString;
 }
 
 - (const char*)UTF8String
 {
-	return [self cStringUsingEncoding: OF_STRING_ENCODING_UTF_8];
+	return [self cStringWithEncoding: OF_STRING_ENCODING_UTF_8];
 }
 
 - (size_t)length
 {
 	[self doesNotRecognizeSelector: _cmd];
 	abort();
 }
 
-- (size_t)lengthOfBytesUsingEncoding: (of_string_encoding_t)encoding
+- (size_t)cStringLengthWithEncoding: (of_string_encoding_t)encoding
 {
 	switch (encoding) {
 	case OF_STRING_ENCODING_UTF_8:;
 		const of_unichar_t *characters;
 		size_t i, length, UTF8StringLength = 0;
@@ -1132,11 +1132,11 @@
 	}
 }
 
 - (size_t)UTF8StringLength
 {
-	return [self lengthOfBytesUsingEncoding: OF_STRING_ENCODING_UTF_8];
+	return [self cStringLengthWithEncoding: OF_STRING_ENCODING_UTF_8];
 }
 
 - (of_unichar_t)characterAtIndex: (size_t)index
 {
 	[self doesNotRecognizeSelector: _cmd];