ARMmbed
diff --git a/‎storage/kvstore/direct_access_devicekey/tests/TESTS/direct_access_devicekey/direct_access_devicekey_tdb/main.cpp renamed to ‎storage/kvstore/tests/TESTS/direct_access_devicekey/tdb/main.cpp b/‎storage/kvstore/direct_access_devicekey/tests/TESTS/direct_access_devicekey/direct_access_devicekey_tdb/main.cpp renamed to ‎storage/kvstore/tests/TESTS/direct_access_devicekey/tdb/main.cpp
diff --git a/‎storage/kvstore/securestore/tests/TESTS/securestore/securestore_whitebox/main.cpp renamed to ‎storage/kvstore/tests/TESTS/securestore/whitebox/main.cpp b/‎storage/kvstore/securestore/tests/TESTS/securestore/securestore_whitebox/main.cpp renamed to ‎storage/kvstore/tests/TESTS/securestore/whitebox/main.cpp