@@ -45,11 +45,11 @@
  * FIXME: Key normalization replaces headers like "DNT" with "Dnt".
  * FIXME: Errors are not reported to the user.
  */
 
 @interface OFHTTPServer ()
-- (bool)OF_socket: (OFTCPSocket *)socket
+- (bool)of_socket: (OFTCPSocket *)socket
   didAcceptSocket: (OFTCPSocket *)clientSocket
 	exception: (OFException *)exception;
 @end
 
 static const char *
@@ -208,11 +208,11 @@
 	[_request release];
 
 	[super dealloc];
 }
 
-- (void)OF_sendHeaders
+- (void)of_sendHeaders
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFMutableDictionary OF_GENERIC(OFString *, OFString *) *headers;
 	OFEnumerator *keyEnumerator, *valueEnumerator;
 	OFString *key, *value;
@@ -261,11 +261,11 @@
 
 	if (_socket == nil)
 		@throw [OFNotOpenException exceptionWithObject: self];
 
 	if (!_headersSent)
-		[self OF_sendHeaders];
+		[self of_sendHeaders];
 
 	if (!_chunked) {
 		[_socket writeBuffer: buffer
 			      length: length];
 		return;
@@ -286,11 +286,11 @@
 	if (_socket == nil)
 		@throw [OFNotOpenException exceptionWithObject: self];
 
 	@try {
 		if (!_headersSent)
-			[self OF_sendHeaders];
+			[self of_sendHeaders];
 
 		if (_chunked)
 			[_socket writeBuffer: "0\r\n\r\n"
 				      length: 5];
 	} @catch (OFWriteFailedException *e) {
@@ -717,11 +717,11 @@
 	_port = [_listeningSocket bindToHost: _host
 					port: _port];
 	[_listeningSocket listen];
 
 	[_listeningSocket asyncAcceptWithTarget: self
-				       selector: @selector(OF_socket:
+				       selector: @selector(of_socket:
 						     didAcceptSocket:
 						     exception:)];
 }
 
 - (void)stop
@@ -729,11 +729,11 @@
 	[_listeningSocket cancelAsyncRequests];
 	[_listeningSocket release];
 	_listeningSocket = nil;
 }
 
-- (bool)OF_socket: (OFTCPSocket *)socket
+- (bool)of_socket: (OFTCPSocket *)socket
   didAcceptSocket: (OFTCPSocket *)clientSocket
 	exception: (OFException *)exception
 {
 	OFHTTPServer_Connection *connection;