diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa174a5d2..6ee98185e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Added openocd shikra support based on @ninjastyle82 patch to deprecated iceman fork (@iceman1001)
  - Changed `hf lto info` - now decode more of LTO CM info (@iceman1001)
  - Added `HF_TMUDFORD` standalone mode that reads and emulates ISO15693 UID (@tmudford)
  - Changed `hf mf wipe` - now supports enforcing sector 0 / block 0 writes (@iceman1001)
diff --git a/client/src/cmddata.h b/client/src/cmddata.h
index 6ae362933..5530e860d 100644
--- a/client/src/cmddata.h
+++ b/client/src/cmddata.h
@@ -61,8 +61,8 @@ int CmdSave(const char *Cmd);
 int CmdTuneSamples(const char *Cmd);                                                            // used by cmd lf hw
 
 int ASKbiphaseDemod(int offset, int clk, int invert, int maxErr, bool verbose);                 // used by cmd lf em4x, lf fdxb, lf guard, lf jablotron, lf nedap, lf t55xx
-int ASKDemod(int clk, int invert, int maxErr, size_t maxLen, bool amplify, bool verbose, bool emSearch, uint8_t askType);                    // used by cmd lf em4x, lf t55xx, lf viking
-int ASKDemod_ext(int clk, int invert, int maxErr, size_t maxLen, bool amplify, bool verbose, bool emSearch, uint8_t askType, bool *stCheck); // used by cmd lf, lf em4x, lf noralsy, le presco, lf securekey, lf t55xx, lf visa2k
+int ASKDemod(int clk, int invert, int maxErr, size_t maxlen, bool amplify, bool verbose, bool emSearch, uint8_t askType);                    // used by cmd lf em4x, lf t55xx, lf viking
+int ASKDemod_ext(int clk, int invert, int maxErr, size_t maxlen, bool amplify, bool verbose, bool emSearch, uint8_t askType, bool *stCheck); // used by cmd lf, lf em4x, lf noralsy, le presco, lf securekey, lf t55xx, lf visa2k
 int FSKrawDemod(uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow, bool verbose);    // used by cmd lf, lf em4x, lf t55xx
 int PSKDemod(int clk, int invert, int maxErr, bool verbose);                                    // used by cmd lf em4x, lf indala, lf keri, lf nexwatch, lf t55xx
 int NRZrawDemod(int clk, int invert, int maxErr, bool verbose);                                 // used by cmd lf pac, lf t55xx
diff --git a/client/src/cmdlfdestron.h b/client/src/cmdlfdestron.h
index fb2b62f4a..d154e36b6 100644
--- a/client/src/cmdlfdestron.h
+++ b/client/src/cmdlfdestron.h
@@ -12,7 +12,7 @@
 #include "common.h"
 
 int CmdLFDestron(const char *Cmd);
-int detectDestron(uint8_t *bits, size_t *size);
+int detectDestron(uint8_t *dest, size_t *size);
 int demodDestron(bool verbose);
 int readDestronUid(void);
 #endif
diff --git a/client/src/cmdlfhitag.c b/client/src/cmdlfhitag.c
index 97a561292..bd246c281 100644
--- a/client/src/cmdlfhitag.c
+++ b/client/src/cmdlfhitag.c
@@ -874,7 +874,7 @@ static int CmdLFHitag2Dump(const char *Cmd) {
 
 
 // Annotate HITAG protocol
-void annotateHitag1(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, bool is_reader) {
+void annotateHitag1(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, bool is_response) {
 }
 
 void annotateHitag2(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, bool is_response) {
@@ -928,7 +928,7 @@ void annotateHitag2(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, bool
 }
 
 
-void annotateHitagS(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, bool is_reader) {
+void annotateHitagS(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, bool is_response) {
 }
 
 static command_t CommandTable[] = {
diff --git a/client/src/cmdlfhitag.h b/client/src/cmdlfhitag.h
index 5066cadc8..817cb16f3 100644
--- a/client/src/cmdlfhitag.h
+++ b/client/src/cmdlfhitag.h
@@ -16,7 +16,7 @@
 int CmdLFHitag(const char *Cmd);
 
 int readHitagUid(void);
-void annotateHitag1(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, bool is_reader);
-void annotateHitag2(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, bool is_reader);
-void annotateHitagS(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, bool is_reader);
+void annotateHitag1(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, bool is_response);
+void annotateHitag2(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, bool is_response);
+void annotateHitagS(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, bool is_response);
 #endif