diff --git a/README.md b/README.md
index 5b9571bf7..983d2c072 100644
--- a/README.md
+++ b/README.md
@@ -110,7 +110,7 @@ See the [demo scenario](examples/demo_verification) for an example.
 **Mocks**
 
 ```
-//score/launch_manager:mock_applicationcontext_cc
+//score/launch_manager:mock_application_context_cc
 //score/launch_manager:mock_lifecycle_cc
 //score/launch_manager:mock_report_running_cc
 ```
diff --git a/docs/release/release_note_v_0_4_0.rst b/docs/release/release_note_v_0_4_0.rst
index de6eb07ba..5464ab9ac 100644
--- a/docs/release/release_note_v_0_4_0.rst
+++ b/docs/release/release_note_v_0_4_0.rst
@@ -90,14 +90,13 @@ Known Vulnerabilities
 Upgrade Instructions
 ~~~~~~~~~~~~~~~~~~~~
 
-- Update include paths and BUILD labels for public mocks.
-   - Rename all usage of `//score/launch_manager:applicationcontext_mock_c` to `//score/launch_manager:mock_applicationcontext_cc`.
+- Update include paths and BUILD labels for public mocks. These changes introduce a consistent naming convention for the test doubles in the lifecycle repository. More information in `#422 <https://github.com/eclipse-score/lifecycle/issues/422>`_
+   - Rename all usage of `//score/launch_manager:applicationcontext_mock_c` to `//score/launch_manager:mock_application_context_cc`.
    - Rename all usage of `//score/launch_manager:lifecycle_mock_cc` to `//score/launch_manager:mock_lifecycle_cc`.
-   - Rename all usage of  `//score/launch_manager:report_running_mock_cc` to `//score/launch_manager:mock_lifecycle_cc`.
-   - Rename all usage of `applicationcontextmock.h` to `mock_applicationcontext.h`.
-   - Rename all usage of `lifecyclemanagermock.h` to `mock_lifecyclemanager.h`.
+   - Rename all usage of  `//score/launch_manager:report_running_mock_cc` to `//score/launch_manager:mock_report_running_cc`.
+   - Rename all usage of `applicationcontextmock.h` to `mock_application_context.h`.
+   - Rename all usage of `lifecyclemanagermock.h` to `mock_lifecycle_manager.h`.
    - Rename all usage of `report_running_mock.h` to `mock_report_running.h`.
-   - These changes introduce a consistent naming convention for the test doubles in the lifecycle repository. More information in `#422 <https://github.com/eclipse-score/lifecycle/issues/422>`_
 
 - Backward compatibility with the previous release is not guaranteed.
 
diff --git a/score/launch_manager/BUILD b/score/launch_manager/BUILD
index 261c8dc42..55dd202ef 100644
--- a/score/launch_manager/BUILD
+++ b/score/launch_manager/BUILD
@@ -84,8 +84,8 @@ lm_cc_test(
 )
 
 alias(
-    name = "mock_applicationcontext_cc",
-    actual = "//score/launch_manager/src/lifecycle_client:mock_applicationcontext",
+    name = "mock_application_context_cc",
+    actual = "//score/launch_manager/src/lifecycle_client:mock_application_context",
 )
 
 cc_library(
diff --git a/score/launch_manager/src/lifecycle_client/BUILD b/score/launch_manager/src/lifecycle_client/BUILD
index 7f8beeb45..70edab5ce 100644
--- a/score/launch_manager/src/lifecycle_client/BUILD
+++ b/score/launch_manager/src/lifecycle_client/BUILD
@@ -150,14 +150,14 @@ cc_library(
 )
 
 cc_library(
-    name = "mock_applicationcontext",
+    name = "mock_application_context",
     testonly = True,
     srcs = [
-        "src/mock_applicationcontext.cpp",
+        "src/mock_application_context.cpp",
     ],
     hdrs = [
         "src/applicationcontext.h",
-        "src/mock_applicationcontext.h",
+        "src/mock_application_context.h",
     ],
     features = COMPILER_WARNING_FEATURES,
     include_prefix = "score/mw/lifecycle",
@@ -173,11 +173,11 @@ cc_library(
     name = "mock_mw_lifecycle_manager",
     testonly = True,
     srcs = [
-        "src/mock_mwlifecyclemanager.cpp",
+        "src/mock_mw_lifecycle_manager.cpp",
     ],
     hdrs = [
         "src/lifecyclemanager.h",
-        "src/mock_mwlifecyclemanager.h",
+        "src/mock_mw_lifecycle_manager.h",
     ],
     features = COMPILER_WARNING_FEATURES,
     include_prefix = "score/mw/lifecycle",
@@ -193,12 +193,12 @@ cc_library(
     name = "mock_lifecycle",
     testonly = True,
     srcs = [
-        "src/mock_lifecyclemanager.cpp",
+        "src/mock_lifecycle_manager.cpp",
     ],
     hdrs = [
         "src/application.h",
         "src/lifecyclemanager.h",
-        "src/mock_lifecyclemanager.h",
+        "src/mock_lifecycle_manager.h",
     ],
     features = COMPILER_WARNING_FEATURES,
     include_prefix = "score/mw/lifecycle",
@@ -206,7 +206,7 @@ cc_library(
     visibility = ["//score/launch_manager:__subpackages__"],
     deps = [
         ":lifecyclemanager",
-        ":mock_applicationcontext",
+        ":mock_application_context",
         ":mock_mw_lifecycle_manager",
         "@googletest//:gtest",
         "@score_baselibs//score/os/utils:signal",
diff --git a/score/launch_manager/src/lifecycle_client/src/lifecycle_mocks_UT.cpp b/score/launch_manager/src/lifecycle_client/src/lifecycle_mocks_UT.cpp
index fd992ae8f..3e6da455d 100644
--- a/score/launch_manager/src/lifecycle_client/src/lifecycle_mocks_UT.cpp
+++ b/score/launch_manager/src/lifecycle_client/src/lifecycle_mocks_UT.cpp
@@ -19,9 +19,9 @@
 /// a reference for other components (e.g. config_management) that depend on the
 /// lifecycle mocks in their own test suites.
 
-#include "score/mw/lifecycle/mock_applicationcontext.h"
-#include "score/mw/lifecycle/mock_lifecyclemanager.h"
-#include "score/mw/lifecycle/mock_mwlifecyclemanager.h"
+#include "score/mw/lifecycle/mock_application_context.h"
+#include "score/mw/lifecycle/mock_lifecycle_manager.h"
+#include "score/mw/lifecycle/mock_mw_lifecycle_manager.h"
 #include "score/mw/lifecycle/runapplication.h"
 
 #include <gmock/gmock.h>
diff --git a/score/launch_manager/src/lifecycle_client/src/mock_applicationcontext.cpp b/score/launch_manager/src/lifecycle_client/src/mock_application_context.cpp
similarity index 98%
rename from score/launch_manager/src/lifecycle_client/src/mock_applicationcontext.cpp
rename to score/launch_manager/src/lifecycle_client/src/mock_application_context.cpp
index 9581d2469..a3e92b0c0 100644
--- a/score/launch_manager/src/lifecycle_client/src/mock_applicationcontext.cpp
+++ b/score/launch_manager/src/lifecycle_client/src/mock_application_context.cpp
@@ -11,7 +11,7 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-#include "score/mw/lifecycle/mock_applicationcontext.h"
+#include "score/mw/lifecycle/mock_application_context.h"
 #include "score/mw/lifecycle/applicationcontext.h"
 
 #include <functional>
diff --git a/score/launch_manager/src/lifecycle_client/src/mock_applicationcontext.h b/score/launch_manager/src/lifecycle_client/src/mock_application_context.h
similarity index 100%
rename from score/launch_manager/src/lifecycle_client/src/mock_applicationcontext.h
rename to score/launch_manager/src/lifecycle_client/src/mock_application_context.h
diff --git a/score/launch_manager/src/lifecycle_client/src/mock_lifecyclemanager.cpp b/score/launch_manager/src/lifecycle_client/src/mock_lifecycle_manager.cpp
similarity index 98%
rename from score/launch_manager/src/lifecycle_client/src/mock_lifecyclemanager.cpp
rename to score/launch_manager/src/lifecycle_client/src/mock_lifecycle_manager.cpp
index 5a3786a68..a09ba473e 100644
--- a/score/launch_manager/src/lifecycle_client/src/mock_lifecyclemanager.cpp
+++ b/score/launch_manager/src/lifecycle_client/src/mock_lifecycle_manager.cpp
@@ -11,7 +11,7 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-#include "score/mw/lifecycle/mock_lifecyclemanager.h"
+#include "score/mw/lifecycle/mock_lifecycle_manager.h"
 #include "score/mw/lifecycle/lifecyclemanager.h"
 
 #include <functional>
diff --git a/score/launch_manager/src/lifecycle_client/src/mock_lifecyclemanager.h b/score/launch_manager/src/lifecycle_client/src/mock_lifecycle_manager.h
similarity index 96%
rename from score/launch_manager/src/lifecycle_client/src/mock_lifecyclemanager.h
rename to score/launch_manager/src/lifecycle_client/src/mock_lifecycle_manager.h
index b18b5f4bb..cc86d991e 100644
--- a/score/launch_manager/src/lifecycle_client/src/mock_lifecyclemanager.h
+++ b/score/launch_manager/src/lifecycle_client/src/mock_lifecycle_manager.h
@@ -15,7 +15,7 @@
 #define SCORE_MW_LIFECYCLE_MOCKS_LIFECYCLEMANAGERMOCK_H_
 
 #include "score/mw/lifecycle/application.h"
-#include "score/mw/lifecycle/mock_applicationcontext.h"
+#include "score/mw/lifecycle/mock_application_context.h"
 #include "score/os/utils/mocklib/signalmock.h"
 #include "score/os/utils/signal.h"
 
diff --git a/score/launch_manager/src/lifecycle_client/src/mock_mwlifecyclemanager.cpp b/score/launch_manager/src/lifecycle_client/src/mock_mw_lifecycle_manager.cpp
similarity index 96%
rename from score/launch_manager/src/lifecycle_client/src/mock_mwlifecyclemanager.cpp
rename to score/launch_manager/src/lifecycle_client/src/mock_mw_lifecycle_manager.cpp
index d653b2bc3..4e88b4ab8 100644
--- a/score/launch_manager/src/lifecycle_client/src/mock_mwlifecyclemanager.cpp
+++ b/score/launch_manager/src/lifecycle_client/src/mock_mw_lifecycle_manager.cpp
@@ -11,7 +11,7 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-#include "score/mw/lifecycle/mock_mwlifecyclemanager.h"
+#include "score/mw/lifecycle/mock_mw_lifecycle_manager.h"
 #include "score/mw/lifecycle/lifecyclemanager.h"
 
 #include <functional>
diff --git a/score/launch_manager/src/lifecycle_client/src/mock_mwlifecyclemanager.h b/score/launch_manager/src/lifecycle_client/src/mock_mw_lifecycle_manager.h
similarity index 100%
rename from score/launch_manager/src/lifecycle_client/src/mock_mwlifecyclemanager.h
rename to score/launch_manager/src/lifecycle_client/src/mock_mw_lifecycle_manager.h
diff --git a/score/launch_manager/src/lifecycle_client/src/runapplication_UT.cpp b/score/launch_manager/src/lifecycle_client/src/runapplication_UT.cpp
index ac81a289d..f3f489dfd 100644
--- a/score/launch_manager/src/lifecycle_client/src/runapplication_UT.cpp
+++ b/score/launch_manager/src/lifecycle_client/src/runapplication_UT.cpp
@@ -11,8 +11,8 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-#include "score/mw/lifecycle/mock_applicationcontext.h"
-#include "score/mw/lifecycle/mock_lifecyclemanager.h"
+#include "score/mw/lifecycle/mock_application_context.h"
+#include "score/mw/lifecycle/mock_lifecycle_manager.h"
 #include "score/mw/lifecycle/runapplication.h"
 
 #include <gmock/gmock.h>