@@ -168,15 +168,14 @@
 	return [components componentsJoinedByString: @"."];
 }
 
 static OF_KINDOF(OFDNSResourceRecord *)
 parseResourceRecord(OFString *name, of_dns_class_t DNSClass,
-    of_dns_resource_record_type_t recordType, uint32_t TTL,
-    const unsigned char *buffer, size_t length, size_t i, uint16_t dataLength)
+    of_dns_record_type_t recordType, uint32_t TTL, const unsigned char *buffer,
+    size_t length, size_t i, uint16_t dataLength)
 {
-	if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_A &&
-	    DNSClass == OF_DNS_CLASS_IN) {
+	if (recordType == OF_DNS_RECORD_TYPE_A && DNSClass == OF_DNS_CLASS_IN) {
 		of_socket_address_t address;
 
 		if (dataLength != 4)
 			@throw [OFInvalidServerReplyException exception];
 
@@ -189,11 +188,11 @@
 
 		return [[[OFADNSResourceRecord alloc]
 		    initWithName: name
 			 address: &address
 			     TTL: TTL] autorelease];
-	} else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_NS) {
+	} else if (recordType == OF_DNS_RECORD_TYPE_NS) {
 		size_t j = i;
 		OFString *authoritativeHost = parseName(buffer, length, &j,
 		    MAX_ALLOWED_POINTERS);
 
 		if (j != i + dataLength)
@@ -202,11 +201,11 @@
 		return [[[OFNSDNSResourceRecord alloc]
 			 initWithName: name
 			     DNSClass: DNSClass
 		    authoritativeHost: authoritativeHost
 				  TTL: TTL] autorelease];
-	} else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_CNAME) {
+	} else if (recordType == OF_DNS_RECORD_TYPE_CNAME) {
 		size_t j = i;
 		OFString *alias = parseName(buffer, length, &j,
 		    MAX_ALLOWED_POINTERS);
 
 		if (j != i + dataLength)
@@ -215,11 +214,11 @@
 		return [[[OFCNAMEDNSResourceRecord alloc]
 		    initWithName: name
 			DNSClass: DNSClass
 			   alias: alias
 			     TTL: TTL] autorelease];
-	} else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_SOA) {
+	} else if (recordType == OF_DNS_RECORD_TYPE_SOA) {
 		size_t j = i;
 		OFString *primaryNameServer = parseName(buffer, length, &j,
 		    MAX_ALLOWED_POINTERS);
 		OFString *responsiblePerson;
 		uint32_t serialNumber, refreshInterval, retryInterval;
@@ -256,11 +255,11 @@
 		       refreshInterval: refreshInterval
 			 retryInterval: retryInterval
 		    expirationInterval: expirationInterval
 				minTTL: minTTL
 				   TTL: TTL] autorelease];
-	} else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_PTR) {
+	} else if (recordType == OF_DNS_RECORD_TYPE_PTR) {
 		size_t j = i;
 		OFString *domainName = parseName(buffer, length, &j,
 		    MAX_ALLOWED_POINTERS);
 
 		if (j != i + dataLength)
@@ -269,11 +268,11 @@
 		return [[[OFPTRDNSResourceRecord alloc]
 		    initWithName: name
 			DNSClass: DNSClass
 		      domainName: domainName
 			     TTL: TTL] autorelease];
-	} else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_HINFO) {
+	} else if (recordType == OF_DNS_RECORD_TYPE_HINFO) {
 		size_t j = i;
 		OFString *CPU = parseString(buffer, length, &j);
 		OFString *OS;
 
 		if (j > i + dataLength)
@@ -288,11 +287,11 @@
 		    initWithName: name
 			DNSClass: DNSClass
 			     CPU: CPU
 			      OS: OS
 			     TTL: TTL] autorelease];
-	} else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_MX) {
+	} else if (recordType == OF_DNS_RECORD_TYPE_MX) {
 		uint16_t preference;
 		size_t j;
 		OFString *mailExchange;
 
 		if (dataLength < 2)
@@ -311,20 +310,20 @@
 			    initWithName: name
 				DNSClass: DNSClass
 			      preference: preference
 			    mailExchange: mailExchange
 				     TTL: TTL] autorelease];
-	} else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_TXT) {
+	} else if (recordType == OF_DNS_RECORD_TYPE_TXT) {
 		OFData *textData = [OFData dataWithItems: &buffer[i]
 						   count: dataLength];
 
 		return [[[OFTXTDNSResourceRecord alloc]
 		    initWithName: name
 			DNSClass: DNSClass
 			textData: textData
 			     TTL: TTL] autorelease];
-	} else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_RP) {
+	} else if (recordType == OF_DNS_RECORD_TYPE_RP) {
 		size_t j = i;
 		OFString *mailbox = parseName(buffer, length, &j,
 		    MAX_ALLOWED_POINTERS);
 		OFString *TXTDomainName;
 
@@ -341,11 +340,11 @@
 		    initWithName: name
 			DNSClass: DNSClass
 			 mailbox: mailbox
 		   TXTDomainName: TXTDomainName
 			     TTL: TTL] autorelease];
-	} else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_AAAA &&
+	} else if (recordType == OF_DNS_RECORD_TYPE_AAAA &&
 	    DNSClass == OF_DNS_CLASS_IN) {
 		of_socket_address_t address;
 
 		if (dataLength != 16)
 			@throw [OFInvalidServerReplyException exception];
@@ -363,11 +362,11 @@
 
 		return [[[OFAAAADNSResourceRecord alloc]
 		    initWithName: name
 			 address: &address
 			     TTL: TTL] autorelease];
-	} else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_SRV &&
+	} else if (recordType == OF_DNS_RECORD_TYPE_SRV &&
 	    DNSClass == OF_DNS_CLASS_IN) {
 		uint16_t priority, weight, port;
 		size_t j;
 		OFString *target;
 
@@ -409,11 +408,11 @@
 
 	for (uint_fast16_t j = 0; j < count; j++) {
 		OFString *name = parseName(buffer, length, i,
 		    MAX_ALLOWED_POINTERS);
 		of_dns_class_t DNSClass;
-		of_dns_resource_record_type_t recordType;
+		of_dns_record_type_t recordType;
 		uint32_t TTL;
 		uint16_t dataLength;
 		OFDNSResourceRecord *record;
 
 		if (*i + 10 > length)