diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 773aca7ff..0fdece610 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -1079,7 +1079,7 @@ static int CmdHF14AAntiFuzz(const char *Cmd) {
 
     CLIParserFree();
     clearCommandBuffer();
-    SendCommandOLD(CMD_ANTIFUZZ_ISO_14443a, arg0, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_ANTIFUZZ_ISO_14443a, arg0, 0, 0, NULL, 0);
     return 0;
 }
 
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index a637e1e59..54195c155 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -281,7 +281,7 @@ static int CmdHFiClassList(const char *Cmd) {
 static int CmdHFiClassSniff(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_iclass_sniff();
-    SendCommandOLD(CMD_SNIFF_ICLASS, 0, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_SNIFF_ICLASS, 0, 0, 0, NULL, 0);
     return 0;
 }
 
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index dabde228b..88e96155e 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -808,7 +808,7 @@ int legic_get_type(legic_card_select_t *card) {
     if (card == NULL) return 1;
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_LEGIC_INFO, 0, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_LEGIC_INFO, 0, 0, 0, NULL, 0);
     PacketResponseNG resp;
     if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500))
         return 2;
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 30264ba24..51de727c9 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2291,7 +2291,7 @@ static int CmdHF14AMfSniff(const char *Cmd) {
     PrintAndLogEx(NORMAL, "-------------------------------------------------------------------------\n");
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_MIFARE_SNIFFER, 0, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_MIFARE_SNIFFER, 0, 0, 0, NULL, 0);
 
     PacketResponseNG resp;
 
@@ -2420,7 +2420,7 @@ int CmdHF14AMfDbg(const char *Cmd) {
     uint8_t dbgMode = param_get8ex(Cmd, 0, 0, 10);
     if (dbgMode > 4) return usage_hf14_dbg();
 
-    SendCommandOLD(CMD_MIFARE_SET_DBGMODE, dbgMode, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_MIFARE_SET_DBGMODE, dbgMode, 0, 0, NULL, 0);
     return 0;
 }
 
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 9330b2ff4..163d9e4b7 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -390,7 +390,7 @@ int CmdLFSniff(const char *Cmd) {
     if (cmdp == 'h') return usage_lf_sniff();
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_LF_SNIFF_RAW_ADC_SAMPLES, 0, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_LF_SNIFF_RAW_ADC_SAMPLES, 0, 0, 0, NULL, 0);
     WaitForResponse(CMD_ACK, NULL);
     getSamples(0, false);
     return 0;
diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c
index f9f80aa5c..e071e5a7d 100644
--- a/client/mifare/mifarehost.c
+++ b/client/mifare/mifarehost.c
@@ -906,7 +906,7 @@ returns:
 int detect_classic_nackbug(bool verbose) {
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_MIFARE_NACK_DETECT, 0, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_MIFARE_NACK_DETECT, 0, 0, 0, NULL, 0);
     PacketResponseNG resp;
 
     if (verbose)
@@ -991,7 +991,7 @@ void detect_classic_magic(void) {
     uint8_t isGeneration = 0;
     PacketResponseNG resp;
     clearCommandBuffer();
-    SendCommandOLD(CMD_MIFARE_CIDENT, 0, 0, 0, NULL, 0);
+    SendCommandMIX(CMD_MIFARE_CIDENT, 0, 0, 0, NULL, 0);
     if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
         isGeneration = resp.oldarg[0] & 0xff;