diff --git a/client/cli.c b/client/cli.c
index 9863b898..f6162227 100644
--- a/client/cli.c
+++ b/client/cli.c
@@ -46,7 +46,7 @@ int main(int argc, char **argv)
 			ReceiveCommand(&cmdbuf);
 			HANDLE_ERROR
 			for (i=0; i<5; i++) {
-				ReceiveCommandP(&cmdbuf);
+				ReceiveCommandPoll(&cmdbuf);
 			}
 			HANDLE_ERROR
 
diff --git a/client/proxmark3.c b/client/proxmark3.c
index 4c6076bc..280d07f9 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -26,7 +26,7 @@ static void *usb_receiver(void *targ) {
 	UsbCommand cmdbuf;
 
 	while(arg->run) {
-		if (ReceiveCommandP(&cmdbuf) > 0) {
+		if (ReceiveCommandPoll(&cmdbuf)) {
 			int i;
 
 			for (i=0; i<strlen(PROXPROMPT); i++)
diff --git a/client/snooper.c b/client/snooper.c
index a7a8894a..e6d4c364 100644
--- a/client/snooper.c
+++ b/client/snooper.c
@@ -34,7 +34,7 @@ int main()
 			ReceiveCommand(&cmdbuf);
 			HANDLE_ERROR
 			for (i=0; i<5; i++) {
-				ReceiveCommandP(&cmdbuf);
+				ReceiveCommandPoll(&cmdbuf);
 			}
 			HANDLE_ERROR
 
diff --git a/client/usb.c b/client/usb.c
index 8f5f38a7..e7573fea 100644
--- a/client/usb.c
+++ b/client/usb.c
@@ -51,7 +51,7 @@ void SendCommand(UsbCommand *c, bool wantAck) {
 	}
 }
 
-int ReceiveCommandP(UsbCommand *c) {
+bool ReceiveCommandPoll(UsbCommand *c) {
 	int ret;
 
 	bzero(c, sizeof(UsbCommand));
@@ -96,11 +96,11 @@ int ReceiveCommandP(UsbCommand *c) {
 #endif
 	}
 
-	return ret;
+	return ret > 0;
 }
 
 void ReceiveCommand(UsbCommand *c) {
-	while(ReceiveCommandP(c)<0) {}
+	while(!ReceiveCommandPoll(c)) {}
 }
 
 usb_dev_handle* findProxmark(int verbose, unsigned int *iface) {