diff --git a/client/src/cmdhf.c b/client/src/cmdhf.c
index f5ef9f188..0cf9bcc37 100644
--- a/client/src/cmdhf.c
+++ b/client/src/cmdhf.c
@@ -409,7 +409,7 @@ static command_t CommandTable[] = {
     {"mfp",         CmdHFMFP,         AlwaysAvailable, "{ MIFARE Plus RFIDs...                }"},
     {"mfu",         CmdHFMFUltra,     AlwaysAvailable, "{ MIFARE Ultralight RFIDs...          }"},
     {"mfdes",       CmdHFMFDes,       AlwaysAvailable, "{ MIFARE Desfire RFIDs...             }"},
-    {"st",          CmdHF_ST,         AlwaysAvailable, "{ ST Rothult RFIDs...                 }"},
+    {"st",          CmdHFST,          AlwaysAvailable, "{ ST Rothult RFIDs...                 }"},
     {"thinfilm",    CmdHFThinfilm,    AlwaysAvailable, "{ Thinfilm RFIDs...                   }"},
     {"topaz",       CmdHFTopaz,       AlwaysAvailable, "{ TOPAZ (NFC Type 1) RFIDs...         }"},
     {"waveshare",   CmdHFWaveshare,   AlwaysAvailable, "{ Waveshare NFC ePaper...             }"},
diff --git a/client/src/cmdhfemrtd.c b/client/src/cmdhfemrtd.c
index a61a8e709..df4cb7273 100644
--- a/client/src/cmdhfemrtd.c
+++ b/client/src/cmdhfemrtd.c
@@ -2075,7 +2075,7 @@ static bool validate_date(uint8_t *data, int datalen) {
     return !(day <= 0 || day > 31 || month <= 0 || month > 12);
 }
 
-static int cmd_hf_emrtd_dump(const char *Cmd) {
+static int CmdHFeMRTDDump(const char *Cmd) {
     CLIParserContext *ctx;
     CLIParserInit(&ctx, "hf emrtd dump",
                   "Dump all files on an eMRTD",
@@ -2167,7 +2167,7 @@ static int cmd_hf_emrtd_dump(const char *Cmd) {
     return dumpHF_EMRTD((char *)docnum, (char *)dob, (char *)expiry, BAC, (const char *)path);
 }
 
-static int cmd_hf_emrtd_info(const char *Cmd) {
+static int CmdHFeMRTDInfo(const char *Cmd) {
     CLIParserContext *ctx;
     CLIParserInit(&ctx, "hf emrtd info",
                   "Display info about an eMRTD",
@@ -2258,15 +2258,15 @@ static int cmd_hf_emrtd_info(const char *Cmd) {
     }
 }
 
-static int cmd_hf_emrtd_list(const char *Cmd) {
+static int CmdHFeMRTDList(const char *Cmd) {
     return CmdTraceListAlias(Cmd, "hf emrtd", "7816");
 }
 
 static command_t CommandTable[] = {
     {"help",    CmdHelp,           AlwaysAvailable, "This help"},
-    {"dump",    cmd_hf_emrtd_dump, IfPm3Iso14443,   "Dump eMRTD files to binary files"},
-    {"info",    cmd_hf_emrtd_info, AlwaysAvailable, "Display info about an eMRTD"},
-    {"list",    cmd_hf_emrtd_list, AlwaysAvailable, "List ISO 14443A/7816 history"},
+    {"dump",    CmdHFeMRTDDump,    IfPm3Iso14443,   "Dump eMRTD files to binary files"},
+    {"info",    CmdHFeMRTDInfo,    AlwaysAvailable, "Display info about an eMRTD"},
+    {"list",    CmdHFeMRTDList,    AlwaysAvailable, "List ISO 14443A/7816 history"},
     {NULL, NULL, NULL, NULL}
 };
 
diff --git a/client/src/cmdhffido.c b/client/src/cmdhffido.c
index 4a0267fe5..d6648371d 100644
--- a/client/src/cmdhffido.c
+++ b/client/src/cmdhffido.c
@@ -38,11 +38,11 @@
 
 static int CmdHelp(const char *Cmd);
 
-static int cmd_hf_fido_list(const char *Cmd) {
+static int CmdHFFidoList(const char *Cmd) {
     return CmdTraceListAlias(Cmd, "hf fido", "14a");
 }
 
-static int cmd_hf_fido_info(const char *Cmd) {
+static int CmdHFFidoInfo(const char *Cmd) {
     CLIParserContext *ctx;
     CLIParserInit(&ctx, "hf fido info",
                   "Get info from Fido tags",
@@ -161,7 +161,7 @@ static json_t *OpenJson(CLIParserContext *ctx, int paramnum, char *fname, void *
     return root;
 }
 
-static int cmd_hf_fido_register(const char *cmd) {
+static int CmdHFFidoRegister(const char *cmd) {
     uint8_t data[64] = {0};
     int chlen = 0;
     uint8_t cdata[250] = {0};
@@ -404,7 +404,7 @@ static int cmd_hf_fido_register(const char *cmd) {
     return PM3_SUCCESS;
 }
 
-static int cmd_hf_fido_authenticate(const char *cmd) {
+static int CmdHFFidoAuthenticate(const char *cmd) {
     uint8_t data[512] = {0};
     uint8_t hdata[250] = {0};
     bool public_key_loaded = false;
@@ -677,7 +677,7 @@ static int GetExistsFileNameJson(const char *prefixDir, const char *reqestedFile
     return PM3_SUCCESS;
 }
 
-static int cmd_hf_fido_2make_credential(const char *cmd) {
+static int CmdHFFido2MakeCredential(const char *cmd) {
     json_error_t error;
     char fname[FILE_PATH_SIZE] = {0};
 
@@ -805,7 +805,7 @@ static int cmd_hf_fido_2make_credential(const char *cmd) {
     return PM3_SUCCESS;
 }
 
-static int cmd_hf_fido_2get_assertion(const char *cmd) {
+static int CmdHFFido2GetAssertion(const char *cmd) {
     json_error_t error;
     char fname[FILE_PATH_SIZE] = {0};
 
@@ -935,12 +935,12 @@ static int cmd_hf_fido_2get_assertion(const char *cmd) {
 
 static command_t CommandTable[] = {
     {"help",      CmdHelp,                      AlwaysAvailable, "This help."},
-    {"list",      cmd_hf_fido_list,             AlwaysAvailable, "List ISO 14443A history"},
-    {"info",      cmd_hf_fido_info,             IfPm3Iso14443a,  "Info about FIDO tag."},
-    {"reg",       cmd_hf_fido_register,         IfPm3Iso14443a,  "FIDO U2F Registration Message."},
-    {"auth",      cmd_hf_fido_authenticate,     IfPm3Iso14443a,  "FIDO U2F Authentication Message."},
-    {"make",      cmd_hf_fido_2make_credential, IfPm3Iso14443a,  "FIDO2 MakeCredential command."},
-    {"assert",    cmd_hf_fido_2get_assertion,   IfPm3Iso14443a,  "FIDO2 GetAssertion command."},
+    {"list",      CmdHFFidoList,                AlwaysAvailable, "List ISO 14443A history"},
+    {"info",      CmdHFFidoInfo,                IfPm3Iso14443a,  "Info about FIDO tag."},
+    {"reg",       CmdHFFidoRegister,            IfPm3Iso14443a,  "FIDO U2F Registration Message."},
+    {"auth",      CmdHFFidoAuthenticate,        IfPm3Iso14443a,  "FIDO U2F Authentication Message."},
+    {"make",      CmdHFFido2MakeCredential,     IfPm3Iso14443a,  "FIDO2 MakeCredential command."},
+    {"assert",    CmdHFFido2GetAssertion,       IfPm3Iso14443a,  "FIDO2 GetAssertion command."},
     {NULL, NULL, 0, NULL}
 };
 
diff --git a/client/src/cmdhfst.c b/client/src/cmdhfst.c
index 64e244323..2c0ffea31 100644
--- a/client/src/cmdhfst.c
+++ b/client/src/cmdhfst.c
@@ -203,7 +203,7 @@ static uint16_t get_sw(uint8_t *d, uint8_t n) {
 }
 
 // ST rothult
-int infoHF_ST(void) {
+int infoHFST(void) {
 
     bool activate_field = true;
     bool keep_field_on = true;
@@ -317,7 +317,7 @@ int infoHF_ST(void) {
 }
 
 // menu command to get and print all info known about any known ST25TA tag
-static int cmd_hf_st_info(const char *Cmd) {
+static int CmdHFSTInfo(const char *Cmd) {
     CLIParserContext *ctx;
     CLIParserInit(&ctx, "hf st info",
                   "Get info about ST25TA tag",
@@ -330,10 +330,10 @@ static int cmd_hf_st_info(const char *Cmd) {
     };
     CLIExecWithReturn(ctx, Cmd, argtable, true);
     CLIParserFree(ctx);
-    return infoHF_ST();
+    return infoHFST();
 }
 
-static int cmd_hf_st_sim(const char *Cmd) {
+static int CmdHFSTSim(const char *Cmd) {
     int uidlen = 0;
     uint8_t uid[7] = {0};
 
@@ -361,7 +361,7 @@ static int cmd_hf_st_sim(const char *Cmd) {
     return CmdHF14ASim(param);
 }
 
-static int cmd_hf_st_ndef(const char *Cmd) {
+static int CmdHFSTNdef(const char *Cmd) {
     int pwdlen = 0;
     uint8_t pwd[16] = {0};
     bool with_pwd = false;
@@ -489,7 +489,7 @@ static int cmd_hf_st_ndef(const char *Cmd) {
     return PM3_SUCCESS;
 }
 
-static int cmd_hf_st_protect(const char *Cmd) {
+static int CmdHFSTProtect(const char *Cmd) {
 
     int pwdlen = 0;
     uint8_t pwd[16] = {0};
@@ -644,7 +644,7 @@ static int cmd_hf_st_protect(const char *Cmd) {
     return PM3_SUCCESS;
 }
 
-static int cmd_hf_st_pwd(const char *Cmd) {
+static int CmdHFSTPwd(const char *Cmd) {
 
     int pwdlen = 0;
     uint8_t pwd[16] = {0};
@@ -787,7 +787,7 @@ static int cmd_hf_st_pwd(const char *Cmd) {
     return PM3_SUCCESS;
 }
 
-static int cmd_hf_st_list(const char *Cmd) {
+static int CmdHFSTList(const char *Cmd) {
     return CmdTraceListAlias(Cmd, "hf st", "7816");
     char args[128] = {0};
     if (strlen(Cmd) == 0) {
@@ -800,12 +800,12 @@ static int cmd_hf_st_list(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",    CmdHelp,           AlwaysAvailable, "This help"},
-    {"info",    cmd_hf_st_info,    IfPm3Iso14443a,  "Tag information"},
-    {"list",    cmd_hf_st_list,    AlwaysAvailable, "List ISO 14443A/7816 history"},
-    {"ndef",    cmd_hf_st_ndef,    AlwaysAvailable, "read NDEF file on tag"},
-    {"protect", cmd_hf_st_protect, IfPm3Iso14443a,  "change protection on tag"},
-    {"pwd",     cmd_hf_st_pwd,     IfPm3Iso14443a,  "change password on tag"},
-    {"sim",     cmd_hf_st_sim,     IfPm3Iso14443a,  "Fake ISO 14443A/ST tag"},
+    {"info",    CmdHFSTInfo,       IfPm3Iso14443a,  "Tag information"},
+    {"list",    CmdHFSTList,       AlwaysAvailable, "List ISO 14443A/7816 history"},
+    {"ndef",    CmdHFSTNdef,       AlwaysAvailable, "read NDEF file on tag"},
+    {"protect", CmdHFSTProtect,    IfPm3Iso14443a,  "change protection on tag"},
+    {"pwd",     CmdHFSTPwd,        IfPm3Iso14443a,  "change password on tag"},
+    {"sim",     CmdHFSTSim,        IfPm3Iso14443a,  "Fake ISO 14443A/ST tag"},
     {NULL, NULL, NULL, NULL}
 };
 
@@ -815,7 +815,7 @@ static int CmdHelp(const char *Cmd) {
     return PM3_SUCCESS;
 }
 
-int CmdHF_ST(const char *Cmd) {
+int CmdHFST(const char *Cmd) {
     clearCommandBuffer();
     return CmdsParse(CommandTable, Cmd);
 }
diff --git a/client/src/cmdhfst.h b/client/src/cmdhfst.h
index c3772318d..cd73fffd0 100644
--- a/client/src/cmdhfst.h
+++ b/client/src/cmdhfst.h
@@ -13,7 +13,7 @@
 
 #include "common.h"
 
-int CmdHF_ST(const char *Cmd);
+int CmdHFST(const char *Cmd);
 
-int infoHF_ST(void);
+int infoHFST(void);
 #endif