diff --git a/OpenCL/m07800_a0.cl b/OpenCL/m07800_a0.cl
index 83706c9ed..939fd8895 100644
--- a/OpenCL/m07800_a0.cl
+++ b/OpenCL/m07800_a0.cl
@@ -17,7 +17,7 @@
 #include "inc_rp.cl"
 #include "inc_simd.cl"
 
-__constant u32a theMagicArray[64] =
+__constant u32 theMagicArray[64] =
 {
   0x91ac5114, 0x9f675443, 0x24e73be0, 0x28747bc2, 0x863313eb, 0x5a4fcb5c, 0x080a7337, 0x0e5d1c2f,
   0x338fe6e5, 0xf89baedd, 0x16f24b8d, 0x2ce1d4dc, 0xb0cbdf9d, 0xd4706d17, 0xf94d423f, 0x9b1b1194,
@@ -29,7 +29,7 @@ __constant u32a theMagicArray[64] =
   0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
 };
 
-u32 GETSHIFTEDINT_CONST (__constant u32a *a, const int n)
+u32 GETSHIFTEDINT_CONST (__constant u32 *a, const int n)
 {
   const int d = n / 4;
   const int m = n & 3;
diff --git a/OpenCL/m07800_a1.cl b/OpenCL/m07800_a1.cl
index 49272c380..4b597d490 100644
--- a/OpenCL/m07800_a1.cl
+++ b/OpenCL/m07800_a1.cl
@@ -15,7 +15,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u32a theMagicArray[64] =
+__constant u32 theMagicArray[64] =
 {
   0x91ac5114, 0x9f675443, 0x24e73be0, 0x28747bc2, 0x863313eb, 0x5a4fcb5c, 0x080a7337, 0x0e5d1c2f,
   0x338fe6e5, 0xf89baedd, 0x16f24b8d, 0x2ce1d4dc, 0xb0cbdf9d, 0xd4706d17, 0xf94d423f, 0x9b1b1194,
@@ -27,7 +27,7 @@ __constant u32a theMagicArray[64] =
   0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
 };
 
-u32 GETSHIFTEDINT_CONST (__constant u32a *a, const int n)
+u32 GETSHIFTEDINT_CONST (__constant u32 *a, const int n)
 {
   const int d = n / 4;
   const int m = n & 3;
diff --git a/OpenCL/m07800_a3.cl b/OpenCL/m07800_a3.cl
index 6b3ac671c..eca037a94 100644
--- a/OpenCL/m07800_a3.cl
+++ b/OpenCL/m07800_a3.cl
@@ -15,7 +15,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u32a theMagicArray[64] =
+__constant u32 theMagicArray[64] =
 {
   0x91ac5114, 0x9f675443, 0x24e73be0, 0x28747bc2, 0x863313eb, 0x5a4fcb5c, 0x080a7337, 0x0e5d1c2f,
   0x338fe6e5, 0xf89baedd, 0x16f24b8d, 0x2ce1d4dc, 0xb0cbdf9d, 0xd4706d17, 0xf94d423f, 0x9b1b1194,
@@ -27,7 +27,7 @@ __constant u32a theMagicArray[64] =
   0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
 };
 
-u32 GETSHIFTEDINT_CONST (__constant u32a *a, const int n)
+u32 GETSHIFTEDINT_CONST (__constant u32 *a, const int n)
 {
   const int d = n / 4;
   const int m = n & 3;
diff --git a/OpenCL/m10400_a0.cl b/OpenCL/m10400_a0.cl
index f03b08f7b..e67c5fec2 100644
--- a/OpenCL/m10400_a0.cl
+++ b/OpenCL/m10400_a0.cl
@@ -17,7 +17,7 @@
 #include "inc_rp.cl"
 #include "inc_simd.cl"
 
-__constant u32a padding[8] =
+__constant u32 padding[8] =
 {
   0x5e4ebf28,
   0x418a754e,
@@ -84,7 +84,7 @@ void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 data[4])
   j += rc4_key->S[255] + d0; swap (rc4_key, 255, j);
 }
 
-u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, __constant u32a *in, u32 out[4])
+u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, __constant u32 *in, u32 out[4])
 {
   #ifdef _unroll
   #pragma unroll
diff --git a/OpenCL/m10400_a1.cl b/OpenCL/m10400_a1.cl
index e016b3cf7..91a6fa3a5 100644
--- a/OpenCL/m10400_a1.cl
+++ b/OpenCL/m10400_a1.cl
@@ -15,7 +15,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u32a padding[8] =
+__constant u32 padding[8] =
 {
   0x5e4ebf28,
   0x418a754e,
@@ -82,7 +82,7 @@ void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 data[4])
   j += rc4_key->S[255] + d0; swap (rc4_key, 255, j);
 }
 
-u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, __constant u32a *in, u32 out[4])
+u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, __constant u32 *in, u32 out[4])
 {
   #ifdef _unroll
   #pragma unroll
diff --git a/OpenCL/m10400_a3.cl b/OpenCL/m10400_a3.cl
index 976fa29ee..b79520401 100644
--- a/OpenCL/m10400_a3.cl
+++ b/OpenCL/m10400_a3.cl
@@ -15,7 +15,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u32a padding[8] =
+__constant u32 padding[8] =
 {
   0x5e4ebf28,
   0x418a754e,
@@ -82,7 +82,7 @@ void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 data[4])
   j += rc4_key->S[255] + d0; swap (rc4_key, 255, j);
 }
 
-u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, __constant u32a *in, u32 out[4])
+u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, __constant u32 *in, u32 out[4])
 {
   #ifdef _unroll
   #pragma unroll
diff --git a/OpenCL/m10410_a0.cl b/OpenCL/m10410_a0.cl
index 31b9b6ff5..10ad3bfd2 100644
--- a/OpenCL/m10410_a0.cl
+++ b/OpenCL/m10410_a0.cl
@@ -17,7 +17,7 @@
 #include "inc_rp.cl"
 #include "inc_simd.cl"
 
-__constant u32a padding[8] =
+__constant u32 padding[8] =
 {
   0x5e4ebf28,
   0x418a754e,
@@ -84,7 +84,7 @@ void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 data[4])
   j += rc4_key->S[255] + d0; swap (rc4_key, 255, j);
 }
 
-u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, __constant u32a *in, u32 out[4])
+u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, __constant u32 *in, u32 out[4])
 {
   #ifdef _unroll
   #pragma unroll
diff --git a/OpenCL/m10410_a1.cl b/OpenCL/m10410_a1.cl
index 3f11c89ee..f2d48b89e 100644
--- a/OpenCL/m10410_a1.cl
+++ b/OpenCL/m10410_a1.cl
@@ -15,7 +15,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u32a padding[8] =
+__constant u32 padding[8] =
 {
   0x5e4ebf28,
   0x418a754e,
@@ -82,7 +82,7 @@ void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 data[4])
   j += rc4_key->S[255] + d0; swap (rc4_key, 255, j);
 }
 
-u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, __constant u32a *in, u32 out[4])
+u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, __constant u32 *in, u32 out[4])
 {
   #ifdef _unroll
   #pragma unroll
diff --git a/OpenCL/m10410_a3.cl b/OpenCL/m10410_a3.cl
index d3980fcfb..306137fa5 100644
--- a/OpenCL/m10410_a3.cl
+++ b/OpenCL/m10410_a3.cl
@@ -15,7 +15,7 @@
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
-__constant u32a padding[8] =
+__constant u32 padding[8] =
 {
   0x5e4ebf28,
   0x418a754e,
@@ -82,7 +82,7 @@ void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 data[4])
   j += rc4_key->S[255] + d0; swap (rc4_key, 255, j);
 }
 
-u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, __constant u32a *in, u32 out[4])
+u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, __constant u32 *in, u32 out[4])
 {
   #ifdef _unroll
   #pragma unroll