diff --git a/OpenCL/inc_hash_sha384.cl b/OpenCL/inc_hash_sha384.cl
index 13ac34d0a..b81eb6703 100644
--- a/OpenCL/inc_hash_sha384.cl
+++ b/OpenCL/inc_hash_sha384.cl
@@ -2879,7 +2879,7 @@ void sha384_hmac_update_vector (sha384_hmac_ctx_vector_t *ctx, const u32x *w, co
   sha384_update_vector (&ctx->ipad, w, len);
 }
 
-void sha384_hmac_final_vector (sha384_hmac_ctx_t *ctx)
+void sha384_hmac_final_vector (sha384_hmac_ctx_vector_t *ctx)
 {
   sha384_final_vector (&ctx->ipad);
 
diff --git a/OpenCL/inc_hash_sha512.cl b/OpenCL/inc_hash_sha512.cl
index 3d9a19dd3..f373a909f 100644
--- a/OpenCL/inc_hash_sha512.cl
+++ b/OpenCL/inc_hash_sha512.cl
@@ -2396,10 +2396,10 @@ void sha512_update_vector_utf16le (sha512_ctx_vector_t *ctx, const u32x *w, cons
     w3[2] = w[pos4 + 14];
     w3[3] = w[pos4 + 15];
 
-    make_utf16le_S (w3, w6, w7);
-    make_utf16le_S (w2, w4, w5);
-    make_utf16le_S (w1, w2, w3);
-    make_utf16le_S (w0, w0, w1);
+    make_utf16le (w3, w6, w7);
+    make_utf16le (w2, w4, w5);
+    make_utf16le (w1, w2, w3);
+    make_utf16le (w0, w0, w1);
 
     sha512_update_vector_128 (ctx, w0, w1, w2, w3, w4, w5, w6, w7, 64 * 2);
   }
@@ -2421,10 +2421,10 @@ void sha512_update_vector_utf16le (sha512_ctx_vector_t *ctx, const u32x *w, cons
   w3[2] = w[pos4 + 14];
   w3[3] = w[pos4 + 15];
 
-  make_utf16le_S (w3, w6, w7);
-  make_utf16le_S (w2, w4, w5);
-  make_utf16le_S (w1, w2, w3);
-  make_utf16le_S (w0, w0, w1);
+  make_utf16le (w3, w6, w7);
+  make_utf16le (w2, w4, w5);
+  make_utf16le (w1, w2, w3);
+  make_utf16le (w0, w0, w1);
 
   sha512_update_vector_128 (ctx, w0, w1, w2, w3, w4, w5, w6, w7, (len - pos1) * 2);
 }
@@ -2462,10 +2462,10 @@ void sha512_update_vector_utf16le_swap (sha512_ctx_vector_t *ctx, const u32x *w,
     w3[2] = w[pos4 + 14];
     w3[3] = w[pos4 + 15];
 
-    make_utf16le_S (w3, w6, w7);
-    make_utf16le_S (w2, w4, w5);
-    make_utf16le_S (w1, w2, w3);
-    make_utf16le_S (w0, w0, w1);
+    make_utf16le (w3, w6, w7);
+    make_utf16le (w2, w4, w5);
+    make_utf16le (w1, w2, w3);
+    make_utf16le (w0, w0, w1);
 
     w0[0] = swap32 (w0[0]);
     w0[1] = swap32 (w0[1]);
@@ -2520,10 +2520,10 @@ void sha512_update_vector_utf16le_swap (sha512_ctx_vector_t *ctx, const u32x *w,
   w3[2] = w[pos4 + 14];
   w3[3] = w[pos4 + 15];
 
-  make_utf16le_S (w3, w6, w7);
-  make_utf16le_S (w2, w4, w5);
-  make_utf16le_S (w1, w2, w3);
-  make_utf16le_S (w0, w0, w1);
+  make_utf16le (w3, w6, w7);
+  make_utf16le (w2, w4, w5);
+  make_utf16le (w1, w2, w3);
+  make_utf16le (w0, w0, w1);
 
   w0[0] = swap32 (w0[0]);
   w0[1] = swap32 (w0[1]);
@@ -2594,10 +2594,10 @@ void sha512_update_vector_utf16beN (sha512_ctx_vector_t *ctx, const u32x *w, con
     w3[2] = w[pos4 + 14];
     w3[3] = w[pos4 + 15];
 
-    make_utf16beN_S (w3, w6, w7);
-    make_utf16beN_S (w2, w4, w5);
-    make_utf16beN_S (w1, w2, w3);
-    make_utf16beN_S (w0, w0, w1);
+    make_utf16beN (w3, w6, w7);
+    make_utf16beN (w2, w4, w5);
+    make_utf16beN (w1, w2, w3);
+    make_utf16beN (w0, w0, w1);
 
     sha512_update_vector_128 (ctx, w0, w1, w2, w3, w4, w5, w6, w7, 64 * 2);
   }
@@ -2619,10 +2619,10 @@ void sha512_update_vector_utf16beN (sha512_ctx_vector_t *ctx, const u32x *w, con
   w3[2] = w[pos4 + 14];
   w3[3] = w[pos4 + 15];
 
-  make_utf16beN_S (w3, w6, w7);
-  make_utf16beN_S (w2, w4, w5);
-  make_utf16beN_S (w1, w2, w3);
-  make_utf16beN_S (w0, w0, w1);
+  make_utf16beN (w3, w6, w7);
+  make_utf16beN (w2, w4, w5);
+  make_utf16beN (w1, w2, w3);
+  make_utf16beN (w0, w0, w1);
 
   sha512_update_vector_128 (ctx, w0, w1, w2, w3, w4, w5, w6, w7, (len - pos1) * 2);
 }
@@ -2879,7 +2879,7 @@ void sha512_hmac_update_vector (sha512_hmac_ctx_vector_t *ctx, const u32x *w, co
   sha512_update_vector (&ctx->ipad, w, len);
 }
 
-void sha512_hmac_final_vector (sha512_hmac_ctx_t *ctx)
+void sha512_hmac_final_vector (sha512_hmac_ctx_vector_t *ctx)
 {
   sha512_final_vector (&ctx->ipad);
 
diff --git a/OpenCL/m00050_a0-pure.cl b/OpenCL/m00050_a0-pure.cl
index 4e7a5bad8..263ef488f 100644
--- a/OpenCL/m00050_a0-pure.cl
+++ b/OpenCL/m00050_a0-pure.cl
@@ -72,10 +72,10 @@ __kernel void m00050_mxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     md5_hmac_final (&ctx);
 
-    const u32x r0 = ctx.opad.h[DGST_R0];
-    const u32x r1 = ctx.opad.h[DGST_R1];
-    const u32x r2 = ctx.opad.h[DGST_R2];
-    const u32x r3 = ctx.opad.h[DGST_R3];
+    const u32 r0 = ctx.opad.h[DGST_R0];
+    const u32 r1 = ctx.opad.h[DGST_R1];
+    const u32 r2 = ctx.opad.h[DGST_R2];
+    const u32 r3 = ctx.opad.h[DGST_R3];
 
     COMPARE_M_SCALAR (r0, r1, r2, r3);
   }
@@ -150,10 +150,10 @@ __kernel void m00050_sxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     md5_hmac_final (&ctx);
 
-    const u32x r0 = ctx.opad.h[DGST_R0];
-    const u32x r1 = ctx.opad.h[DGST_R1];
-    const u32x r2 = ctx.opad.h[DGST_R2];
-    const u32x r3 = ctx.opad.h[DGST_R3];
+    const u32 r0 = ctx.opad.h[DGST_R0];
+    const u32 r1 = ctx.opad.h[DGST_R1];
+    const u32 r2 = ctx.opad.h[DGST_R2];
+    const u32 r3 = ctx.opad.h[DGST_R3];
 
     COMPARE_S_SCALAR (r0, r1, r2, r3);
   }
diff --git a/OpenCL/m00050_a1-pure.cl b/OpenCL/m00050_a1-pure.cl
index 65162ff3c..7d75b6e4f 100644
--- a/OpenCL/m00050_a1-pure.cl
+++ b/OpenCL/m00050_a1-pure.cl
@@ -90,10 +90,10 @@ __kernel void m00050_mxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     md5_hmac_final_vector (&ctx);
 
-    const u32x r0 = ctx.opad.h[DGST_R0];
-    const u32x r1 = ctx.opad.h[DGST_R1];
-    const u32x r2 = ctx.opad.h[DGST_R2];
-    const u32x r3 = ctx.opad.h[DGST_R3];
+    const u32 r0 = ctx.opad.h[DGST_R0];
+    const u32 r1 = ctx.opad.h[DGST_R1];
+    const u32 r2 = ctx.opad.h[DGST_R2];
+    const u32 r3 = ctx.opad.h[DGST_R3];
 
     COMPARE_M_SCALAR (r0, r1, r2, r3);
   }
@@ -188,10 +188,10 @@ __kernel void m00050_sxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     md5_hmac_final_vector (&ctx);
 
-    const u32x r0 = ctx.opad.h[DGST_R0];
-    const u32x r1 = ctx.opad.h[DGST_R1];
-    const u32x r2 = ctx.opad.h[DGST_R2];
-    const u32x r3 = ctx.opad.h[DGST_R3];
+    const u32 r0 = ctx.opad.h[DGST_R0];
+    const u32 r1 = ctx.opad.h[DGST_R1];
+    const u32 r2 = ctx.opad.h[DGST_R2];
+    const u32 r3 = ctx.opad.h[DGST_R3];
 
     COMPARE_S_SCALAR (r0, r1, r2, r3);
   }
diff --git a/OpenCL/m00060_a0-pure.cl b/OpenCL/m00060_a0-pure.cl
index 68a85a999..ea4b96827 100644
--- a/OpenCL/m00060_a0-pure.cl
+++ b/OpenCL/m00060_a0-pure.cl
@@ -74,10 +74,10 @@ __kernel void m00060_mxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     md5_hmac_final (&ctx);
 
-    const u32x r0 = ctx.opad.h[DGST_R0];
-    const u32x r1 = ctx.opad.h[DGST_R1];
-    const u32x r2 = ctx.opad.h[DGST_R2];
-    const u32x r3 = ctx.opad.h[DGST_R3];
+    const u32 r0 = ctx.opad.h[DGST_R0];
+    const u32 r1 = ctx.opad.h[DGST_R1];
+    const u32 r2 = ctx.opad.h[DGST_R2];
+    const u32 r3 = ctx.opad.h[DGST_R3];
 
     COMPARE_M_SCALAR (r0, r1, r2, r3);
   }
@@ -154,10 +154,10 @@ __kernel void m00060_sxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     md5_hmac_final (&ctx);
 
-    const u32x r0 = ctx.opad.h[DGST_R0];
-    const u32x r1 = ctx.opad.h[DGST_R1];
-    const u32x r2 = ctx.opad.h[DGST_R2];
-    const u32x r3 = ctx.opad.h[DGST_R3];
+    const u32 r0 = ctx.opad.h[DGST_R0];
+    const u32 r1 = ctx.opad.h[DGST_R1];
+    const u32 r2 = ctx.opad.h[DGST_R2];
+    const u32 r3 = ctx.opad.h[DGST_R3];
 
     COMPARE_S_SCALAR (r0, r1, r2, r3);
   }
diff --git a/OpenCL/m00060_a1-pure.cl b/OpenCL/m00060_a1-pure.cl
index 4434928b3..a0e4f0a23 100644
--- a/OpenCL/m00060_a1-pure.cl
+++ b/OpenCL/m00060_a1-pure.cl
@@ -92,10 +92,10 @@ __kernel void m00060_mxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     md5_hmac_final (&ctx);
 
-    const u32x r0 = ctx.opad.h[DGST_R0];
-    const u32x r1 = ctx.opad.h[DGST_R1];
-    const u32x r2 = ctx.opad.h[DGST_R2];
-    const u32x r3 = ctx.opad.h[DGST_R3];
+    const u32 r0 = ctx.opad.h[DGST_R0];
+    const u32 r1 = ctx.opad.h[DGST_R1];
+    const u32 r2 = ctx.opad.h[DGST_R2];
+    const u32 r3 = ctx.opad.h[DGST_R3];
 
     COMPARE_M_SCALAR (r0, r1, r2, r3);
   }
@@ -192,10 +192,10 @@ __kernel void m00060_sxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     md5_hmac_final (&ctx);
 
-    const u32x r0 = ctx.opad.h[DGST_R0];
-    const u32x r1 = ctx.opad.h[DGST_R1];
-    const u32x r2 = ctx.opad.h[DGST_R2];
-    const u32x r3 = ctx.opad.h[DGST_R3];
+    const u32 r0 = ctx.opad.h[DGST_R0];
+    const u32 r1 = ctx.opad.h[DGST_R1];
+    const u32 r2 = ctx.opad.h[DGST_R2];
+    const u32 r3 = ctx.opad.h[DGST_R3];
 
     COMPARE_S_SCALAR (r0, r1, r2, r3);
   }
diff --git a/OpenCL/m00150_a0-pure.cl b/OpenCL/m00150_a0-pure.cl
index 7d4e5385d..957d2a50b 100644
--- a/OpenCL/m00150_a0-pure.cl
+++ b/OpenCL/m00150_a0-pure.cl
@@ -72,10 +72,10 @@ __kernel void m00150_mxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     sha1_hmac_final (&ctx);
 
-    const u32x r0 = ctx.opad.h[DGST_R0];
-    const u32x r1 = ctx.opad.h[DGST_R1];
-    const u32x r2 = ctx.opad.h[DGST_R2];
-    const u32x r3 = ctx.opad.h[DGST_R3];
+    const u32 r0 = ctx.opad.h[DGST_R0];
+    const u32 r1 = ctx.opad.h[DGST_R1];
+    const u32 r2 = ctx.opad.h[DGST_R2];
+    const u32 r3 = ctx.opad.h[DGST_R3];
 
     COMPARE_M_SCALAR (r0, r1, r2, r3);
   }
@@ -150,10 +150,10 @@ __kernel void m00150_sxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     sha1_hmac_final (&ctx);
 
-    const u32x r0 = ctx.opad.h[DGST_R0];
-    const u32x r1 = ctx.opad.h[DGST_R1];
-    const u32x r2 = ctx.opad.h[DGST_R2];
-    const u32x r3 = ctx.opad.h[DGST_R3];
+    const u32 r0 = ctx.opad.h[DGST_R0];
+    const u32 r1 = ctx.opad.h[DGST_R1];
+    const u32 r2 = ctx.opad.h[DGST_R2];
+    const u32 r3 = ctx.opad.h[DGST_R3];
 
     COMPARE_S_SCALAR (r0, r1, r2, r3);
   }
diff --git a/OpenCL/m00150_a1-pure.cl b/OpenCL/m00150_a1-pure.cl
index f7d3a3da7..15ab612bf 100644
--- a/OpenCL/m00150_a1-pure.cl
+++ b/OpenCL/m00150_a1-pure.cl
@@ -90,10 +90,10 @@ __kernel void m00150_mxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     sha1_hmac_final_vector (&ctx);
 
-    const u32x r0 = ctx.opad.h[DGST_R0];
-    const u32x r1 = ctx.opad.h[DGST_R1];
-    const u32x r2 = ctx.opad.h[DGST_R2];
-    const u32x r3 = ctx.opad.h[DGST_R3];
+    const u32 r0 = ctx.opad.h[DGST_R0];
+    const u32 r1 = ctx.opad.h[DGST_R1];
+    const u32 r2 = ctx.opad.h[DGST_R2];
+    const u32 r3 = ctx.opad.h[DGST_R3];
 
     COMPARE_M_SCALAR (r0, r1, r2, r3);
   }
@@ -188,10 +188,10 @@ __kernel void m00150_sxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     sha1_hmac_final_vector (&ctx);
 
-    const u32x r0 = ctx.opad.h[DGST_R0];
-    const u32x r1 = ctx.opad.h[DGST_R1];
-    const u32x r2 = ctx.opad.h[DGST_R2];
-    const u32x r3 = ctx.opad.h[DGST_R3];
+    const u32 r0 = ctx.opad.h[DGST_R0];
+    const u32 r1 = ctx.opad.h[DGST_R1];
+    const u32 r2 = ctx.opad.h[DGST_R2];
+    const u32 r3 = ctx.opad.h[DGST_R3];
 
     COMPARE_S_SCALAR (r0, r1, r2, r3);
   }
diff --git a/OpenCL/m00160_a0-pure.cl b/OpenCL/m00160_a0-pure.cl
index ed178fbcf..c87a1bab7 100644
--- a/OpenCL/m00160_a0-pure.cl
+++ b/OpenCL/m00160_a0-pure.cl
@@ -74,10 +74,10 @@ __kernel void m00160_mxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     sha1_hmac_final (&ctx);
 
-    const u32x r0 = ctx.opad.h[DGST_R0];
-    const u32x r1 = ctx.opad.h[DGST_R1];
-    const u32x r2 = ctx.opad.h[DGST_R2];
-    const u32x r3 = ctx.opad.h[DGST_R3];
+    const u32 r0 = ctx.opad.h[DGST_R0];
+    const u32 r1 = ctx.opad.h[DGST_R1];
+    const u32 r2 = ctx.opad.h[DGST_R2];
+    const u32 r3 = ctx.opad.h[DGST_R3];
 
     COMPARE_M_SCALAR (r0, r1, r2, r3);
   }
@@ -154,10 +154,10 @@ __kernel void m00160_sxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     sha1_hmac_final (&ctx);
 
-    const u32x r0 = ctx.opad.h[DGST_R0];
-    const u32x r1 = ctx.opad.h[DGST_R1];
-    const u32x r2 = ctx.opad.h[DGST_R2];
-    const u32x r3 = ctx.opad.h[DGST_R3];
+    const u32 r0 = ctx.opad.h[DGST_R0];
+    const u32 r1 = ctx.opad.h[DGST_R1];
+    const u32 r2 = ctx.opad.h[DGST_R2];
+    const u32 r3 = ctx.opad.h[DGST_R3];
 
     COMPARE_S_SCALAR (r0, r1, r2, r3);
   }
diff --git a/OpenCL/m00160_a1-pure.cl b/OpenCL/m00160_a1-pure.cl
index 4f52a0a40..6a4907c55 100644
--- a/OpenCL/m00160_a1-pure.cl
+++ b/OpenCL/m00160_a1-pure.cl
@@ -92,10 +92,10 @@ __kernel void m00160_mxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     sha1_hmac_final (&ctx);
 
-    const u32x r0 = ctx.opad.h[DGST_R0];
-    const u32x r1 = ctx.opad.h[DGST_R1];
-    const u32x r2 = ctx.opad.h[DGST_R2];
-    const u32x r3 = ctx.opad.h[DGST_R3];
+    const u32 r0 = ctx.opad.h[DGST_R0];
+    const u32 r1 = ctx.opad.h[DGST_R1];
+    const u32 r2 = ctx.opad.h[DGST_R2];
+    const u32 r3 = ctx.opad.h[DGST_R3];
 
     COMPARE_M_SCALAR (r0, r1, r2, r3);
   }
@@ -192,10 +192,10 @@ __kernel void m00160_sxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     sha1_hmac_final (&ctx);
 
-    const u32x r0 = ctx.opad.h[DGST_R0];
-    const u32x r1 = ctx.opad.h[DGST_R1];
-    const u32x r2 = ctx.opad.h[DGST_R2];
-    const u32x r3 = ctx.opad.h[DGST_R3];
+    const u32 r0 = ctx.opad.h[DGST_R0];
+    const u32 r1 = ctx.opad.h[DGST_R1];
+    const u32 r2 = ctx.opad.h[DGST_R2];
+    const u32 r3 = ctx.opad.h[DGST_R3];
 
     COMPARE_S_SCALAR (r0, r1, r2, r3);
   }
diff --git a/OpenCL/m01450_a0-pure.cl b/OpenCL/m01450_a0-pure.cl
index e1799001a..21fa01b0c 100644
--- a/OpenCL/m01450_a0-pure.cl
+++ b/OpenCL/m01450_a0-pure.cl
@@ -72,10 +72,10 @@ __kernel void m01450_mxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     sha256_hmac_final (&ctx);
 
-    const u32x r0 = ctx.opad.h[DGST_R0];
-    const u32x r1 = ctx.opad.h[DGST_R1];
-    const u32x r2 = ctx.opad.h[DGST_R2];
-    const u32x r3 = ctx.opad.h[DGST_R3];
+    const u32 r0 = ctx.opad.h[DGST_R0];
+    const u32 r1 = ctx.opad.h[DGST_R1];
+    const u32 r2 = ctx.opad.h[DGST_R2];
+    const u32 r3 = ctx.opad.h[DGST_R3];
 
     COMPARE_M_SCALAR (r0, r1, r2, r3);
   }
@@ -150,10 +150,10 @@ __kernel void m01450_sxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     sha256_hmac_final (&ctx);
 
-    const u32x r0 = ctx.opad.h[DGST_R0];
-    const u32x r1 = ctx.opad.h[DGST_R1];
-    const u32x r2 = ctx.opad.h[DGST_R2];
-    const u32x r3 = ctx.opad.h[DGST_R3];
+    const u32 r0 = ctx.opad.h[DGST_R0];
+    const u32 r1 = ctx.opad.h[DGST_R1];
+    const u32 r2 = ctx.opad.h[DGST_R2];
+    const u32 r3 = ctx.opad.h[DGST_R3];
 
     COMPARE_S_SCALAR (r0, r1, r2, r3);
   }
diff --git a/OpenCL/m01450_a1-pure.cl b/OpenCL/m01450_a1-pure.cl
index 9dae566d5..c482c7626 100644
--- a/OpenCL/m01450_a1-pure.cl
+++ b/OpenCL/m01450_a1-pure.cl
@@ -90,10 +90,10 @@ __kernel void m01450_mxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     sha256_hmac_final_vector (&ctx);
 
-    const u32x r0 = ctx.opad.h[DGST_R0];
-    const u32x r1 = ctx.opad.h[DGST_R1];
-    const u32x r2 = ctx.opad.h[DGST_R2];
-    const u32x r3 = ctx.opad.h[DGST_R3];
+    const u32 r0 = ctx.opad.h[DGST_R0];
+    const u32 r1 = ctx.opad.h[DGST_R1];
+    const u32 r2 = ctx.opad.h[DGST_R2];
+    const u32 r3 = ctx.opad.h[DGST_R3];
 
     COMPARE_M_SCALAR (r0, r1, r2, r3);
   }
@@ -188,10 +188,10 @@ __kernel void m01450_sxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     sha256_hmac_final_vector (&ctx);
 
-    const u32x r0 = ctx.opad.h[DGST_R0];
-    const u32x r1 = ctx.opad.h[DGST_R1];
-    const u32x r2 = ctx.opad.h[DGST_R2];
-    const u32x r3 = ctx.opad.h[DGST_R3];
+    const u32 r0 = ctx.opad.h[DGST_R0];
+    const u32 r1 = ctx.opad.h[DGST_R1];
+    const u32 r2 = ctx.opad.h[DGST_R2];
+    const u32 r3 = ctx.opad.h[DGST_R3];
 
     COMPARE_S_SCALAR (r0, r1, r2, r3);
   }
diff --git a/OpenCL/m01460_a0-pure.cl b/OpenCL/m01460_a0-pure.cl
index 7571deb94..0b14e52e9 100644
--- a/OpenCL/m01460_a0-pure.cl
+++ b/OpenCL/m01460_a0-pure.cl
@@ -74,10 +74,10 @@ __kernel void m01460_mxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     sha256_hmac_final (&ctx);
 
-    const u32x r0 = ctx.opad.h[DGST_R0];
-    const u32x r1 = ctx.opad.h[DGST_R1];
-    const u32x r2 = ctx.opad.h[DGST_R2];
-    const u32x r3 = ctx.opad.h[DGST_R3];
+    const u32 r0 = ctx.opad.h[DGST_R0];
+    const u32 r1 = ctx.opad.h[DGST_R1];
+    const u32 r2 = ctx.opad.h[DGST_R2];
+    const u32 r3 = ctx.opad.h[DGST_R3];
 
     COMPARE_M_SCALAR (r0, r1, r2, r3);
   }
@@ -154,10 +154,10 @@ __kernel void m01460_sxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     sha256_hmac_final (&ctx);
 
-    const u32x r0 = ctx.opad.h[DGST_R0];
-    const u32x r1 = ctx.opad.h[DGST_R1];
-    const u32x r2 = ctx.opad.h[DGST_R2];
-    const u32x r3 = ctx.opad.h[DGST_R3];
+    const u32 r0 = ctx.opad.h[DGST_R0];
+    const u32 r1 = ctx.opad.h[DGST_R1];
+    const u32 r2 = ctx.opad.h[DGST_R2];
+    const u32 r3 = ctx.opad.h[DGST_R3];
 
     COMPARE_S_SCALAR (r0, r1, r2, r3);
   }
diff --git a/OpenCL/m01460_a1-pure.cl b/OpenCL/m01460_a1-pure.cl
index d6063b348..d4b0fdb8b 100644
--- a/OpenCL/m01460_a1-pure.cl
+++ b/OpenCL/m01460_a1-pure.cl
@@ -92,10 +92,10 @@ __kernel void m01460_mxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     sha256_hmac_final (&ctx);
 
-    const u32x r0 = ctx.opad.h[DGST_R0];
-    const u32x r1 = ctx.opad.h[DGST_R1];
-    const u32x r2 = ctx.opad.h[DGST_R2];
-    const u32x r3 = ctx.opad.h[DGST_R3];
+    const u32 r0 = ctx.opad.h[DGST_R0];
+    const u32 r1 = ctx.opad.h[DGST_R1];
+    const u32 r2 = ctx.opad.h[DGST_R2];
+    const u32 r3 = ctx.opad.h[DGST_R3];
 
     COMPARE_M_SCALAR (r0, r1, r2, r3);
   }
@@ -192,10 +192,10 @@ __kernel void m01460_sxx (__global pw_t *pws, __global const kernel_rule_t *rule
 
     sha256_hmac_final (&ctx);
 
-    const u32x r0 = ctx.opad.h[DGST_R0];
-    const u32x r1 = ctx.opad.h[DGST_R1];
-    const u32x r2 = ctx.opad.h[DGST_R2];
-    const u32x r3 = ctx.opad.h[DGST_R3];
+    const u32 r0 = ctx.opad.h[DGST_R0];
+    const u32 r1 = ctx.opad.h[DGST_R1];
+    const u32 r2 = ctx.opad.h[DGST_R2];
+    const u32 r3 = ctx.opad.h[DGST_R3];
 
     COMPARE_S_SCALAR (r0, r1, r2, r3);
   }