@@ -774,11 +774,11 @@
 		free(s->freeWhenDone);
 
 	[super dealloc];
 }
 
-- (const char*)cStringUsingEncoding: (of_string_encoding_t)encoding
+- (const char*)cStringWithEncoding: (of_string_encoding_t)encoding
 {
 	switch (encoding) {
 	case OF_STRING_ENCODING_UTF_8:
 		return s->cString;
 	case OF_STRING_ENCODING_ASCII:
@@ -786,11 +786,11 @@
 			@throw [OFInvalidEncodingException
 			    exceptionWithClass: [self class]];
 
 		return s->cString;
 	default:
-		return [super cStringUsingEncoding: encoding];
+		return [super cStringWithEncoding: encoding];
 	}
 }
 
 - (const char*)UTF8String
 {
@@ -800,18 +800,18 @@
 - (size_t)length
 {
 	return s->length;
 }
 
-- (size_t)lengthOfBytesUsingEncoding: (of_string_encoding_t)encoding
+- (size_t)cStringLengthWithEncoding: (of_string_encoding_t)encoding
 {
 	switch (encoding) {
 	case OF_STRING_ENCODING_UTF_8:
 	case OF_STRING_ENCODING_ASCII:
 		return s->cStringLength;
 	default:
-		return [super lengthOfBytesUsingEncoding: encoding];
+		return [super cStringLengthWithEncoding: encoding];
 	}
 }
 
 - (size_t)UTF8StringLength
 {