diff --git a/driver/flash.h b/driver/flash.h
index 713681b..7947163 100644
--- a/driver/flash.h
+++ b/driver/flash.h
@@ -20,33 +20,33 @@
 #include "bsp/dp32g030/flash.h"
 
 enum FLASH_READ_MODE {
-	FLASH_READ_MODE_1_CYCLE = FLASH_CFG_READ_MD_BITS_1_CYCLE,
-	FLASH_READ_MODE_2_CYCLE = FLASH_CFG_READ_MD_BITS_2_CYCLE,
+	FLASH_READ_MODE_1_CYCLE = FLASH_CFG_READ_MD_VALUE_1_CYCLE,
+	FLASH_READ_MODE_2_CYCLE = FLASH_CFG_READ_MD_VALUE_2_CYCLE,
 };
 
 typedef enum FLASH_READ_MODE FLASH_READ_MODE;
 
 enum FLASH_MASK_SELECTION {
-	FLASH_MASK_SELECTION_NONE = FLASH_MASK_SEL_BITS_NONE,
-	FLASH_MASK_SELECTION_2KB  = FLASH_MASK_SEL_BITS_2KB,
-	FLASH_MASK_SELECTION_4KB  = FLASH_MASK_SEL_BITS_4KB,
-	FLASH_MASK_SELECTION_8KB  = FLASH_MASK_SEL_BITS_8KB,
+	FLASH_MASK_SELECTION_NONE = FLASH_MASK_SEL_VALUE_NONE,
+	FLASH_MASK_SELECTION_2KB  = FLASH_MASK_SEL_VALUE_2KB,
+	FLASH_MASK_SELECTION_4KB  = FLASH_MASK_SEL_VALUE_4KB,
+	FLASH_MASK_SELECTION_8KB  = FLASH_MASK_SEL_VALUE_8KB,
 };
 
 typedef enum FLASH_MASK_SELECTION FLASH_MASK_SELECTION;
 
 enum FLASH_MODE {
-	FLASH_MODE_READ_AHB = FLASH_CFG_MODE_BITS_READ_AHB,
-	FLASH_MODE_PROGRAM  = FLASH_CFG_MODE_BITS_PROGRAM,
-	FLASH_MODE_ERASE    = FLASH_CFG_MODE_BITS_ERASE,
-	FLASH_MODE_READ_APB = FLASH_CFG_MODE_BITS_READ_APB,
+	FLASH_MODE_READ_AHB = FLASH_CFG_MODE_VALUE_READ_AHB,
+	FLASH_MODE_PROGRAM  = FLASH_CFG_MODE_VALUE_PROGRAM,
+	FLASH_MODE_ERASE    = FLASH_CFG_MODE_VALUE_ERASE,
+	FLASH_MODE_READ_APB = FLASH_CFG_MODE_VALUE_READ_APB,
 };
 
 typedef enum FLASH_MODE FLASH_MODE;
 
 enum FLASH_AREA {
-	FLASH_AREA_MAIN = FLASH_CFG_NVR_SEL_BITS_MAIN,
-	FLASH_AREA_NVR  = FLASH_CFG_NVR_SEL_BITS_NVR,
+	FLASH_AREA_MAIN = FLASH_CFG_NVR_SEL_VALUE_MAIN,
+	FLASH_AREA_NVR  = FLASH_CFG_NVR_SEL_VALUE_NVR,
 };
 
 typedef enum FLASH_AREA FLASH_AREA;
diff --git a/sram-overlay.c b/sram-overlay.c
index b792343..c4b24e4 100644
--- a/sram-overlay.c
+++ b/sram-overlay.c
@@ -67,7 +67,7 @@ void overlay_FLASH_MaskLock(void)
 
 void overlay_FLASH_SetMaskSel(FLASH_MASK_SELECTION Mask)
 {
-	FLASH_MASK = (FLASH_MASK & ~FLASH_MASK_SEL_MASK) | (Mask & FLASH_MASK_SEL_MASK);
+	FLASH_MASK = (FLASH_MASK & ~FLASH_MASK_SEL_MASK) | ((Mask << FLASH_MASK_SEL_SHIFT) & FLASH_MASK_SEL_MASK);
 }
 
 void overlay_FLASH_MaskUnlock(void)
@@ -115,7 +115,7 @@ uint32_t overlay_FLASH_ReadByAPB(uint32_t Offset)
 
 void overlay_FLASH_SetArea(FLASH_AREA Area)
 {
-	FLASH_CFG = (FLASH_CFG & ~FLASH_CFG_NVR_SEL_MASK) | (Area & FLASH_CFG_NVR_SEL_MASK);
+	FLASH_CFG = (FLASH_CFG & ~FLASH_CFG_NVR_SEL_MASK) | ((Area << FLASH_CFG_NVR_SEL_SHIFT) & FLASH_CFG_NVR_SEL_MASK);
 }
 
 void overlay_FLASH_SetReadMode(FLASH_READ_MODE Mode)
@@ -141,8 +141,7 @@ void overlay_FLASH_WakeFromDeepSleep(void)
 
 void overlay_FLASH_SetMode(FLASH_MODE Mode)
 {
-	FLASH_CFG = (FLASH_CFG & ~FLASH_CFG_MODE_MASK) | (Mode & FLASH_CFG_MODE_MASK);
-	return;
+	FLASH_CFG = (FLASH_CFG & ~FLASH_CFG_MODE_MASK) | ((Mode << FLASH_CFG_MODE_SHIFT) & FLASH_CFG_MODE_MASK);
 }
 
 void overlay_FLASH_SetProgramTime(void)