Index: src/OFThread.h
==================================================================
--- src/OFThread.h
+++ src/OFThread.h
@@ -137,16 +137,16 @@
 + threadWithBlock: (of_thread_block_t)block;
 
 /**
  * \brief Creates a new thread with the specified block and object.
  *
- * \param block A block which is executed by the thread
  * \param object An object which is passed for use in the main method or nil
+ * \param block A block which is executed by the thread
  * \return A new, autoreleased thread
  */
-+ threadWithBlock: (of_thread_block_t)block
-	   object: (id)object;
++ threadWithObject: (id)object
+	     block: (of_thread_block_t)block;
 #endif
 
 /**
  * \brief Sets the Thread Local Storage for the specified key.
  *
@@ -242,12 +242,12 @@
  *
  * \param block A block which is executed by the thread
  * \param object An object which is passed for use in the main method or nil
  * \return An initialized OFThread.
  */
-- initWithBlock: (of_thread_block_t)block
-	 object: (id)object;
+- initWithObject: (id)object
+	   block: (of_thread_block_t)block;
 #endif
 
 /**
  * \brief The main routine of the thread. You need to reimplement this!
  *

Index: src/OFThread.m
==================================================================
--- src/OFThread.m
+++ src/OFThread.m
@@ -121,15 +121,15 @@
 + threadWithBlock: (of_thread_block_t)block
 {
 	return [[[self alloc] initWithBlock: block] autorelease];
 }
 
-+ threadWithBlock: (of_thread_block_t)block
-	   object: (id)object
++ threadWithObject: (id)object
+	     block: (of_thread_block_t)block
 {
-	return [[[self alloc] initWithBlock: block
-				     object: object] autorelease];
+	return [[[self alloc] initWithObject: object
+				       block: block] autorelease];
 }
 #endif
 
 + (void)setObject: (id)object
 	forTLSKey: (OFTLSKey*)key
@@ -249,22 +249,22 @@
 }
 
 #ifdef OF_HAVE_BLOCKS
 - initWithBlock: (of_thread_block_t)block_
 {
-	return [self initWithBlock: block_
-			    object: nil];
+	return [self initWithObject: nil
+			      block: block_];
 }
 
-- initWithBlock: (of_thread_block_t)block_
-	 object: (id)object_
+- initWithObject: (id)object_
+	   block: (of_thread_block_t)block_
 {
 	self = [super init];
 
 	@try {
-		block = [block_ copy];
 		object = [object_ retain];
+		block = [block_ copy];
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}