diff --git a/UNITTESTS/empty_baseline/unittest.cmake b/UNITTESTS/empty_baseline/unittest.cmake
index 2dc0fa46488..e6a4da5bcf2 100644
--- a/UNITTESTS/empty_baseline/unittest.cmake
+++ b/UNITTESTS/empty_baseline/unittest.cmake
@@ -11,10 +11,6 @@ set(unittest-includes ${unittest-includes}
   ../features/frameworks/mbed-trace/mbed-trace/
 )
 
-set(unittest-sources
-    ../storage/system_storage/SystemStorage.cpp
-)
-
 set(unittest-test-sources
   empty_baseline/empty_baseline.cpp
 )
diff --git a/storage/blockdevice/tests/TESTS/blockdevice/general_block_device/README.md b/storage/blockdevice/tests/TESTS/blockdevice/general_block_device/README.md
index 586137f9c04..2b9fc1486ce 100644
--- a/storage/blockdevice/tests/TESTS/blockdevice/general_block_device/README.md
+++ b/storage/blockdevice/tests/TESTS/blockdevice/general_block_device/README.md
@@ -43,7 +43,7 @@ Please review the [documentation](https://os.mbed.com/docs/latest/tutorials/debu
 
 In Mbed OS, a C++ class that inherits from the [BlockDevice](https://os.mbed.com/docs/latest/reference/storage.html#block-devices) interface represents each block device.
 
-This test uses the default block device that the function `get_default_instance()` receives. [SystemStorage.cpp](https://github.com/ARMmbed/mbed-os/blob/master/storage/system_storage/SystemStorage.cpp#L35-L77) defines this as `MBED_WEAK`. If you would like to test a new block device, you have to override it.
+This test uses the default block device that the function `get_default_instance()` receives. [PlatformStorage.cpp](https://github.com/ARMmbed/mbed-os/blob/master/storage/platform/source/PlatformStorage.cpp#L35-L77) defines this as `MBED_WEAK`. If you would like to test a new block device, you have to override it.
 
 First add the new block device .cpp and header files to the [blockdevice folder](https://github.com/ARMmbed/mbed-os/tree/master/storage/blockdevice). Then, implement `get_default_instance()` inside the test `main.cpp`.
 
diff --git a/storage/system_storage/mbed_lib.json b/storage/platform/mbed_lib.json
similarity index 100%
rename from storage/system_storage/mbed_lib.json
rename to storage/platform/mbed_lib.json
diff --git a/storage/system_storage/SystemStorage.cpp b/storage/platform/source/PlatformStorage.cpp
similarity index 100%
rename from storage/system_storage/SystemStorage.cpp
rename to storage/platform/source/PlatformStorage.cpp