diff --git a/docs/index.rst b/docs/index.rst
index ca85732..98fb3c2 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -13,7 +13,7 @@
   :titlesonly:
   :hidden:
 
-  Test Framework <tfm_erpc_test_framework>
+  eRPC Test Framework <tfm_erpc_test_framework>
   Test Partitions <tfm_test_partitions_addition>
   Test Suites <tfm_test_suites_addition>
 
diff --git a/readme.rst b/readme.rst
index 39df659..3ce86d5 100644
--- a/readme.rst
+++ b/readme.rst
@@ -12,14 +12,15 @@
 ****************
 Folder Structure
 ****************
-- app - The application code that executes the testing, including both the TF-M
-  tests and the `psa-arch-tests`_.
+- app_broker - Common application code that executes the testing, included by the TF-M tests and
+  the `psa-arch-tests`_.
+- cmake - Common CMake utility scripts.
 - docs - The documents about test developments.
-- CMSIS - The libraries of RTX which is the Non-secure RTOS of the tests
-- test - The TF-M test codes including test framework, test suites and test
-  services
-- lib/ext - 3rd party projects. May contain either imported source codes or CMake files to fetch the
-  projects.
+- erpc - eRPC test framework.
+- lib - TF-M libraries and 3rd-party libraries. May contain either imported source codes or CMake
+  files to fetch the projects.
+- tests_psa_arch - PSA Arch tests integration with TF-M.
+- tests_reg - TF-M regression test codes including test framework, test suites and test services.
 
 #######
 License