@@ -68,11 +68,11 @@
 + (void)initialize
 {
 	if (self != [OFKernelEventObserver class])
 		return;
 
-	if (!of_socket_init())
+	if (!OFSocketInit())
 		@throw [OFInitializationFailedException
 		    exceptionWithClass: self];
 }
 
 + (instancetype)observer
@@ -134,11 +134,11 @@
 		    sizeof(_cancelAddr)) != 0)
 			@throw [OFInitializationFailedException
 			    exceptionWithClass: self.class];
 
 		cancelAddrLen = sizeof(_cancelAddr);
-		if (of_getsockname(_cancelFD[0],
+		if (OFGetSockName(_cancelFD[0],
 		    (struct sockaddr *)&_cancelAddr, &cancelAddrLen) != 0)
 			@throw [OFInitializationFailedException
 			    exceptionWithClass: self.class];
 # else
 		for (;;) {
@@ -154,11 +154,11 @@
 			    sizeof(_cancelAddr));
 
 			if (ret == 0)
 				break;
 
-			if (of_socket_errno() != EADDRINUSE)
+			if (OFSocketErrNo() != EADDRINUSE)
 				@throw [OFInitializationFailedException
 				    exceptionWithClass: self.class];
 		}
 # endif
 #endif