diff --git a/src/extension/select_eventloop.c b/src/extension/select_eventloop.c
index 0b7b3592..2b0ddf21 100644
--- a/src/extension/select_eventloop.c
+++ b/src/extension/select_eventloop.c
@@ -245,7 +245,7 @@ select_eventloop_run_once(getdns_eventloop *loop, int blocking)
 #endif
 	if (select(max_fd + 1, &readfds, &writefds, NULL,
 	    (timeout == TIMEOUT_FOREVER ? NULL : &tv)) < 0) {
-		if (_getdns_socket_retr())
+		if (_getdns_socket_wants_retry())
 			return;
 
 		DEBUG_SCHED("I/O error with select(): %s\n", _getdns_errnostr());
diff --git a/src/platform.h b/src/platform.h
index 940d0f6e..952668c6 100644
--- a/src/platform.h
+++ b/src/platform.h
@@ -137,12 +137,12 @@ const char *_getdns_strerror(int errnum);
 void _getdns_perror(const char *str);
 
 #define _getdns_errnostr() (_getdns_strerror(_getdns_socketerror()))
-#define _getdns_errno_retry(X) (  (X) == _getdns_EINTR \
-                               || (X) == _getdns_EAGAIN \
-                               || (X) == _getdns_EWOULDBLOCK \
-                               || (X) == _getdns_EINPROGRESS \
-                               || (X) == _getdns_ENOBUFS )
-#define _getdns_socket_wants_retry() (_getdns_errno_retry(_getdns_socketerror()))
+#define _getdns_error_wants_retry(X) (  (X) == _getdns_EINTR \
+                                     || (X) == _getdns_EAGAIN \
+                                     || (X) == _getdns_EWOULDBLOCK \
+                                     || (X) == _getdns_EINPROGRESS \
+                                     || (X) == _getdns_ENOBUFS )
+#define _getdns_socket_wants_retry() (_getdns_error_wants_retry(_getdns_socketerror()))
 #define _getdns_resource_depletion() (  _getdns_socketerror() == _getdns_ENFILE \
                                      || _getdns_socketerror() == _getdns_EMFILE )
 
diff --git a/src/stub.c b/src/stub.c
index 247862d6..bb46e5b0 100644
--- a/src/stub.c
+++ b/src/stub.c
@@ -430,7 +430,7 @@ tcp_connected(getdns_upstream *upstream) {
 	int error = 0;
 	socklen_t len = (socklen_t)sizeof(error);
 	getsockopt(upstream->fd, SOL_SOCKET, SO_ERROR, (void*)&error, &len);
-	if (_getdns_errno_retry(error))
+	if (_getdns_error_wants_retry(error))
 		return STUB_TCP_RETRY;
 	else if (error != 0) {
 		return STUB_SETUP_ERROR;