@@ -66,11 +66,11 @@
 - (instancetype)initWithSocket: (OFTCPSocket *)sock
 			server: (OFHTTPServer *)server
 		       request: (OFHTTPRequest *)request;
 @end
 
-@interface OFHTTPServer_Connection: OFObject <OFTCPSocketDelegate>
+@interface OFHTTPServerConnection: OFObject <OFTCPSocketDelegate>
 {
 @public
 	OFTCPSocket *_socket;
 	OFHTTPServer *_server;
 	OFTimer *_timer;
@@ -367,11 +367,11 @@
 
 	return _socket.fileDescriptorForWriting;
 }
 @end
 
-@implementation OFHTTPServer_Connection
+@implementation OFHTTPServerConnection
 - (instancetype)initWithSocket: (OFTCPSocket *)sock
 			server: (OFHTTPServer *)server
 {
 	self = [super init];
 
@@ -943,11 +943,11 @@
 #endif
 }
 
 - (void)of_handleAcceptedSocket: (OFTCPSocket *)acceptedSocket
 {
-	OFHTTPServer_Connection *connection = [[[OFHTTPServer_Connection alloc]
+	OFHTTPServerConnection *connection = [[[OFHTTPServerConnection alloc]
 	    initWithSocket: acceptedSocket
 		    server: self] autorelease];
 
 	acceptedSocket.delegate = connection;
 	[acceptedSocket asyncReadLine];