diff --git a/doc/testing/testplan/api_invoker_management/README.md b/doc/testing/testplan/api_invoker_management/README.md
index 50227871e1d39fc4a4773b18efa8400f504e7650..076d9e7af395e100cef102c0b5251e124d136454 100644
--- a/doc/testing/testplan/api_invoker_management/README.md
+++ b/doc/testing/testplan/api_invoker_management/README.md
@@ -1,18 +1,18 @@
 # Test Plan for CAPIF Api Invoker Management
 At this documentation you will have all information and related files and examples of test plan for this API.
 
-## Test Case 1: Onboard NetApp
+## Test Case 1: Onboard Network App
 
 **Test ID**: ***capif_api_invoker_management-1***
 
 **Description**:
 
-  This test will try to register new NetApp at CAPIF Core.
+  This test will try to register new Network App at CAPIF Core.
 
 **Pre-Conditions**:
 
-  * NetApp was not registered previously
-  * NetApp was not onboarded previously
+  * Network App was not registered previously
+  * Network App was not onboarded previously
   * ***Preconditions: The administrator must have previously registered the User.***
 
 **Execution Steps**:
@@ -47,25 +47,25 @@ At this documentation you will have all information and related files and exampl
      3. Response Header **Location** must be received with URI to new resource created, following this structure: **{apiRoot}/api-invoker-management/{apiVersion}/onboardedInvokers/{onboardingId}**
 
 
-## Test Case 2: Onboard NetApp Already onboarded
+## Test Case 2: Onboard Network App Already onboarded
 
 **Test ID**: ***capif_api_invoker_management-2***
 
 **Description**:
 
-  This test will check second onboard of same NetApp is not allowed.
+  This test will check second onboard of same Network App is not allowed.
 
 **Pre-Conditions**:
 
-  * NetApp was registered previously
-  * NetApp was onboarded previously
+  * Network App was registered previously
+  * Network App was onboarded previously
 
 **Execution Steps**:
 
-  1. Register NetApp at CCF
-  2. Onboard NetApp at CCF
-  3. Store signed Certificate at NetApp
-  4. Onboard Again the NetApp at CCF
+  1. Register Network App at CCF
+  2. Onboard Network App at CCF
+  3. Store signed Certificate at Network App
+  4. Onboard Again the Network App at CCF
 
 **Information of Test**:
 
@@ -85,7 +85,7 @@ At this documentation you will have all information and related files and exampl
         * apiInvokerId
         * onboardingInformation->apiInvokerCertificate must contain the public key signed.
      3. Response Header **Location** must be received with URI to new resource created, following this structure: **{apiRoot}/api-invoker-management/{apiVersion}/onboardedInvokers/{onboardingId}**
-  2. Response to Second Onboard of NetApp must accomplish:
+  2. Response to Second Onboard of Network App must accomplish:
      1. **403 Forbidden**
      2. Error Response Body must accomplish with **ProblemDetails** data structure with:
         * status 403
@@ -94,18 +94,18 @@ At this documentation you will have all information and related files and exampl
         * cause with message "Identical invoker public key".
 
 
-## Test Case 3: Update Onboarded NetApp  
+## Test Case 3: Update Onboarded Network App
 
 **Test ID**: ***capif_api_invoker_management-3***
 
 **Description**:
 
-  This test will try to update information of previous onboard NetApp at CAPIF Core.
+  This test will try to update information of previous onboard Network App at CAPIF Core.
 
 **Pre-Conditions**:
 
-  * NetApp was registered previously
-  * NetApp was onboarded previously with {onboardingId}
+  * Network App was registered previously
+  * Network App was onboarded previously with {onboardingId}
 
 **Execution Steps**:
 
@@ -136,18 +136,18 @@ At this documentation you will have all information and related files and exampl
      2. notificationDestination on response must contain the new value
 
 
-## Test Case 4: Update Not Onboarded NetApp
+## Test Case 4: Update Not Onboarded Network App
 
 **Test ID**: ***capif_api_invoker_management-4***
 
 **Description**:
 
-  This test will try to update information of not onboarded NetApp at CAPIF Core.
+  This test will try to update information of not onboarded Network App at CAPIF Core.
 
 **Pre-Conditions**:
 
-  * NetApp was registered previously
-  * NetApp was not onboarded previously
+  * Network App was registered previously
+  * Network App was not onboarded previously
 
 **Execution Steps**:
 
@@ -172,22 +172,22 @@ At this documentation you will have all information and related files and exampl
      2. Error Response Body must accomplish with **ProblemDetails** data structure with:
         * status 404
         * title with message "Not Found"
-        * detail with message "Please provide an existing Netapp ID".
-        * cause with message "Not exist NetappID".
+        * detail with message "Please provide an existing Network App ID".
+        * cause with message "Not exist Network App ID".
 
 
-## Test Case 5: Offboard NetApp
+## Test Case 5: Offboard Network App
 
 **Test ID**: ***capif_api_invoker_management-5***
 
 **Description**:
 
-  This test case will check that a Registered NetApp can be deleted.
+  This test case will check that a Registered Network App can be deleted.
 
 **Pre-Conditions**:
 
-  * NetApp was registered previously
-  * NetApp was onboarded previously
+  * Network App was registered previously
+  * Network App was onboarded previously
 
 **Execution Steps**:
 
@@ -210,18 +210,18 @@ At this documentation you will have all information and related files and exampl
      1. **204 No Content**
 
 
-## Test Case 6: Offboard Not previsouly Onboarded NetApp
+## Test Case 6: Offboard Not previsouly Onboarded Network App
 
 **Test ID**: ***capif_api_invoker_management-6***
 
 **Description**:
 
-  This test case will check that a Non-Registered NetApp cannot be deleted
+  This test case will check that a Non-Registered Network App cannot be deleted
 
 **Pre-Conditions**:
 
-  * NetApp was registered previously
-  * NetApp was not onboarded previously
+  * Network App was registered previously
+  * Network App was not onboarded previously
 
 **Execution Steps**:
 
@@ -242,10 +242,10 @@ At this documentation you will have all information and related files and exampl
      2. Error Response Body must accomplish with **ProblemDetails** data structure with:
         * status 404
         * title with message "Not Found"
-        * detail with message "Please provide an existing Netapp ID".
-        * cause with message "Not exist NetappID".
+        * detail with message "Please provide an existing Network App ID".
+        * cause with message "Not exist Network App ID".
 
-## Test Case 7: Update Onboarded NetApp Certificate
+## Test Case 7: Update Onboarded Network App Certificate
 
 **Test ID**: ***capif_api_invoker_management-7***
 
@@ -255,8 +255,8 @@ At this documentation you will have all information and related files and exampl
 
 **Pre-Conditions**:
 
-  * NetApp was registered previously
-  * NetApp was onboarded previously with {onboardingId} and {public_key_1}
+  * Network App was registered previously
+  * Network App was onboarded previously with {onboardingId} and {public_key_1}
 
 **Execution Steps**: