diff --git a/Target/Source/ARMCM3_STM32F1/flash.c b/Target/Source/ARMCM3_STM32F1/flash.c
index 44a33fa9..c3903032 100644
--- a/Target/Source/ARMCM3_STM32F1/flash.c
+++ b/Target/Source/ARMCM3_STM32F1/flash.c
@@ -54,7 +54,7 @@
 #define FLASH_ERASE_BLOCK_SIZE          (0x400)
 #endif
 /** \brief Macro for accessing the flash control registers. */
-#define FLASH                           ((tFlashRegs *) (blt_int32u)0x40022000)
+#define FLASH_DRV_REGS_BASE             ((tFlashRegs *) (blt_int32u)0x40022000)
 /** \brief Offset into the user program's vector table where the checksum is located. 
  *         For this target it is set to the end of the vector table. Note that the 
  *         value can be overriden in blt_conf.h, because the size of the vector table
@@ -708,7 +708,7 @@ static blt_bool FlashWriteBlock(tFlashBlockInfo *block)
   /* unlock the flash array */
   FlashUnlock();
   /* check that the flash peripheral is not busy */
-  if ((FLASH->SR & FLASH_BSY_BIT) == FLASH_BSY_BIT)
+  if ((FLASH_DRV_REGS_BASE->SR & FLASH_BSY_BIT) == FLASH_BSY_BIT)
   {
     /* lock the flash array again */
     FlashLock();
@@ -716,7 +716,7 @@ static blt_bool FlashWriteBlock(tFlashBlockInfo *block)
     return BLT_FALSE;
   }
   /* set the program bit to indicate that we are about to program data */
-  FLASH->CR |= FLASH_PG_BIT;
+  FLASH_DRV_REGS_BASE->CR |= FLASH_PG_BIT;
   /* program all words in the block one by one */
   for (word_cnt=0; word_cnt<(FLASH_WRITE_BLOCK_SIZE/sizeof(blt_int32u)); word_cnt++)
   {
@@ -727,7 +727,7 @@ static blt_bool FlashWriteBlock(tFlashBlockInfo *block)
     /* set the timeout time for the program operation */
     timeout = TimerGet() + FLASH_PROGRAM_TIME_MAX_MS;
     /* wait for the program operation to complete */
-    while ((FLASH->SR & FLASH_BSY_BIT) == FLASH_BSY_BIT)
+    while ((FLASH_DRV_REGS_BASE->SR & FLASH_BSY_BIT) == FLASH_BSY_BIT)
     {
       /* keep the watchdog happy */
       CopService();
@@ -743,7 +743,7 @@ static blt_bool FlashWriteBlock(tFlashBlockInfo *block)
     /* set the timeout time for the program operation */
     timeout = TimerGet() + FLASH_PROGRAM_TIME_MAX_MS;
     /* wait for the program operation to complete */
-    while ((FLASH->SR & FLASH_BSY_BIT) == FLASH_BSY_BIT)
+    while ((FLASH_DRV_REGS_BASE->SR & FLASH_BSY_BIT) == FLASH_BSY_BIT)
     {
       /* keep the watchdog happy */
       CopService();
@@ -762,7 +762,7 @@ static blt_bool FlashWriteBlock(tFlashBlockInfo *block)
     }
   }
   /* reset the program bit to indicate that we are done programming data */
-  FLASH->CR &= ~FLASH_PG_BIT;
+  FLASH_DRV_REGS_BASE->CR &= ~FLASH_PG_BIT;
   /* lock the flash array */
   FlashLock();
   /* give the result back to the caller */
@@ -799,7 +799,7 @@ static blt_bool FlashEraseSectors(blt_int8u first_sector, blt_int8u last_sector)
   /* unlock the flash array */
   FlashUnlock();
   /* check that the flash peripheral is not busy */
-  if ((FLASH->SR & FLASH_BSY_BIT) == FLASH_BSY_BIT)
+  if ((FLASH_DRV_REGS_BASE->SR & FLASH_BSY_BIT) == FLASH_BSY_BIT)
   {
     /* lock the flash array again */
     FlashLock();
@@ -807,7 +807,7 @@ static blt_bool FlashEraseSectors(blt_int8u first_sector, blt_int8u last_sector)
     return BLT_FALSE;
   }
   /* set the page erase bit to indicate that we are about to erase a block */
-  FLASH->CR |= FLASH_PER_BIT;
+  FLASH_DRV_REGS_BASE->CR |= FLASH_PER_BIT;
 
   /* determine how many blocks need to be erased */
   start_addr = FlashGetSectorBaseAddr(first_sector);
@@ -818,13 +818,13 @@ static blt_bool FlashEraseSectors(blt_int8u first_sector, blt_int8u last_sector)
   for (block_cnt=0; block_cnt<nr_of_blocks; block_cnt++)
   {
     /* store an address of the block that is to be erased to select the block */
-    FLASH->AR = start_addr + (block_cnt * FLASH_ERASE_BLOCK_SIZE);
+    FLASH_DRV_REGS_BASE->AR = start_addr + (block_cnt * FLASH_ERASE_BLOCK_SIZE);
     /* start the block erase operation */
-    FLASH->CR |= FLASH_STRT_BIT;
+    FLASH_DRV_REGS_BASE->CR |= FLASH_STRT_BIT;
     /* set the timeout time for the erase operation */
     timeout = TimerGet() + FLASH_ERASE_TIME_MAX_MS;
     /* wait for the erase operation to complete */
-    while ((FLASH->SR & FLASH_BSY_BIT) == FLASH_BSY_BIT)
+    while ((FLASH_DRV_REGS_BASE->SR & FLASH_BSY_BIT) == FLASH_BSY_BIT)
     {
       /* keep the watchdog happy */
       CopService();
@@ -837,7 +837,7 @@ static blt_bool FlashEraseSectors(blt_int8u first_sector, blt_int8u last_sector)
     }
   }
   /* reset the page erase bit because we're all done erasing */
-  FLASH->CR &= ~FLASH_PER_BIT;
+  FLASH_DRV_REGS_BASE->CR &= ~FLASH_PER_BIT;
   /* lock the flash array */
   FlashLock();
   /* give the result back to the caller */
@@ -854,10 +854,10 @@ static blt_bool FlashEraseSectors(blt_int8u first_sector, blt_int8u last_sector)
 static void FlashUnlock(void)
 {
   /* authorize the FPEC to access bank 1 */
-  FLASH->KEYR = FLASH_KEY1;
-  FLASH->KEYR = FLASH_KEY2;
+  FLASH_DRV_REGS_BASE->KEYR = FLASH_KEY1;
+  FLASH_DRV_REGS_BASE->KEYR = FLASH_KEY2;
   /* clear all possibly pending status flags */
-  FLASH->SR = (FLASH_EOP_BIT | FLASH_PGERR_BIT | FLASH_WRPRTERR_BIT);
+  FLASH_DRV_REGS_BASE->SR = (FLASH_EOP_BIT | FLASH_PGERR_BIT | FLASH_WRPRTERR_BIT);
 } /*** end of FlashUnlock ***/
 
 
@@ -870,7 +870,7 @@ static void FlashUnlock(void)
 static void FlashLock(void)
 {
   /* set the lock bit to lock the FPEC */
-  FLASH->CR |= FLASH_LOCK_BIT;
+  FLASH_DRV_REGS_BASE->CR |= FLASH_LOCK_BIT;
 } /*** end of FlashLock ***/