@@ -34,13 +34,12 @@
  * @param sender The address of the sender of the packet
  * @param exception An exception which occurred while receiving or `nil` on
  *		    success
  * @return A bool whether the same block should be used for the next receive
  */
-typedef bool (^of_datagram_socket_async_receive_block_t)(
-    size_t length, const of_socket_address_t *_Nonnull sender,
-    id _Nullable exception);
+typedef bool (^OFDatagramSocketAsyncReceiveBlock)(size_t length,
+    const of_socket_address_t *_Nonnull sender, id _Nullable exception);
 
 /**
  * @brief A block which is called when a packet has been sent.
  *
  * @param data The data which was sent
@@ -47,11 +46,11 @@
  * @param receiver The receiver for the packet
  * @param exception An exception which occurred while reading or `nil` on
  *		    success
  * @return The data to repeat the send with or nil if it should not repeat
  */
-typedef OFData *_Nullable (^of_datagram_socket_async_send_data_block_t)(
+typedef OFData *_Nullable (^OFDatagramSocketAsyncSendDataBlock)(
     OFData *_Nonnull data, const of_socket_address_t *_Nonnull receiver,
     id _Nullable exception);
 #endif
 
 /**
@@ -202,11 +201,11 @@
  *		the datagram received next, you need to return false from the
  *		method.
  */
 - (void)asyncReceiveIntoBuffer: (void *)buffer
 			length: (size_t)length
-			 block: (of_datagram_socket_async_receive_block_t)block;
+			 block: (OFDatagramSocketAsyncReceiveBlock)block;
 
 /**
  * @brief Asynchronously receives a datagram and stores it into the specified
  *	  buffer.
  *
@@ -223,11 +222,11 @@
  *		method.
  */
 - (void)asyncReceiveIntoBuffer: (void *)buffer
 			length: (size_t)length
 		   runLoopMode: (of_run_loop_mode_t)runLoopMode
-			 block: (of_datagram_socket_async_receive_block_t)block;
+			 block: (OFDatagramSocketAsyncReceiveBlock)block;
 #endif
 
 /**
  * @brief Sends the specified datagram to the specified address.
  *
@@ -273,11 +272,11 @@
  *		return the data for the next send with the same callback or nil
  *		if it should not repeat.
  */
 - (void)asyncSendData: (OFData *)data
 	     receiver: (const of_socket_address_t *)receiver
-		block: (of_datagram_socket_async_send_data_block_t)block;
+		block: (OFDatagramSocketAsyncSendDataBlock)block;
 
 /**
  * @brief Asynchronously sends the specified datagram to the specified address.
  *
  * @param data The data to send as a datagram
@@ -289,11 +288,11 @@
  *		if it should not repeat.
  */
 - (void)asyncSendData: (OFData *)data
 	     receiver: (const of_socket_address_t *)receiver
 	  runLoopMode: (of_run_loop_mode_t)runLoopMode
-		block: (of_datagram_socket_async_send_data_block_t)block;
+		block: (OFDatagramSocketAsyncSendDataBlock)block;
 #endif
 
 /**
  * @brief Cancels all pending asynchronous requests on the socket.
  */