diff --git a/OpenCL/m05300_a0.cl b/OpenCL/m05300_a0.cl
index 5bcee3ed5..6c17f8865 100644
--- a/OpenCL/m05300_a0.cl
+++ b/OpenCL/m05300_a0.cl
@@ -83,7 +83,7 @@ __kernel void m05300_mxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     md5_hmac_ctx_t ctx;
 
-    md5_hmac_init_vector_64 (&ctx, w0, w1, w2, w3);
+    md5_hmac_init_64 (&ctx, w0, w1, w2, w3);
 
     md5_hmac_update_global (&ctx, ikepsk_bufs[digests_offset].msg_buf, ikepsk_bufs[digests_offset].msg_len);
 
@@ -178,7 +178,7 @@ __kernel void m05300_sxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     md5_hmac_ctx_t ctx;
 
-    md5_hmac_init_vector_64 (&ctx, w0, w1, w2, w3);
+    md5_hmac_init_64 (&ctx, w0, w1, w2, w3);
 
     md5_hmac_update_global (&ctx, ikepsk_bufs[digests_offset].msg_buf, ikepsk_bufs[digests_offset].msg_len);
 
diff --git a/OpenCL/m05300_a1.cl b/OpenCL/m05300_a1.cl
index 141e20207..aedad50e9 100644
--- a/OpenCL/m05300_a1.cl
+++ b/OpenCL/m05300_a1.cl
@@ -69,9 +69,9 @@ __kernel void m05300_mxx (__global pw_t *pws, __global const kernel_rule_t *rule
       c[i] |= w[i];
     }
 
-    md5_hmac_ctx_vector_t ctx0;
+    md5_hmac_ctx_t ctx0;
 
-    md5_hmac_init_vector (&ctx0, c, pw_len + comb_len);
+    md5_hmac_init (&ctx0, c, pw_len + comb_len);
 
     md5_hmac_update_global (&ctx0, ikepsk_bufs[digests_offset].nr_buf, ikepsk_bufs[digests_offset].nr_len);
 
@@ -101,7 +101,7 @@ __kernel void m05300_mxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     md5_hmac_ctx_t ctx;
 
-    md5_hmac_init_vector_64 (&ctx, w0, w1, w2, w3);
+    md5_hmac_init_64 (&ctx, w0, w1, w2, w3);
 
     md5_hmac_update_global (&ctx, ikepsk_bufs[digests_offset].msg_buf, ikepsk_bufs[digests_offset].msg_len);
 
@@ -184,9 +184,9 @@ __kernel void m05300_sxx (__global pw_t *pws, __global const kernel_rule_t *rule
       c[i] |= w[i];
     }
 
-    md5_hmac_ctx_vector_t ctx0;
+    md5_hmac_ctx_t ctx0;
 
-    md5_hmac_init_vector (&ctx0, c, pw_len + comb_len);
+    md5_hmac_init (&ctx0, c, pw_len + comb_len);
 
     md5_hmac_update_global (&ctx0, ikepsk_bufs[digests_offset].nr_buf, ikepsk_bufs[digests_offset].nr_len);
 
@@ -216,7 +216,7 @@ __kernel void m05300_sxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     md5_hmac_ctx_t ctx;
 
-    md5_hmac_init_vector_64 (&ctx, w0, w1, w2, w3);
+    md5_hmac_init_64 (&ctx, w0, w1, w2, w3);
 
     md5_hmac_update_global (&ctx, ikepsk_bufs[digests_offset].msg_buf, ikepsk_bufs[digests_offset].msg_len);
 
diff --git a/OpenCL/m05300_a3.cl b/OpenCL/m05300_a3.cl
index 29e83a70d..e42db4387 100644
--- a/OpenCL/m05300_a3.cl
+++ b/OpenCL/m05300_a3.cl
@@ -87,7 +87,7 @@ __kernel void m05300_mxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     md5_hmac_ctx_t ctx;
 
-    md5_hmac_init_vector_64 (&ctx, w0, w1, w2, w3);
+    md5_hmac_init_64 (&ctx, w0, w1, w2, w3);
 
     md5_hmac_update_global (&ctx, ikepsk_bufs[digests_offset].msg_buf, ikepsk_bufs[digests_offset].msg_len);
 
@@ -188,7 +188,7 @@ __kernel void m05300_sxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     md5_hmac_ctx_t ctx;
 
-    md5_hmac_init_vector_64 (&ctx, w0, w1, w2, w3);
+    md5_hmac_init_64 (&ctx, w0, w1, w2, w3);
 
     md5_hmac_update_global (&ctx, ikepsk_bufs[digests_offset].msg_buf, ikepsk_bufs[digests_offset].msg_len);
 
diff --git a/OpenCL/m05400_a0.cl b/OpenCL/m05400_a0.cl
index ccafef2f5..34b78379f 100644
--- a/OpenCL/m05400_a0.cl
+++ b/OpenCL/m05400_a0.cl
@@ -83,7 +83,7 @@ __kernel void m05400_mxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     sha1_hmac_ctx_t ctx;
 
-    sha1_hmac_init_vector_64 (&ctx, w0, w1, w2, w3);
+    sha1_hmac_init_64 (&ctx, w0, w1, w2, w3);
 
     sha1_hmac_update_global_swap (&ctx, ikepsk_bufs[digests_offset].msg_buf, ikepsk_bufs[digests_offset].msg_len);
 
@@ -178,7 +178,7 @@ __kernel void m05400_sxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     sha1_hmac_ctx_t ctx;
 
-    sha1_hmac_init_vector_64 (&ctx, w0, w1, w2, w3);
+    sha1_hmac_init_64 (&ctx, w0, w1, w2, w3);
 
     sha1_hmac_update_global_swap (&ctx, ikepsk_bufs[digests_offset].msg_buf, ikepsk_bufs[digests_offset].msg_len);
 
diff --git a/OpenCL/m05400_a1.cl b/OpenCL/m05400_a1.cl
index 415d537d1..74bd00d06 100644
--- a/OpenCL/m05400_a1.cl
+++ b/OpenCL/m05400_a1.cl
@@ -101,7 +101,7 @@ __kernel void m05400_mxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     sha1_hmac_ctx_t ctx;
 
-    sha1_hmac_init_vector_64 (&ctx, w0, w1, w2, w3);
+    sha1_hmac_init_64 (&ctx, w0, w1, w2, w3);
 
     sha1_hmac_update_global_swap (&ctx, ikepsk_bufs[digests_offset].msg_buf, ikepsk_bufs[digests_offset].msg_len);
 
@@ -216,7 +216,7 @@ __kernel void m05400_sxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     sha1_hmac_ctx_t ctx;
 
-    sha1_hmac_init_vector_64 (&ctx, w0, w1, w2, w3);
+    sha1_hmac_init_64 (&ctx, w0, w1, w2, w3);
 
     sha1_hmac_update_global_swap (&ctx, ikepsk_bufs[digests_offset].msg_buf, ikepsk_bufs[digests_offset].msg_len);
 
diff --git a/OpenCL/m05400_a3.cl b/OpenCL/m05400_a3.cl
index ee4ab2b53..92c014049 100644
--- a/OpenCL/m05400_a3.cl
+++ b/OpenCL/m05400_a3.cl
@@ -87,7 +87,7 @@ __kernel void m05400_mxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     sha1_hmac_ctx_t ctx;
 
-    sha1_hmac_init_vector_64 (&ctx, w0, w1, w2, w3);
+    sha1_hmac_init_64 (&ctx, w0, w1, w2, w3);
 
     sha1_hmac_update_global_swap (&ctx, ikepsk_bufs[digests_offset].msg_buf, ikepsk_bufs[digests_offset].msg_len);
 
@@ -188,7 +188,7 @@ __kernel void m05400_sxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     sha1_hmac_ctx_t ctx;
 
-    sha1_hmac_init_vector_64 (&ctx, w0, w1, w2, w3);
+    sha1_hmac_init_64 (&ctx, w0, w1, w2, w3);
 
     sha1_hmac_update_global_swap (&ctx, ikepsk_bufs[digests_offset].msg_buf, ikepsk_bufs[digests_offset].msg_len);