diff --git a/client/cmdsmartcard.h b/client/cmdsmartcard.h
index f7adb7690..1e94499af 100644
--- a/client/cmdsmartcard.h
+++ b/client/cmdsmartcard.h
@@ -29,9 +29,9 @@
 
 int CmdSmartcard(const char *Cmd);
 
-int CmdSmartRaw(const char *cmd);
-int CmdSmartUpgrade(const char *cmd);
-int CmdSmartInfo(const char *cmd);
+int CmdSmartRaw(const char *Cmd);
+int CmdSmartUpgrade(const char *Cmd);
+int CmdSmartInfo(const char *Cmd);
 int CmdSmartReader(const char *Cmd);
 
 bool smart_select(bool silent, smart_card_atr_t *atr);
diff --git a/client/emv/dol.h b/client/emv/dol.h
index 9b1b51656..496ae66f5 100644
--- a/client/emv/dol.h
+++ b/client/emv/dol.h
@@ -20,6 +20,6 @@
 #include <stddef.h>
 
 struct tlv *dol_process(const struct tlv *tlv, const struct tlvdb *tlvdb, tlv_tag_t tag);
-struct tlvdb *dol_parse(const struct tlv *tlv, const unsigned char *buf, size_t len);
+struct tlvdb *dol_parse(const struct tlv *tlv, const unsigned char *data, size_t data_len);
 
 #endif
diff --git a/client/emv/emv_pki.h b/client/emv/emv_pki.h
index 0b80f2665..91ff60166 100644
--- a/client/emv/emv_pki.h
+++ b/client/emv/emv_pki.h
@@ -28,10 +28,10 @@ struct emv_pk *emv_pki_recover_issuer_cert(const struct emv_pk *pk, struct tlvdb
 struct emv_pk *emv_pki_recover_icc_cert(const struct emv_pk *pk, struct tlvdb *db, const struct tlv *sda_tlv);
 struct emv_pk *emv_pki_recover_icc_pe_cert(const struct emv_pk *pk, struct tlvdb *db);
 
-struct tlvdb *emv_pki_recover_dac(const struct emv_pk *pk, const struct tlvdb *db, const struct tlv *sda_tlv);
-struct tlvdb *emv_pki_recover_dac_ex(const struct emv_pk *pk, const struct tlvdb *db, const struct tlv *sda_tlv, bool showData);
-struct tlvdb *emv_pki_recover_idn(const struct emv_pk *pk, const struct tlvdb *db, const struct tlv *dyn_tlv);
-struct tlvdb *emv_pki_recover_idn_ex(const struct emv_pk *pk, const struct tlvdb *db, const struct tlv *dyn_tlv, bool showData);
+struct tlvdb *emv_pki_recover_dac(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *sda_tlv);
+struct tlvdb *emv_pki_recover_dac_ex(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *sda_tlv, bool showData);
+struct tlvdb *emv_pki_recover_idn(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *dyn_tlv);
+struct tlvdb *emv_pki_recover_idn_ex(const struct emv_pk *enc_pk, const struct tlvdb *db, const struct tlv *dyn_tlv, bool showData);
 struct tlvdb *emv_pki_recover_atc_ex(const struct emv_pk *enc_pk, const struct tlvdb *db, bool showData);
 struct tlvdb *emv_pki_perform_cda(const struct emv_pk *enc_pk, const struct tlvdb *db,
                                   const struct tlvdb *this_db,