diff --git a/client/Makefile b/client/Makefile
index 1de8622e..fb82788a 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -88,8 +88,8 @@ CMDSRCS = 	crapto1/crapto1.c\
 			crapto1/crypto1.c\
 			polarssl/des.c \
 			polarssl/aes.c\
-			clparser/argtable3.c\
-			clparser/clparser.c\
+			cliparser/argtable3.c\
+			cliparser/cliparser.c\
 			mfkey.c\
 			loclass/cipher.c \
 			loclass/cipherutils.c \
diff --git a/client/clparser/argtable3.c b/client/cliparser/argtable3.c
similarity index 100%
rename from client/clparser/argtable3.c
rename to client/cliparser/argtable3.c
diff --git a/client/clparser/argtable3.h b/client/cliparser/argtable3.h
similarity index 100%
rename from client/clparser/argtable3.h
rename to client/cliparser/argtable3.h
diff --git a/client/clparser/clparser.c b/client/cliparser/cliparser.c
similarity index 89%
rename from client/clparser/clparser.c
rename to client/cliparser/cliparser.c
index 522218bb..8d3e7969 100644
--- a/client/clparser/clparser.c
+++ b/client/cliparser/cliparser.c
@@ -8,7 +8,7 @@
 // Command line parser core commands
 //-----------------------------------------------------------------------------
 
-#include "clparser.h"
+#include "cliparser.h"
 #include <stdio.h>
 #include <string.h>
 
@@ -18,7 +18,7 @@ char *programName = NULL;
 char *programHint = NULL;
 char buf[500] = {0};
 
-int CLParserInit(char *vprogramName, char *vprogramHint) {
+int CLIParserInit(char *vprogramName, char *vprogramHint) {
 	argtable = NULL;
 	argtableLen = 0;
 	programName = vprogramName;
@@ -28,7 +28,7 @@ int CLParserInit(char *vprogramName, char *vprogramHint) {
 	return 0;
 }
 
-int CLParserParseArg(int argc, char **argv, void* vargtable[], size_t vargtableLen) { 
+int CLIParserParseArg(int argc, char **argv, void* vargtable[], size_t vargtableLen) { 
 	int nerrors;
 	
 	argtable = vargtable;
@@ -75,7 +75,7 @@ enum ParserState {
 
 #define isSpace(c)(c == ' ' || c == '\t')
 
-int CLParserParseString(const char* str, void* vargtable[], size_t vargtableLen) {
+int CLIParserParseString(const char* str, void* vargtable[], size_t vargtableLen) {
 	int argc = 0;
 	char *argv[200] = {NULL};
 	
@@ -132,10 +132,10 @@ int CLParserParseString(const char* str, void* vargtable[], size_t vargtableLen)
 		}
 	}
 
-	return CLParserParseArg(argc, argv, vargtable, vargtableLen);
+	return CLIParserParseArg(argc, argv, vargtable, vargtableLen);
 }
 
-void CLParserFree() {
+void CLIParserFree() {
 	arg_freetable(argtable, argtableLen);
 	argtable = NULL;
 	
@@ -143,7 +143,7 @@ void CLParserFree() {
 }
 
 // convertors
-int CLParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen) {
+int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen) {
 	switch(param_gethex_to_eol(argstr->sval[0], 0, data, maxdatalen, datalen)) {
 	case 1:
 		printf("Parameter error: Invalid HEX value.\n");
diff --git a/client/clparser/clparser.h b/client/cliparser/cliparser.h
similarity index 66%
rename from client/clparser/clparser.h
rename to client/cliparser/cliparser.h
index 868f078e..2999fc74 100644
--- a/client/clparser/clparser.h
+++ b/client/cliparser/cliparser.h
@@ -17,9 +17,9 @@
 #define arg_get_lit(n)(((struct arg_lit*)argtable[n]))
 #define arg_get_str(n)(((struct arg_str*)argtable[n]))
 
-extern int CLParserInit(char *vprogramName, char *vprogramHint);
-extern int CLParserParseString(const char* str, void* argtable[], size_t vargtableLen);
-extern int CLParserParseArg(int argc, char **argv, void* argtable[], size_t vargtableLen);
-extern void CLParserFree();
+extern int CLIParserInit(char *vprogramName, char *vprogramHint);
+extern int CLIParserParseString(const char* str, void* argtable[], size_t vargtableLen);
+extern int CLIParserParseArg(int argc, char **argv, void* argtable[], size_t vargtableLen);
+extern void CLIParserFree();
 
-extern int CLParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen);
+extern int CLIParamHexToBuf(struct arg_str *argstr, uint8_t *data, int maxdatalen, int *datalen);
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index cadc96f0..b1be639a 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -28,7 +28,7 @@
 #include "mifare.h"
 #include "cmdhfmfu.h"
 #include "mifarehost.h"
-#include "clparser/clparser.h"
+#include "cliparser/cliparser.h"
 #include "emv/apduinfo.h"
 #include "emv/emvcore.h"
 
@@ -727,7 +727,7 @@ int CmdHF14AAPDU(const char *cmd) {
 	bool leaveSignalON = false;
 	bool decodeTLV = false;
 
-	CLParserInit("hf 14a apdu", "Send ISO 14443-4 APDU to tag");
+	CLIParserInit("hf 14a apdu", "Send ISO 14443-4 APDU to tag");
 	/*struct arg_lit *ahelp  = arg_lit0("hH",  "help",    "print this help and exit");
 	struct arg_lit *as     = arg_lit0("sS",  "select",  "activate field and select card");
 	struct arg_lit *ak     = arg_lit0("kK",  "keep",    "leave the signal field ON after receive response");
@@ -744,8 +744,8 @@ int CmdHF14AAPDU(const char *cmd) {
 		arg_str1(NULL,  NULL,      "<APDU (hex)>", NULL),
 		arg_param_end
 	};
-	if (CLParserParseString(cmd, argtable, sizeof(argtable) / sizeof(argtable[0]))){
-		CLParserFree();
+	if (CLIParserParseString(cmd, argtable, sizeof(argtable) / sizeof(argtable[0]))){
+		CLIParserFree();
 		return 0;
 	}
 	
@@ -753,12 +753,12 @@ int CmdHF14AAPDU(const char *cmd) {
 	leaveSignalON = arg_get_lit(2)->count;
 	decodeTLV = arg_get_lit(3)->count;
 	// len = data + PCB(1b) + CRC(2b)
-	if (CLParamHexToBuf(arg_get_str(4), data, sizeof(data) - 1 -2, &datalen)) {
-		CLParserFree();
+	if (CLIParamHexToBuf(arg_get_str(4), data, sizeof(data) - 1 -2, &datalen)) {
+		CLIParserFree();
 		return 1;
 	}
 	
-	CLParserFree();
+	CLIParserFree();
 //	PrintAndLog("---str [%d] %s", astr->count, astr->sval[0]);
 
 	PrintAndLog(">>>>[%s%s%s] %s", activateField ? "sel ": "", leaveSignalON ? "keep ": "", decodeTLV ? "TLV": "", sprint_hex(data, datalen));
diff --git a/client/obj/clparser/.dummy b/client/obj/cliparser/.dummy
similarity index 100%
rename from client/obj/clparser/.dummy
rename to client/obj/cliparser/.dummy