@@ -37,20 +37,20 @@
 	_boolValue = bool_;
 
 	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
 {
 	unsigned char value;
 
 	@try {
-		if (tagClass != OF_ASN1_TAG_CLASS_UNIVERSAL ||
-		    tagNumber != OF_ASN1_TAG_NUMBER_BOOLEAN || constructed)
+		if (tagClass != OFASN1TagClassUniversal ||
+		    tagNumber != OFASN1TagNumberBoolean || constructed)
 			@throw [OFInvalidArgumentException exception];
 
 		if (DEREncodedContents.itemSize != 1 ||
 		    DEREncodedContents.count != 1)
 			@throw [OFInvalidFormatException exception];
@@ -73,11 +73,11 @@
 }
 
 - (OFData *)ASN1DERRepresentation
 {
 	char buffer[] = {
-		OF_ASN1_TAG_NUMBER_BOOLEAN,
+		OFASN1TagNumberBoolean,
 		1,
 		(_boolValue ? 0xFF : 0x00)
 	};
 
 	return [OFData dataWithItems: buffer count: sizeof(buffer)];