diff --git a/features/storage/kvstore/tdbstore/DirectAccessDevicekey.cpp b/features/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp
similarity index 100%
rename from features/storage/kvstore/tdbstore/DirectAccessDevicekey.cpp
rename to features/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp
diff --git a/features/storage/kvstore/tdbstore/DirectAccessDevicekey.h b/features/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.h
similarity index 100%
rename from features/storage/kvstore/tdbstore/DirectAccessDevicekey.h
rename to features/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.h
diff --git a/features/storage/kvstore/tdbstore/TDBStore.cpp b/features/storage/kvstore/tdbstore/TDBStore.cpp
index 596ce445ca..a9877fb075 100644
--- a/features/storage/kvstore/tdbstore/TDBStore.cpp
+++ b/features/storage/kvstore/tdbstore/TDBStore.cpp
@@ -25,7 +25,7 @@
 #include "mbed_wait_api.h"
 #include "MbedCRC.h"
 //Bypass the check of NVStore co existance if compiled for TARGET_TFM
-#if !(TARGET_TFM_BYPASS_NVSTORE_CHECK)
+#if !(TARGET_BYPASS_NVSTORE_CHECK)
 #include "SystemStorage.h"
 #endif
 
@@ -994,7 +994,7 @@ int TDBStore::init()
     }
 
 //Bypass the check of NVStore co existance if compiled for TARGET_TFM
-#if !(TARGET_TFM_BYPASS_NVSTORE_CHECK)
+#if !(TARGET_BYPASS_NVSTORE_CHECK)
 
     //Check if we are on internal memory && try to set the internal memory for TDBStore use.
     if (strcmp(_bd->get_type(), "FLASHIAP") == 0 &&