@@ -29,11 +29,11 @@
  *
  * @param socket The socket which connected
  * @param exception An exception which occurred while connecting the socket or
  *		    nil on success
  */
-typedef void (^of_tcpsocket_async_connect_block_t)(OFTCPSocket *socket,
+typedef void (^of_tcp_socket_async_connect_block_t)(OFTCPSocket *socket,
     OFException *exception);
 
 /*!
  * @brief A block which is called when the socket accepted a connection.
  *
@@ -42,11 +42,11 @@
  * @param exception An exception which occurred while accepting the socket or
  *		    nil on success
  * @return A bool whether the same block should be used for the next incoming
  *	   connection
  */
-typedef bool (^of_tcpsocket_async_accept_block_t)(OFTCPSocket *socket,
+typedef bool (^of_tcp_socket_async_accept_block_t)(OFTCPSocket *socket,
     OFTCPSocket *acceptedSocket, OFException *exception);
 #endif
 
 /*!
  * @brief A class which provides functions to create and use TCP sockets.
@@ -161,11 +161,11 @@
  * @param port The port on the host to connect to
  * @param block The block to execute once the connection has been established
  */
 - (void)asyncConnectToHost: (OFString*)host
 		      port: (uint16_t)port
-		     block: (of_tcpsocket_async_connect_block_t)block;
+		     block: (of_tcp_socket_async_connect_block_t)block;
 # endif
 #endif
 
 /*!
  * @brief Bind the socket to the specified host and port.
@@ -218,11 +218,11 @@
  *
  * @param block The block to execute when a new connection has been accepted.
  *		Returns whether the next incoming connection should be accepted
  *		by the specified block as well.
  */
-- (void)asyncAcceptWithBlock: (of_tcpsocket_async_accept_block_t)block;
+- (void)asyncAcceptWithBlock: (of_tcp_socket_async_accept_block_t)block;
 #endif
 
 /*!
  * @brief Enable or disable keep alives for the connection.
  *