diff --git a/docs/documentation.md b/docs/documentation.md
index 0476418..41c0642 100644
--- a/docs/documentation.md
+++ b/docs/documentation.md
@@ -329,9 +329,9 @@
 
 - [Deployment](./sections/deployment.md#deployment)
   - [Fixed Virtual Platform](./sections/deployment.md#fixed-virtual-platform)
-    - [Setting up the MPS3 Corstone-300 FVP](./sections/deployment.md#setting-up-the-mps3-arm-corstone_300-fvp)
-    - [Deploying on an FVP emulating MPS3](./sections/deployment.md#deploying-on-an-fvp-emulating-mps3)
-  - [MPS3 board](./sections/deployment.md#mps3-board)
+    - [Installing an FVP](./sections/deployment.md#installing-an-fvp)
+    - [Deploying on an FVP](./sections/deployment.md#deploying-on-an-fvp)
+  - [MPS3 FPGA board](./sections/deployment.md#mps3-fpga-board)
     - [Deployment on MPS3 board](./sections/deployment.md#deployment-on-mps3-board)
 
 ## Implementing custom ML application
diff --git a/docs/sections/building.md b/docs/sections/building.md
index 7854c6a..775f71a 100644
--- a/docs/sections/building.md
+++ b/docs/sections/building.md
@@ -486,7 +486,7 @@
 Default CMake configuration behaviour looks for input samples, for each use case, in the default directory. All these
 inputs are baked-in into the application. If the number of files baked in is greater than one, a user menu is displayed
 on the application output, where the user is expected to enter their chosen option. See more here:
-[Deploying on an FVP emulating MPS3](./deployment.md#deploying-on-an-fvp-emulating-mps3).
+[Deploying on an FVP emulating MPS3](./deployment.md#deploying-on-an-fvp).
 
 To configure the project to use single input for each use case, CMake option `USE_SINGLE_INPUT` can be set to `ON`.
 This will result in each use case automatically running with predefined input data, thus removing the need for the
diff --git a/docs/sections/memory_considerations.md b/docs/sections/memory_considerations.md
index b8d1c25..30b36ac 100644
--- a/docs/sections/memory_considerations.md
+++ b/docs/sections/memory_considerations.md
@@ -290,6 +290,6 @@
 A bigger region of memory for storing the neural network model is placed in the DDR, or flash, region under
 `LOAD_REGION_1`. The two load regions are necessary as the motherboard configuration controller of the MPS3 limits the
 load size at address `0x00000000` to 1MiB. This has implications on how the application **is deployed** on MPS3, as
-explained under the following section: [Deployment on MPS3](./deployment.md#mps3-board).
+explained under the following section: [Deployment on MPS3](./deployment.md#mps3-fpga-board).
 
 The next section of the documentation covers: [Troubleshooting](troubleshooting.md).
diff --git a/docs/sections/timing_adapters.md b/docs/sections/timing_adapters.md
index b5d6e98..24f2fc9 100644
--- a/docs/sections/timing_adapters.md
+++ b/docs/sections/timing_adapters.md
@@ -161,4 +161,7 @@
 | 3         | User memory               | 0x4170_3000/0x5170_3000          | 4KB  |
 
 This is why the evaluation kit is configured with timing adapters disabled altogether (parameter
-`ETHOS_U_NPU_TIMING_ADAPTER_ENABLED` set to `OFF`) for Corstone-310 target platform. 
+`ETHOS_U_NPU_TIMING_ADAPTER_ENABLED` set to `OFF`) for Corstone-310 target platform.
+
+> **NOTE**: Arm® Corstone™-315 reference platforms do not use timing adapters. Therefore, like for
+Arm® Corstone™-310, they are force-disabled in the CMake configuration.
diff --git a/docs/sections/troubleshooting.md b/docs/sections/troubleshooting.md
index 6841e62..180f62d 100644
--- a/docs/sections/troubleshooting.md
+++ b/docs/sections/troubleshooting.md
@@ -51,7 +51,7 @@
 `ethos-u55-256`, the FVP must be executed with additional command line parameter to instruct it to emulate the
 256 MACs configuration instead.
 
-The [deploying on an FVP emulating MPS3](./deployment.md#deploying-on-an-fvp-emulating-mps3) page provides guidance
+The [deploying on an FVP](./deployment.md#deploying-on-an-fvp) page provides guidance
 on how to instruct the FVP to change the number of MACs units.
 
 Note that when the FVP is launched and the application starts executing, various parameters about the system are