diff --git a/ccsds_types.h b/ccsds_types.h
--- a/ccsds_types.h
+++ b/ccsds_types.h
@@ -800,25 +800,20 @@ typedef struct {
     unsigned char sy_lfr_s2_bp_p1;
 
     // mask F0
-    union{
-        struct{
-            unsigned char f0_word1[BYTES_PER_WORD];
-            unsigned char f0_word2[BYTES_PER_WORD];
-            unsigned char f0_word3[BYTES_PER_WORD];
-            unsigned char f0_word4[BYTES_PER_WORD];
-            // mask F1
-            unsigned char f1_word1[BYTES_PER_WORD];
-            unsigned char f1_word2[BYTES_PER_WORD];
-            unsigned char f1_word3[BYTES_PER_WORD];
-            unsigned char f1_word4[BYTES_PER_WORD];
-            // mask F2
-            unsigned char f2_word1[BYTES_PER_WORD];
-            unsigned char f2_word2[BYTES_PER_WORD];
-            unsigned char f2_word3[BYTES_PER_WORD];
-            unsigned char f2_word4[BYTES_PER_WORD];
-        } fx;
-        unsigned char raw[ BYTES_PER_MASKS_SET ];
-    } sy_lfr_fbins;
+    unsigned char sy_lfr_fbins_f0_word1[BYTES_PER_WORD];
+    unsigned char sy_lfr_fbins_f0_word2[BYTES_PER_WORD];
+    unsigned char sy_lfr_fbins_f0_word3[BYTES_PER_WORD];
+    unsigned char sy_lfr_fbins_f0_word4[BYTES_PER_WORD];
+    // mask F1
+    unsigned char sy_lfr_fbins_f1_word1[BYTES_PER_WORD];
+    unsigned char sy_lfr_fbins_f1_word2[BYTES_PER_WORD];
+    unsigned char sy_lfr_fbins_f1_word3[BYTES_PER_WORD];
+    unsigned char sy_lfr_fbins_f1_word4[BYTES_PER_WORD];
+    // mask F2
+    unsigned char sy_lfr_fbins_f2_word1[BYTES_PER_WORD];
+    unsigned char sy_lfr_fbins_f2_word2[BYTES_PER_WORD];
+    unsigned char sy_lfr_fbins_f2_word3[BYTES_PER_WORD];
+    unsigned char sy_lfr_fbins_f2_word4[BYTES_PER_WORD];
 
     // PAS FILTER PARAMETERS
     unsigned char pa_rpw_spare8_2;
@@ -830,25 +825,20 @@ typedef struct {
     unsigned char sy_lfr_sc_rw_delta_f[PARAM_4_BYTES];
 
     // LFR_RW_MASK
-    union{
-        struct{
-            unsigned char f0_word1[BYTES_PER_WORD];
-            unsigned char f0_word2[BYTES_PER_WORD];
-            unsigned char f0_word3[BYTES_PER_WORD];
-            unsigned char f0_word4[BYTES_PER_WORD];
-            // mask F1
-            unsigned char f1_word1[BYTES_PER_WORD];
-            unsigned char f1_word2[BYTES_PER_WORD];
-            unsigned char f1_word3[BYTES_PER_WORD];
-            unsigned char f1_word4[BYTES_PER_WORD];
-            // mask F2
-            unsigned char f2_word1[BYTES_PER_WORD];
-            unsigned char f2_word2[BYTES_PER_WORD];
-            unsigned char f2_word3[BYTES_PER_WORD];
-            unsigned char f2_word4[BYTES_PER_WORD];
-        } fx;
-        unsigned char raw[ BYTES_PER_MASKS_SET ];
-    } sy_lfr_rw_mask;
+    unsigned char sy_lfr_rw_mask_f0_word1[BYTES_PER_WORD];
+    unsigned char sy_lfr_rw_mask_f0_word2[BYTES_PER_WORD];
+    unsigned char sy_lfr_rw_mask_f0_word3[BYTES_PER_WORD];
+    unsigned char sy_lfr_rw_mask_f0_word4[BYTES_PER_WORD];
+    // mask F1
+    unsigned char sy_lfr_rw_mask_f1_word1[BYTES_PER_WORD];
+    unsigned char sy_lfr_rw_mask_f1_word2[BYTES_PER_WORD];
+    unsigned char sy_lfr_rw_mask_f1_word3[BYTES_PER_WORD];
+    unsigned char sy_lfr_rw_mask_f1_word4[BYTES_PER_WORD];
+    // mask F2
+    unsigned char sy_lfr_rw_mask_f2_word1[BYTES_PER_WORD];
+    unsigned char sy_lfr_rw_mask_f2_word2[BYTES_PER_WORD];
+    unsigned char sy_lfr_rw_mask_f2_word3[BYTES_PER_WORD];
+    unsigned char sy_lfr_rw_mask_f2_word4[BYTES_PER_WORD];
 
     // SPARE
     unsigned char pa_rpw_spare8_3;