diff --git a/OpenCL/m23900-pure.cl b/OpenCL/m23900-pure.cl
index 02699db1d..3d203779d 100644
--- a/OpenCL/m23900-pure.cl
+++ b/OpenCL/m23900-pure.cl
@@ -39,8 +39,8 @@ KERNEL_FQ void m23900_init (KERN_ATTR_TMPS_ESALT (bestcrypt_tmp_t, bestcrypt_t))
 
   u32 comb[16];
 
-  comb[ 0] = salt_bufs[salt_pos].salt_buf[0];
-  comb[ 1] = salt_bufs[salt_pos].salt_buf[1];
+  comb[ 0] = salt_bufs[SALT_POS].salt_buf[0];
+  comb[ 1] = salt_bufs[SALT_POS].salt_buf[1];
 
   comb[ 2] = hc_swap32_S (pws[gid].i[ 0]); // in theory BE is faster because it
   comb[ 3] = hc_swap32_S (pws[gid].i[ 1]); // avoids several other byte swaps later on
@@ -365,10 +365,10 @@ KERNEL_FQ void m23900_comp (KERN_ATTR_TMPS_ESALT (bestcrypt_tmp_t, bestcrypt_t))
   {
     u32 data[4];
 
-    data[0] = esalt_bufs[digests_offset].data[i + 0];
-    data[1] = esalt_bufs[digests_offset].data[i + 1];
-    data[2] = esalt_bufs[digests_offset].data[i + 2];
-    data[3] = esalt_bufs[digests_offset].data[i + 3];
+    data[0] = esalt_bufs[DIGESTS_OFFSET].data[i + 0];
+    data[1] = esalt_bufs[DIGESTS_OFFSET].data[i + 1];
+    data[2] = esalt_bufs[DIGESTS_OFFSET].data[i + 2];
+    data[3] = esalt_bufs[DIGESTS_OFFSET].data[i + 3];
 
     u32 out[4];
 
@@ -444,9 +444,9 @@ KERNEL_FQ void m23900_comp (KERN_ATTR_TMPS_ESALT (bestcrypt_tmp_t, bestcrypt_t))
       (digest[2] == res[18]) &&
       (digest[3] == res[19]))
   {
-    if (atomic_inc (&hashes_shown[digests_offset]) == 0)
+    if (atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0)
     {
-      mark_hash (plains_buf, d_return_buf, salt_pos, digests_cnt, 0, digests_offset + 0, gid, 0, 0, 0);
+      mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0);
     }
 
     return;