@@ -330,11 +330,11 @@
 		    exceptionWithHost: host
 				 port: port
 			       socket: self
 				errNo: of_socket_errno()];
 
-	_blocking = true;
+	_canBlock = true;
 
 #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC)
 	if ((flags = fcntl(_socket, F_GETFD, 0)) != -1)
 		fcntl(_socket, F_SETFD, flags | FD_CLOEXEC);
 #endif
@@ -436,22 +436,22 @@
 						  errNo: EADDRNOTAVAIL];
 #endif
 }
 
 #if !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
-- (void)setKeepAliveEnabled: (bool)enabled
+- (void)setSendsKeepAlives: (bool)sendsKeepAlives
 {
-	int v = enabled;
+	int v = sendsKeepAlives;
 
 	if (setsockopt(_socket, SOL_SOCKET, SO_KEEPALIVE,
 	    (char *)&v, (socklen_t)sizeof(v)) != 0)
 		@throw [OFSetOptionFailedException
 		    exceptionWithObject: self
 				  errNo: of_socket_errno()];
 }
 
-- (bool)isKeepAliveEnabled
+- (bool)sendsKeepAlives
 {
 	int v;
 	socklen_t len = sizeof(v);
 
 	if (getsockopt(_socket, SOL_SOCKET, SO_KEEPALIVE,
@@ -463,22 +463,22 @@
 	return v;
 }
 #endif
 
 #ifndef OF_WII
-- (void)setNoDelayEnabled: (bool)enabled
+- (void)setCanDelaySendingSegments: (bool)canDelaySendingSegments
 {
-	int v = enabled;
+	int v = !canDelaySendingSegments;
 
 	if (setsockopt(_socket, IPPROTO_TCP, TCP_NODELAY,
 	    (char *)&v, (socklen_t)sizeof(v)) != 0)
 		@throw [OFSetOptionFailedException
 		    exceptionWithObject: self
 				  errNo: of_socket_errno()];
 }
 
-- (bool)isNoDelayEnabled
+- (bool)canDelaySendingSegments
 {
 	int v;
 	socklen_t len = sizeof(v);
 
 	if (getsockopt(_socket, IPPROTO_TCP, TCP_NODELAY,
@@ -485,11 +485,11 @@
 	    (char *)&v, &len) != 0 || len != sizeof(v))
 		@throw [OFGetOptionFailedException
 		    exceptionWithObject: self
 				  errNo: of_socket_errno()];
 
-	return v;
+	return !v;
 }
 #endif
 
 - (void)close
 {