Index: tests/OFHTTPClientTests.m
==================================================================
--- tests/OFHTTPClientTests.m
+++ tests/OFHTTPClientTests.m
@@ -33,18 +33,18 @@
 #import "TestsAppDelegate.h"
 
 static OFString *module = @"OFHTTPClient";
 static OFCondition *cond;
 
-@interface OFHTTPClientTestsServer: OFThread
+@interface HTTPClientTestsServer: OFThread
 {
 @public
 	uint16_t _port;
 }
 @end
 
-@implementation OFHTTPClientTestsServer
+@implementation HTTPClientTestsServer
 - main
 {
 	OFTCPSocket *listener, *client;
 
 	[cond lock];
@@ -81,25 +81,25 @@
 
 	return nil;
 }
 @end
 
-@implementation TestsAppDelegate (OFHTTPClientests)
+@implementation TestsAppDelegate (OFHTTPClientTests)
 - (void)HTTPClientTests
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
-	OFHTTPClientTestsServer *server;
+	HTTPClientTestsServer *server;
 	OFURL *url;
 	OFHTTPClient *client;
 	OFHTTPRequest *request;
 	OFHTTPResponse *response = nil;
 	OFDataArray *data;
 
 	cond = [OFCondition condition];
 	[cond lock];
 
-	server = [[[OFHTTPClientTestsServer alloc] init] autorelease];
+	server = [[[HTTPClientTestsServer alloc] init] autorelease];
 	[server start];
 
 	[cond wait];
 	[cond unlock];
 

Index: tests/OFSerializationTests.m
==================================================================
--- tests/OFSerializationTests.m
+++ tests/OFSerializationTests.m
@@ -32,11 +32,11 @@
 
 #import "TestsAppDelegate.h"
 
 static OFString *module = @"OFSerialization";
 
-@implementation TestsAppDelegate (SerializationTests)
+@implementation TestsAppDelegate (OFSerializationTests)
 - (void)serializationTests
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	OFMutableDictionary *d = [OFMutableDictionary dictionary];
 	OFMutableArray *a = [OFMutableArray array];

Index: tests/TestsAppDelegate.h
==================================================================
--- tests/TestsAppDelegate.h
+++ tests/TestsAppDelegate.h
@@ -134,11 +134,11 @@
 
 @interface TestsAppDelegate (OFRIPEMD160HashTests)
 - (void)RIPEMD160HashTests;
 @end
 
-@interface TestsAppDelegate (SerializationTests)
+@interface TestsAppDelegate (OFSerializationTests)
 - (void)serializationTests;
 @end
 
 @interface TestsAppDelegate (OFSetTests)
 - (void)setTests;