@@ -168,11 +168,11 @@
 		      target: (id)target
 		    selector: (SEL)selector
 		     context: (id)context;
 @end
 
-@interface OFDNSResolver_AsyncResolveSocketAddressesContext: OFObject
+@interface OFDNSResolverAsyncResolveSocketAddressesContext: OFObject
 {
 	OFString *_host;
 	id _delegate;
 	OFMutableArray OF_GENERIC(OF_KINDOF(OFDNSResourceRecord *)) *_records;
 	OFDNSResolver *_resolver;
@@ -210,11 +210,11 @@
      additionalRecords: (OFDictionary *)additionalRecords
 	       context: (OFNumber *)context
 	     exception: (id)exception;
 @end
 
-@interface OFDNSResolver_ResolveSocketAddressesDelegate: OFObject
+@interface OFDNSResolverResolveSocketAddressesDelegate: OFObject
     <OFDNSResolverDelegate>
 {
 @public
 	bool _done;
 	OFData *_socketAddresses;
@@ -832,11 +832,11 @@
 
 	[super dealloc];
 }
 @end
 
-@implementation OFDNSResolver_AsyncResolveSocketAddressesContext
+@implementation OFDNSResolverAsyncResolveSocketAddressesContext
 - (instancetype)initWithHost: (OFString *)host
 		    delegate: (id)delegate
 {
 	self = [super init];
 
@@ -1111,11 +1111,11 @@
 	if (_expectedResponses == 0)
 		[self done];
 }
 @end
 
-@implementation OFDNSResolver_ResolveSocketAddressesDelegate
+@implementation OFDNSResolverResolveSocketAddressesDelegate
 - (void)dealloc
 {
 	[_socketAddresses release];
 	[_exception release];
 
@@ -2067,11 +2067,11 @@
 			       runLoopMode: (of_run_loop_mode_t)runLoopMode
 				  delegate: (id <OFDNSResolverDelegate>)delegate
 {
 	OFArray OF_GENERIC(OFString *) *aliases;
 	void *pool;
-	OFDNSResolver_AsyncResolveSocketAddressesContext *context;
+	OFDNSResolverAsyncResolveSocketAddressesContext *context;
 
 	@try {
 		of_socket_address_t address =
 		    of_socket_address_parse_ip(host, 0);
 		OFData *addresses = nil;
@@ -2186,11 +2186,11 @@
 		return;
 	}
 
 	pool = objc_autoreleasePoolPush();
 
-	context = [[[OFDNSResolver_AsyncResolveSocketAddressesContext alloc]
+	context = [[[OFDNSResolverAsyncResolveSocketAddressesContext alloc]
 	    initWithHost: host
 		delegate: delegate] autorelease];
 
 	switch (addressFamily) {
 	case OF_SOCKET_ADDRESS_FAMILY_IPV4:
@@ -2252,14 +2252,14 @@
 			    addressFamily: (of_socket_address_family_t)
 					       addressFamily
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFRunLoop *runLoop = [OFRunLoop currentRunLoop];
-	OFDNSResolver_ResolveSocketAddressesDelegate *delegate;
+	OFDNSResolverResolveSocketAddressesDelegate *delegate;
 	OFData *ret;
 
-	delegate = [[[OFDNSResolver_ResolveSocketAddressesDelegate
+	delegate = [[[OFDNSResolverResolveSocketAddressesDelegate
 	    alloc] init] autorelease];
 
 	[self asyncResolveSocketAddressesForHost: host
 				   addressFamily: addressFamily
 				     runLoopMode: resolveRunLoopMode