Index: src/OFThread.h
==================================================================
--- src/OFThread.h
+++ src/OFThread.h
@@ -35,17 +35,17 @@
 }
 
 /**
  * \return A new autoreleased Thread Local Storage key
  */
-+ tlsKey;
++ TLSKey;
 
 /**
  * \param destructor A destructor that is called when the thread is terminated
  * \return A new autoreleased Thread Local Storage key
  */
-+ tlsKeyWithDestructor: (void(*)(id))destructor;
++ TLSKeyWithDestructor: (void(*)(id))destructor;
 
 + (void)callAllDestructors;
 
 /**
  * \return An initialized Thread Local Storage key

Index: src/OFThread.m
==================================================================
--- src/OFThread.m
+++ src/OFThread.m
@@ -254,16 +254,16 @@
 {
 	if (self == [OFTLSKey class])
 		tlskeys = [[OFList alloc] init];
 }
 
-+ tlsKey
++ TLSKey
 {
 	return [[[self alloc] init] autorelease];
 }
 
-+ tlsKeyWithDestructor: (void(*)(id))destructor
++ TLSKeyWithDestructor: (void(*)(id))destructor
 {
 	return [[[self alloc] initWithDestructor: destructor] autorelease];
 }
 
 + (void)callAllDestructors

Index: tests/OFThreadTests.m
==================================================================
--- tests/OFThreadTests.m
+++ tests/OFThreadTests.m
@@ -50,19 +50,19 @@
 
 	TEST(@"-[start]", R([t start]))
 
 	TEST(@"-[join]", [[t join] isEqual: @"success"])
 
-	TEST(@"OFTLSKey's +[tlsKey]", (key = [OFTLSKey tlsKey]))
+	TEST(@"OFTLSKey's +[TLSKey]", (key = [OFTLSKey TLSKey]))
 
 	TEST(@"+[setObject:forTLSKey:]",
 	    R([OFThread setObject: @"setme"
 			forTLSKey: key]) &&
-	    [[OFThread setObject: @"foo"
-		       forTLSKey: key] isEqual: @"setme"])
+	    R([OFThread setObject: @"foo"
+			forTLSKey: key]))
 
 	TEST(@"+[objectForTLSKey:]",
 	    [[OFThread objectForTLSKey: key] isEqual: @"foo"])
 
 	[pool drain];
 }
 @end