diff --git a/docs/index.rst b/docs/index.rst
index 659486d..2a98a7b 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -95,7 +95,7 @@ Project structure and processes
       Platform Management Plan (PMP)
       ^^^
       Read about our project and organization structure in the
-      :ref:`Project Handbook <pmp>`.
+      :ref:`Project Handbook <project_management_plan>`.
       And learn how we deal with :ref:`safety_management` or care about :ref:`sw_verification`.
 
 .. dropdown:: Click to see the complete sitemap
diff --git a/docs/platform_management_plan/project_management.rst b/docs/platform_management_plan/project_management.rst
index d79b21f..a973cf5 100644
--- a/docs/platform_management_plan/project_management.rst
+++ b/docs/platform_management_plan/project_management.rst
@@ -12,6 +12,8 @@
    # SPDX-License-Identifier: Apache-2.0
    # *******************************************************************************
 
+.. _project_management_plan:
+
 Project management plan
 #######################
 
diff --git a/docs/score_releases/index.rst b/docs/score_releases/index.rst
index 0e1ea52..fd6e5a2 100644
--- a/docs/score_releases/index.rst
+++ b/docs/score_releases/index.rst
@@ -48,28 +48,28 @@ SW Module List
      - Repo
      - GitHub Discussions
    * - IPC
-     - Holger Grandy, Gerd Schaeffer, Nico Hartmann, Sven Kappel, Thilo Schmitt
+     - Holger Grandy, Gerd Schäfer, Nico Hartmann, Sven Kappel, Thilo Schmitt
      - v0.5
      - Q4
      - _
      - `inc_mw_com <https://github.com/eclipse-score/inc_mw_com>`_
      - `Communication CTF <https://github.com/orgs/eclipse-score/discussions/categories/communication-cft>`_
    * - Fixed Execution Order Framework (incl. Orchestrator)
-     - Holger Grandy, Gerd Schaeffer, Nico Hartmann, Sven Kappel, Thilo Schmitt
+     - Holger Grandy, Gerd Schäfer, Nico Hartmann, Sven Kappel, Thilo Schmitt
      - v0.5
      - Q4
      - _
      - `inc_feo <https://github.com/eclipse-score/inc_feo>`_
      - `FEO CTF <https://github.com/orgs/eclipse-score/discussions/categories/feo-cft>`_
    * - Logging
-     - Holger Grandy, Gerd Schaeffer, Nico Hartmann
+     - Holger Grandy, Gerd Schäfer, Nico Hartmann
      - v0.5
      - Q4
      - _
      - `inc_mw_log <https://github.com/eclipse-score/inc_mw_log>`_
      - `Logging CTF <https://github.com/orgs/eclipse-score/discussions/categories/logging-cft>`_
    * - Persistency
-     - Gerd Schaeffer, Nico Hartmann, Sven Kappel
+     - Gerd Schäfer, Nico Hartmann, Sven Kappel
      - v0.5
      - Q4
      - _