@@ -271,11 +271,11 @@
 {
 	self = [super init];
 
 	@try {
 		size_t count = [string
-		    cStringLengthWithEncoding: OF_STRING_ENCODING_ASCII];
+		    cStringLengthWithEncoding: OFStringEncodingASCII];
 		const char *cString;
 
 		if (count % 2 != 0)
 			@throw [OFInvalidFormatException exception];
 
@@ -284,12 +284,11 @@
 		_items = of_alloc(count, 1);
 		_count = count;
 		_itemSize = 1;
 		_freeWhenDone = true;
 
-		cString = [string
-		    cStringWithEncoding: OF_STRING_ENCODING_ASCII];
+		cString = [string cStringWithEncoding: OFStringEncodingASCII];
 
 		for (size_t i = 0; i < count; i++) {
 			uint8_t c1 = cString[2 * i];
 			uint8_t c2 = cString[2 * i + 1];
 			uint8_t byte;
@@ -333,13 +332,12 @@
 
 	self = [(OFMutableData *)self initWithCapacity: string.length / 3];
 
 	@try {
 		if (!of_base64_decode((OFMutableData *)self,
-		    [string cStringWithEncoding: OF_STRING_ENCODING_ASCII],
-		    [string cStringLengthWithEncoding:
-		    OF_STRING_ENCODING_ASCII]))
+		    [string cStringWithEncoding: OFStringEncodingASCII],
+		    [string cStringLengthWithEncoding: OFStringEncodingASCII]))
 			@throw [OFInvalidFormatException exception];
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}