@@ -55,21 +55,21 @@
 	    SOCK_DGRAM | SOCK_CLOEXEC, protocol)) == INVALID_SOCKET)
 		@throw [OFBindFailedException
 		    exceptionWithPort: port
 			   packetType: packetType
 			       socket: self
-				errNo: of_socket_errno()];
+				errNo: OFSocketErrNo()];
 
 	_canBlock = true;
 
 #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL_H) && defined(FD_CLOEXEC)
 	if ((flags = fcntl(_socket, F_GETFD, 0)) != -1)
 		fcntl(_socket, F_SETFD, flags | FD_CLOEXEC);
 #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 exceptionWithPort: port
@@ -80,13 +80,13 @@
 
 	memset(&address, 0, sizeof(address));
 	address.family = OFSocketAddressFamilyIPX;
 	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 exceptionWithPort: port