diff --git a/docs/about/maintainers.rst b/docs/about/maintainers.rst
index 468ed82..f03bdb0 100644
--- a/docs/about/maintainers.rst
+++ b/docs/about/maintainers.rst
@@ -8,8 +8,8 @@
 Contributions must follow the instructions in
 :doc:`Contributing Guidelines </docs/processes/contributing>`.
 
-Maintainers
------------
+Main maintainers
+----------------
 
 Abhishek Pandit
     :email: `abhishek.pandit@arm.com <abhishek.pandit@arm.com>`__
diff --git a/docs/conf.py.in b/docs/conf.py.in
index bc79be7..4c5a740 100644
--- a/docs/conf.py.in
+++ b/docs/conf.py.in
@@ -57,8 +57,8 @@
 
 #Make auso section labals generated be prefixed with file name.
 autosectionlabel_prefix_document=True
-#Add auso section label for level 1 headers only.
-autosectionlabel_maxdepth=1
+#Add auso section label for level 2 headers only.
+autosectionlabel_maxdepth=2
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
diff --git a/docs/user_guides/services/tfm_audit_integration_guide.rst b/docs/user_guides/services/tfm_audit_integration_guide.rst
index b70c588..b82f816 100644
--- a/docs/user_guides/services/tfm_audit_integration_guide.rst
+++ b/docs/user_guides/services/tfm_audit_integration_guide.rst
@@ -77,9 +77,9 @@
 - ``audit_wrappers.c`` : This file implements TF-M compatible wrappers in case
   they are needed by the functions exported by the core.
 
-***************************************
-Audit logging service integration guide
-***************************************
+*********************************
+Audit logging service integration
+*********************************
 In this section, a brief description of each field of a log record is given,
 with an example on how to perform a logging request from a secure service.
 The secure service that requests the addition of a record to the log has to
diff --git a/docs/user_guides/services/tfm_crypto_integration_guide.rst b/docs/user_guides/services/tfm_crypto_integration_guide.rst
index 696b808..b10d2c0 100644
--- a/docs/user_guides/services/tfm_crypto_integration_guide.rst
+++ b/docs/user_guides/services/tfm_crypto_integration_guide.rst
@@ -60,9 +60,9 @@
   implements the PSA Crypto API client interface exposed to the  Non-Secure
   Processing Environment.
 
-********************************
-Crypto service integration guide
-********************************
+**************************
+Crypto service integration
+**************************
 In this section, a brief description of the required flow of operation for the
 functionalities exported by the PSA Crypto interface is given, with particular
 focus on the TF-M Crypto service specific operations. For the details of the
diff --git a/docs/user_guides/tfm_secure_irq_handling.rst b/docs/user_guides/tfm_secure_irq_handling.rst
index d83ec81..970d6ba 100644
--- a/docs/user_guides/tfm_secure_irq_handling.rst
+++ b/docs/user_guides/tfm_secure_irq_handling.rst
@@ -124,9 +124,9 @@
 Implementation details
 ######################
 
-*************
-Library model
-*************
+****************************
+Library model implementation
+****************************
 
 As a result of the function call like behaviour of secure services in library
 model, some information that is critical for the SPM to keep track of partition