@@ -36,11 +36,11 @@
 /**
  * @brief A block to be executed in a new thread.
  *
  * @return The object which should be returned when the thread is joined
  */
-typedef id _Nullable (^of_thread_block_t)(void);
+typedef id _Nullable (^OFThreadBlock)(void);
 #endif
 
 /**
  * @class OFThread OFThread.h ObjFW/OFThread.h
  *
@@ -73,11 +73,11 @@
 	} _running;
 # ifndef OF_OBJFW_RUNTIME
 	void *_pool;
 # endif
 # ifdef OF_HAVE_BLOCKS
-	of_thread_block_t _Nullable _threadBlock;
+	OFThreadBlock _Nullable _threadBlock;
 # endif
 	jmp_buf _exitEnv;
 	id _returnValue;
 	bool _supportsSockets;
 	OFRunLoop *_Nullable _runLoop;
@@ -117,12 +117,11 @@
 
 # ifdef OF_HAVE_BLOCKS
 /**
  * @brief The block to execute in the thread.
  */
-@property OF_NULLABLE_PROPERTY (readonly, nonatomic)
-    of_thread_block_t threadBlock;
+@property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFThreadBlock threadBlock;
 # endif
 
 /**
  * @brief The run loop for the thread.
  */
@@ -167,11 +166,11 @@
  * @brief Creates a new thread with the specified block.
  *
  * @param threadBlock A block which is executed by the thread
  * @return A new, autoreleased thread
  */
-+ (instancetype)threadWithThreadBlock: (of_thread_block_t)threadBlock;
++ (instancetype)threadWithThreadBlock: (OFThreadBlock)threadBlock;
 # endif
 
 /**
  * @brief Returns the current thread.
  *
@@ -267,11 +266,11 @@
  * @brief Initializes an already allocated thread with the specified block.
  *
  * @param threadBlock A block which is executed by the thread
  * @return An initialized OFThread.
  */
-- (instancetype)initWithThreadBlock: (of_thread_block_t)threadBlock;
+- (instancetype)initWithThreadBlock: (OFThreadBlock)threadBlock;
 # endif
 
 /**
  * @brief The main routine of the thread. You need to reimplement this!
  *