@@ -180,19 +180,19 @@
 		const char *cString;
 		size_t i;
 
 		itemSize = 1;
 		count = [string
-		    lengthOfBytesUsingEncoding: OF_STRING_ENCODING_ASCII];
+		    cStringLengthWithEncoding: OF_STRING_ENCODING_ASCII];
 
 		if (count & 1)
 			@throw [OFInvalidFormatException
 			    exceptionWithClass: [self class]];
 
 		count >>= 1;
 		cString = [string
-		    cStringUsingEncoding: OF_STRING_ENCODING_ASCII];
+		    cStringWithEncoding: OF_STRING_ENCODING_ASCII];
 		items = [self allocMemoryWithSize: count];
 
 		for (i = 0; i < count; i++) {
 			uint8_t c1 = cString[2 * i];
 			uint8_t c2 = cString[2 * i + 1];
@@ -233,13 +233,13 @@
 	self = [super init];
 
 	@try {
 		itemSize = 1;
 
-		if (!of_base64_decode(self, [string cStringUsingEncoding:
+		if (!of_base64_decode(self, [string cStringWithEncoding:
 		    OF_STRING_ENCODING_ASCII], [string
-		    lengthOfBytesUsingEncoding: OF_STRING_ENCODING_ASCII])) {
+		    cStringLengthWithEncoding: OF_STRING_ENCODING_ASCII])) {
 			Class c = [self class];
 			[self release];
 			@throw [OFInvalidFormatException exceptionWithClass: c];
 		}
 	} @catch (id e) {
@@ -267,12 +267,12 @@
 				      selector: _cmd];
 
 		stringValue = [element stringValue];
 
 		if (!of_base64_decode(self, [stringValue
-		    cStringUsingEncoding: OF_STRING_ENCODING_ASCII],
-		    [stringValue lengthOfBytesUsingEncoding:
+		    cStringWithEncoding: OF_STRING_ENCODING_ASCII],
+		    [stringValue cStringLengthWithEncoding:
 		    OF_STRING_ENCODING_ASCII]))
 			@throw [OFInvalidFormatException
 			    exceptionWithClass: [self class]];
 
 		objc_autoreleasePoolPop(pool);