Index: src/OFTCPSocket.h
==================================================================
--- src/OFTCPSocket.h
+++ src/OFTCPSocket.h
@@ -17,11 +17,11 @@
  */
 @interface OFTCPSocket: OFSocket {}
 /**
  * \return A new autoreleased OFTCPSocket
  */
-+ tcpSocket;
++ socket;
 
 /**
  * Initializes an already allocated OFTCPSocket.
  *
  * \return An initialized OFTCPSocket

Index: src/OFTCPSocket.m
==================================================================
--- src/OFTCPSocket.m
+++ src/OFTCPSocket.m
@@ -21,11 +21,11 @@
 #ifndef INVALID_SOCKET
 #define INVALID_SOCKET -1
 #endif
 
 @implementation OFTCPSocket
-+ tcpSocket
++ socket
 {
 	return [[[OFTCPSocket alloc] init] autorelease];
 }
 
 - init
@@ -155,11 +155,11 @@
 	OFTCPSocket *newsock;
 	struct sockaddr *addr;
 	socklen_t addrlen;
 	int s;
 
-	newsock = [OFTCPSocket tcpSocket];
+	newsock = [OFTCPSocket socket];
 	addrlen = sizeof(struct sockaddr);
 
 	@try {
 		addr = [newsock allocWithSize: sizeof(struct sockaddr)];
 	} @catch (OFException *e) {

Index: tests/OFTCPSocket/OFTCPSocket.m
==================================================================
--- tests/OFTCPSocket/OFTCPSocket.m
+++ tests/OFTCPSocket/OFTCPSocket.m
@@ -38,12 +38,12 @@
 	OFString *service;
 
 	srand(time(NULL));
 
 	@try {
-		OFTCPSocket *server = [OFTCPSocket tcpSocket];
-		OFTCPSocket *client = [OFTCPSocket tcpSocket];
+		OFTCPSocket *server = [OFTCPSocket socket];
+		OFTCPSocket *client = [OFTCPSocket socket];
 		OFTCPSocket *accepted;
 		char buf[7];
 
 		puts("== IPv4 ==");
 		port = get_port();