diff --git a/client/cmddata.c b/client/cmddata.c
index c13cbe904..1d2541ccb 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1622,7 +1622,7 @@ static int CmdLoad(const char *Cmd) {
     FILE *f = fopen(filename, "r");
     if (!f) {
         PrintAndLogEx(WARNING, "couldn't open '%s'", filename);
-        return 0;
+        return PM3_EFILE;
     }
 
     GraphTraceLen = 0;
@@ -1649,7 +1649,7 @@ static int CmdLoad(const char *Cmd) {
     setClockGrid(0, 0);
     DemodBufferLen = 0;
     RepaintGraphWindow();
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // trim graph from the end
@@ -1742,7 +1742,7 @@ static int CmdSave(const char *Cmd) {
     FILE *f = fopen(filename, "w");
     if (!f) {
         PrintAndLogEx(WARNING, "couldn't open '%s'", filename);
-        return 0;
+        return PM3_EFILE;
     }
 
     for (uint32_t i = 0; i < GraphTraceLen; i++)
@@ -1752,7 +1752,7 @@ static int CmdSave(const char *Cmd) {
         fclose(f);
 
     PrintAndLogEx(SUCCESS, "saved to '%s'", Cmd);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdScale(const char *Cmd) {
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 5b22979cc..0c3cb9281 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -275,14 +275,14 @@ static int CmdHFiClassList(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     //PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list iclass' instead");
     CmdTraceList("iclass");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHFiClassSniff(const char *Cmd) {
     char cmdp = tolower(param_getchar(Cmd, 0));
     if (cmdp == 'h') return usage_hf_iclass_sniff();
     SendCommandNG(CMD_SNIFF_ICLASS, NULL, 0);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHFiClassSim(const char *Cmd) {
@@ -501,7 +501,7 @@ static int CmdHFiClassSim(const char *Cmd) {
             break;
         }
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHFiClassReader(const char *Cmd) {
@@ -525,8 +525,8 @@ static int CmdHFiClassReader_Replay(const char *Cmd) {
     }
 
     clearCommandBuffer();
-    SendCommandOLD(CMD_READER_ICLASS_REPLAY, readerType, 0, 0, MAC, 4);
-    return 0;
+    SendCommandMIX(CMD_READER_ICLASS_REPLAY, readerType, 0, 0, MAC, 4);
+    return PM3_SUCCESS;
 }
 
 static int CmdHFiClassELoad(const char *Cmd) {
@@ -547,7 +547,7 @@ static int CmdHFiClassELoad(const char *Cmd) {
     FILE *f = fopen(filename, "rb");
     if (!f) {
         PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
-        return 1;
+        return PM3_EFILE;
     }
 
     // get filesize in order to malloc memory
@@ -601,14 +601,14 @@ static int CmdHFiClassELoad(const char *Cmd) {
     free(dump);
 
     PrintAndLogEx(SUCCESS, "sent %d bytes of data to device emulator memory", bytes_sent);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int readKeyfile(const char *filename, size_t len, uint8_t *buffer) {
     FILE *f = fopen(filename, "rb");
     if (!f) {
-        PrintAndLogEx(WARNING, "Failed to read from file '%s'", filename);
-        return 1;
+        PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
+        return PM3_EFILE;
     }
     fseek(f, 0, SEEK_END);
     long fsize = ftell(f);
@@ -625,7 +625,7 @@ static int readKeyfile(const char *filename, size_t len, uint8_t *buffer) {
         PrintAndLogEx(WARNING, "Warning, could only read %d bytes, expected %d", bytes_read, len);
         return 1;
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHFiClassDecrypt(const char *Cmd) {
@@ -644,8 +644,8 @@ static int CmdHFiClassDecrypt(const char *Cmd) {
     if (opt == 'f' && param_getstr(Cmd, 1, filename, sizeof(filename)) > 0) {
         f = fopen(filename, "rb");
         if (!f) {
-            PrintAndLogEx(WARNING, "could not find file %s", filename);
-            return 1;
+            PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
+            return PM3_EFILE;
         }
     } else {
         return usage_hf_iclass_decrypt();
@@ -712,7 +712,7 @@ static int CmdHFiClassDecrypt(const char *Cmd) {
     saveFile(outfilename, ".bin", decrypted, fsize);
     printIclassDumpContents(decrypted, 1, (fsize / 8), fsize);
     free(decrypted);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int iClassEncryptBlkData(uint8_t *blkData) {
@@ -745,7 +745,7 @@ static int CmdHFiClassEncryptBlk(const char *Cmd) {
     if (!iClassEncryptBlkData(blkData)) return 0;
 
     printvar("encrypted block", blkData, 8);
-    return 1;
+    return PM3_SUCCESS;
 }
 
 static void Calc_wb_mac(uint8_t blockno, uint8_t *data, uint8_t *div_key, uint8_t MAC[4]) {
@@ -1272,8 +1272,8 @@ static int CmdHFiClassCloneTag(const char *Cmd) {
     // file handling and reading
     f = fopen(filename, "rb");
     if (!f) {
-        PrintAndLogEx(WARNING, "failed to read file '%s'", filename);
-        return 1;
+        PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
+        return PM3_EFILE;
     }
 
     if (startblock < 5) {
@@ -1331,7 +1331,7 @@ static int CmdHFiClassCloneTag(const char *Cmd) {
         PrintAndLogEx(WARNING, "command execute timeout");
         return 0;
     }
-    return 1;
+    return PM3_SUCCESS;
 }
 
 static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite, bool rawkey, bool verbose, bool auth) {
@@ -1461,7 +1461,7 @@ static int CmdHFiClass_loclass(const char *Cmd) {
         if (errors) PrintAndLogDevice(WARNING, "There were errors!!!");
         return errors;
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t endblock, size_t filesize) {
@@ -1520,8 +1520,8 @@ static int CmdHFiClassReadTagFile(const char *Cmd) {
     // file handling and reading
     f = fopen(filename, "rb");
     if (!f) {
-        PrintAndLogEx(WARNING, "Failed to read from file '%s'", filename);
-        return 1;
+        PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
+        return PM3_EFILE;
     }
     fseek(f, 0, SEEK_END);
     long fsize = ftell(f);
@@ -1547,7 +1547,7 @@ static int CmdHFiClassReadTagFile(const char *Cmd) {
     PrintAndLogEx(NORMAL, "CSN   |00| %s|\n", sprint_hex(csn, 8));
     printIclassDumpContents(dump, startblock, endblock, bytes_read);
     free(dump);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 void HFiClassCalcDivKey(uint8_t *CSN, uint8_t *KEY, uint8_t *div_key, bool elite) {
@@ -1670,15 +1670,15 @@ static int CmdHFiClassCalcNewKey(const char *Cmd) {
             return 0;
 
     HFiClassCalcNewKey(CSN, OLDKEY, NEWKEY, xor_div_key, elite, oldElite, true);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int loadKeys(char *filename) {
     FILE *f;
     f = fopen(filename, "rb");
     if (!f) {
-        PrintAndLogEx(WARNING, "Failed to read from file '%s'", filename);
-        return 0;
+        PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
+        return PM3_EFILE;
     }
     fseek(f, 0, SEEK_END);
     long fsize = ftell(f);
@@ -1709,24 +1709,24 @@ static int loadKeys(char *filename) {
 
     free(dump);
     PrintAndLogEx(SUCCESS, "%u keys loaded", i);
-    return 1;
+    return PM3_SUCCESS;
 }
 
 static int saveKeys(char *filename) {
     FILE *f;
     f = fopen(filename, "wb");
     if (!f) {
-        PrintAndLogEx(NORMAL, "[!] error opening file %s\n", filename);
-        return 0;
+        PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
+        return PM3_EFILE;
     }
     for (uint8_t i = 0; i < ICLASS_KEYS_MAX; i++) {
         if (fwrite(iClass_Key_Table[i], 8, 1, f) != 1) {
-            PrintAndLogEx(WARNING, "save key failed to write to file: %s", filename);
+            PrintAndLogEx(WARNING, "save key failed to write to file:" _YELLOW_("%s"), filename);
             break;
         }
     }
     fclose(f);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int printKeys(void) {
@@ -1734,7 +1734,7 @@ static int printKeys(void) {
     for (uint8_t i = 0; i < ICLASS_KEYS_MAX; i++)
         PrintAndLogEx(NORMAL, "%u: %s", i, sprint_hex(iClass_Key_Table[i], 8));
     PrintAndLogEx(NORMAL, "");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHFiClassManageKeys(const char *Cmd) {
@@ -1824,7 +1824,7 @@ static int CmdHFiClassManageKeys(const char *Cmd) {
             return saveKeys(filename);
             break;
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdHFiClassCheckKeys(const char *Cmd) {
@@ -2032,7 +2032,7 @@ out:
     DropField();
     free(pre);
     free(keyBlock);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int cmp_uint32(const void *a, const void *b) {
@@ -2184,7 +2184,7 @@ static int CmdHFiClassLookUp(const char *Cmd) {
     free(prekey);
     free(keyBlock);
     PrintAndLogEx(NORMAL, "");
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int LoadDictionaryKeyFile(char *filename, uint8_t **keys, int *keycnt) {
@@ -2234,7 +2234,7 @@ int LoadDictionaryKeyFile(char *filename, uint8_t **keys, int *keycnt) {
     }
     fclose(f);
     PrintAndLogEx(SUCCESS, "Loaded " _GREEN_("%2d") " keys from %s", *keycnt, filename);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // precalc diversified keys and their MAC
@@ -2253,7 +2253,7 @@ int GenerateMacFromKeyFile(uint8_t *CSN, uint8_t *CCNR, bool use_raw, bool use_e
 
         doMAC(CCNR, div_key, list[i].mac);
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int GenerateFromKeyFile(uint8_t *CSN, uint8_t *CCNR, bool use_raw, bool use_elite, uint8_t *keys, int keycnt, iclass_prekey_t *list) {
@@ -2273,7 +2273,7 @@ int GenerateFromKeyFile(uint8_t *CSN, uint8_t *CCNR, bool use_raw, bool use_elit
         // generate MAC
         doMAC(CCNR, div_key, list[i].mac);
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 // print diversified keys
@@ -2403,7 +2403,7 @@ static int CmdHFiClassPermuteKey(const char *Cmd) {
         permutekey(key, key_iclass_format);
         PrintAndLogEx(SUCCESS, "holiman std key | %s \n", sprint_hex(key_iclass_format, 8));
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static command_t CommandTable[] = {
@@ -2433,7 +2433,7 @@ static command_t CommandTable[] = {
 static int CmdHelp(const char *Cmd) {
     (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int CmdHFiClass(const char *Cmd) {
@@ -2503,6 +2503,6 @@ int readIclass(bool loop, bool verbose) {
         if (!loop) break;
     }
     DropField();
-    return 0;
+    return PM3_SUCCESS;
 }
 
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index ed956bdf9..8bd976030 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -947,14 +947,14 @@ static int CmdLegicDump(const char *Cmd) {
         PrintAndLogEx(WARNING, "Could not create file name %s", filename);
         if (data)
             free(data);
-        return 5;
+        return PM3_EFILE;
     }
     fwrite(data, 1, readlen, f);
     fflush(f);
     fclose(f);
     free(data);
     PrintAndLogEx(SUCCESS, "Wrote %d bytes to %s", readlen, filename);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdLegicRestore(const char *Cmd) {
@@ -1017,7 +1017,7 @@ static int CmdLegicRestore(const char *Cmd) {
     if (!f) {
         PrintAndLogEx(WARNING, "File %s not found or locked", filename);
         free(data);
-        return 3;
+        return PM3_EFILE;
     }
 
     // verify size of dumpfile is the same as card.
@@ -1083,7 +1083,7 @@ static int CmdLegicRestore(const char *Cmd) {
 
     free(data);
     PrintAndLogEx(SUCCESS, "\nWrote %d bytes to card from file %s", numofbytes, filename);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdLegicELoad(const char *Cmd) {
@@ -1133,7 +1133,7 @@ static int CmdLegicELoad(const char *Cmd) {
     if (!f) {
         PrintAndLogEx(WARNING, "File %s not found or locked", filename);
         free(data);
-        return 1;
+        return PM3_EFILE;
     }
 
     // load file
@@ -1153,7 +1153,7 @@ static int CmdLegicELoad(const char *Cmd) {
 
     free(data);
     PrintAndLogEx(SUCCESS, "\nLoaded %d bytes from file: %s  to emulator memory", numofbytes, filename);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdLegicESave(const char *Cmd) {
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index a22c43c1b..998512575 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -177,7 +177,7 @@ static int CmdLFHitagList(const char *Cmd) {
         f = fopen(filename, "wb");
         if (!f) {
             PrintAndLogEx(WARNING, "Error: Could not open file [%s]", filename);
-            return 1;
+            return PM3_EFILE;
         }
     }
 
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index bf252f3d7..d6870e579 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -559,7 +559,7 @@ static int CmdSmartUpgrade(const char *Cmd) {
     f = fopen(filename, "rb");
     if (!f) {
         PrintAndLogEx(FAILED, "Firmware file " _YELLOW_("%s") " not found or locked.", filename);
-        return 1;
+        return PM3_EFILE;
     }
 
     // get filesize in order to malloc memory
@@ -588,7 +588,7 @@ static int CmdSmartUpgrade(const char *Cmd) {
     if (!f) {
         PrintAndLogEx(FAILED, "SHA-512 file not found or locked.");
         free(dump);
-        return 1;
+        return PM3_EFILE;
     }
 
     // get filesize in order to malloc memory
@@ -683,7 +683,7 @@ static int CmdSmartUpgrade(const char *Cmd) {
     } else {
         PrintAndLogEx(FAILED, "Sim module firmware upgrade " _RED_("failed"));
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int CmdSmartInfo(const char *Cmd) {
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index a592e7dfc..cb16a7fa3 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -102,14 +102,14 @@ int saveFile(const char *preferredName, const char *suffix, const void *data, si
     if (!f) {
         PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_("%s")"'", fileName);
         free(fileName);
-        return 1;
+        return PM3_EFILE;
     }
     fwrite(data, 1, datalen, f);
     fflush(f);
     fclose(f);
     PrintAndLogDevice(SUCCESS, "saved %u bytes to binary file " _YELLOW_("%s"), datalen, fileName);
     free(fileName);
-    return 0;
+    return PM3_SUCCESS;
 }
 
 int saveFileEML(const char *preferredName, uint8_t *data, size_t datalen, size_t blocksize) {
@@ -118,7 +118,7 @@ int saveFileEML(const char *preferredName, uint8_t *data, size_t datalen, size_t
     char *fileName = newfilenamemcopy(preferredName, ".eml");
     if (fileName == NULL) return 1;
 
-    int retval = 0;
+    int retval = PM3_SUCCESS;
     int blocks = datalen / blocksize;
     uint16_t currblock = 1;
 
@@ -128,7 +128,7 @@ int saveFileEML(const char *preferredName, uint8_t *data, size_t datalen, size_t
     FILE *f = fopen(fileName, "w+");
     if (!f) {
         PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_("%s")"'", fileName);
-        retval =  1;
+        retval = PM3_EFILE;
         goto out;
     }
 
@@ -163,7 +163,7 @@ int saveFileJSON(const char *preferredName, JSONFileType ftype, uint8_t *data, s
     char *fileName = newfilenamemcopy(preferredName, ".json");
     if (fileName == NULL) return 1;
 
-    int retval = 0;
+    int retval = PM3_SUCCESS;
 
     json_t *root = json_object();
     JsonSaveStr(root, "Created", "proxmark3");
@@ -292,13 +292,13 @@ int loadFile(const char *preferredName, const char *suffix, void *data, size_t m
     char *fileName = filenamemcopy(preferredName, suffix);
     if (fileName == NULL) return 1;
 
-    int retval = 0;
+    int retval = PM3_SUCCESS;
 
     FILE *f = fopen(fileName, "rb");
     if (!f) {
         PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_("%s")"'", fileName);
         free(fileName);
-        return 1;
+        return PM3_EFILE;
     }
 
     // get filesize in order to malloc memory
@@ -354,12 +354,12 @@ int loadFileEML(const char *preferredName, void *data, size_t *datalen) {
     if (fileName == NULL) return 1;
 
     size_t counter = 0;
-    int retval = 0, hexlen = 0;
+    int retval = PM3_SUCCESS, hexlen = 0;
 
     FILE *f = fopen(fileName, "r");
     if (!f) {
         PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_("%s")"'", fileName);
-        retval = 1;
+        retval = PM3_EFILE;
         goto out;
     }
 
@@ -411,7 +411,7 @@ int loadFileJSON(const char *preferredName, void *data, size_t maxdatalen, size_
     json_t *root;
     json_error_t error;
 
-    int retval = 0;
+    int retval = PM3_SUCCESS;
 
     root = json_load_file(fileName, 0, &error);
     if (!root) {
@@ -528,12 +528,12 @@ int loadFileDICTIONARY(const char *preferredName, void *data, size_t *datalen, u
     char line[255];
 
     size_t counter = 0;
-    int retval = 0;
+    int retval = PM3_SUCCESS;
 
     FILE *f = fopen(fileName, "r");
     if (!f) {
         PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_("%s")"'", fileName);
-        retval = 1;
+        retval = PM3_EFILE;
         goto out;
     }
 
@@ -602,7 +602,7 @@ int convertOldMfuDump(uint8_t **dump, size_t *dumplen) {
     free(*dump);
     *dump = (uint8_t *) mfu_dump;
     PrintAndLogDevice(SUCCESS, "old mfu dump format, was converted on load to " _GREEN_("%d") " pages", mfu_dump->pages + 1);
-    return 0;
+    return PM3_SUCCESS;
 }