diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index bb7ffa483..6bb5e6728 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1309,7 +1309,7 @@ bool AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password ){
 
 	//uint8_t got[12288];
 	uint8_t got[7679];
-	if ( !GetFromBigBuf(got, sizeof(got), 0, NULL, 6000, true)) {
+	if ( !GetFromDevice(BIG_BUF, got, sizeof(got), 0, NULL, 6000, true)) {
 		PrintAndLogEx(WARNING, "command execution time out");
 		return false;
 	}
@@ -1441,7 +1441,7 @@ int CmdResetRead(const char *Cmd) {
 	}
 
 	uint8_t got[BIGBUF_SIZE-1];
-	if ( !GetFromBigBuf(got, sizeof(got), 0, NULL, 2500, false)) {
+	if ( !GetFromDevice(BIG_BUF, got, sizeof(got), 0, NULL, 2500, false)) {
 		PrintAndLogEx(WARNING, "command execution time out");
 		return 0;
 	}
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index 8b6e640f8..68ca6266d 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -487,7 +487,7 @@ int CmdTraceList(const char *Cmd) {
 	if ( isOnline ) {
 		// Query for the size of the trace,  downloading USB_CMD_DATA_SIZE
 		UsbCommand response;
-		if ( !GetFromBigBuf(trace, USB_CMD_DATA_SIZE, 0, &response, 4000, true)) {
+		if ( !GetFromDevice(BIG_BUF, trace, USB_CMD_DATA_SIZE, 0, &response, 4000, true)) {
 			PrintAndLogEx(WARNING, "timeout while waiting for reply.");
 			return 1;
 		}
@@ -501,7 +501,7 @@ int CmdTraceList(const char *Cmd) {
 				return 2;
 			}
 			trace = p;
-			if ( !GetFromBigBuf(trace, traceLen, 0, NULL, 2500, false)) {
+			if ( !GetFromDevice(BIG_BUF, trace, traceLen, 0, NULL, 2500, false)) {
 				PrintAndLogEx(WARNING, "command execution time out");
 				free(trace);
 				return 3;
diff --git a/client/scripting.c b/client/scripting.c
index 1c3e2d189..74e005ba8 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -79,7 +79,7 @@ static int l_GetFromBigBuf(lua_State *L){
         return 2; // two return values
 	}
 		
-	if ( !GetFromBigBuf(data, len, startindex, NULL, 2500, false)) {
+	if ( !GetFromDevice(BIG_BUF, data, len, startindex, NULL, 2500, false)) {
 		free(data);
 		lua_pushnil(L);
         lua_pushstring(L,"command execution time out");