diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index 7791c5e53..b2e0eeecc 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -357,7 +357,7 @@ void annotateIso7816(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
 			case ISO7816_EXTERNAL_AUTHENTICATION 	:snprintf(exp, size, "EXTERNAL AUTH");break;
 			case ISO7816_GET_CHALLENGE				:snprintf(exp, size, "GET CHALLENGE");break;
 			case ISO7816_MANAGE_CHANNEL				:snprintf(exp, size, "MANAGE CHANNEL");break;
-			case ISO7816_GETSTATUS					:snprintf(exp, size, "GET RESPONSE");break;
+			case ISO7816_GET_RESPONSE				:snprintf(exp, size, "GET RESPONSE");break;
 			default									:snprintf(exp,size,"?"); break;
 		}
 	}
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index fdc825d38..45957d407 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -356,7 +356,7 @@ static int smart_responseEx(uint8_t *data, bool silent) {
 	if (needGetData) {
 		int len = data[datalen - 1];
 		if (!silent) PrintAndLogEx(INFO, "Requesting 0x%02X bytes response", len);	
-		uint8_t getstatus[] = {0x00, ISO7816_GETSTATUS, 0x00, 0x00, len};
+		uint8_t getstatus[] = {0x00, ISO7816_GET_RESPONSE, 0x00, 0x00, len};
 		UsbCommand cStatus = {CMD_SMART_RAW, {SC_RAW, sizeof(getstatus), 0}};	
 		memcpy(cStatus.d.asBytes, getstatus, sizeof(getstatus) );
 		clearCommandBuffer();
@@ -372,7 +372,7 @@ static int smart_responseEx(uint8_t *data, bool silent) {
 		if (datalen != len + 2) { 
 			// data with ACK
 			if (datalen == len + 2 + 1) { // 2 - response, 1 - ACK
-				if (data[0] != ISO7816_GETSTATUS) {
+				if (data[0] != ISO7816_GET_RESPONSE) {
 					if (!silent) {
 						PrintAndLogEx(ERR, "GetResponse ACK error. len 0x%x | data[0] %02X", len, data[0]);	
 					}
diff --git a/common/protocols.h b/common/protocols.h
index 9696c73e0..3c2e79a8d 100644
--- a/common/protocols.h
+++ b/common/protocols.h
@@ -302,10 +302,10 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
 #define ISO7816_VERIFY 					0x20
 #define ISO7816_INTERNAL_AUTHENTICATION 0x88
 #define ISO7816_EXTERNAL_AUTHENTICATION 0x82
-#define ISO7816_GET_CHALLENGE 			0xB4
+#define ISO7816_GET_CHALLENGE 			0x84
 #define ISO7816_MANAGE_CHANNEL 			0x70
 
-#define ISO7816_GETSTATUS				0xC0
+#define ISO7816_GET_RESPONSE			0xC0
 // ISO7816-4	For response APDU's
 #define ISO7816_OK						0x9000
 //	6x xx = ERROR