@@ -45,21 +45,21 @@
  * @param key The current key
  * @param object The current object
  * @param stop A pointer to a variable that can be set to true to stop the
  *	       enumeration
  */
-typedef void (^of_map_table_enumeration_block_t)(void *_Nullable key,
+typedef void (^OFMapTableEnumerationBlock)(void *_Nullable key,
     void *_Nullable object, bool *stop);
 
 /**
  * @brief A block for replacing objects in an OFMapTable.
  *
  * @param key The key of the object to replace
  * @param object The object to replace
  * @return The object to replace the object with
  */
-typedef void *_Nullable (^of_map_table_replace_block_t)(void *_Nullable key,
+typedef void *_Nullable (^OFMapTableReplaceBlock)(void *_Nullable key,
     void *_Nullable object);
 #endif
 
 @class OFMapTableEnumerator;
 
@@ -215,19 +215,18 @@
 /**
  * @brief Executes a block for each key / object pair.
  *
  * @param block The block to execute for each key / object pair.
  */
-- (void)enumerateKeysAndObjectsUsingBlock:
-    (of_map_table_enumeration_block_t)block;
+- (void)enumerateKeysAndObjectsUsingBlock: (OFMapTableEnumerationBlock)block;
 
 /**
  * @brief Replaces each object with the object returned by the block.
  *
  * @param block The block which returns a new object for each object
  */
-- (void)replaceObjectsUsingBlock: (of_map_table_replace_block_t)block;
+- (void)replaceObjectsUsingBlock: (OFMapTableReplaceBlock)block;
 #endif
 @end
 
 /**
  * @class OFMapTableEnumerator OFMapTable.h ObjFW/OFMapTable.h