diff --git a/OpenCL/m02501-pure.cl b/OpenCL/m02501-pure.cl
index b86f0bb41..5e1e779f9 100644
--- a/OpenCL/m02501-pure.cl
+++ b/OpenCL/m02501-pure.cl
@@ -19,6 +19,12 @@
 #define COMPARE_S "inc_comp_single.cl"
 #define COMPARE_M "inc_comp_multi.cl"
 
+typedef struct wpa_pmk_tmp
+{
+  u32 out[8];
+
+} wpa_pmk_tmp_t;
+
 typedef struct wpa_eapol
 {
   u32  pke[32];
@@ -42,16 +48,6 @@ typedef struct wpa_eapol
 
 } wpa_eapol_t;
 
-typedef struct wpa_pbkdf2_tmp
-{
-  u32 ipad[5];
-  u32 opad[5];
-
-  u32 dgst[10];
-  u32 out[10];
-
-} wpa_pbkdf2_tmp_t;
-
 DECLSPEC u8 hex_convert (const u8 c)
 {
   return (c & 15) + (c >> 6) * 9;
diff --git a/OpenCL/m16801-pure.cl b/OpenCL/m16801-pure.cl
index b9c5cd513..e57133fb0 100644
--- a/OpenCL/m16801-pure.cl
+++ b/OpenCL/m16801-pure.cl
@@ -16,15 +16,11 @@
 #define COMPARE_S "inc_comp_single.cl"
 #define COMPARE_M "inc_comp_multi.cl"
 
-typedef struct wpa_pbkdf2_tmp
+typedef struct wpa_pmk_tmp
 {
-  u32 ipad[5];
-  u32 opad[5];
+  u32 out[8];
 
-  u32 dgst[10];
-  u32 out[10];
-
-} wpa_pbkdf2_tmp_t;
+} wpa_pmk_tmp_t;
 
 typedef struct wpa_pmkid
 {