diff --git a/OpenCL/m02000_a0-pure.cl b/OpenCL/m02000_a0-pure.cl
index d0d9258e5..555c71cd7 100644
--- a/OpenCL/m02000_a0-pure.cl
+++ b/OpenCL/m02000_a0-pure.cl
@@ -10,10 +10,10 @@
 #include "inc_common.cl"
 #endif
 
-KERNEL_FQ void m02000_mxx (KERN_ATTR_BASIC ())
+KERNEL_FQ void m02000_mxx (KERN_ATTR_RULES ())
 {
 }
 
-KERNEL_FQ void m02000_sxx (KERN_ATTR_BASIC ())
+KERNEL_FQ void m02000_sxx (KERN_ATTR_RULES ())
 {
 }
diff --git a/OpenCL/m18500_a1-pure.cl b/OpenCL/m18500_a1-pure.cl
index f66a7f0bd..84d6b1771 100644
--- a/OpenCL/m18500_a1-pure.cl
+++ b/OpenCL/m18500_a1-pure.cl
@@ -29,7 +29,7 @@
 #define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7], l_bin2asc[(i).s8], l_bin2asc[(i).s9], l_bin2asc[(i).sa], l_bin2asc[(i).sb], l_bin2asc[(i).sc], l_bin2asc[(i).sd], l_bin2asc[(i).se], l_bin2asc[(i).sf])
 #endif
 
-KERNEL_FQ void m18500_mxx (KERN_ATTR_RULES ())
+KERNEL_FQ void m18500_mxx (KERN_ATTR_BASIC ())
 {
   /**
    * modifier
@@ -144,7 +144,7 @@ KERNEL_FQ void m18500_mxx (KERN_ATTR_RULES ())
   }
 }
 
-KERNEL_FQ void m18500_sxx (KERN_ATTR_RULES ())
+KERNEL_FQ void m18500_sxx (KERN_ATTR_BASIC ())
 {
   /**
    * modifier
diff --git a/OpenCL/m23002_a1-pure.cl b/OpenCL/m23002_a1-pure.cl
index 6cad15fb1..d0dc1648c 100644
--- a/OpenCL/m23002_a1-pure.cl
+++ b/OpenCL/m23002_a1-pure.cl
@@ -24,7 +24,7 @@ typedef struct securezip
 
 } securezip_t;
 
-KERNEL_FQ void m23002_mxx (KERN_ATTR_RULES_ESALT (securezip_t))
+KERNEL_FQ void m23002_mxx (KERN_ATTR_ESALT (securezip_t))
 {
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
@@ -267,7 +267,7 @@ KERNEL_FQ void m23002_mxx (KERN_ATTR_RULES_ESALT (securezip_t))
   }
 }
 
-KERNEL_FQ void m23002_sxx (KERN_ATTR_RULES_ESALT (securezip_t))
+KERNEL_FQ void m23002_sxx (KERN_ATTR_ESALT (securezip_t))
 {
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
diff --git a/OpenCL/m23003_a1-pure.cl b/OpenCL/m23003_a1-pure.cl
index 30b4afd8f..17d13b16c 100644
--- a/OpenCL/m23003_a1-pure.cl
+++ b/OpenCL/m23003_a1-pure.cl
@@ -24,7 +24,7 @@ typedef struct securezip
 
 } securezip_t;
 
-KERNEL_FQ void m23003_mxx (KERN_ATTR_RULES_ESALT (securezip_t))
+KERNEL_FQ void m23003_mxx (KERN_ATTR_ESALT (securezip_t))
 {
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
@@ -269,7 +269,7 @@ KERNEL_FQ void m23003_mxx (KERN_ATTR_RULES_ESALT (securezip_t))
   }
 }
 
-KERNEL_FQ void m23003_sxx (KERN_ATTR_RULES_ESALT (securezip_t))
+KERNEL_FQ void m23003_sxx (KERN_ATTR_ESALT (securezip_t))
 {
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);