@@ -71,17 +71,17 @@
     const of_socket_address_t **address,
     of_socket_address_family_t addressFamily)
 {
 	switch ([record recordType]) {
 #ifdef OF_HAVE_IPV6
-	case OF_DNS_RESOURCE_RECORD_TYPE_AAAA:
+	case OF_DNS_RECORD_TYPE_AAAA:
 		if (addressFamily != OF_SOCKET_ADDRESS_FAMILY_IPV6 &&
 		    addressFamily != OF_SOCKET_ADDRESS_FAMILY_ANY)
 			return false;
 		break;
 #endif
-	case OF_DNS_RESOURCE_RECORD_TYPE_A:
+	case OF_DNS_RECORD_TYPE_A:
 		if (addressFamily != OF_SOCKET_ADDRESS_FAMILY_IPV4 &&
 		    addressFamily != OF_SOCKET_ADDRESS_FAMILY_ANY)
 			return false;
 		break;
 	default:
@@ -168,11 +168,11 @@
 	if (_addressFamily == OF_SOCKET_ADDRESS_FAMILY_IPV6 ||
 	    _addressFamily == OF_SOCKET_ADDRESS_FAMILY_ANY) {
 		OFDNSQuery *query = [OFDNSQuery
 		    queryWithDomainName: domainName
 			       DNSClass: OF_DNS_CLASS_IN
-			     recordType: OF_DNS_RESOURCE_RECORD_TYPE_AAAA];
+			     recordType: OF_DNS_RECORD_TYPE_AAAA];
 		_numExpectedResponses++;
 		[_resolver asyncPerformQuery: query
 				 runLoopMode: _runLoopMode
 				    delegate: self];
 	}
@@ -181,11 +181,11 @@
 	if (_addressFamily == OF_SOCKET_ADDRESS_FAMILY_IPV4 ||
 	    _addressFamily == OF_SOCKET_ADDRESS_FAMILY_ANY) {
 		OFDNSQuery *query = [OFDNSQuery
 		    queryWithDomainName: domainName
 			       DNSClass: OF_DNS_CLASS_IN
-			     recordType: OF_DNS_RESOURCE_RECORD_TYPE_A];
+			     recordType: OF_DNS_RECORD_TYPE_A];
 		_numExpectedResponses++;
 		[_resolver asyncPerformQuery: query
 				 runLoopMode: _runLoopMode
 				    delegate: self];
 	}
@@ -218,11 +218,11 @@
 		if (addressForRecord(record, &address, _addressFamily)) {
 			[_addresses addItem: address];
 			continue;
 		}
 
-		if ([record recordType] != OF_DNS_RESOURCE_RECORD_TYPE_CNAME)
+		if ([record recordType] != OF_DNS_RECORD_TYPE_CNAME)
 			continue;
 
 		/* FIXME: Check if it's already in answers */
 		CNAMEQuery = [OFDNSQuery queryWithDomainName: [record alias]
 						    DNSClass: OF_DNS_CLASS_IN