@@ -72,11 +72,11 @@
 	} _running;
 # ifndef OF_OBJFW_RUNTIME
 	void *_pool;
 # endif
 # ifdef OF_HAVE_BLOCKS
-	OFThreadBlock _Nullable _threadBlock;
+	OFThreadBlock _Nullable _block;
 # endif
 	jmp_buf _exitEnv;
 	id _returnValue;
 	bool _supportsSockets;
 	OFRunLoop *_Nullable _runLoop;
@@ -116,11 +116,11 @@
 
 # ifdef OF_HAVE_BLOCKS
 /**
  * @brief The block to execute in the thread.
  */
-@property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFThreadBlock threadBlock;
+@property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFThreadBlock block;
 # endif
 
 /**
  * @brief The run loop for the thread.
  */
@@ -162,14 +162,14 @@
 
 # ifdef OF_HAVE_BLOCKS
 /**
  * @brief Creates a new thread with the specified block.
  *
- * @param threadBlock A block which is executed by the thread
+ * @param block A block which is executed by the thread
  * @return A new, autoreleased thread
  */
-+ (instancetype)threadWithThreadBlock: (OFThreadBlock)threadBlock;
++ (instancetype)threadWithBlock: (OFThreadBlock)block;
 # endif
 
 /**
  * @brief Returns the current thread.
  *
@@ -201,14 +201,17 @@
 #endif
 
 #ifdef OF_HAVE_SOCKETS
 /**
  * @brief Returns the DNS resolver for the current thread.
+ *
+ * Constructs the DNS resolver is there is none yet, unless @ref currentThread
+ * is `nil`, in which case it returns `nil`.
  *
  * @return The DNS resolver for the current thread
  */
-+ (OFDNSResolver *)DNSResolver;
++ (nullable OFDNSResolver *)DNSResolver;
 #endif
 
 /**
  * @brief Suspends execution of the current thread for the specified time
  *	  interval.
@@ -262,14 +265,14 @@
 
 # ifdef OF_HAVE_BLOCKS
 /**
  * @brief Initializes an already allocated thread with the specified block.
  *
- * @param threadBlock A block which is executed by the thread
+ * @param block A block which is executed by the thread
  * @return An initialized OFThread.
  */
-- (instancetype)initWithThreadBlock: (OFThreadBlock)threadBlock;
+- (instancetype)initWithBlock: (OFThreadBlock)block;
 # endif
 
 /**
  * @brief The main routine of the thread. You need to reimplement this!
  *