@@ -32,11 +32,11 @@
 #if !defined(__GNUC__) || __GNUC__ != 4 || __GNUC_MINOR__ != 4 || \
     __GNUC_PATCHLEVEL__ != 4
 @protected
 #endif
 	void (*destructor)(id);
-	of_list_object_t *listobj;
+	of_list_object_t *listObject;
 	BOOL initialized;
 }
 
 /**
  * \return A new autoreleased Thread Local Storage key
@@ -77,11 +77,11 @@
 	enum {
 		OF_THREAD_NOT_RUNNING,
 		OF_THREAD_RUNNING,
 		OF_THREAD_WAITING_FOR_JOIN
 	} running;
-	id retval;
+	id returnValue;
 }
 
 /**
  * \return A new, autoreleased thread
  */
@@ -89,11 +89,11 @@
 
 /**
  * \param obj An object that is passed to the main method as a copy or nil
  * \return A new, autoreleased thread
  */
-+ threadWithObject: (id)obj;
++ threadWithObject: (id)object;
 
 /**
  * Sets the Thread Local Storage for the specified key.
  *
  * The specified object is first retained and then the object stored before is
@@ -101,11 +101,11 @@
  * released and don't want any new object for the TLS key.
  *
  * \param key The Thread Local Storage key
  * \param obj The object the Thread Local Storage key will be set to
  */
-+ (void)setObject: (id)obj
++ (void)setObject: (id)object
 	forTLSKey: (OFTLSKey*)key;
 
 /**
  * Returns the object for the specified Thread Local Storage key.
  *
@@ -122,22 +122,22 @@
 + (OFThread*)currentThread;
 
 /**
  * Suspends execution of the current thread for the specified time interval.
  *
- * \param sec The number of seconds to sleep
+ * \param seconds The number of seconds to sleep
  */
-+ (void)sleepForTimeInterval: (int64_t)sec;
++ (void)sleepForTimeInterval: (int64_t)seconds;
 
 /**
  * Suspends execution of the current thread for the specified time interval.
  *
- * \param sec The number of seconds to sleep
- * \param usec The number of microseconds to sleep
+ * \param seconds The number of seconds to sleep
+ * \param microseconds The number of microseconds to sleep
  */
-+ (void)sleepForTimeInterval: (int64_t)sec
-		microseconds: (uint32_t)usec;
++ (void)sleepForTimeInterval: (int64_t)seconds
+		microseconds: (uint32_t)microseconds;
 
 /**
  * Suspends execution of the current thread until the specified date.
  */
 + (void)sleepUntilDate: (OFDate*)date;
@@ -156,17 +156,17 @@
 /**
  * Terminates the current thread, letting it return the specified object.
  *
  * \param obj The object which the terminated thread will return
  */
-+ (void)terminateWithObject: (id)obj;
++ (void)terminateWithObject: (id)object;
 
 /**
  * \param obj An object that is passed to the main method as a copy or nil
  * \return An initialized OFThread.
  */
-- initWithObject: (id)obj;
+- initWithObject: (id)object;
 
 /**
  * The main routine of the thread. You need to reimplement this!
  *
  * It can access the object passed to the threadWithObject or initWithObject
@@ -232,11 +232,11 @@
  * \brief A class implementing a condition variable for thread synchronization.
  */
 @interface OFCondition: OFMutex
 {
 	of_condition_t condition;
-	BOOL cond_initialized;
+	BOOL conditionInitialized;
 }
 
 /**
  * \return A new, autoreleased OFCondition
  */