@@ -194,11 +194,11 @@
 {
 	OF_INVALID_INIT_METHOD
 }
 
 - (instancetype)initWithName: (OFString *)name
-		     address: (const of_socket_address_t *)address
+		     address: (const OFSocketAddress *)address
 			 TTL: (uint32_t)TTL
 {
 	self = [super initWithName: name
 			  DNSClass: OF_DNS_CLASS_IN
 			recordType: OF_DNS_RECORD_TYPE_A
@@ -207,11 +207,11 @@
 	_address = *address;
 
 	return self;
 }
 
-- (const of_socket_address_t *)address
+- (const OFSocketAddress *)address
 {
 	return &_address;
 }
 
 - (bool)isEqual: (id)object
@@ -233,11 +233,11 @@
 		return false;
 
 	if (record->_recordType != _recordType)
 		return false;
 
-	if (!of_socket_address_equal(&record->_address, &_address))
+	if (!OFSocketAddressEqual(&record->_address, &_address))
 		return false;
 
 	return true;
 }
 
@@ -250,11 +250,11 @@
 	OF_HASH_ADD_HASH(hash, _name.hash);
 	OF_HASH_ADD(hash, _DNSClass >> 8);
 	OF_HASH_ADD(hash, _DNSClass);
 	OF_HASH_ADD(hash, _recordType >> 8);
 	OF_HASH_ADD(hash, _recordType);
-	OF_HASH_ADD_HASH(hash, of_socket_address_hash(&_address));
+	OF_HASH_ADD_HASH(hash, OFSocketAddressHash(&_address));
 
 	OF_HASH_FINALIZE(hash);
 
 	return hash;
 }
@@ -265,12 +265,11 @@
 	    @"<%@:\n"
 	    @"\tName = %@\n"
 	    @"\tAddress = %@\n"
 	    @"\tTTL = %" PRIu32 "\n"
 	    @">",
-	    self.className, _name,
-	    of_socket_address_ip_string(&_address, NULL), _TTL];
+	    self.className, _name, OFSocketAddressString(&_address), _TTL];
 }
 @end
 
 @implementation OFAAAADNSResourceRecord
 - (instancetype)initWithName: (OFString *)name
@@ -280,11 +279,11 @@
 {
 	OF_INVALID_INIT_METHOD
 }
 
 - (instancetype)initWithName: (OFString *)name
-		     address: (const of_socket_address_t *)address
+		     address: (const OFSocketAddress *)address
 			 TTL: (uint32_t)TTL
 {
 	self = [super initWithName: name
 			  DNSClass: OF_DNS_CLASS_IN
 			recordType: OF_DNS_RECORD_TYPE_AAAA
@@ -293,11 +292,11 @@
 	_address = *address;
 
 	return self;
 }
 
-- (const of_socket_address_t *)address
+- (const OFSocketAddress *)address
 {
 	return &_address;
 }
 
 - (bool)isEqual: (id)object
@@ -319,11 +318,11 @@
 		return false;
 
 	if (record->_recordType != _recordType)
 		return false;
 
-	if (!of_socket_address_equal(&record->_address, &_address))
+	if (!OFSocketAddressEqual(&record->_address, &_address))
 		return false;
 
 	return true;
 }
 
@@ -336,11 +335,11 @@
 	OF_HASH_ADD_HASH(hash, _name.hash);
 	OF_HASH_ADD(hash, _DNSClass >> 8);
 	OF_HASH_ADD(hash, _DNSClass);
 	OF_HASH_ADD(hash, _recordType >> 8);
 	OF_HASH_ADD(hash, _recordType);
-	OF_HASH_ADD_HASH(hash, of_socket_address_hash(&_address));
+	OF_HASH_ADD_HASH(hash, OFSocketAddressHash(&_address));
 
 	OF_HASH_FINALIZE(hash);
 
 	return hash;
 }
@@ -351,12 +350,11 @@
 	    @"<%@:\n"
 	    @"\tName = %@\n"
 	    @"\tAddress = %@\n"
 	    @"\tTTL = %" PRIu32 "\n"
 	    @">",
-	    self.className, _name,
-	    of_socket_address_ip_string(&_address, NULL), _TTL];
+	    self.className, _name, OFSocketAddressString(&_address), _TTL];
 }
 @end
 
 @implementation OFCNAMEDNSResourceRecord
 @synthesize alias = _alias;