diff --git a/docs/contributing.rst b/docs/contributing.rst
index f1e5b08..c58334b 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -1,5 +1,5 @@
-Contributing to Trusted Firmware M
-==================================
+Contributing
+============
 
 Contributions to TF-M project need to follow the process below.
 
diff --git a/docs/design_documents/tfm_crypto_design.rst b/docs/design_documents/tfm_crypto_design.rst
index c0cf769..a8e260d 100644
--- a/docs/design_documents/tfm_crypto_design.rst
+++ b/docs/design_documents/tfm_crypto_design.rst
@@ -1,5 +1,5 @@
-TF-M Crypto Service design
-==========================
+Crypto Service design
+=====================
 
 :Author: Antonio de Angelis
 :Organization: Arm Limited
diff --git a/docs/design_documents/tfm_its_service.rst b/docs/design_documents/tfm_its_service.rst
index 2de1e84..27f9300 100644
--- a/docs/design_documents/tfm_its_service.rst
+++ b/docs/design_documents/tfm_its_service.rst
@@ -1,6 +1,6 @@
-===========================================
-TF-M Internal Trusted Storage (ITS) Service
-===========================================
+======================================
+Internal Trusted Storage (ITS) Service
+======================================
 
 :Author: Jamie Fox
 :Organization: Arm Limited
diff --git a/docs/design_documents/tfm_partition_and_service_design_document.rst b/docs/design_documents/tfm_partition_and_service_design_document.rst
index 85b9f59..dc66ad7 100644
--- a/docs/design_documents/tfm_partition_and_service_design_document.rst
+++ b/docs/design_documents/tfm_partition_and_service_design_document.rst
@@ -1,6 +1,6 @@
-##########################################
-TF-M Partition and Service Design Document
-##########################################
+#####################################
+Partition and Service Design Document
+#####################################
 
 :Authors: Summer Qin
 :Organization: Arm Limited
diff --git a/docs/design_documents/tfm_psa_inter_process_communication.rst b/docs/design_documents/tfm_psa_inter_process_communication.rst
index ae832e5..acb9c89 100644
--- a/docs/design_documents/tfm_psa_inter_process_communication.rst
+++ b/docs/design_documents/tfm_psa_inter_process_communication.rst
@@ -1,6 +1,6 @@
-################################
-TF-M Inter-Process Communication
-################################
+###########################
+Inter-Process Communication
+###########################
 
 :Authors: Ken Liu, Mingyang Sun
 :Organization: Arm Limited
diff --git a/docs/design_documents/tfm_secure_partition_runtime_library.rst b/docs/design_documents/tfm_secure_partition_runtime_library.rst
index 844f9b7..6977f04 100644
--- a/docs/design_documents/tfm_secure_partition_runtime_library.rst
+++ b/docs/design_documents/tfm_secure_partition_runtime_library.rst
@@ -1,6 +1,6 @@
-#####################################
-TF-M Secure Partition Runtime Library
-#####################################
+################################
+Secure Partition Runtime Library
+################################
 
 :Authors: Ken Liu
 :Organization: Arm Limited
diff --git a/docs/glossary.rst b/docs/glossary.rst
index b50ba4a..ef39f2c 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -1,6 +1,6 @@
-########################################
-TF-M glossary of terms and abbreviations
-########################################
+###################################
+Glossary of terms and abbreviations
+###################################
 
 ************
 TF-M related
diff --git a/docs/maintainers.rst b/docs/maintainers.rst
index be99af2..e7736d4 100644
--- a/docs/maintainers.rst
+++ b/docs/maintainers.rst
@@ -1,5 +1,5 @@
-Trusted Firmware M - Maintainers
-================================
+Maintainers
+===========
 
 Trusted Firmware M is a community maintained project. Contributions can only
 be approved and merged by the maintainers listed below.
diff --git a/docs/user_guides/services/core_test_services_integration_guide.rst b/docs/user_guides/services/core_test_services_integration_guide.rst
index 36fbf07..2be5be9 100644
--- a/docs/user_guides/services/core_test_services_integration_guide.rst
+++ b/docs/user_guides/services/core_test_services_integration_guide.rst
@@ -1,6 +1,6 @@
-################################
-TF-M Core Test integration guide
-################################
+###########################
+Core Test integration guide
+###########################
 
 ************
 Introduction
diff --git a/docs/user_guides/services/tfm_attestation_integration_guide.rst b/docs/user_guides/services/tfm_attestation_integration_guide.rst
index e9a15fd..8ce6786 100644
--- a/docs/user_guides/services/tfm_attestation_integration_guide.rst
+++ b/docs/user_guides/services/tfm_attestation_integration_guide.rst
@@ -1,6 +1,6 @@
-##################################################
-TF-M Initial Attestation Service Integration Guide
-##################################################
+#############################################
+Initial Attestation Service Integration Guide
+#############################################
 
 ************
 Introduction
diff --git a/docs/user_guides/services/tfm_audit_integration_guide.rst b/docs/user_guides/services/tfm_audit_integration_guide.rst
index 314128d..b70c588 100644
--- a/docs/user_guides/services/tfm_audit_integration_guide.rst
+++ b/docs/user_guides/services/tfm_audit_integration_guide.rst
@@ -1,6 +1,6 @@
-############################################
-TF-M Audit Logging Service Integration Guide
-############################################
+#######################################
+Audit Logging Service Integration Guide
+#######################################
 
 ************
 Introduction
diff --git a/docs/user_guides/services/tfm_crypto_integration_guide.rst b/docs/user_guides/services/tfm_crypto_integration_guide.rst
index 0241c35..696b808 100644
--- a/docs/user_guides/services/tfm_crypto_integration_guide.rst
+++ b/docs/user_guides/services/tfm_crypto_integration_guide.rst
@@ -1,6 +1,6 @@
-#####################################
-TF-M Crypto Service Integration Guide
-#####################################
+################################
+Crypto Service Integration Guide
+################################
 
 ************
 Introduction
diff --git a/docs/user_guides/services/tfm_platform_integration_guide.rst b/docs/user_guides/services/tfm_platform_integration_guide.rst
index 5828579..5041a0a 100644
--- a/docs/user_guides/services/tfm_platform_integration_guide.rst
+++ b/docs/user_guides/services/tfm_platform_integration_guide.rst
@@ -1,6 +1,6 @@
-#######################################
-TF-M Platform Service Integration Guide
-#######################################
+##################################
+Platform Service Integration Guide
+##################################
 
 ************
 Introduction
diff --git a/docs/user_guides/services/tfm_sst_integration_guide.rst b/docs/user_guides/services/tfm_sst_integration_guide.rst
index 8d4273e..a2eaece 100644
--- a/docs/user_guides/services/tfm_sst_integration_guide.rst
+++ b/docs/user_guides/services/tfm_sst_integration_guide.rst
@@ -1,6 +1,6 @@
-#############################################
-TF-M Secure Storage Service Integration Guide
-#############################################
+########################################
+Secure Storage Service Integration Guide
+########################################
 
 ************
 Introduction
diff --git a/docs/user_guides/tfm_build_instruction.rst b/docs/user_guides/tfm_build_instruction.rst
index 33aefd7..52e52a5 100644
--- a/docs/user_guides/tfm_build_instruction.rst
+++ b/docs/user_guides/tfm_build_instruction.rst
@@ -1,6 +1,6 @@
-######################
-TF-M build instruction
-######################
+##################
+Build instructions
+##################
 Please make sure you have all required software installed as explained in the
 :doc:`software requirements <tfm_sw_requirement>`.
 
diff --git a/docs/user_guides/tfm_integration_guide.rst b/docs/user_guides/tfm_integration_guide.rst
index df8a87a..7db65a0 100644
--- a/docs/user_guides/tfm_integration_guide.rst
+++ b/docs/user_guides/tfm_integration_guide.rst
@@ -1,6 +1,6 @@
-######################
-TF-M integration guide
-######################
+#################
+Integration guide
+#################
 The purpose of this document is to provide a guide on how to integrate TF-M
 with other hardware platforms and operating systems.
 
diff --git a/docs/user_guides/tfm_secure_boot.rst b/docs/user_guides/tfm_secure_boot.rst
index b29b38e..83e372a 100644
--- a/docs/user_guides/tfm_secure_boot.rst
+++ b/docs/user_guides/tfm_secure_boot.rst
@@ -1,6 +1,6 @@
-################
-TF-M secure boot
-################
+###########
+Secure boot
+###########
 For secure devices it is security critical to enforce firmware authenticity to
 protect against execution of malicious software. This is implemented by building
 a trust chain where each step in the execution chain authenticates the next
diff --git a/docs/user_guides/tfm_sw_requirement.rst b/docs/user_guides/tfm_sw_requirement.rst
index 2c4f470..432b237 100644
--- a/docs/user_guides/tfm_sw_requirement.rst
+++ b/docs/user_guides/tfm_sw_requirement.rst
@@ -1,6 +1,6 @@
-##########################
-TF-M Software requirements
-##########################
+#####################
+Software requirements
+#####################
 
 .. |DS5_VERSION| replace:: v5.29.1
 .. |KEIL_VERSION| replace:: v5.25.2
diff --git a/docs/user_guides/tfm_user_guide.rst b/docs/user_guides/tfm_user_guide.rst
index f653e83..1c770e9 100644
--- a/docs/user_guides/tfm_user_guide.rst
+++ b/docs/user_guides/tfm_user_guide.rst
@@ -1,6 +1,6 @@
-#############################
-Trusted Firmware M user guide
-#############################
+##########
+User guide
+##########
 How to compile and run TF-M and example test application for CoreLink
 SSE-200 subsystem on the MPS2 board and on the Fast Model(FVP).