diff --git a/features/storage/FEATURE_STORAGE/cfstore/configuration-store/configuration_store.h b/features/storage/FEATURE_STORAGE/cfstore/configuration-store/configuration_store.h
index 5af0c3ae49..6f4e33173d 100644
--- a/features/storage/FEATURE_STORAGE/cfstore/configuration-store/configuration_store.h
+++ b/features/storage/FEATURE_STORAGE/cfstore/configuration-store/configuration_store.h
@@ -189,7 +189,7 @@ typedef struct _ARM_CFSTORE_STATUS {
     }while(0)
 #endif
 
-#if defined __MBED__ && defined TOOLCHAIN_IAR
+#if defined __MBED__ && defined __ICCARM__
 /** @brief  Helper macro to swap 2 handles, which is useful for the Find() idiom. */
 /* note, memory barriers may be required in the following implementation */
 #define CFSTORE_HANDLE_SWAP(__a_HaNdLe, __b_HaNdLe)         \
diff --git a/features/storage/FEATURE_STORAGE/storage-volume-manager/storage-volume-manager/storage_volume_manager.h b/features/storage/FEATURE_STORAGE/storage-volume-manager/storage-volume-manager/storage_volume_manager.h
index 208b3e7003..d01376989a 100644
--- a/features/storage/FEATURE_STORAGE/storage-volume-manager/storage-volume-manager/storage_volume_manager.h
+++ b/features/storage/FEATURE_STORAGE/storage-volume-manager/storage-volume-manager/storage_volume_manager.h
@@ -35,7 +35,7 @@
  * FlashJournal_t. The caller will only allocate a FlashJournal_t and expect the
  * Sequential Strategy to reuse that space for a SequentialFlashJournal_t.
  */
-#ifndef TOOLCHAIN_IAR
+#ifndef __ICCARM__
 typedef char AssertStorageVolumeManagerMaxVolumesIsSane[(((MAX_VOLUMES) > 0) && ((MAX_VOLUMES) <= 8)) ? 0:-1];
 #endif
 
diff --git a/rtos/TARGET_CORTEX/mbed_boot.c b/rtos/TARGET_CORTEX/mbed_boot.c
index 31bae04774..266dce37cd 100644
--- a/rtos/TARGET_CORTEX/mbed_boot.c
+++ b/rtos/TARGET_CORTEX/mbed_boot.c
@@ -554,7 +554,7 @@ void __rtos_env_unlock( struct _reent *_r )
 
 #endif
 
-#if defined(TOOLCHAIN_IAR) /******************** IAR ********************/
+#if defined(__ICCARM__) /******************** IAR ********************/
 
 extern void* __vector_table;
 extern int  __low_level_init(void);