diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeNFVMANOEntityStateTask.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeNFVMANOEntityStateTask.robot
index bc5062631d88edf835348b28e98bdc2a9e108b99..c1914e7c8f3e7a68d132a738c296c43106c51ba6 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeNFVMANOEntityStateTask.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/ChangeNFVMANOEntityStateTask.robot
@@ -8,7 +8,7 @@ Library           REST    ${NFVMANO_SCHEMA}://${NFVMANO_HOST}:${NFVMANO_PORT}
 Library           MockServerLibrary
 *** Test Cases ***
 POST NFV-MANO functional entity application state change
-    [Documentation]    Test ID: 8.3.4.2.1
+    [Documentation]    Test ID: 8.3.1.2.1
     ...    Test title: POST NFV-MANO functional entity application state change
     ...    Test objective: The objective is to request state change of the NFV-MANO functional entity application.
     ...    Pre-conditions: 
@@ -21,7 +21,7 @@ POST NFV-MANO functional entity application state change
     Check Operation Occurrence Id
     
 POST NFV-MANO functional entity application state change - Conflict
-    [Documentation]    Test ID: 8.3.4.2.2
+    [Documentation]    Test ID: 8.3.1.2.2
     ...    Test title: POST NFV-MANO functional entity application state change - Conflict
     ...    Test objective: The objective is to test that request to change the state of the NFV-MANO functional entity application failed due to a conflict with the state of the NFV-MANO entity resource and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: 
@@ -34,7 +34,7 @@ POST NFV-MANO functional entity application state change - Conflict
     Check HTTP Response Body Json Schema Is   ProblemDetails
     
 GET NFV-MANO functional entity application state change - Method not implemented
-    [Documentation]    Test ID: 8.3.4.2.3
+    [Documentation]    Test ID: 8.3.1.2.3
     ...    Test title: GET NFV-MANO functional entity application state change - Method not implemented
     ...    Test objective: The objective is to test that GET method is not allowed to retrieve the changed state of the NFV-MANO functional entity application.
     ...    Pre-conditions: 
@@ -46,7 +46,7 @@ GET NFV-MANO functional entity application state change - Method not implemented
     Check HTTP Response Status Code Is    405
     
 PUT NFV-MANO functional entity application state change - Method not implemented
-    [Documentation]    Test ID: 8.3.4.2.4
+    [Documentation]    Test ID: 8.3.1.2.4
     ...    Test title: PUT NFV-MANO functional entity application state change - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update the changed state of the NFV-MANO functional entity application.
     ...    Pre-conditions: 
@@ -58,7 +58,7 @@ PUT NFV-MANO functional entity application state change - Method not implemented
     Check HTTP Response Status Code Is    405
     
 PATCH NFV-MANO functional entity application state change - Method not implemented
-    [Documentation]    Test ID: 8.3.4.2.5
+    [Documentation]    Test ID: 8.3.1.2.5
     ...    Test title: PATCH NFV-MANO functional entity application state change - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update the changed state of the NFV-MANO functional entity application.
     ...    Pre-conditions: 
@@ -70,7 +70,7 @@ PATCH NFV-MANO functional entity application state change - Method not implement
     Check HTTP Response Status Code Is    405
     
 DELETE NFV-MANO functional entity application state change - Method not implemented
-    [Documentation]    Test ID: 8.3.4.2.6
+    [Documentation]    Test ID: 8.3.1.2.6
     ...    Test title: DELETE NFV-MANO functional entity application state change - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete the changed state of the NFV-MANO functional entity application.
     ...    Pre-conditions: