@@ -51,11 +51,11 @@
 + (void)initialize
 {
 	if (self != [OFSequencedPacketSocket class])
 		return;
 
-	if (!of_socket_init())
+	if (!OFSocketInit())
 		@throw [OFInitializationFailedException
 		    exceptionWithClass: self];
 }
 
 + (instancetype)socket
@@ -97,11 +97,11 @@
 	int errNo;
 	socklen_t len = sizeof(errNo);
 
 	if (getsockopt(_socket, SOL_SOCKET, SO_ERROR, (char *)&errNo,
 	    &len) != 0)
-		return of_socket_errno();
+		return OFSocketErrNo();
 
 	return errNo;
 }
 #endif
 
@@ -138,11 +138,11 @@
 	u_long v = canBlock;
 
 	if (ioctlsocket(_socket, FIONBIO, &v) == SOCKET_ERROR)
 		@throw [OFSetOptionFailedException
 		    exceptionWithObject: self
-				  errNo: of_socket_errno()];
+				  errNo: OFSocketErrNo()];
 
 	_canBlock = canBlock;
 #else
 	OF_UNRECOGNIZED_SELECTOR
 #endif
@@ -158,20 +158,20 @@
 #ifndef OF_WINDOWS
 	if ((ret = recv(_socket, buffer, length, 0)) < 0)
 		@throw [OFReadFailedException
 		    exceptionWithObject: self
 			requestedLength: length
-				  errNo: of_socket_errno()];
+				  errNo: OFSocketErrNo()];
 #else
 	if (length > INT_MAX)
 		@throw [OFOutOfRangeException exception];
 
 	if ((ret = recv(_socket, buffer, (int)length, 0)) < 0)
 		@throw [OFReadFailedException
 		    exceptionWithObject: self
 			requestedLength: length
-				  errNo: of_socket_errno()];
+				  errNo: OFSocketErrNo()];
 #endif
 
 	return ret;
 }
 
@@ -236,11 +236,11 @@
 	if ((bytesWritten = send(_socket, (void *)buffer, length, 0)) < 0)
 		@throw [OFWriteFailedException
 		    exceptionWithObject: self
 			requestedLength: length
 			   bytesWritten: 0
-				  errNo: of_socket_errno()];
+				  errNo: OFSocketErrNo()];
 #else
 	int bytesWritten;
 
 	if (length > INT_MAX)
 		@throw [OFOutOfRangeException exception];
@@ -248,11 +248,11 @@
 	if ((bytesWritten = send(_socket, buffer, (int)length, 0)) < 0)
 		@throw [OFWriteFailedException
 		    exceptionWithObject: self
 			requestedLength: length
 			   bytesWritten: 0
-				  errNo: of_socket_errno()];
+				  errNo: OFSocketErrNo()];
 #endif
 
 	if ((size_t)bytesWritten != length)
 		@throw [OFWriteFailedException exceptionWithObject: self
 						   requestedLength: length
@@ -309,11 +309,11 @@
 
 	if (listen(_socket, backlog) == -1)
 		@throw [OFListenFailedException
 		    exceptionWithSocket: self
 				backlog: backlog
-				  errNo: of_socket_errno()];
+				  errNo: OFSocketErrNo()];
 
 	_listening = true;
 }
 
 - (instancetype)accept
@@ -334,25 +334,25 @@
 	    &client->_remoteAddress.sockaddr.sockaddr,
 	    &client->_remoteAddress.length, NULL, SOCK_CLOEXEC)) ==
 	    INVALID_SOCKET)
 		@throw [OFAcceptFailedException
 		    exceptionWithSocket: self
-				  errNo: of_socket_errno()];
+				  errNo: OFSocketErrNo()];
 #elif defined(HAVE_ACCEPT4) && defined(SOCK_CLOEXEC)
 	if ((client->_socket = accept4(_socket,
 	    &client->_remoteAddress.sockaddr.sockaddr,
 	    &client->_remoteAddress.length, SOCK_CLOEXEC)) == INVALID_SOCKET)
 		@throw [OFAcceptFailedException
 		    exceptionWithSocket: self
-				  errNo: of_socket_errno()];
+				  errNo: OFSocketErrNo()];
 #else
 	if ((client->_socket = accept(_socket,
 	    &client->_remoteAddress.sockaddr.sockaddr,
 	    &client->_remoteAddress.length)) == INVALID_SOCKET)
 		@throw [OFAcceptFailedException
 		    exceptionWithSocket: self
-				  errNo: of_socket_errno()];
+				  errNo: OFSocketErrNo()];
 
 # if defined(HAVE_FCNTL) && defined(FD_CLOEXEC)
 	if ((flags = fcntl(client->_socket, F_GETFD, 0)) != -1)
 		fcntl(client->_socket, F_SETFD, flags | FD_CLOEXEC);
 # endif