@@ -51,11 +51,11 @@
 #import "OFSetOptionFailedException.h"
 
 static const OFRunLoopMode connectRunLoopMode =
     @"OFTCPSocketConnectRunLoopMode";
 
-Class of_tls_socket_class = Nil;
+Class OFTLSSocketClass = Nil;
 
 static OFString *defaultSOCKS5Host = nil;
 static uint16_t defaultSOCKS5Port = 1080;
 
 @interface OFTCPSocket () <OFIPSocketAsyncConnecting>
@@ -145,11 +145,11 @@
 	if (_socket != INVALID_SOCKET)
 		@throw [OFAlreadyConnectedException exceptionWithSocket: self];
 
 	if ((_socket = socket(address->sockaddr.sockaddr.sa_family,
 	    SOCK_STREAM | SOCK_CLOEXEC, 0)) == INVALID_SOCKET) {
-		*errNo = of_socket_errno();
+		*errNo = OFSocketErrNo();
 		return false;
 	}
 
 #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC)
 	if ((flags = fcntl(_socket, F_GETFD, 0)) != -1)
@@ -166,11 +166,11 @@
 		@throw [OFNotOpenException exceptionWithObject: self];
 
 	/* Cast needed for AmigaOS, where the argument is declared non-const */
 	if (connect(_socket, (struct sockaddr *)&address->sockaddr.sockaddr,
 	    address->length) != 0) {
-		*errNo = of_socket_errno();
+		*errNo = OFSocketErrNo();
 		return false;
 	}
 
 	return true;
 }
@@ -324,11 +324,11 @@
 	    SOCK_STREAM | SOCK_CLOEXEC, 0)) == INVALID_SOCKET)
 		@throw [OFBindFailedException
 		    exceptionWithHost: host
 				 port: port
 			       socket: self
-				errNo: of_socket_errno()];
+				errNo: OFSocketErrNo()];
 
 	_canBlock = true;
 
 #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC)
 	if ((flags = fcntl(_socket, F_GETFD, 0)) != -1)
@@ -341,11 +341,11 @@
 #if defined(OF_HPUX) || defined(OF_WII) || defined(OF_NINTENDO_3DS)
 	if (port != 0) {
 #endif
 		if (bind(_socket, &address.sockaddr.sockaddr,
 		    address.length) != 0) {
-			int errNo = of_socket_errno();
+			int errNo = OFSocketErrNo();
 
 			closesocket(_socket);
 			_socket = INVALID_SOCKET;
 
 			@throw [OFBindFailedException exceptionWithHost: host
@@ -368,12 +368,12 @@
 			    address.length)) == 0) {
 				port = rnd;
 				break;
 			}
 
-			if (of_socket_errno() != EADDRINUSE) {
-				int errNo = of_socket_errno();
+			if (OFSocketErrNo() != EADDRINUSE) {
+				int errNo = OFSocketErrNo();
 
 				closesocket(_socket);
 				_socket = INVALID_SOCKET;
 
 				@throw [OFBindFailedException
@@ -393,13 +393,13 @@
 
 #if !defined(OF_HPUX) && !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
 	memset(&address, 0, sizeof(address));
 
 	address.length = (socklen_t)sizeof(address.sockaddr);
-	if (of_getsockname(_socket, &address.sockaddr.sockaddr,
+	if (OFGetSockName(_socket, &address.sockaddr.sockaddr,
 	    &address.length) != 0) {
-		int errNo = of_socket_errno();
+		int errNo = OFSocketErrNo();
 
 		closesocket(_socket);
 		_socket = INVALID_SOCKET;
 
 		@throw [OFBindFailedException exceptionWithHost: host
@@ -440,11 +440,11 @@
 
 	if (setsockopt(_socket, SOL_SOCKET, SO_KEEPALIVE,
 	    (char *)&v, (socklen_t)sizeof(v)) != 0)
 		@throw [OFSetOptionFailedException
 		    exceptionWithObject: self
-				  errNo: of_socket_errno()];
+				  errNo: OFSocketErrNo()];
 }
 
 - (bool)sendsKeepAlives
 {
 	int v;
@@ -452,11 +452,11 @@
 
 	if (getsockopt(_socket, SOL_SOCKET, SO_KEEPALIVE,
 	    (char *)&v, &len) != 0 || len != sizeof(v))
 		@throw [OFGetOptionFailedException
 		    exceptionWithObject: self
-				  errNo: of_socket_errno()];
+				  errNo: OFSocketErrNo()];
 
 	return v;
 }
 #endif
 
@@ -467,11 +467,11 @@
 
 	if (setsockopt(_socket, IPPROTO_TCP, TCP_NODELAY,
 	    (char *)&v, (socklen_t)sizeof(v)) != 0)
 		@throw [OFSetOptionFailedException
 		    exceptionWithObject: self
-				  errNo: of_socket_errno()];
+				  errNo: OFSocketErrNo()];
 }
 
 - (bool)canDelaySendingSegments
 {
 	int v;
@@ -479,11 +479,11 @@
 
 	if (getsockopt(_socket, IPPROTO_TCP, TCP_NODELAY,
 	    (char *)&v, &len) != 0 || len != sizeof(v))
 		@throw [OFGetOptionFailedException
 		    exceptionWithObject: self
-				  errNo: of_socket_errno()];
+				  errNo: OFSocketErrNo()];
 
 	return !v;
 }
 #endif