diff --git a/common/JackSocket.cpp b/common/JackSocket.cpp
index b5c890a9..a0110c94 100644
--- a/common/JackSocket.cpp
+++ b/common/JackSocket.cpp
@@ -47,11 +47,11 @@ void JackClientSocket::SetWriteTimeOut(long sec)
     }
 }
 
-void JackClientSocket::SetBlocking(bool onoff)
+void JackClientSocket::SetNonBlocking(bool onoff)
 {   
     int flag = (onoff) ? 1 : 0;
     if (ioctl(fSocket, FIONBIO, &flag) < 0) {
-        jack_error("SetBlocking fd = %ld err = %s", fSocket, strerror(errno));
+        jack_error("SetNonBlocking fd = %ld err = %s", fSocket, strerror(errno));
     }
 }
 
diff --git a/common/JackSocket.h b/common/JackSocket.h
index ebcaebc2..3540fa0d 100644
--- a/common/JackSocket.h
+++ b/common/JackSocket.h
@@ -69,7 +69,7 @@ class JackClientSocket : public JackChannelTransaction
         void SetReadTimeOut(long sec);
         void SetWriteTimeOut(long sec);
         
-        void SetBlocking(bool onoff);
+        void SetNonBlocking(bool onoff);
 };
 
 /*!
diff --git a/common/JackSocketServerNotifyChannel.cpp b/common/JackSocketServerNotifyChannel.cpp
index 1f3d36d1..0b3f20e4 100644
--- a/common/JackSocketServerNotifyChannel.cpp
+++ b/common/JackSocketServerNotifyChannel.cpp
@@ -31,7 +31,7 @@ int JackSocketServerNotifyChannel::Open(const char* server_name)
         jack_error("Cannot connect to server socket");
         return -1;
     } else {
-        fRequestSocket.SetBlocking(true);
+        fRequestSocket.SetNonBlocking(true);
         return 0;
     }
 }