@@ -293,15 +293,15 @@
 	[self finishInitialization];
 
 	return [self UTF8String];
 }
 
-- (const char*)cStringWithEncoding: (of_string_encoding_t)encoding
+- (const char*)cStringUsingEncoding: (of_string_encoding_t)encoding
 {
 	[self finishInitialization];
 
-	return [self cStringWithEncoding: encoding];
+	return [self cStringUsingEncoding: encoding];
 }
 
 - (size_t)length
 {
 	[self finishInitialization];
@@ -314,15 +314,15 @@
 	[self finishInitialization];
 
 	return [self UTF8StringLength];
 }
 
-- (size_t)cStringLengthWithEncoding: (of_string_encoding_t)encoding
+- (size_t)lengthOfBytesUsingEncoding: (of_string_encoding_t)encoding
 {
 	[self finishInitialization];
 
-	return [self cStringLengthWithEncoding: encoding];
+	return [self lengthOfBytesUsingEncoding: encoding];
 }
 
 - (of_comparison_result_t)caseInsensitiveCompare: (OFString*)otherString
 {
 	[self finishInitialization];