diff --git a/drivers/device_key/source/DeviceKey.cpp b/drivers/device_key/source/DeviceKey.cpp
index bf60efd..decdd52 100644
--- a/drivers/device_key/source/DeviceKey.cpp
+++ b/drivers/device_key/source/DeviceKey.cpp
@@ -21,8 +21,8 @@
 #include "mbedtls/cmac.h"
 #include "mbedtls/platform.h"
 #include "kvstore/KVStore.h"
-#include "kvstore/TDBStore.h"
-#include "kvstore/KVMap.h"
+#include "tdbstore/TDBStore.h"
+#include "kvstore_global_api/KVMap.h"
 #include "kv_config/kv_config.h"
 #include "mbed_wait_api.h"
 #include <stdlib.h>
diff --git a/storage/kvstore/kv_config/source/kv_config.cpp b/storage/kvstore/kv_config/source/kv_config.cpp
index 187ec74..682535a 100644
--- a/storage/kvstore/kv_config/source/kv_config.cpp
+++ b/storage/kvstore/kv_config/source/kv_config.cpp
@@ -16,14 +16,14 @@
 
 #include "kv_config.h"
 #include "kvstore/KVStore.h"
-#include "kvstore/KVMap.h"
+#include "kvstore_global_api/KVMap.h"
 #include "blockdevice/BlockDevice.h"
 #include "filesystem/FileSystem.h"
-#include "kvstore/FileSystemStore.h"
+#include "filesystemstore/FileSystemStore.h"
 #include "blockdevice/SlicingBlockDevice.h"
 #include "fat/FATFileSystem.h"
 #include "littlefs/LittleFileSystem.h"
-#include "kvstore/TDBStore.h"
+#include "tdbstore/TDBStore.h"
 #include "mbed_error.h"
 #include "drivers/FlashIAP.h"
 #include "blockdevice/FlashSimBlockDevice.h"
diff --git a/storage/kvstore/tests/TESTS/direct_access_devicekey/tdb/main.cpp b/storage/kvstore/tests/TESTS/direct_access_devicekey/tdb/main.cpp
index 204670f..eb9a3c1 100644
--- a/storage/kvstore/tests/TESTS/direct_access_devicekey/tdb/main.cpp
+++ b/storage/kvstore/tests/TESTS/direct_access_devicekey/tdb/main.cpp
@@ -24,9 +24,9 @@
 #include <string.h>
 #include "DeviceKey.h"
 #include "kvstore/KVStore.h"
-#include "kvstore/KVMap.h"
+#include "kvstore_global_api/KVMap.h"
 #include "kv_config/kv_config.h"
-#include "kvstore/TDBStore.h"
+#include "tdbstore/TDBStore.h"
 #include "FlashIAP.h"
 #include "FlashIAPBlockDevice.h"
 #include "direct_access_devicekey/DirectAccessDevicekey.h"
diff --git a/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_1/main.cpp b/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_1/main.cpp
index ef7ad4d..d225294 100644
--- a/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_1/main.cpp
+++ b/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_1/main.cpp
@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 #include "securestore/SecureStore.h"
-#include "kvstore/TDBStore.h"
+#include "tdbstore/TDBStore.h"
 #ifdef MBED_CONF_RTOS_PRESENT
 #include "Thread.h"
 #endif
diff --git a/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_2/main.cpp b/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_2/main.cpp
index f195608..275c024 100644
--- a/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_2/main.cpp
+++ b/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_2/main.cpp
@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 #include "securestore/SecureStore.h"
-#include "kvstore/TDBStore.h"
+#include "tdbstore/TDBStore.h"
 #include "mbed_error.h"
 #include "FlashSimBlockDevice.h"
 #include "SlicingBlockDevice.h"
diff --git a/storage/kvstore/tests/TESTS/securestore/whitebox/main.cpp b/storage/kvstore/tests/TESTS/securestore/whitebox/main.cpp
index 5cb1b21..8c10e06 100644
--- a/storage/kvstore/tests/TESTS/securestore/whitebox/main.cpp
+++ b/storage/kvstore/tests/TESTS/securestore/whitebox/main.cpp
@@ -17,7 +17,7 @@
 */
 
 #include "securestore/SecureStore.h"
-#include "kvstore/TDBStore.h"
+#include "tdbstore/TDBStore.h"
 #ifdef MBED_CONF_RTOS_PRESENT
 #include "Thread.h"
 #endif
diff --git a/storage/kvstore/tests/UNITTESTS/FileSystemStore/moduletest.cpp b/storage/kvstore/tests/UNITTESTS/FileSystemStore/moduletest.cpp
index 531c60e..6e91090 100644
--- a/storage/kvstore/tests/UNITTESTS/FileSystemStore/moduletest.cpp
+++ b/storage/kvstore/tests/UNITTESTS/FileSystemStore/moduletest.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 #include "blockdevice/HeapBlockDevice.h"
-#include "kvstore/FileSystemStore.h"
+#include "filesystemstore/FileSystemStore.h"
 #include "littlefs/LittleFileSystem.h"
 #include "mbed_error.h"
 #include <stdlib.h>
diff --git a/storage/kvstore/tests/UNITTESTS/TDBStore/moduletest.cpp b/storage/kvstore/tests/UNITTESTS/TDBStore/moduletest.cpp
index c51680e..6a124e1 100644
--- a/storage/kvstore/tests/UNITTESTS/TDBStore/moduletest.cpp
+++ b/storage/kvstore/tests/UNITTESTS/TDBStore/moduletest.cpp
@@ -17,7 +17,7 @@
 #include "gtest/gtest.h"
 #include "blockdevice/HeapBlockDevice.h"
 #include "blockdevice/FlashSimBlockDevice.h"
-#include "kvstore/TDBStore.h"
+#include "tdbstore/TDBStore.h"
 #include <stdlib.h>
 
 #define BLOCK_SIZE (256)