@@ -60,12 +60,12 @@
 	}
 
 	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();
 	OFMutableArray OF_GENERIC(OFNumber *) *subidentifiers;
@@ -74,13 +74,12 @@
 		const unsigned char *items = DEREncodedContents.items;
 		size_t count = DEREncodedContents.count;
 		unsigned long long value = 0;
 		uint_fast8_t bits = 0;
 
-		if (tagClass != OF_ASN1_TAG_CLASS_UNIVERSAL ||
-		    tagNumber != OF_ASN1_TAG_NUMBER_OBJECT_IDENTIFIER ||
-		    constructed)
+		if (tagClass != OFASN1TagClassUniversal ||
+		    tagNumber != OFASN1TagNumberObjectIdentifier || constructed)
 			@throw [OFInvalidArgumentException exception];
 
 		if (DEREncodedContents.itemSize != 1 || count == 0)
 			@throw [OFInvalidArgumentException exception];