diff --git a/docs/hashcat-plugin-development-guide.md b/docs/hashcat-plugin-development-guide.md
index 9eb002acf..11e6cec9e 100644
--- a/docs/hashcat-plugin-development-guide.md
+++ b/docs/hashcat-plugin-development-guide.md
@@ -797,7 +797,7 @@ One very unique feature is that the tokenizer allows you to have both dynamic le
 The first step after declaring the tokenizer context buffer is to create its configuration. There is just one mandatory parameter and a maximum of 128 optional configuration items (columns). The mandatory configuration item needs to be set to the number of columns/fields which the hash line includes. Note that this is a fixed value. For more complex hash lines with a dynamic column count you need to create multiple tokenizer instances (e.g. use a second configuration, if the first one failed), but in most of the times this is not required.
 
 ```
-token_t token;
+hc_token_t token;
 
 token.token_cnt = 1;
 ```
diff --git a/include/shared.h b/include/shared.h
index 496b611fd..8291ecfeb 100644
--- a/include/shared.h
+++ b/include/shared.h
@@ -101,6 +101,6 @@ const char *stroptitype (const u32 opti_type);
 bool generic_salt_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, const u8 *in_buf, const int in_len, u8 *out_buf, int *out_len);
 int  generic_salt_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, const u8 *in_buf, const int in_len, u8 *out_buf);
 
-int input_tokenizer (const u8 *input_buf, const int input_len, token_t *token);
+int input_tokenizer (const u8 *input_buf, const int input_len, hc_token_t *token);
 
 #endif // _SHARED_H
diff --git a/include/types.h b/include/types.h
index 72cf46360..57a3029f9 100644
--- a/include/types.h
+++ b/include/types.h
@@ -2800,7 +2800,7 @@ typedef struct hook_thread_param
 #define MAX_TOKENS     128
 #define MAX_SIGNATURES 16
 
-typedef struct token
+typedef struct hc_token
 {
   int token_cnt;
 
@@ -2820,7 +2820,7 @@ typedef struct token
   const u8 *opt_buf;
   int opt_len;
 
-} token_t;
+} hc_token_t;
 
 /**
  * hash category is relevant in usage.c (--help screen)
diff --git a/src/keyboard_layout.c b/src/keyboard_layout.c
index fd1680388..18e338038 100644
--- a/src/keyboard_layout.c
+++ b/src/keyboard_layout.c
@@ -34,7 +34,7 @@ bool initialize_keyboard_layout_mapping (const char *filename, keyboard_layout_m
 
     if (line_len == 0) continue;
 
-    token_t token;
+    hc_token_t token;
 
     token.token_cnt  = 2;
 
diff --git a/src/modules/module_00000.c b/src/modules/module_00000.c
index 960aa296f..2c8ca530a 100644
--- a/src/modules/module_00000.c
+++ b/src/modules/module_00000.c
@@ -52,7 +52,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_00010.c b/src/modules/module_00010.c
index b95ee08e6..0283bc9ee 100644
--- a/src/modules/module_00010.c
+++ b/src/modules/module_00010.c
@@ -52,7 +52,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_00011.c b/src/modules/module_00011.c
index ab2b00ee5..d7f37998c 100644
--- a/src/modules/module_00011.c
+++ b/src/modules/module_00011.c
@@ -52,7 +52,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_00012.c b/src/modules/module_00012.c
index 15c21ef0e..bc342be9c 100644
--- a/src/modules/module_00012.c
+++ b/src/modules/module_00012.c
@@ -52,7 +52,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_00020.c b/src/modules/module_00020.c
index c0b7b1cdb..7974d334e 100644
--- a/src/modules/module_00020.c
+++ b/src/modules/module_00020.c
@@ -51,7 +51,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_00021.c b/src/modules/module_00021.c
index 981ad2a87..d9d7616b0 100644
--- a/src/modules/module_00021.c
+++ b/src/modules/module_00021.c
@@ -51,7 +51,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_00022.c b/src/modules/module_00022.c
index 901206de6..34e069a28 100644
--- a/src/modules/module_00022.c
+++ b/src/modules/module_00022.c
@@ -53,7 +53,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_00023.c b/src/modules/module_00023.c
index 753c3e77e..2bf1d48eb 100644
--- a/src/modules/module_00023.c
+++ b/src/modules/module_00023.c
@@ -53,7 +53,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_00024.c b/src/modules/module_00024.c
index d1bb3ab1a..77bec1284 100644
--- a/src/modules/module_00024.c
+++ b/src/modules/module_00024.c
@@ -51,7 +51,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_00030.c b/src/modules/module_00030.c
index eac02c15a..8644facef 100644
--- a/src/modules/module_00030.c
+++ b/src/modules/module_00030.c
@@ -53,7 +53,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_00040.c b/src/modules/module_00040.c
index 34b750e0b..3f1e0a65f 100644
--- a/src/modules/module_00040.c
+++ b/src/modules/module_00040.c
@@ -52,7 +52,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_00050.c b/src/modules/module_00050.c
index c1715cccb..d46928533 100644
--- a/src/modules/module_00050.c
+++ b/src/modules/module_00050.c
@@ -47,7 +47,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_00060.c b/src/modules/module_00060.c
index b87e13deb..cec82c4e3 100644
--- a/src/modules/module_00060.c
+++ b/src/modules/module_00060.c
@@ -47,7 +47,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_00070.c b/src/modules/module_00070.c
index 14a7446ff..39c35857e 100644
--- a/src/modules/module_00070.c
+++ b/src/modules/module_00070.c
@@ -53,7 +53,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_00100.c b/src/modules/module_00100.c
index af22d7634..0d8e7eec2 100644
--- a/src/modules/module_00100.c
+++ b/src/modules/module_00100.c
@@ -51,7 +51,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_00101.c b/src/modules/module_00101.c
index c33d259e8..087075971 100644
--- a/src/modules/module_00101.c
+++ b/src/modules/module_00101.c
@@ -51,7 +51,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_00110.c b/src/modules/module_00110.c
index a831fecc8..8a89f64be 100644
--- a/src/modules/module_00110.c
+++ b/src/modules/module_00110.c
@@ -51,7 +51,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_00111.c b/src/modules/module_00111.c
index 0cadb81c5..18cf1e2e1 100644
--- a/src/modules/module_00111.c
+++ b/src/modules/module_00111.c
@@ -54,7 +54,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_00112.c b/src/modules/module_00112.c
index 004a1410a..db359e905 100644
--- a/src/modules/module_00112.c
+++ b/src/modules/module_00112.c
@@ -59,7 +59,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_00120.c b/src/modules/module_00120.c
index c9c9f00ee..ca00b23ea 100644
--- a/src/modules/module_00120.c
+++ b/src/modules/module_00120.c
@@ -51,7 +51,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_00121.c b/src/modules/module_00121.c
index 667579f22..ce85c4491 100644
--- a/src/modules/module_00121.c
+++ b/src/modules/module_00121.c
@@ -52,7 +52,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_00122.c b/src/modules/module_00122.c
index 212600cbb..db108b445 100644
--- a/src/modules/module_00122.c
+++ b/src/modules/module_00122.c
@@ -52,7 +52,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 2;
 
diff --git a/src/modules/module_00124.c b/src/modules/module_00124.c
index 36ff6e286..a1fd511fa 100644
--- a/src/modules/module_00124.c
+++ b/src/modules/module_00124.c
@@ -53,7 +53,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_00125.c b/src/modules/module_00125.c
index a53700e02..13ad796a8 100644
--- a/src/modules/module_00125.c
+++ b/src/modules/module_00125.c
@@ -52,7 +52,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 2;
 
diff --git a/src/modules/module_00130.c b/src/modules/module_00130.c
index 65b56aab8..669a9150a 100644
--- a/src/modules/module_00130.c
+++ b/src/modules/module_00130.c
@@ -52,7 +52,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_00131.c b/src/modules/module_00131.c
index 097511c78..f1d937ab1 100644
--- a/src/modules/module_00131.c
+++ b/src/modules/module_00131.c
@@ -56,7 +56,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_00132.c b/src/modules/module_00132.c
index 397482263..b0f8c4b0b 100644
--- a/src/modules/module_00132.c
+++ b/src/modules/module_00132.c
@@ -55,7 +55,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_00133.c b/src/modules/module_00133.c
index c8eec7748..ee20d9336 100644
--- a/src/modules/module_00133.c
+++ b/src/modules/module_00133.c
@@ -52,7 +52,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_00140.c b/src/modules/module_00140.c
index a3d699acf..147ea76cf 100644
--- a/src/modules/module_00140.c
+++ b/src/modules/module_00140.c
@@ -52,7 +52,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_00141.c b/src/modules/module_00141.c
index 16ee72433..e88efaddf 100644
--- a/src/modules/module_00141.c
+++ b/src/modules/module_00141.c
@@ -55,7 +55,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_00150.c b/src/modules/module_00150.c
index b15243a4a..62c97c024 100644
--- a/src/modules/module_00150.c
+++ b/src/modules/module_00150.c
@@ -47,7 +47,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_00160.c b/src/modules/module_00160.c
index df6caaf27..e0aaac31c 100644
--- a/src/modules/module_00160.c
+++ b/src/modules/module_00160.c
@@ -47,7 +47,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_00170.c b/src/modules/module_00170.c
index 3551f4d3b..a1672c354 100644
--- a/src/modules/module_00170.c
+++ b/src/modules/module_00170.c
@@ -52,7 +52,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_00200.c b/src/modules/module_00200.c
index 6771a790b..57164fefd 100644
--- a/src/modules/module_00200.c
+++ b/src/modules/module_00200.c
@@ -44,7 +44,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_00300.c b/src/modules/module_00300.c
index 6950b633c..f85bff8c6 100644
--- a/src/modules/module_00300.c
+++ b/src/modules/module_00300.c
@@ -50,7 +50,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_00400.c b/src/modules/module_00400.c
index adcd154c0..15c0d3477 100644
--- a/src/modules/module_00400.c
+++ b/src/modules/module_00400.c
@@ -169,7 +169,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 4;
 
diff --git a/src/modules/module_00500.c b/src/modules/module_00500.c
index af81dedc2..7aaf8f406 100644
--- a/src/modules/module_00500.c
+++ b/src/modules/module_00500.c
@@ -169,7 +169,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_00501.c b/src/modules/module_00501.c
index 67c3f0b9a..ae7a186dd 100644
--- a/src/modules/module_00501.c
+++ b/src/modules/module_00501.c
@@ -248,7 +248,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
@@ -269,7 +269,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   u8 *md5crypt_hash = decrypted + 12;
 
-  token_t token2;
+  hc_token_t token2;
 
   token2.token_cnt  = 3;
 
diff --git a/src/modules/module_00600.c b/src/modules/module_00600.c
index d04771c16..f3e91252b 100644
--- a/src/modules/module_00600.c
+++ b/src/modules/module_00600.c
@@ -48,7 +48,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 2;
 
diff --git a/src/modules/module_00900.c b/src/modules/module_00900.c
index 1df0d5bbe..8ae01dbbc 100644
--- a/src/modules/module_00900.c
+++ b/src/modules/module_00900.c
@@ -52,7 +52,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_01000.c b/src/modules/module_01000.c
index db8728e2f..f284aa081 100644
--- a/src/modules/module_01000.c
+++ b/src/modules/module_01000.c
@@ -55,7 +55,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_01100.c b/src/modules/module_01100.c
index 68cfc5e4c..0efaaaa68 100644
--- a/src/modules/module_01100.c
+++ b/src/modules/module_01100.c
@@ -53,7 +53,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_01300.c b/src/modules/module_01300.c
index b1476a45a..5e5a2df42 100644
--- a/src/modules/module_01300.c
+++ b/src/modules/module_01300.c
@@ -51,7 +51,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_01400.c b/src/modules/module_01400.c
index 5f8b5d469..f7d21be5a 100644
--- a/src/modules/module_01400.c
+++ b/src/modules/module_01400.c
@@ -51,7 +51,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_01410.c b/src/modules/module_01410.c
index 17c587e55..4da5b51d4 100644
--- a/src/modules/module_01410.c
+++ b/src/modules/module_01410.c
@@ -51,7 +51,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_01411.c b/src/modules/module_01411.c
index 5a2b9edf8..3bbf39071 100644
--- a/src/modules/module_01411.c
+++ b/src/modules/module_01411.c
@@ -53,7 +53,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_01420.c b/src/modules/module_01420.c
index f16538878..2f6993e9a 100644
--- a/src/modules/module_01420.c
+++ b/src/modules/module_01420.c
@@ -51,7 +51,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_01421.c b/src/modules/module_01421.c
index 889b5360e..84b5c7d98 100644
--- a/src/modules/module_01421.c
+++ b/src/modules/module_01421.c
@@ -51,7 +51,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_01430.c b/src/modules/module_01430.c
index a0b0ec18a..12192499a 100644
--- a/src/modules/module_01430.c
+++ b/src/modules/module_01430.c
@@ -52,7 +52,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_01440.c b/src/modules/module_01440.c
index 16ddc6a5d..5edd9971a 100644
--- a/src/modules/module_01440.c
+++ b/src/modules/module_01440.c
@@ -52,7 +52,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_01441.c b/src/modules/module_01441.c
index f05c9b6d7..5834a4ef1 100644
--- a/src/modules/module_01441.c
+++ b/src/modules/module_01441.c
@@ -55,7 +55,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_01450.c b/src/modules/module_01450.c
index 908d43422..c6ae84fec 100644
--- a/src/modules/module_01450.c
+++ b/src/modules/module_01450.c
@@ -46,7 +46,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_01460.c b/src/modules/module_01460.c
index e1c977fa8..6a9d4ec79 100644
--- a/src/modules/module_01460.c
+++ b/src/modules/module_01460.c
@@ -78,7 +78,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_01470.c b/src/modules/module_01470.c
index 61988c543..60e3bd750 100644
--- a/src/modules/module_01470.c
+++ b/src/modules/module_01470.c
@@ -52,7 +52,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_01500.c b/src/modules/module_01500.c
index 5b35eae57..35edcf92b 100644
--- a/src/modules/module_01500.c
+++ b/src/modules/module_01500.c
@@ -199,7 +199,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_01600.c b/src/modules/module_01600.c
index 0e29a1385..6851c4eec 100644
--- a/src/modules/module_01600.c
+++ b/src/modules/module_01600.c
@@ -169,7 +169,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_01700.c b/src/modules/module_01700.c
index e5bcc5619..cd6ead929 100644
--- a/src/modules/module_01700.c
+++ b/src/modules/module_01700.c
@@ -77,7 +77,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_01710.c b/src/modules/module_01710.c
index 9b13b9110..17def13bf 100644
--- a/src/modules/module_01710.c
+++ b/src/modules/module_01710.c
@@ -52,7 +52,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_01711.c b/src/modules/module_01711.c
index b940e419a..b4a6cef85 100644
--- a/src/modules/module_01711.c
+++ b/src/modules/module_01711.c
@@ -54,7 +54,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_01720.c b/src/modules/module_01720.c
index f092e5e49..43a33e374 100644
--- a/src/modules/module_01720.c
+++ b/src/modules/module_01720.c
@@ -77,7 +77,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_01722.c b/src/modules/module_01722.c
index c91f4b09a..68252bd31 100644
--- a/src/modules/module_01722.c
+++ b/src/modules/module_01722.c
@@ -78,7 +78,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 2;
 
diff --git a/src/modules/module_01730.c b/src/modules/module_01730.c
index 8374952ab..946bb6002 100644
--- a/src/modules/module_01730.c
+++ b/src/modules/module_01730.c
@@ -53,7 +53,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_01731.c b/src/modules/module_01731.c
index b3bcafd3d..7e4d6191a 100644
--- a/src/modules/module_01731.c
+++ b/src/modules/module_01731.c
@@ -56,7 +56,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_01740.c b/src/modules/module_01740.c
index 331ea0acc..a4028f155 100644
--- a/src/modules/module_01740.c
+++ b/src/modules/module_01740.c
@@ -53,7 +53,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_01750.c b/src/modules/module_01750.c
index 92cd6e066..fcfbccc24 100644
--- a/src/modules/module_01750.c
+++ b/src/modules/module_01750.c
@@ -47,7 +47,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_01760.c b/src/modules/module_01760.c
index c58dd94b6..01f2578e0 100644
--- a/src/modules/module_01760.c
+++ b/src/modules/module_01760.c
@@ -48,7 +48,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_01770.c b/src/modules/module_01770.c
index 62b1929bf..90875d3a0 100644
--- a/src/modules/module_01770.c
+++ b/src/modules/module_01770.c
@@ -67,7 +67,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_01800.c b/src/modules/module_01800.c
index 4d6a2c231..40f8ffd63 100644
--- a/src/modules/module_01800.c
+++ b/src/modules/module_01800.c
@@ -475,7 +475,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_02100.c b/src/modules/module_02100.c
index 91d64fe45..6edbf4b54 100644
--- a/src/modules/module_02100.c
+++ b/src/modules/module_02100.c
@@ -75,7 +75,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_02400.c b/src/modules/module_02400.c
index 91698214b..c43a3ccd3 100644
--- a/src/modules/module_02400.c
+++ b/src/modules/module_02400.c
@@ -48,7 +48,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_02410.c b/src/modules/module_02410.c
index 2578a46f8..e11db1f26 100644
--- a/src/modules/module_02410.c
+++ b/src/modules/module_02410.c
@@ -47,7 +47,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_02600.c b/src/modules/module_02600.c
index 2c2cc46b9..0e278b4e4 100644
--- a/src/modules/module_02600.c
+++ b/src/modules/module_02600.c
@@ -49,7 +49,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_02611.c b/src/modules/module_02611.c
index 0f7798217..dc3a9bfe8 100644
--- a/src/modules/module_02611.c
+++ b/src/modules/module_02611.c
@@ -49,7 +49,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_02612.c b/src/modules/module_02612.c
index 89cc485bc..ac1a5e541 100644
--- a/src/modules/module_02612.c
+++ b/src/modules/module_02612.c
@@ -52,7 +52,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_02711.c b/src/modules/module_02711.c
index 9af816df1..fa7a3296c 100644
--- a/src/modules/module_02711.c
+++ b/src/modules/module_02711.c
@@ -49,7 +49,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_02811.c b/src/modules/module_02811.c
index 7af0ceef2..aa7dbd0dd 100644
--- a/src/modules/module_02811.c
+++ b/src/modules/module_02811.c
@@ -77,7 +77,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_03000.c b/src/modules/module_03000.c
index e2240aa5f..31777c133 100644
--- a/src/modules/module_03000.c
+++ b/src/modules/module_03000.c
@@ -159,7 +159,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 1;
 
diff --git a/src/modules/module_03100.c b/src/modules/module_03100.c
index 5285e6bc4..abc96aca0 100644
--- a/src/modules/module_03100.c
+++ b/src/modules/module_03100.c
@@ -73,7 +73,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 2;
 
diff --git a/src/modules/module_03200.c b/src/modules/module_03200.c
index 03cf3e33e..7d29c356c 100644
--- a/src/modules/module_03200.c
+++ b/src/modules/module_03200.c
@@ -175,7 +175,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_03500.c b/src/modules/module_03500.c
index 05d16be0c..62c223ee0 100644
--- a/src/modules/module_03500.c
+++ b/src/modules/module_03500.c
@@ -49,7 +49,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_03710.c b/src/modules/module_03710.c
index b605f3a2e..289ec6c3b 100644
--- a/src/modules/module_03710.c
+++ b/src/modules/module_03710.c
@@ -60,7 +60,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_03711.c b/src/modules/module_03711.c
index 4706ee393..561045883 100644
--- a/src/modules/module_03711.c
+++ b/src/modules/module_03711.c
@@ -62,7 +62,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_03800.c b/src/modules/module_03800.c
index 89c565b19..815225c46 100644
--- a/src/modules/module_03800.c
+++ b/src/modules/module_03800.c
@@ -49,7 +49,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_03910.c b/src/modules/module_03910.c
index bdfa15ea6..d9f567199 100644
--- a/src/modules/module_03910.c
+++ b/src/modules/module_03910.c
@@ -79,7 +79,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_04010.c b/src/modules/module_04010.c
index 24a737a5a..2df115a6b 100644
--- a/src/modules/module_04010.c
+++ b/src/modules/module_04010.c
@@ -63,7 +63,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_04110.c b/src/modules/module_04110.c
index 09009c6ba..f8d148a19 100644
--- a/src/modules/module_04110.c
+++ b/src/modules/module_04110.c
@@ -61,7 +61,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_04300.c b/src/modules/module_04300.c
index 8dc3ce94e..4fbd7d264 100644
--- a/src/modules/module_04300.c
+++ b/src/modules/module_04300.c
@@ -49,7 +49,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_04400.c b/src/modules/module_04400.c
index 88e1b8271..254f8c705 100644
--- a/src/modules/module_04400.c
+++ b/src/modules/module_04400.c
@@ -51,7 +51,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_04500.c b/src/modules/module_04500.c
index f53ffa7da..d1f10d0a0 100644
--- a/src/modules/module_04500.c
+++ b/src/modules/module_04500.c
@@ -49,7 +49,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_04510.c b/src/modules/module_04510.c
index f4e2f101f..1ed2cc140 100644
--- a/src/modules/module_04510.c
+++ b/src/modules/module_04510.c
@@ -50,7 +50,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_04520.c b/src/modules/module_04520.c
index a52871999..5836f1596 100644
--- a/src/modules/module_04520.c
+++ b/src/modules/module_04520.c
@@ -49,7 +49,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_04521.c b/src/modules/module_04521.c
index 201f619ca..ff0699ac2 100644
--- a/src/modules/module_04521.c
+++ b/src/modules/module_04521.c
@@ -49,7 +49,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_04522.c b/src/modules/module_04522.c
index f6bcab658..181786973 100644
--- a/src/modules/module_04522.c
+++ b/src/modules/module_04522.c
@@ -49,7 +49,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_04700.c b/src/modules/module_04700.c
index 7b7ece9e8..e9501ae62 100644
--- a/src/modules/module_04700.c
+++ b/src/modules/module_04700.c
@@ -51,7 +51,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_04710.c b/src/modules/module_04710.c
index c48b091d8..95174240a 100644
--- a/src/modules/module_04710.c
+++ b/src/modules/module_04710.c
@@ -50,7 +50,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_04711.c b/src/modules/module_04711.c
index be3765ef2..7e02b9b87 100644
--- a/src/modules/module_04711.c
+++ b/src/modules/module_04711.c
@@ -64,7 +64,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_04800.c b/src/modules/module_04800.c
index 7625a09de..7382ad279 100644
--- a/src/modules/module_04800.c
+++ b/src/modules/module_04800.c
@@ -50,7 +50,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_04900.c b/src/modules/module_04900.c
index a6578bbdc..c4e65c2e9 100644
--- a/src/modules/module_04900.c
+++ b/src/modules/module_04900.c
@@ -46,7 +46,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_05000.c b/src/modules/module_05000.c
index 2340c43e0..81f937485 100644
--- a/src/modules/module_05000.c
+++ b/src/modules/module_05000.c
@@ -46,7 +46,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_05100.c b/src/modules/module_05100.c
index e0afe1bb9..612ae3f36 100644
--- a/src/modules/module_05100.c
+++ b/src/modules/module_05100.c
@@ -47,7 +47,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_05300.c b/src/modules/module_05300.c
index ae36c1563..a56d05221 100644
--- a/src/modules/module_05300.c
+++ b/src/modules/module_05300.c
@@ -71,7 +71,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   ikepsk_t *ikepsk = (ikepsk_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 9;
 
diff --git a/src/modules/module_05400.c b/src/modules/module_05400.c
index 5e75f8499..7e145e4fd 100644
--- a/src/modules/module_05400.c
+++ b/src/modules/module_05400.c
@@ -71,7 +71,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   ikepsk_t *ikepsk = (ikepsk_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 9;
 
diff --git a/src/modules/module_05500.c b/src/modules/module_05500.c
index fe84cae4e..1b79fc822 100644
--- a/src/modules/module_05500.c
+++ b/src/modules/module_05500.c
@@ -111,7 +111,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   netntlm_t *netntlm = (netntlm_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 6;
 
diff --git a/src/modules/module_05600.c b/src/modules/module_05600.c
index 30b7433f2..4760210f4 100644
--- a/src/modules/module_05600.c
+++ b/src/modules/module_05600.c
@@ -70,7 +70,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   netntlm_t *netntlm = (netntlm_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 6;
 
diff --git a/src/modules/module_05700.c b/src/modules/module_05700.c
index 7b90d842b..274a02123 100644
--- a/src/modules/module_05700.c
+++ b/src/modules/module_05700.c
@@ -51,7 +51,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 1;
 
diff --git a/src/modules/module_05800.c b/src/modules/module_05800.c
index 8e97806e4..67a7e3b30 100644
--- a/src/modules/module_05800.c
+++ b/src/modules/module_05800.c
@@ -75,7 +75,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_06000.c b/src/modules/module_06000.c
index 739217bda..5443bdea1 100644
--- a/src/modules/module_06000.c
+++ b/src/modules/module_06000.c
@@ -45,7 +45,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_06100.c b/src/modules/module_06100.c
index 9ef6ea870..3414120ad 100644
--- a/src/modules/module_06100.c
+++ b/src/modules/module_06100.c
@@ -59,7 +59,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_06300.c b/src/modules/module_06300.c
index c31c5b680..1e5119c73 100644
--- a/src/modules/module_06300.c
+++ b/src/modules/module_06300.c
@@ -169,7 +169,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_06400.c b/src/modules/module_06400.c
index 232735799..86b94b55b 100644
--- a/src/modules/module_06400.c
+++ b/src/modules/module_06400.c
@@ -258,7 +258,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_06500.c b/src/modules/module_06500.c
index a6f3ba773..c29992181 100644
--- a/src/modules/module_06500.c
+++ b/src/modules/module_06500.c
@@ -432,7 +432,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_06600.c b/src/modules/module_06600.c
index 68374063a..47e69b8c7 100644
--- a/src/modules/module_06600.c
+++ b/src/modules/module_06600.c
@@ -87,7 +87,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   agilekey_t *agilekey = (agilekey_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_06700.c b/src/modules/module_06700.c
index 621c0104c..9a2422d02 100644
--- a/src/modules/module_06700.c
+++ b/src/modules/module_06700.c
@@ -193,7 +193,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_06800.c b/src/modules/module_06800.c
index 73624ecc8..a897b4f69 100644
--- a/src/modules/module_06800.c
+++ b/src/modules/module_06800.c
@@ -114,7 +114,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_06900.c b/src/modules/module_06900.c
index ad153495a..35c67cf12 100644
--- a/src/modules/module_06900.c
+++ b/src/modules/module_06900.c
@@ -62,7 +62,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_07000.c b/src/modules/module_07000.c
index 0c67ef0f9..a19483e62 100644
--- a/src/modules/module_07000.c
+++ b/src/modules/module_07000.c
@@ -62,7 +62,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_07100.c b/src/modules/module_07100.c
index bcf1a1084..6a1d34b14 100644
--- a/src/modules/module_07100.c
+++ b/src/modules/module_07100.c
@@ -105,7 +105,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   if (strncmp (sigchk, SIGNATURE_SHA512MACOS, 4) == 0)
   {
-    token_t token;
+    hc_token_t token;
 
     token.token_cnt  = 4;
 
@@ -192,7 +192,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   if (strncmp (sigchk, SIGNATURE_SHA512MACOS_JOHN, 20) == 0)
   {
-    token_t token;
+    hc_token_t token;
 
     token.token_cnt  = 7;
 
diff --git a/src/modules/module_07200.c b/src/modules/module_07200.c
index 032dd79bd..75cea5909 100644
--- a/src/modules/module_07200.c
+++ b/src/modules/module_07200.c
@@ -90,7 +90,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pbkdf2_sha512_t *pbkdf2_sha512 = (pbkdf2_sha512_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_07300.c b/src/modules/module_07300.c
index f69642897..8810d6413 100644
--- a/src/modules/module_07300.c
+++ b/src/modules/module_07300.c
@@ -63,7 +63,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   rakp_t *rakp = (rakp_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_07400.c b/src/modules/module_07400.c
index 63a609f5c..7de2e0513 100644
--- a/src/modules/module_07400.c
+++ b/src/modules/module_07400.c
@@ -284,7 +284,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_07401.c b/src/modules/module_07401.c
index ca47c6526..0d19dcb64 100644
--- a/src/modules/module_07401.c
+++ b/src/modules/module_07401.c
@@ -285,7 +285,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
 
diff --git a/src/modules/module_07500.c b/src/modules/module_07500.c
index b8e0c9a26..dc12ce9de 100644
--- a/src/modules/module_07500.c
+++ b/src/modules/module_07500.c
@@ -94,7 +94,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   krb5pa_t *krb5pa = (krb5pa_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 6;
 
diff --git a/src/modules/module_07700.c b/src/modules/module_07700.c
index 4a70c0442..f2a8b4044 100644
--- a/src/modules/module_07700.c
+++ b/src/modules/module_07700.c
@@ -68,7 +68,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_07701.c b/src/modules/module_07701.c
index 051f2d9f2..9be93fac8 100644
--- a/src/modules/module_07701.c
+++ b/src/modules/module_07701.c
@@ -61,7 +61,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_07800.c b/src/modules/module_07800.c
index f99bb0367..d93bf1df1 100644
--- a/src/modules/module_07800.c
+++ b/src/modules/module_07800.c
@@ -70,7 +70,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_07801.c b/src/modules/module_07801.c
index f35924799..6dbe0db45 100644
--- a/src/modules/module_07801.c
+++ b/src/modules/module_07801.c
@@ -70,7 +70,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_07900.c b/src/modules/module_07900.c
index 8a0331437..7846c62c9 100644
--- a/src/modules/module_07900.c
+++ b/src/modules/module_07900.c
@@ -333,7 +333,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_08000.c b/src/modules/module_08000.c
index 1b3d88af6..5f4411392 100644
--- a/src/modules/module_08000.c
+++ b/src/modules/module_08000.c
@@ -79,7 +79,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_08100.c b/src/modules/module_08100.c
index ad798d35c..e4f1da890 100644
--- a/src/modules/module_08100.c
+++ b/src/modules/module_08100.c
@@ -51,7 +51,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_08200.c b/src/modules/module_08200.c
index 00a50b0b4..c56d168a6 100644
--- a/src/modules/module_08200.c
+++ b/src/modules/module_08200.c
@@ -108,7 +108,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   cloudkey_t *cloudkey = (cloudkey_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_08300.c b/src/modules/module_08300.c
index aa7a04dc7..d8bd22ec3 100644
--- a/src/modules/module_08300.c
+++ b/src/modules/module_08300.c
@@ -46,7 +46,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_08400.c b/src/modules/module_08400.c
index fe9cdc0a0..12c3ab2e4 100644
--- a/src/modules/module_08400.c
+++ b/src/modules/module_08400.c
@@ -48,7 +48,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_08500.c b/src/modules/module_08500.c
index e865ef6b3..80d4f7261 100644
--- a/src/modules/module_08500.c
+++ b/src/modules/module_08500.c
@@ -100,7 +100,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
     0xdc, 0xdd, 0xde, 0xdf, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
   };
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_08600.c b/src/modules/module_08600.c
index 813d85518..3df9a3820 100644
--- a/src/modules/module_08600.c
+++ b/src/modules/module_08600.c
@@ -54,7 +54,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_08700.c b/src/modules/module_08700.c
index 7af692a01..446870dbe 100644
--- a/src/modules/module_08700.c
+++ b/src/modules/module_08700.c
@@ -78,7 +78,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 4;
 
diff --git a/src/modules/module_08800.c b/src/modules/module_08800.c
index 5635f9bad..928a0dc64 100644
--- a/src/modules/module_08800.c
+++ b/src/modules/module_08800.c
@@ -90,7 +90,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   androidfde_t *androidfde = (androidfde_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 6;
 
diff --git a/src/modules/module_08900.c b/src/modules/module_08900.c
index c42045b44..bca25fc39 100644
--- a/src/modules/module_08900.c
+++ b/src/modules/module_08900.c
@@ -280,7 +280,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 6;
 
diff --git a/src/modules/module_09100.c b/src/modules/module_09100.c
index 4a3f1d1f0..ec8b92b86 100644
--- a/src/modules/module_09100.c
+++ b/src/modules/module_09100.c
@@ -69,7 +69,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 4;
 
diff --git a/src/modules/module_09200.c b/src/modules/module_09200.c
index 24bbd174c..be3b6a3f0 100644
--- a/src/modules/module_09200.c
+++ b/src/modules/module_09200.c
@@ -92,7 +92,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pbkdf2_sha256_t *pbkdf2_sha256 = (pbkdf2_sha256_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_09300.c b/src/modules/module_09300.c
index 48a5e5ac0..cb61a0f6c 100644
--- a/src/modules/module_09300.c
+++ b/src/modules/module_09300.c
@@ -272,7 +272,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_09400.c b/src/modules/module_09400.c
index 6f2865c8b..a090c983a 100644
--- a/src/modules/module_09400.c
+++ b/src/modules/module_09400.c
@@ -89,7 +89,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   office2007_t *office2007 = (office2007_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 8;
 
diff --git a/src/modules/module_09500.c b/src/modules/module_09500.c
index b61fca835..cbbaca530 100644
--- a/src/modules/module_09500.c
+++ b/src/modules/module_09500.c
@@ -103,7 +103,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   office2010_t *office2010 = (office2010_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 8;
 
diff --git a/src/modules/module_09600.c b/src/modules/module_09600.c
index 6c33a4de6..a9831b9aa 100644
--- a/src/modules/module_09600.c
+++ b/src/modules/module_09600.c
@@ -137,7 +137,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   office2013_t *office2013 = (office2013_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 8;
 
diff --git a/src/modules/module_09700.c b/src/modules/module_09700.c
index 8f88336bf..8e5f64b21 100644
--- a/src/modules/module_09700.c
+++ b/src/modules/module_09700.c
@@ -104,7 +104,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   oldoffice01_t *oldoffice01 = (oldoffice01_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
 
diff --git a/src/modules/module_09710.c b/src/modules/module_09710.c
index 855ed9d83..20353e48c 100644
--- a/src/modules/module_09710.c
+++ b/src/modules/module_09710.c
@@ -123,7 +123,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   oldoffice01_t *oldoffice01 = (oldoffice01_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
 
diff --git a/src/modules/module_09720.c b/src/modules/module_09720.c
index 0da323e63..fd957a024 100644
--- a/src/modules/module_09720.c
+++ b/src/modules/module_09720.c
@@ -105,7 +105,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   oldoffice01_t *oldoffice01 = (oldoffice01_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 6;
 
diff --git a/src/modules/module_09800.c b/src/modules/module_09800.c
index 7abf1040b..f76547a1f 100644
--- a/src/modules/module_09800.c
+++ b/src/modules/module_09800.c
@@ -106,7 +106,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   oldoffice34_t *oldoffice34 = (oldoffice34_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
 
diff --git a/src/modules/module_09810.c b/src/modules/module_09810.c
index c4310b6b0..4fb41a61d 100644
--- a/src/modules/module_09810.c
+++ b/src/modules/module_09810.c
@@ -124,7 +124,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   oldoffice34_t *oldoffice34 = (oldoffice34_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
 
diff --git a/src/modules/module_09820.c b/src/modules/module_09820.c
index a728fa521..d4782cac7 100644
--- a/src/modules/module_09820.c
+++ b/src/modules/module_09820.c
@@ -107,7 +107,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   oldoffice34_t *oldoffice34 = (oldoffice34_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 6;
 
diff --git a/src/modules/module_09900.c b/src/modules/module_09900.c
index 128f70117..a91624b94 100644
--- a/src/modules/module_09900.c
+++ b/src/modules/module_09900.c
@@ -57,7 +57,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_10000.c b/src/modules/module_10000.c
index b9c212fbc..8f016484b 100644
--- a/src/modules/module_10000.c
+++ b/src/modules/module_10000.c
@@ -89,7 +89,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pbkdf2_sha256_t *pbkdf2_sha256 = (pbkdf2_sha256_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_10100.c b/src/modules/module_10100.c
index 3612c86b5..ada9316ba 100644
--- a/src/modules/module_10100.c
+++ b/src/modules/module_10100.c
@@ -47,7 +47,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_10200.c b/src/modules/module_10200.c
index 0d9491517..0292bcd94 100644
--- a/src/modules/module_10200.c
+++ b/src/modules/module_10200.c
@@ -65,7 +65,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   cram_md5_t *cram_md5 = (cram_md5_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_10300.c b/src/modules/module_10300.c
index 384d8162c..6e243018b 100644
--- a/src/modules/module_10300.c
+++ b/src/modules/module_10300.c
@@ -66,7 +66,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_10400.c b/src/modules/module_10400.c
index 22475cf20..2cfda4397 100644
--- a/src/modules/module_10400.c
+++ b/src/modules/module_10400.c
@@ -111,7 +111,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pdf_t *pdf = (pdf_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 12;
 
diff --git a/src/modules/module_10410.c b/src/modules/module_10410.c
index 33f2d27b4..02c11f4a8 100644
--- a/src/modules/module_10410.c
+++ b/src/modules/module_10410.c
@@ -131,7 +131,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pdf_t *pdf = (pdf_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 12;
 
diff --git a/src/modules/module_10420.c b/src/modules/module_10420.c
index 76d2933a0..5d5779c4e 100644
--- a/src/modules/module_10420.c
+++ b/src/modules/module_10420.c
@@ -111,7 +111,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pdf_t *pdf = (pdf_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 13;
 
diff --git a/src/modules/module_10500.c b/src/modules/module_10500.c
index 88da9d41c..beaf5e8fd 100644
--- a/src/modules/module_10500.c
+++ b/src/modules/module_10500.c
@@ -142,7 +142,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pdf_t *pdf = (pdf_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 12;
 
diff --git a/src/modules/module_10600.c b/src/modules/module_10600.c
index 0ed06629e..8262fa9d9 100644
--- a/src/modules/module_10600.c
+++ b/src/modules/module_10600.c
@@ -96,7 +96,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pdf_t *pdf = (pdf_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 16;
 
diff --git a/src/modules/module_10700.c b/src/modules/module_10700.c
index 02fc1a368..69bfe3b15 100644
--- a/src/modules/module_10700.c
+++ b/src/modules/module_10700.c
@@ -146,7 +146,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pdf_t *pdf = (pdf_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 16;
 
diff --git a/src/modules/module_10800.c b/src/modules/module_10800.c
index 405d0127c..faf7808a7 100644
--- a/src/modules/module_10800.c
+++ b/src/modules/module_10800.c
@@ -92,7 +92,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_10810.c b/src/modules/module_10810.c
index 269ba9bbf..4f3968a9e 100644
--- a/src/modules/module_10810.c
+++ b/src/modules/module_10810.c
@@ -91,7 +91,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_10820.c b/src/modules/module_10820.c
index 790f0625f..4f97e11e9 100644
--- a/src/modules/module_10820.c
+++ b/src/modules/module_10820.c
@@ -91,7 +91,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_10830.c b/src/modules/module_10830.c
index 043d80af7..1f298cd56 100644
--- a/src/modules/module_10830.c
+++ b/src/modules/module_10830.c
@@ -92,7 +92,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_10840.c b/src/modules/module_10840.c
index 8b900e37c..ea9a03fa7 100644
--- a/src/modules/module_10840.c
+++ b/src/modules/module_10840.c
@@ -92,7 +92,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_10870.c b/src/modules/module_10870.c
index 2fd620f17..d3324b238 100644
--- a/src/modules/module_10870.c
+++ b/src/modules/module_10870.c
@@ -92,7 +92,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_10900.c b/src/modules/module_10900.c
index 82e95e69d..f6414e9b6 100644
--- a/src/modules/module_10900.c
+++ b/src/modules/module_10900.c
@@ -122,7 +122,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pbkdf2_sha256_t *pbkdf2_sha256 = (pbkdf2_sha256_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_10901.c b/src/modules/module_10901.c
index 67d0494ee..3305af65a 100644
--- a/src/modules/module_10901.c
+++ b/src/modules/module_10901.c
@@ -91,7 +91,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pbkdf2_sha256_t *pbkdf2_sha256 = (pbkdf2_sha256_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_11000.c b/src/modules/module_11000.c
index 00b9d8617..a0f076da0 100644
--- a/src/modules/module_11000.c
+++ b/src/modules/module_11000.c
@@ -62,7 +62,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_11100.c b/src/modules/module_11100.c
index 62570b6bb..84d58dbdd 100644
--- a/src/modules/module_11100.c
+++ b/src/modules/module_11100.c
@@ -49,7 +49,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_11200.c b/src/modules/module_11200.c
index 6894f660a..f26998fec 100644
--- a/src/modules/module_11200.c
+++ b/src/modules/module_11200.c
@@ -49,7 +49,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_11300.c b/src/modules/module_11300.c
index e6d35c793..9f2b33c62 100644
--- a/src/modules/module_11300.c
+++ b/src/modules/module_11300.c
@@ -132,7 +132,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   bitcoin_wallet_t *bitcoin_wallet = (bitcoin_wallet_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 10;
 
diff --git a/src/modules/module_11400.c b/src/modules/module_11400.c
index 8c222093a..79989ab1d 100644
--- a/src/modules/module_11400.c
+++ b/src/modules/module_11400.c
@@ -84,7 +84,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   sip_t *sip = (sip_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 15;
 
diff --git a/src/modules/module_11500.c b/src/modules/module_11500.c
index 3723e8c2d..2cc733168 100644
--- a/src/modules/module_11500.c
+++ b/src/modules/module_11500.c
@@ -45,7 +45,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_11600.c b/src/modules/module_11600.c
index 220b6af1e..69a3c908e 100644
--- a/src/modules/module_11600.c
+++ b/src/modules/module_11600.c
@@ -435,7 +435,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   seven_zip_hook_salt_t *seven_zip = (seven_zip_hook_salt_t *) hook_salt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 11;
 
diff --git a/src/modules/module_11700.c b/src/modules/module_11700.c
index b9208f738..2503d9a9f 100644
--- a/src/modules/module_11700.c
+++ b/src/modules/module_11700.c
@@ -68,7 +68,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_11750.c b/src/modules/module_11750.c
index 5f4fe624c..2b9612ec2 100644
--- a/src/modules/module_11750.c
+++ b/src/modules/module_11750.c
@@ -68,7 +68,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_11760.c b/src/modules/module_11760.c
index fd77c44ef..fff6181b8 100644
--- a/src/modules/module_11760.c
+++ b/src/modules/module_11760.c
@@ -68,7 +68,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_11800.c b/src/modules/module_11800.c
index d16911756..0abef9faf 100644
--- a/src/modules/module_11800.c
+++ b/src/modules/module_11800.c
@@ -68,7 +68,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_11850.c b/src/modules/module_11850.c
index 2fd8a079b..115a70225 100644
--- a/src/modules/module_11850.c
+++ b/src/modules/module_11850.c
@@ -68,7 +68,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_11860.c b/src/modules/module_11860.c
index dfa7045bf..f8a1d4307 100644
--- a/src/modules/module_11860.c
+++ b/src/modules/module_11860.c
@@ -68,7 +68,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_11900.c b/src/modules/module_11900.c
index 4066926e8..327491875 100644
--- a/src/modules/module_11900.c
+++ b/src/modules/module_11900.c
@@ -91,7 +91,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pbkdf2_md5_t *pbkdf2_md5 = (pbkdf2_md5_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_12000.c b/src/modules/module_12000.c
index 811bced9d..a8b3eff55 100644
--- a/src/modules/module_12000.c
+++ b/src/modules/module_12000.c
@@ -91,7 +91,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pbkdf2_sha1_t *pbkdf2_sha1 = (pbkdf2_sha1_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_12001.c b/src/modules/module_12001.c
index a0a7dffaf..65d67af49 100644
--- a/src/modules/module_12001.c
+++ b/src/modules/module_12001.c
@@ -91,7 +91,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pbkdf2_sha1_t *pbkdf2_sha1 = (pbkdf2_sha1_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_12100.c b/src/modules/module_12100.c
index 8191d32d0..17f15cb27 100644
--- a/src/modules/module_12100.c
+++ b/src/modules/module_12100.c
@@ -92,7 +92,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pbkdf2_sha512_t *pbkdf2_sha512 = (pbkdf2_sha512_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_12200.c b/src/modules/module_12200.c
index 2f3d5e7c5..3e45863ed 100644
--- a/src/modules/module_12200.c
+++ b/src/modules/module_12200.c
@@ -117,7 +117,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
 
diff --git a/src/modules/module_12300.c b/src/modules/module_12300.c
index 016cb1425..8638effd7 100644
--- a/src/modules/module_12300.c
+++ b/src/modules/module_12300.c
@@ -75,7 +75,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 2;
 
diff --git a/src/modules/module_12400.c b/src/modules/module_12400.c
index 8fd98364a..a0e16525e 100644
--- a/src/modules/module_12400.c
+++ b/src/modules/module_12400.c
@@ -91,7 +91,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_12500.c b/src/modules/module_12500.c
index f781333bb..fd2021660 100644
--- a/src/modules/module_12500.c
+++ b/src/modules/module_12500.c
@@ -114,7 +114,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_12600.c b/src/modules/module_12600.c
index 377bbeb44..66b484907 100644
--- a/src/modules/module_12600.c
+++ b/src/modules/module_12600.c
@@ -63,7 +63,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_12700.c b/src/modules/module_12700.c
index f80958f74..419ab38e9 100644
--- a/src/modules/module_12700.c
+++ b/src/modules/module_12700.c
@@ -87,7 +87,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_12800.c b/src/modules/module_12800.c
index 0c9774dae..7974ff7a5 100644
--- a/src/modules/module_12800.c
+++ b/src/modules/module_12800.c
@@ -105,7 +105,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_12900.c b/src/modules/module_12900.c
index 61fe46634..f16678d33 100644
--- a/src/modules/module_12900.c
+++ b/src/modules/module_12900.c
@@ -105,7 +105,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_13000.c b/src/modules/module_13000.c
index 7f7776434..ec79e3cb7 100644
--- a/src/modules/module_13000.c
+++ b/src/modules/module_13000.c
@@ -120,7 +120,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   rar5_t *rar5 = (rar5_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 7;
 
diff --git a/src/modules/module_13100.c b/src/modules/module_13100.c
index b42098d97..498bf058a 100644
--- a/src/modules/module_13100.c
+++ b/src/modules/module_13100.c
@@ -104,7 +104,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   krb5tgs_t *krb5tgs = (krb5tgs_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.signatures_cnt    = 1;
   token.signatures_buf[0] = SIGNATURE_KRB5TGS;
diff --git a/src/modules/module_13200.c b/src/modules/module_13200.c
index 679ebb62c..956135fb9 100644
--- a/src/modules/module_13200.c
+++ b/src/modules/module_13200.c
@@ -71,7 +71,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
 
diff --git a/src/modules/module_13300.c b/src/modules/module_13300.c
index 26dadcbbe..cb011b3af 100644
--- a/src/modules/module_13300.c
+++ b/src/modules/module_13300.c
@@ -52,7 +52,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_13400.c b/src/modules/module_13400.c
index 80b0b27d5..6214adfd8 100644
--- a/src/modules/module_13400.c
+++ b/src/modules/module_13400.c
@@ -110,7 +110,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
    && (line_buf[line_len - (64 + 1 + 2 + 1 + 1)] == '1')
    && (line_buf[line_len - (64 + 1 + 2 + 1 + 0)] == '*')) is_keyfile_present = true;
 
-  token_t token;
+  hc_token_t token;
 
   token.signatures_cnt    = 1;
   token.signatures_buf[0] = SIGNATURE_KEEPASS;
diff --git a/src/modules/module_13500.c b/src/modules/module_13500.c
index 09293bbbf..3f6686d1c 100644
--- a/src/modules/module_13500.c
+++ b/src/modules/module_13500.c
@@ -70,7 +70,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pstoken_t *pstoken = (pstoken_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_13600.c b/src/modules/module_13600.c
index 7cb811871..31af408c3 100644
--- a/src/modules/module_13600.c
+++ b/src/modules/module_13600.c
@@ -116,7 +116,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   zip2_t *zip2 = (zip2_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 10;
 
diff --git a/src/modules/module_13800.c b/src/modules/module_13800.c
index a37f60c22..51f23e52e 100644
--- a/src/modules/module_13800.c
+++ b/src/modules/module_13800.c
@@ -83,7 +83,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   win8phone_t *esalt = (win8phone_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_13900.c b/src/modules/module_13900.c
index 122bdf352..d834c3016 100644
--- a/src/modules/module_13900.c
+++ b/src/modules/module_13900.c
@@ -48,7 +48,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_14000.c b/src/modules/module_14000.c
index 6d2c6ea6e..bb317b6ce 100644
--- a/src/modules/module_14000.c
+++ b/src/modules/module_14000.c
@@ -160,7 +160,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 2;
 
diff --git a/src/modules/module_14100.c b/src/modules/module_14100.c
index 05c0ba0e8..a03800ada 100644
--- a/src/modules/module_14100.c
+++ b/src/modules/module_14100.c
@@ -112,7 +112,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 2;
 
diff --git a/src/modules/module_14400.c b/src/modules/module_14400.c
index 949c509a9..2bcfe0a47 100644
--- a/src/modules/module_14400.c
+++ b/src/modules/module_14400.c
@@ -72,7 +72,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_14500.c b/src/modules/module_14500.c
index 60615d848..5cce792f2 100644
--- a/src/modules/module_14500.c
+++ b/src/modules/module_14500.c
@@ -141,7 +141,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   cryptoapi_t *cryptoapi = (cryptoapi_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 6;
 
diff --git a/src/modules/module_14700.c b/src/modules/module_14700.c
index 35699ff31..5ce1ee308 100644
--- a/src/modules/module_14700.c
+++ b/src/modules/module_14700.c
@@ -102,7 +102,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   itunes_backup_t *itunes_backup = (itunes_backup_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 7;
 
diff --git a/src/modules/module_14800.c b/src/modules/module_14800.c
index 5ec1e3c88..3712f2ad5 100644
--- a/src/modules/module_14800.c
+++ b/src/modules/module_14800.c
@@ -108,7 +108,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   itunes_backup_t *itunes_backup = (itunes_backup_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 7;
 
diff --git a/src/modules/module_14900.c b/src/modules/module_14900.c
index af11c25f3..9722da6e5 100644
--- a/src/modules/module_14900.c
+++ b/src/modules/module_14900.c
@@ -65,7 +65,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 2;
 
diff --git a/src/modules/module_15000.c b/src/modules/module_15000.c
index cd8890197..d5f4de06e 100644
--- a/src/modules/module_15000.c
+++ b/src/modules/module_15000.c
@@ -102,7 +102,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_15100.c b/src/modules/module_15100.c
index 4fb8a0106..59a8c4825 100644
--- a/src/modules/module_15100.c
+++ b/src/modules/module_15100.c
@@ -197,7 +197,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_15200.c b/src/modules/module_15200.c
index 734d34d5f..976f6e349 100644
--- a/src/modules/module_15200.c
+++ b/src/modules/module_15200.c
@@ -85,7 +85,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_15300.c b/src/modules/module_15300.c
index 4f41374a3..937b2db65 100644
--- a/src/modules/module_15300.c
+++ b/src/modules/module_15300.c
@@ -115,7 +115,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   dpapimk_t *dpapimk = (dpapimk_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 10;
 
diff --git a/src/modules/module_15400.c b/src/modules/module_15400.c
index 09223c592..3622269e3 100644
--- a/src/modules/module_15400.c
+++ b/src/modules/module_15400.c
@@ -87,7 +87,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   chacha20_t *chacha20 = (chacha20_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 6;
 
diff --git a/src/modules/module_15500.c b/src/modules/module_15500.c
index 9d6ea9bba..b55db95a9 100644
--- a/src/modules/module_15500.c
+++ b/src/modules/module_15500.c
@@ -86,7 +86,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   jks_sha1_t *jks_sha1 = (jks_sha1_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 7;
 
diff --git a/src/modules/module_15600.c b/src/modules/module_15600.c
index 94195a767..c8bb210ce 100644
--- a/src/modules/module_15600.c
+++ b/src/modules/module_15600.c
@@ -123,7 +123,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   ethereum_pbkdf2_t *ethereum_pbkdf2 = (ethereum_pbkdf2_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
 
diff --git a/src/modules/module_15700.c b/src/modules/module_15700.c
index b07934645..5f97873af 100644
--- a/src/modules/module_15700.c
+++ b/src/modules/module_15700.c
@@ -295,7 +295,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   ethereum_scrypt_t *ethereum_scrypt = (ethereum_scrypt_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 7;
 
diff --git a/src/modules/module_15900.c b/src/modules/module_15900.c
index 335e86872..97befaac3 100644
--- a/src/modules/module_15900.c
+++ b/src/modules/module_15900.c
@@ -103,7 +103,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   dpapimk_t *dpapimk = (dpapimk_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 10;
 
diff --git a/src/modules/module_16000.c b/src/modules/module_16000.c
index 6fcb3d4a5..9905550e3 100644
--- a/src/modules/module_16000.c
+++ b/src/modules/module_16000.c
@@ -68,7 +68,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 1;
 
diff --git a/src/modules/module_16100.c b/src/modules/module_16100.c
index 605638c70..2b33b5117 100644
--- a/src/modules/module_16100.c
+++ b/src/modules/module_16100.c
@@ -69,7 +69,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   tacacs_plus_t *tacacs_plus = (tacacs_plus_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_16200.c b/src/modules/module_16200.c
index f233fa17a..9875971b0 100644
--- a/src/modules/module_16200.c
+++ b/src/modules/module_16200.c
@@ -113,7 +113,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   apple_secure_notes_t *apple_secure_notes = (apple_secure_notes_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
 
diff --git a/src/modules/module_16300.c b/src/modules/module_16300.c
index 7ca2c5a74..1fb7ce311 100644
--- a/src/modules/module_16300.c
+++ b/src/modules/module_16300.c
@@ -114,7 +114,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   ethereum_presale_t *ethereum_presale = (ethereum_presale_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_16400.c b/src/modules/module_16400.c
index 28451cd3b..c4ea7e361 100644
--- a/src/modules/module_16400.c
+++ b/src/modules/module_16400.c
@@ -61,7 +61,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_16500.c b/src/modules/module_16500.c
index d75d8b704..b939d3082 100644
--- a/src/modules/module_16500.c
+++ b/src/modules/module_16500.c
@@ -120,7 +120,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   jwt_t *jwt = (jwt_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_16600.c b/src/modules/module_16600.c
index 63c5e64d9..b611d44d4 100644
--- a/src/modules/module_16600.c
+++ b/src/modules/module_16600.c
@@ -67,7 +67,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   electrum_wallet_t *electrum_wallet = (electrum_wallet_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_16700.c b/src/modules/module_16700.c
index b1ad45277..e35615b3b 100644
--- a/src/modules/module_16700.c
+++ b/src/modules/module_16700.c
@@ -82,7 +82,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   apple_secure_notes_t *apple_secure_notes = (apple_secure_notes_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 6;
 
diff --git a/src/modules/module_16800.c b/src/modules/module_16800.c
index 564dd9197..376260dba 100644
--- a/src/modules/module_16800.c
+++ b/src/modules/module_16800.c
@@ -323,7 +323,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   // start normal parsing
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_16801.c b/src/modules/module_16801.c
index 01f8cd566..86bdcd707 100644
--- a/src/modules/module_16801.c
+++ b/src/modules/module_16801.c
@@ -345,7 +345,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   // start normal parsing
 
-  token_t token;
+  hc_token_t token;
 
   // real 16801 pmkid hash-lines
 
diff --git a/src/modules/module_16900.c b/src/modules/module_16900.c
index 71d53d31f..3185bac10 100644
--- a/src/modules/module_16900.c
+++ b/src/modules/module_16900.c
@@ -124,7 +124,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   ansible_vault_t *ansible_vault = (ansible_vault_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 6;
 
diff --git a/src/modules/module_17010.c b/src/modules/module_17010.c
index f334da749..8d9bfc157 100644
--- a/src/modules/module_17010.c
+++ b/src/modules/module_17010.c
@@ -134,7 +134,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   gpg_t *gpg = (gpg_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 13;
 
diff --git a/src/modules/module_17300.c b/src/modules/module_17300.c
index dbce8e4c7..85a30e48e 100644
--- a/src/modules/module_17300.c
+++ b/src/modules/module_17300.c
@@ -47,7 +47,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 1;
 
diff --git a/src/modules/module_17400.c b/src/modules/module_17400.c
index 795edd59c..755d65aa3 100644
--- a/src/modules/module_17400.c
+++ b/src/modules/module_17400.c
@@ -47,7 +47,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 1;
 
diff --git a/src/modules/module_17500.c b/src/modules/module_17500.c
index c97f4e968..3582dfe2f 100644
--- a/src/modules/module_17500.c
+++ b/src/modules/module_17500.c
@@ -47,7 +47,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 1;
 
diff --git a/src/modules/module_17600.c b/src/modules/module_17600.c
index 462c75955..4d25eeab6 100644
--- a/src/modules/module_17600.c
+++ b/src/modules/module_17600.c
@@ -47,7 +47,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 1;
 
diff --git a/src/modules/module_17700.c b/src/modules/module_17700.c
index 3ab997e2c..b975aaa71 100644
--- a/src/modules/module_17700.c
+++ b/src/modules/module_17700.c
@@ -47,7 +47,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 1;
 
diff --git a/src/modules/module_17800.c b/src/modules/module_17800.c
index a49bbd61d..04081743c 100644
--- a/src/modules/module_17800.c
+++ b/src/modules/module_17800.c
@@ -47,7 +47,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 1;
 
diff --git a/src/modules/module_17900.c b/src/modules/module_17900.c
index d52c41037..d96d6306a 100644
--- a/src/modules/module_17900.c
+++ b/src/modules/module_17900.c
@@ -47,7 +47,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 1;
 
diff --git a/src/modules/module_18000.c b/src/modules/module_18000.c
index 8cdf0eb44..58716c374 100644
--- a/src/modules/module_18000.c
+++ b/src/modules/module_18000.c
@@ -47,7 +47,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 1;
 
diff --git a/src/modules/module_18100.c b/src/modules/module_18100.c
index 2af6097f5..352b014fd 100644
--- a/src/modules/module_18100.c
+++ b/src/modules/module_18100.c
@@ -69,7 +69,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_18200.c b/src/modules/module_18200.c
index 03ebb228b..5db972584 100644
--- a/src/modules/module_18200.c
+++ b/src/modules/module_18200.c
@@ -104,7 +104,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   krb5asrep_t *krb5asrep = (krb5asrep_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.signatures_cnt    = 1;
   token.signatures_buf[0] = SIGNATURE_KRB5ASREP;
diff --git a/src/modules/module_18300.c b/src/modules/module_18300.c
index 6bc0f90a1..abfdb370c 100644
--- a/src/modules/module_18300.c
+++ b/src/modules/module_18300.c
@@ -113,7 +113,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   apple_secure_notes_t *apple_secure_notes = (apple_secure_notes_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 6;
 
diff --git a/src/modules/module_18400.c b/src/modules/module_18400.c
index e71515d3b..8e88b5910 100644
--- a/src/modules/module_18400.c
+++ b/src/modules/module_18400.c
@@ -92,7 +92,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   odf12_t *odf12 = (odf12_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 12;
 
diff --git a/src/modules/module_18500.c b/src/modules/module_18500.c
index 26cc3308e..e1fe9d9a4 100644
--- a/src/modules/module_18500.c
+++ b/src/modules/module_18500.c
@@ -52,7 +52,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_18600.c b/src/modules/module_18600.c
index baee424e7..fd080cc15 100644
--- a/src/modules/module_18600.c
+++ b/src/modules/module_18600.c
@@ -187,7 +187,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   odf11_t *odf11 = (odf11_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 12;
 
diff --git a/src/modules/module_18700.c b/src/modules/module_18700.c
index 8169013de..73de68406 100644
--- a/src/modules/module_18700.c
+++ b/src/modules/module_18700.c
@@ -45,7 +45,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_18800.c b/src/modules/module_18800.c
index 43696d0ed..251980cf5 100644
--- a/src/modules/module_18800.c
+++ b/src/modules/module_18800.c
@@ -122,7 +122,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   bsp_t *bsp = (bsp_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_18900.c b/src/modules/module_18900.c
index 9094c2fd3..436afdfd8 100644
--- a/src/modules/module_18900.c
+++ b/src/modules/module_18900.c
@@ -104,7 +104,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   android_backup_t *android_backup = (android_backup_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 8;
 
diff --git a/src/modules/module_19000.c b/src/modules/module_19000.c
index 00f2370f5..4562ca1d3 100644
--- a/src/modules/module_19000.c
+++ b/src/modules/module_19000.c
@@ -62,7 +62,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_19100.c b/src/modules/module_19100.c
index 204ed6c60..72537d36d 100644
--- a/src/modules/module_19100.c
+++ b/src/modules/module_19100.c
@@ -61,7 +61,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_19200.c b/src/modules/module_19200.c
index b8c9c3875..988ae644a 100644
--- a/src/modules/module_19200.c
+++ b/src/modules/module_19200.c
@@ -78,7 +78,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_19300.c b/src/modules/module_19300.c
index 2c8c776aa..4c17e5dfe 100644
--- a/src/modules/module_19300.c
+++ b/src/modules/module_19300.c
@@ -66,7 +66,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   sha1_double_salt_t *sha1_double_salt = (sha1_double_salt_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_19500.c b/src/modules/module_19500.c
index b20d4df8d..f4d3ba10d 100644
--- a/src/modules/module_19500.c
+++ b/src/modules/module_19500.c
@@ -80,7 +80,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   devise_hash_t *devise_double_salt = (devise_hash_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_19600.c b/src/modules/module_19600.c
index 30210cdb0..29ccfe263 100644
--- a/src/modules/module_19600.c
+++ b/src/modules/module_19600.c
@@ -97,7 +97,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   krb5tgs_17_t *krb5tgs = (krb5tgs_17_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.signatures_cnt    = 1;
   token.signatures_buf[0] = SIGNATURE_KRB5TGS;
diff --git a/src/modules/module_19700.c b/src/modules/module_19700.c
index 336fc3729..beab1009b 100644
--- a/src/modules/module_19700.c
+++ b/src/modules/module_19700.c
@@ -97,7 +97,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   krb5tgs_18_t *krb5tgs = (krb5tgs_18_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.signatures_cnt    = 1;
   token.signatures_buf[0] = SIGNATURE_KRB5TGS;
diff --git a/src/modules/module_19800.c b/src/modules/module_19800.c
index c1b80b49e..3eaaec0b6 100644
--- a/src/modules/module_19800.c
+++ b/src/modules/module_19800.c
@@ -97,7 +97,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   krb5pa_17_t *krb5pa = (krb5pa_17_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.signatures_cnt    = 1;
   token.signatures_buf[0] = SIGNATURE_KRB5PA;
diff --git a/src/modules/module_19900.c b/src/modules/module_19900.c
index 9f9d55aba..ded17e1aa 100644
--- a/src/modules/module_19900.c
+++ b/src/modules/module_19900.c
@@ -97,7 +97,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   krb5pa_18_t *krb5pa = (krb5pa_18_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.signatures_cnt    = 1;
   token.signatures_buf[0] = SIGNATURE_KRB5PA;
diff --git a/src/modules/module_20011.c b/src/modules/module_20011.c
index dcce1b01b..32b4c2d29 100644
--- a/src/modules/module_20011.c
+++ b/src/modules/module_20011.c
@@ -101,7 +101,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   diskcryptor_esalt_t *diskcryptor_esalt = (diskcryptor_esalt_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 3;
 
diff --git a/src/modules/module_20012.c b/src/modules/module_20012.c
index f718e1224..4c81a7ccc 100644
--- a/src/modules/module_20012.c
+++ b/src/modules/module_20012.c
@@ -101,7 +101,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   diskcryptor_esalt_t *diskcryptor_esalt = (diskcryptor_esalt_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 3;
 
diff --git a/src/modules/module_20013.c b/src/modules/module_20013.c
index 48cab3344..f45e68ee7 100644
--- a/src/modules/module_20013.c
+++ b/src/modules/module_20013.c
@@ -101,7 +101,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   diskcryptor_esalt_t *diskcryptor_esalt = (diskcryptor_esalt_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 3;
 
diff --git a/src/modules/module_20200.c b/src/modules/module_20200.c
index 488bdea59..5193001b0 100644
--- a/src/modules/module_20200.c
+++ b/src/modules/module_20200.c
@@ -90,7 +90,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pbkdf2_sha512_t *pbkdf2_sha512 = (pbkdf2_sha512_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
 
diff --git a/src/modules/module_20300.c b/src/modules/module_20300.c
index fc2ef04e0..6596dc10a 100644
--- a/src/modules/module_20300.c
+++ b/src/modules/module_20300.c
@@ -89,7 +89,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pbkdf2_sha256_t *pbkdf2_sha256 = (pbkdf2_sha256_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
 
diff --git a/src/modules/module_20400.c b/src/modules/module_20400.c
index b608dbac7..1afb8b4f5 100644
--- a/src/modules/module_20400.c
+++ b/src/modules/module_20400.c
@@ -89,7 +89,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pbkdf2_sha1_t *pbkdf2_sha1 = (pbkdf2_sha1_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
 
diff --git a/src/modules/module_20500.c b/src/modules/module_20500.c
index db677ace9..797f7a1db 100644
--- a/src/modules/module_20500.c
+++ b/src/modules/module_20500.c
@@ -102,7 +102,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_20510.c b/src/modules/module_20510.c
index e2bd73ce2..5fcdf408b 100644
--- a/src/modules/module_20510.c
+++ b/src/modules/module_20510.c
@@ -142,7 +142,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_20600.c b/src/modules/module_20600.c
index b882bdd44..9018af256 100644
--- a/src/modules/module_20600.c
+++ b/src/modules/module_20600.c
@@ -96,7 +96,7 @@ u64 module_tmp_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED c
 
 int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED void *digest_buf, MAYBE_UNUSED salt_t *salt, MAYBE_UNUSED void *esalt_buf, MAYBE_UNUSED void *hook_salt_buf, MAYBE_UNUSED hashinfo_t *hash_info, const char *line_buf, MAYBE_UNUSED const int line_len)
 {
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_20710.c b/src/modules/module_20710.c
index 306b3eda4..b77eb9186 100644
--- a/src/modules/module_20710.c
+++ b/src/modules/module_20710.c
@@ -51,7 +51,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_20711.c b/src/modules/module_20711.c
index 2eb86978c..f9c91f8ea 100644
--- a/src/modules/module_20711.c
+++ b/src/modules/module_20711.c
@@ -67,7 +67,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_20720.c b/src/modules/module_20720.c
index e1636c7b9..dedeb8041 100644
--- a/src/modules/module_20720.c
+++ b/src/modules/module_20720.c
@@ -51,7 +51,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_20800.c b/src/modules/module_20800.c
index 49314b7f7..b150e8876 100644
--- a/src/modules/module_20800.c
+++ b/src/modules/module_20800.c
@@ -51,7 +51,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_20900.c b/src/modules/module_20900.c
index 52e463249..b4a7b8bed 100644
--- a/src/modules/module_20900.c
+++ b/src/modules/module_20900.c
@@ -51,7 +51,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_21000.c b/src/modules/module_21000.c
index 0291f86c6..280ec6e5f 100644
--- a/src/modules/module_21000.c
+++ b/src/modules/module_21000.c
@@ -92,7 +92,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_21100.c b/src/modules/module_21100.c
index 8061b1992..957060d4e 100644
--- a/src/modules/module_21100.c
+++ b/src/modules/module_21100.c
@@ -51,7 +51,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_21200.c b/src/modules/module_21200.c
index 687eb539a..a427632ec 100644
--- a/src/modules/module_21200.c
+++ b/src/modules/module_21200.c
@@ -51,7 +51,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_21300.c b/src/modules/module_21300.c
index dbe1720a0..1ecd72ca3 100644
--- a/src/modules/module_21300.c
+++ b/src/modules/module_21300.c
@@ -50,7 +50,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_21400.c b/src/modules/module_21400.c
index 09001c039..feb368161 100644
--- a/src/modules/module_21400.c
+++ b/src/modules/module_21400.c
@@ -51,7 +51,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_21500.c b/src/modules/module_21500.c
index da90446b2..7656a94eb 100644
--- a/src/modules/module_21500.c
+++ b/src/modules/module_21500.c
@@ -106,7 +106,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   solarwinds_t *solarwinds = (solarwinds_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_21501.c b/src/modules/module_21501.c
index 5eab4c21e..f3466d241 100644
--- a/src/modules/module_21501.c
+++ b/src/modules/module_21501.c
@@ -120,7 +120,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   solarwinds_t *solarwinds = (solarwinds_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_21600.c b/src/modules/module_21600.c
index b5bbd5def..86469a7ce 100644
--- a/src/modules/module_21600.c
+++ b/src/modules/module_21600.c
@@ -76,7 +76,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
 
diff --git a/src/modules/module_21700.c b/src/modules/module_21700.c
index 33dee83e9..4dcc6defc 100644
--- a/src/modules/module_21700.c
+++ b/src/modules/module_21700.c
@@ -92,7 +92,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   electrum_t *esalt = (electrum_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_21800.c b/src/modules/module_21800.c
index 6d395fef3..3e8f8a2cf 100644
--- a/src/modules/module_21800.c
+++ b/src/modules/module_21800.c
@@ -114,7 +114,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   electrum_t *esalt = (electrum_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_22000.c b/src/modules/module_22000.c
index ffa523ecb..68f834576 100644
--- a/src/modules/module_22000.c
+++ b/src/modules/module_22000.c
@@ -708,7 +708,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
     // start normal parsing
 
-    token_t token;
+    hc_token_t token;
 
     token.token_cnt  = 4;
 
@@ -750,7 +750,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   // start normal parsing
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 9;
 
diff --git a/src/modules/module_22001.c b/src/modules/module_22001.c
index f8f1bf2e2..7decf0cf6 100644
--- a/src/modules/module_22001.c
+++ b/src/modules/module_22001.c
@@ -709,7 +709,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
     // start normal parsing
 
-    token_t token;
+    hc_token_t token;
 
     token.token_cnt  = 4;
 
@@ -750,7 +750,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   // start normal parsing
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 9;
 
diff --git a/src/modules/module_22100.c b/src/modules/module_22100.c
index 025bddece..425dc67b4 100644
--- a/src/modules/module_22100.c
+++ b/src/modules/module_22100.c
@@ -156,7 +156,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   bitlocker_t *bitlocker = (bitlocker_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 9;
 
diff --git a/src/modules/module_22200.c b/src/modules/module_22200.c
index 3aeaf1a54..14a9c2256 100644
--- a/src/modules/module_22200.c
+++ b/src/modules/module_22200.c
@@ -91,7 +91,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u64 *digest = (u64 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 3;
 
diff --git a/src/modules/module_22300.c b/src/modules/module_22300.c
index eb50b4f8d..da85f0f55 100644
--- a/src/modules/module_22300.c
+++ b/src/modules/module_22300.c
@@ -48,7 +48,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_22301.c b/src/modules/module_22301.c
index dbdad9433..f57860d34 100644
--- a/src/modules/module_22301.c
+++ b/src/modules/module_22301.c
@@ -50,7 +50,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_22400.c b/src/modules/module_22400.c
index 02278dab9..fd47f7ddb 100644
--- a/src/modules/module_22400.c
+++ b/src/modules/module_22400.c
@@ -131,7 +131,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   aescrypt_t *aescrypt = (aescrypt_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 6;
 
diff --git a/src/modules/module_22500.c b/src/modules/module_22500.c
index 551d4bd9f..e9b315119 100644
--- a/src/modules/module_22500.c
+++ b/src/modules/module_22500.c
@@ -76,7 +76,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_22600.c b/src/modules/module_22600.c
index d4c27e47a..733f86ecd 100644
--- a/src/modules/module_22600.c
+++ b/src/modules/module_22600.c
@@ -91,7 +91,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   telegram_t *telegram = (telegram_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
 
diff --git a/src/modules/module_22700.c b/src/modules/module_22700.c
index 8c9c177a2..0aae58e78 100644
--- a/src/modules/module_22700.c
+++ b/src/modules/module_22700.c
@@ -280,7 +280,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
 
diff --git a/src/modules/module_22911.c b/src/modules/module_22911.c
index cfcb2e551..fc322301d 100644
--- a/src/modules/module_22911.c
+++ b/src/modules/module_22911.c
@@ -66,7 +66,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pem_t *pem = (pem_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 6;
 
diff --git a/src/modules/module_22921.c b/src/modules/module_22921.c
index d4f3774b1..94c716e97 100644
--- a/src/modules/module_22921.c
+++ b/src/modules/module_22921.c
@@ -66,7 +66,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pem_t *pem = (pem_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 6;
 
diff --git a/src/modules/module_22931.c b/src/modules/module_22931.c
index 1d5b41997..7d86c617c 100644
--- a/src/modules/module_22931.c
+++ b/src/modules/module_22931.c
@@ -66,7 +66,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pem_t *pem = (pem_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 6;
 
diff --git a/src/modules/module_22941.c b/src/modules/module_22941.c
index 19cb04ae5..6f845dccc 100644
--- a/src/modules/module_22941.c
+++ b/src/modules/module_22941.c
@@ -66,7 +66,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pem_t *pem = (pem_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 6;
 
diff --git a/src/modules/module_22951.c b/src/modules/module_22951.c
index 1ded11d57..d5f2da818 100644
--- a/src/modules/module_22951.c
+++ b/src/modules/module_22951.c
@@ -65,7 +65,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pem_t *pem = (pem_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 6;
 
diff --git a/src/modules/module_23001.c b/src/modules/module_23001.c
index feb269e95..91bbf3f75 100644
--- a/src/modules/module_23001.c
+++ b/src/modules/module_23001.c
@@ -69,7 +69,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   securezip_t *securezip = (securezip_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt   = 11;
 
diff --git a/src/modules/module_23002.c b/src/modules/module_23002.c
index b1ac4f8ed..4b244a1a2 100644
--- a/src/modules/module_23002.c
+++ b/src/modules/module_23002.c
@@ -69,7 +69,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   securezip_t *securezip = (securezip_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt   = 11;
 
diff --git a/src/modules/module_23003.c b/src/modules/module_23003.c
index 5976fc66f..c3b248bd7 100644
--- a/src/modules/module_23003.c
+++ b/src/modules/module_23003.c
@@ -70,7 +70,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   securezip_t *securezip = (securezip_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt   = 11;
 
diff --git a/src/modules/module_23100.c b/src/modules/module_23100.c
index 130f0cee0..db69c4947 100644
--- a/src/modules/module_23100.c
+++ b/src/modules/module_23100.c
@@ -103,7 +103,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   keychain_t *keychain = (keychain_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_23200.c b/src/modules/module_23200.c
index 3f5233caf..ba3d73f37 100644
--- a/src/modules/module_23200.c
+++ b/src/modules/module_23200.c
@@ -74,7 +74,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 7;
 
diff --git a/src/modules/module_23300.c b/src/modules/module_23300.c
index 1342a4a05..39ce12870 100644
--- a/src/modules/module_23300.c
+++ b/src/modules/module_23300.c
@@ -92,7 +92,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   iwork_t *iwork = (iwork_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 8;
 
diff --git a/src/modules/module_23400.c b/src/modules/module_23400.c
index e06182e9c..3704ef228 100644
--- a/src/modules/module_23400.c
+++ b/src/modules/module_23400.c
@@ -105,7 +105,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
 
diff --git a/src/modules/module_23500.c b/src/modules/module_23500.c
index 37c4cc317..55e839de8 100644
--- a/src/modules/module_23500.c
+++ b/src/modules/module_23500.c
@@ -97,7 +97,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   axcrypt2_t *axcrypt2 = (axcrypt2_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 7;
 
diff --git a/src/modules/module_23600.c b/src/modules/module_23600.c
index 9a77b8251..a3700984b 100644
--- a/src/modules/module_23600.c
+++ b/src/modules/module_23600.c
@@ -97,7 +97,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   axcrypt2_t *axcrypt2 = (axcrypt2_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 7;
 
diff --git a/src/modules/module_23700.c b/src/modules/module_23700.c
index 28b919384..6773d2389 100644
--- a/src/modules/module_23700.c
+++ b/src/modules/module_23700.c
@@ -133,7 +133,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   rar3_t *rar3 = (rar3_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 9;
 
diff --git a/src/modules/module_23800.c b/src/modules/module_23800.c
index b9190de35..65a8cf314 100644
--- a/src/modules/module_23800.c
+++ b/src/modules/module_23800.c
@@ -418,7 +418,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   rar3_hook_salt_t *rar3_hook_salt = (rar3_hook_salt_t *) hook_salt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 9;
 
diff --git a/src/modules/module_23900.c b/src/modules/module_23900.c
index a9b04b786..35cfe2e10 100644
--- a/src/modules/module_23900.c
+++ b/src/modules/module_23900.c
@@ -99,7 +99,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   bestcrypt_t *bestcrypt = (bestcrypt_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
 
diff --git a/src/modules/module_24100.c b/src/modules/module_24100.c
index 518f7c38e..bad9cf10e 100644
--- a/src/modules/module_24100.c
+++ b/src/modules/module_24100.c
@@ -93,7 +93,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   mongodb_sha1_t *mongodb_sha1 = (mongodb_sha1_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 6;
 
diff --git a/src/modules/module_24200.c b/src/modules/module_24200.c
index 06e7f4825..2f4837bbf 100644
--- a/src/modules/module_24200.c
+++ b/src/modules/module_24200.c
@@ -124,7 +124,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   mongodb_sha256_t *mongodb_sha256 = (mongodb_sha256_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 6;
 
diff --git a/src/modules/module_24300.c b/src/modules/module_24300.c
index de1ba5731..5cbda820e 100644
--- a/src/modules/module_24300.c
+++ b/src/modules/module_24300.c
@@ -47,7 +47,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_24410.c b/src/modules/module_24410.c
index 4f8237867..6a033e43f 100644
--- a/src/modules/module_24410.c
+++ b/src/modules/module_24410.c
@@ -95,7 +95,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pkcs_t *pkcs = (pkcs_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 8;
 
diff --git a/src/modules/module_24420.c b/src/modules/module_24420.c
index a573bae18..019585737 100644
--- a/src/modules/module_24420.c
+++ b/src/modules/module_24420.c
@@ -95,7 +95,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pkcs_t *pkcs = (pkcs_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 8;
 
diff --git a/src/modules/module_24500.c b/src/modules/module_24500.c
index cc6a2a230..b6d7c380f 100644
--- a/src/modules/module_24500.c
+++ b/src/modules/module_24500.c
@@ -104,7 +104,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   telegram_t *telegram = (telegram_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
 
diff --git a/src/modules/module_24600.c b/src/modules/module_24600.c
index ec4d88682..c8ff082d4 100644
--- a/src/modules/module_24600.c
+++ b/src/modules/module_24600.c
@@ -148,7 +148,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   sqlcipher_t *sqlcipher = (sqlcipher_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 6;
 
diff --git a/src/modules/module_24700.c b/src/modules/module_24700.c
index 92ad369a3..76db21d0c 100644
--- a/src/modules/module_24700.c
+++ b/src/modules/module_24700.c
@@ -48,7 +48,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_24800.c b/src/modules/module_24800.c
index 68964d386..ecf2a45db 100644
--- a/src/modules/module_24800.c
+++ b/src/modules/module_24800.c
@@ -46,7 +46,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_24900.c b/src/modules/module_24900.c
index 0a6d7fe39..22dc5f58f 100644
--- a/src/modules/module_24900.c
+++ b/src/modules/module_24900.c
@@ -86,7 +86,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_25000.c b/src/modules/module_25000.c
index 9888b54af..dbb2cb0b5 100644
--- a/src/modules/module_25000.c
+++ b/src/modules/module_25000.c
@@ -125,7 +125,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   snmpv3_t *snmpv3 = (snmpv3_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
   token.signatures_cnt    = 1;
diff --git a/src/modules/module_25100.c b/src/modules/module_25100.c
index 8dcd8aec3..d8647244e 100644
--- a/src/modules/module_25100.c
+++ b/src/modules/module_25100.c
@@ -121,7 +121,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   snmpv3_t *snmpv3 = (snmpv3_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
   token.signatures_cnt    = 1;
diff --git a/src/modules/module_25200.c b/src/modules/module_25200.c
index 6253b7e7e..6ff4c4dd7 100644
--- a/src/modules/module_25200.c
+++ b/src/modules/module_25200.c
@@ -121,7 +121,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   snmpv3_t *snmpv3 = (snmpv3_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
   token.signatures_cnt    = 1;
diff --git a/src/modules/module_25300.c b/src/modules/module_25300.c
index d08649bfe..fc9dbc31e 100644
--- a/src/modules/module_25300.c
+++ b/src/modules/module_25300.c
@@ -117,7 +117,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   office2016_t *office2016 = (office2016_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_25400.c b/src/modules/module_25400.c
index 21d41c914..c00ad420b 100644
--- a/src/modules/module_25400.c
+++ b/src/modules/module_25400.c
@@ -149,7 +149,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pdf_t *pdf = (pdf_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 12;
 
diff --git a/src/modules/module_25500.c b/src/modules/module_25500.c
index 86184ebf9..57fc74b75 100644
--- a/src/modules/module_25500.c
+++ b/src/modules/module_25500.c
@@ -119,7 +119,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   pbkdf2_sha256_aes_gcm_t *stellar = (pbkdf2_sha256_aes_gcm_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_25600.c b/src/modules/module_25600.c
index 674e85f07..41b32dab2 100644
--- a/src/modules/module_25600.c
+++ b/src/modules/module_25600.c
@@ -168,7 +168,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_25700.c b/src/modules/module_25700.c
index 23993be7b..f5c55e5c6 100644
--- a/src/modules/module_25700.c
+++ b/src/modules/module_25700.c
@@ -59,7 +59,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 2;
 
diff --git a/src/modules/module_25800.c b/src/modules/module_25800.c
index 32cd5f4c4..f4fba0d78 100644
--- a/src/modules/module_25800.c
+++ b/src/modules/module_25800.c
@@ -168,7 +168,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_25900.c b/src/modules/module_25900.c
index 556bedf31..d0d957f79 100644
--- a/src/modules/module_25900.c
+++ b/src/modules/module_25900.c
@@ -129,7 +129,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   blocks_t *blocks = (blocks_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 4;
 
diff --git a/src/modules/module_26000.c b/src/modules/module_26000.c
index 09ac79524..26757eff3 100644
--- a/src/modules/module_26000.c
+++ b/src/modules/module_26000.c
@@ -74,7 +74,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   mozilla_3des_t *mozilla_3des = (mozilla_3des_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
 
diff --git a/src/modules/module_26100.c b/src/modules/module_26100.c
index 979314f09..8c29e805c 100644
--- a/src/modules/module_26100.c
+++ b/src/modules/module_26100.c
@@ -91,7 +91,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   mozilla_aes_t *mozilla_aes = (mozilla_aes_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 7;
 
diff --git a/src/modules/module_26200.c b/src/modules/module_26200.c
index 254393027..2b4ef79cd 100644
--- a/src/modules/module_26200.c
+++ b/src/modules/module_26200.c
@@ -93,7 +93,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/modules/module_26300.c b/src/modules/module_26300.c
index 94bfbbb78..71881fa01 100644
--- a/src/modules/module_26300.c
+++ b/src/modules/module_26300.c
@@ -51,7 +51,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_26401.c b/src/modules/module_26401.c
index 450313d8b..1245f3369 100644
--- a/src/modules/module_26401.c
+++ b/src/modules/module_26401.c
@@ -54,7 +54,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 2;
 
diff --git a/src/modules/module_26402.c b/src/modules/module_26402.c
index ec69abb33..efc26f00f 100644
--- a/src/modules/module_26402.c
+++ b/src/modules/module_26402.c
@@ -54,7 +54,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 2;
 
diff --git a/src/modules/module_26403.c b/src/modules/module_26403.c
index 6f8dd52e2..aaf73f37c 100644
--- a/src/modules/module_26403.c
+++ b/src/modules/module_26403.c
@@ -53,7 +53,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 2;
 
diff --git a/src/modules/module_26500.c b/src/modules/module_26500.c
index c01ffe187..261c94654 100644
--- a/src/modules/module_26500.c
+++ b/src/modules/module_26500.c
@@ -92,7 +92,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   iphone_passcode_t *iphone_passcode = (iphone_passcode_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
 
diff --git a/src/modules/module_26600.c b/src/modules/module_26600.c
index 9875e92f4..9504835c9 100644
--- a/src/modules/module_26600.c
+++ b/src/modules/module_26600.c
@@ -128,7 +128,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   #define CT_MAX_LEN_BASE64 (((3136+16) * 8) / 6) + 3
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_26700.c b/src/modules/module_26700.c
index a71195887..5e9d9ad93 100644
--- a/src/modules/module_26700.c
+++ b/src/modules/module_26700.c
@@ -121,7 +121,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   snmpv3_t *snmpv3 = (snmpv3_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
   token.signatures_cnt    = 1;
diff --git a/src/modules/module_26800.c b/src/modules/module_26800.c
index 8b20d5b8b..1396b9ae9 100644
--- a/src/modules/module_26800.c
+++ b/src/modules/module_26800.c
@@ -121,7 +121,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   snmpv3_t *snmpv3 = (snmpv3_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
   token.signatures_cnt    = 1;
diff --git a/src/modules/module_26900.c b/src/modules/module_26900.c
index 23e137921..71adc69d8 100644
--- a/src/modules/module_26900.c
+++ b/src/modules/module_26900.c
@@ -161,7 +161,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   snmpv3_t *snmpv3 = (snmpv3_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
   token.signatures_cnt    = 1;
diff --git a/src/modules/module_27000.c b/src/modules/module_27000.c
index 95470a63b..f6f307a1a 100644
--- a/src/modules/module_27000.c
+++ b/src/modules/module_27000.c
@@ -125,7 +125,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   netntlm_t *netntlm = (netntlm_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 6;
 
diff --git a/src/modules/module_27100.c b/src/modules/module_27100.c
index 213a495c0..40064b9a0 100644
--- a/src/modules/module_27100.c
+++ b/src/modules/module_27100.c
@@ -85,7 +85,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   netntlm_t *netntlm = (netntlm_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 6;
 
diff --git a/src/modules/module_27200.c b/src/modules/module_27200.c
index d37bc5d43..ddb39e8d4 100644
--- a/src/modules/module_27200.c
+++ b/src/modules/module_27200.c
@@ -77,7 +77,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_27300.c b/src/modules/module_27300.c
index 4dfe9ce0b..e1d5850a8 100644
--- a/src/modules/module_27300.c
+++ b/src/modules/module_27300.c
@@ -161,7 +161,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   snmpv3_t *snmpv3 = (snmpv3_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 5;
   token.signatures_cnt    = 1;
diff --git a/src/modules/module_27400.c b/src/modules/module_27400.c
index a5bd5e617..5fac48db5 100644
--- a/src/modules/module_27400.c
+++ b/src/modules/module_27400.c
@@ -92,7 +92,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   vmware_vmx_t *vmware_vmx = (vmware_vmx_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_27500.c b/src/modules/module_27500.c
index d4dbb1cc6..56442b2e8 100644
--- a/src/modules/module_27500.c
+++ b/src/modules/module_27500.c
@@ -111,7 +111,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   vbox_t *vbox = (vbox_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 8;
 
diff --git a/src/modules/module_27600.c b/src/modules/module_27600.c
index b750c67b1..ea5919d90 100644
--- a/src/modules/module_27600.c
+++ b/src/modules/module_27600.c
@@ -111,7 +111,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   vbox_t *vbox = (vbox_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 8;
 
diff --git a/src/modules/module_27700.c b/src/modules/module_27700.c
index 30dbf2f62..346b9f73d 100644
--- a/src/modules/module_27700.c
+++ b/src/modules/module_27700.c
@@ -278,7 +278,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 7;
 
diff --git a/src/modules/module_27800.c b/src/modules/module_27800.c
index 07ae308e5..9ea213773 100644
--- a/src/modules/module_27800.c
+++ b/src/modules/module_27800.c
@@ -59,7 +59,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt = 2;
 
diff --git a/src/modules/module_27900.c b/src/modules/module_27900.c
index 1cacc5b4b..b04100cdc 100644
--- a/src/modules/module_27900.c
+++ b/src/modules/module_27900.c
@@ -45,7 +45,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_28000.c b/src/modules/module_28000.c
index e4fa3ac2d..d25644c90 100644
--- a/src/modules/module_28000.c
+++ b/src/modules/module_28000.c
@@ -62,7 +62,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   crc64_t *crc64 = (crc64_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 2;
 
diff --git a/src/modules/module_28100.c b/src/modules/module_28100.c
index cfb3d77c7..a2798bc18 100644
--- a/src/modules/module_28100.c
+++ b/src/modules/module_28100.c
@@ -105,7 +105,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   winhello_t *winhello = (winhello_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 9;
 
diff --git a/src/modules/module_28200.c b/src/modules/module_28200.c
index 191ffbf20..648a26403 100644
--- a/src/modules/module_28200.c
+++ b/src/modules/module_28200.c
@@ -274,7 +274,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   exodus_t *exodus = (exodus_t *) esalt_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 8;
 
diff --git a/src/modules/module_28300.c b/src/modules/module_28300.c
index eabbdcf8b..eaf6fd453 100644
--- a/src/modules/module_28300.c
+++ b/src/modules/module_28300.c
@@ -48,7 +48,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 4;
 
diff --git a/src/modules/module_99999.c b/src/modules/module_99999.c
index b85c493a8..641c41a71 100644
--- a/src/modules/module_99999.c
+++ b/src/modules/module_99999.c
@@ -62,7 +62,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 {
   u32 *digest = (u32 *) digest_buf;
 
-  token_t token;
+  hc_token_t token;
 
   token.token_cnt  = 1;
 
diff --git a/src/shared.c b/src/shared.c
index 7049f9a80..26a79f625 100644
--- a/src/shared.c
+++ b/src/shared.c
@@ -1108,7 +1108,7 @@ const u8 *hc_strchr_last (const u8 *input_buf, const int input_len, const u8 sep
   return NULL;
 }
 
-int input_tokenizer (const u8 *input_buf, const int input_len, token_t *token)
+int input_tokenizer (const u8 *input_buf, const int input_len, hc_token_t *token)
 {
   int len_left = input_len;