@@ -38,11 +38,11 @@
 		void *pool = objc_autoreleasePoolPush();
 		const char *cString = string.UTF8String;
 		size_t length = string.UTF8StringLength;
 
 		for (size_t i = 0; i < length; i++) {
-			if (of_ascii_isalnum(cString[i]))
+			if (OFASCIIIsAlnum(cString[i]))
 				continue;
 
 			switch (cString[i]) {
 			case ' ':
 			case '\'':
@@ -71,30 +71,29 @@
 	}
 
 	return self;
 }
 
-- (instancetype)initWithTagClass: (of_asn1_tag_class_t)tagClass
-		       tagNumber: (of_asn1_tag_number_t)tagNumber
+- (instancetype)initWithTagClass: (OFASN1TagClass)tagClass
+		       tagNumber: (OFASN1TagNumber)tagNumber
 		     constructed: (bool)constructed
 	      DEREncodedContents: (OFData *)DEREncodedContents
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFString *printableString;
 
 	@try {
-		if (tagClass != OF_ASN1_TAG_CLASS_UNIVERSAL ||
-		    tagNumber != OF_ASN1_TAG_NUMBER_PRINTABLE_STRING ||
-		    constructed)
+		if (tagClass != OFASN1TagClassUniversal ||
+		    tagNumber != OFASN1TagNumberPrintableString || constructed)
 			@throw [OFInvalidArgumentException exception];
 
 		if (DEREncodedContents.itemSize != 1)
 			@throw [OFInvalidArgumentException exception];
 
 		printableString = [OFString
 		    stringWithCString: DEREncodedContents.items
-			     encoding: OF_STRING_ENCODING_ASCII
+			     encoding: OFStringEncodingASCII
 			       length: DEREncodedContents.count];
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}