diff --git a/src/netbase.h b/src/netbase.h
--- a/src/netbase.h
+++ b/src/netbase.h
@@ -78,7 +78,7 @@
                            const SOCKET &hSocketRet, int nTimeout,
                            bool manual_connection);
 bool ConnectThroughProxy(const proxyType &proxy, const std::string &strDest,
-                         int port, const Sock &hSocketRet, int nTimeout,
+                         int port, const Sock &sock, int nTimeout,
                          bool &outProxyConnectionFailed);
 /** Disable or enable blocking-mode for a socket */
 bool SetSocketNonBlocking(const SOCKET &hSocket, bool fNonBlocking);
diff --git a/src/netbase.cpp b/src/netbase.cpp
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -351,8 +351,8 @@
  * @param data The buffer where the read bytes should be stored.
  * @param len The number of bytes to read into the specified buffer.
  * @param timeout The total timeout in milliseconds for this read.
- * @param hSocket The socket (has to be in non-blocking mode) from which to read
- *                bytes.
+ * @param sock The socket (has to be in non-blocking mode) from which to read
+ * bytes.
  *
  * @returns An IntrRecvError indicating the resulting status of this read.
  *          IntrRecvError::OK only if all of the specified number of bytes were
@@ -363,7 +363,7 @@
  *      SOCKET&, bool).
  */
 static IntrRecvError InterruptibleRecv(uint8_t *data, size_t len, int timeout,
-                                       const Sock &hSocket) {
+                                       const Sock &sock) {
     int64_t curTime = GetTimeMillis();
     int64_t endTime = curTime + timeout;
     // Maximum time to wait for I/O readiness. It will take up until this time
@@ -371,7 +371,7 @@
     const int64_t maxWait = 1000;
     while (len > 0 && curTime < endTime) {
         // Optimistically try the recv first
-        ssize_t ret = hSocket.Recv(data, len, 0);
+        ssize_t ret = sock.Recv(data, len, 0);
         if (ret > 0) {
             len -= ret;
             data += ret;
@@ -386,8 +386,8 @@
                 // Only wait at most maxWait milliseconds at a time, unless
                 // we're approaching the end of the specified total timeout
                 int timeout_ms = std::min(endTime - curTime, maxWait);
-                if (!hSocket.Wait(std::chrono::milliseconds{timeout_ms},
-                                  Sock::RECV)) {
+                if (!sock.Wait(std::chrono::milliseconds{timeout_ms},
+                               Sock::RECV)) {
                     return IntrRecvError::NetworkError;
                 }
             } else {
@@ -440,7 +440,7 @@
  * @param port The destination port.
  * @param auth The credentials with which to authenticate with the specified
  *             SOCKS5 proxy.
- * @param hSocket The SOCKS5 proxy socket.
+ * @param sock The SOCKS5 proxy socket.
  *
  * @returns Whether or not the operation succeeded.
  *
@@ -451,7 +451,7 @@
  *      Version 5</a>
  */
 static bool Socks5(const std::string &strDest, int port,
-                   const ProxyCredentials *auth, const Sock &hSocket) {
+                   const ProxyCredentials *auth, const Sock &sock) {
     IntrRecvError recvr;
     LogPrint(BCLog::NET, "SOCKS5 connecting %s\n", strDest);
     if (strDest.size() > 255) {
@@ -472,12 +472,12 @@
         vSocks5Init.push_back(SOCKS5Method::NOAUTH);
     }
     ssize_t ret =
-        hSocket.Send(vSocks5Init.data(), vSocks5Init.size(), MSG_NOSIGNAL);
+        sock.Send(vSocks5Init.data(), vSocks5Init.size(), MSG_NOSIGNAL);
     if (ret != (ssize_t)vSocks5Init.size()) {
         return error("Error sending to proxy");
     }
     uint8_t pchRet1[2];
-    if ((recvr = InterruptibleRecv(pchRet1, 2, SOCKS5_RECV_TIMEOUT, hSocket)) !=
+    if ((recvr = InterruptibleRecv(pchRet1, 2, SOCKS5_RECV_TIMEOUT, sock)) !=
         IntrRecvError::OK) {
         LogPrintf("Socks5() connect to %s:%d failed: InterruptibleRecv() "
                   "timeout or other failure\n",
@@ -499,7 +499,7 @@
         vAuth.insert(vAuth.end(), auth->username.begin(), auth->username.end());
         vAuth.push_back(auth->password.size());
         vAuth.insert(vAuth.end(), auth->password.begin(), auth->password.end());
-        ret = hSocket.Send(vAuth.data(), vAuth.size(), MSG_NOSIGNAL);
+        ret = sock.Send(vAuth.data(), vAuth.size(), MSG_NOSIGNAL);
         if (ret != (ssize_t)vAuth.size()) {
             return error("Error sending authentication to proxy");
         }
@@ -507,7 +507,7 @@
                  auth->username, auth->password);
         uint8_t pchRetA[2];
         if ((recvr = InterruptibleRecv(pchRetA, 2, SOCKS5_RECV_TIMEOUT,
-                                       hSocket)) != IntrRecvError::OK) {
+                                       sock)) != IntrRecvError::OK) {
             return error("Error reading proxy authentication response");
         }
         if (pchRetA[0] != 0x01 || pchRetA[1] != 0x00) {
@@ -533,12 +533,12 @@
     vSocks5.insert(vSocks5.end(), strDest.begin(), strDest.end());
     vSocks5.push_back((port >> 8) & 0xFF);
     vSocks5.push_back((port >> 0) & 0xFF);
-    ret = hSocket.Send(vSocks5.data(), vSocks5.size(), MSG_NOSIGNAL);
+    ret = sock.Send(vSocks5.data(), vSocks5.size(), MSG_NOSIGNAL);
     if (ret != (ssize_t)vSocks5.size()) {
         return error("Error sending to proxy");
     }
     uint8_t pchRet2[4];
-    if ((recvr = InterruptibleRecv(pchRet2, 4, SOCKS5_RECV_TIMEOUT, hSocket)) !=
+    if ((recvr = InterruptibleRecv(pchRet2, 4, SOCKS5_RECV_TIMEOUT, sock)) !=
         IntrRecvError::OK) {
         if (recvr == IntrRecvError::Timeout) {
             /**
@@ -567,20 +567,19 @@
     uint8_t pchRet3[256];
     switch (pchRet2[3]) {
         case SOCKS5Atyp::IPV4:
-            recvr = InterruptibleRecv(pchRet3, 4, SOCKS5_RECV_TIMEOUT, hSocket);
+            recvr = InterruptibleRecv(pchRet3, 4, SOCKS5_RECV_TIMEOUT, sock);
             break;
         case SOCKS5Atyp::IPV6:
-            recvr =
-                InterruptibleRecv(pchRet3, 16, SOCKS5_RECV_TIMEOUT, hSocket);
+            recvr = InterruptibleRecv(pchRet3, 16, SOCKS5_RECV_TIMEOUT, sock);
             break;
         case SOCKS5Atyp::DOMAINNAME: {
-            recvr = InterruptibleRecv(pchRet3, 1, SOCKS5_RECV_TIMEOUT, hSocket);
+            recvr = InterruptibleRecv(pchRet3, 1, SOCKS5_RECV_TIMEOUT, sock);
             if (recvr != IntrRecvError::OK) {
                 return error("Error reading from proxy");
             }
             int nRecv = pchRet3[0];
             recvr =
-                InterruptibleRecv(pchRet3, nRecv, SOCKS5_RECV_TIMEOUT, hSocket);
+                InterruptibleRecv(pchRet3, nRecv, SOCKS5_RECV_TIMEOUT, sock);
             break;
         }
         default:
@@ -589,7 +588,7 @@
     if (recvr != IntrRecvError::OK) {
         return error("Error reading from proxy");
     }
-    if ((recvr = InterruptibleRecv(pchRet3, 2, SOCKS5_RECV_TIMEOUT, hSocket)) !=
+    if ((recvr = InterruptibleRecv(pchRet3, 2, SOCKS5_RECV_TIMEOUT, sock)) !=
         IntrRecvError::OK) {
         return error("Error reading from proxy");
     }
@@ -836,7 +835,7 @@
  * @param proxy The SOCKS5 proxy.
  * @param strDest The destination service to which to connect.
  * @param port The destination port.
- * @param hSocket The socket on which to connect to the SOCKS5 proxy.
+ * @param sock The socket on which to connect to the SOCKS5 proxy.
  * @param nTimeout Wait this many milliseconds for the connection to the SOCKS5
  *                 proxy to be established.
  * @param[out] outProxyConnectionFailed Whether or not the connection to the
@@ -845,10 +844,10 @@
  * @returns Whether or not the operation succeeded.
  */
 bool ConnectThroughProxy(const proxyType &proxy, const std::string &strDest,
-                         int port, const Sock &hSocket, int nTimeout,
+                         int port, const Sock &sock, int nTimeout,
                          bool &outProxyConnectionFailed) {
     // first connect to proxy server
-    if (!ConnectSocketDirectly(proxy.proxy, hSocket.Get(), nTimeout, true)) {
+    if (!ConnectSocketDirectly(proxy.proxy, sock.Get(), nTimeout, true)) {
         outProxyConnectionFailed = true;
         return false;
     }
@@ -858,10 +857,10 @@
         static std::atomic_int counter(0);
         random_auth.username = random_auth.password =
             strprintf("%i", counter++);
-        if (!Socks5(strDest, uint16_t(port), &random_auth, hSocket)) {
+        if (!Socks5(strDest, uint16_t(port), &random_auth, sock)) {
             return false;
         }
-    } else if (!Socks5(strDest, uint16_t(port), 0, hSocket)) {
+    } else if (!Socks5(strDest, uint16_t(port), 0, sock)) {
         return false;
     }
     return true;