@@ -66,20 +66,20 @@
 		OF_THREAD_NOT_RUNNING,
 		OF_THREAD_RUNNING,
 		OF_THREAD_WAITING_FOR_JOIN
 	} _running;
 # ifdef OF_HAVE_BLOCKS
-	of_thread_block_t _block;
+	of_thread_block_t _threadBlock;
 # endif
 	id _returnValue;
 	OFRunLoop *_runLoop;
 	OFString *_name;
 }
 
 # ifdef OF_HAVE_PROPERTIES
 #  ifdef OF_HAVE_BLOCKS
-@property (copy) of_thread_block_t block;
+@property (copy) of_thread_block_t threadBlock;
 #  endif
 @property (copy) OFString *name;
 # endif
 
 /*!
@@ -91,14 +91,14 @@
 
 # ifdef OF_HAVE_BLOCKS
 /*!
  * @brief Creates a new thread with the specified block.
  *
- * @param block A block which is executed by the thread
+ * @param threadBlock A block which is executed by the thread
  * @return A new, autoreleased thread
  */
-+ (instancetype)threadWithBlock: (of_thread_block_t)block;
++ (instancetype)threadWithThreadBlock: (of_thread_block_t)threadBlock;
 # endif
 
 /*!
  * @brief Sets the Thread Local Storage for the specified key.
  *
@@ -175,14 +175,14 @@
 
 # ifdef OF_HAVE_BLOCKS
 /*!
  * @brief Initializes an already allocated thread with the specified block.
  *
- * @param block A block which is executed by the thread
+ * @param threadBlock A block which is executed by the thread
  * @return An initialized OFThread.
  */
-- initWithBlock: (of_thread_block_t)block;
+- initWithThreadBlock: (of_thread_block_t)threadBlock;
 # endif
 
 /*!
  * @brief The main routine of the thread. You need to reimplement this!
  *