diff --git a/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot b/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
index 7ffdb8db7eaff54ef1d2cb99fe9342fbcff50e56..5098d591b4a4350d1203ae4cac5ff32cdb7534c8 100644
--- a/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
@@ -10,7 +10,7 @@ Library    JSONSchemaLibrary    schemas/
 *** Test Cases ***
 Post Cancel operation task
     [Documentation]    Test ID: 5.3.2.14.1
-    ...    Test title: POST Cancel a NS lifecycle operation
+    ...    Test title: Post Cancel operation task
     ...    Test objective: The objective is to test that POST method cancel an LCM operation
     ...    Pre-conditions: NS instance status equal to STARTING, PROCESSING or ROLLING_BACK
     ...    Reference:  section 6.4.15.3.1 - SOL005 v2.4.1
@@ -23,7 +23,7 @@ Post Cancel operation task
 	
 Post Cancel operation task Not Found
     [Documentation]    Test ID: 5.3.2.14.2
-    ...    Test title: POST Cancel a NS lifecycle operation
+    ...    Test title: Post Cancel operation task Not Found
     ...    Test objective: The objective is to test that POST method fail if LCM operation not found
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.15.3.1 - SOL005 v2.4.1
@@ -37,7 +37,7 @@ Post Cancel operation task Not Found
 		
 Post Cancel operation task Conflict
     [Documentation]    Test ID: 5.3.2.14.3
-    ...    Test title: POST Cancel a NS lifecycle operation
+    ...    Test title: Post Cancel operation task Conflict
     ...    Test objective: The objective is to test that POST method fail if a status conflict exist on LCM operation
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.15.3.1 - SOL005 v2.4.1
@@ -51,7 +51,7 @@ Post Cancel operation task Conflict
 
 GET Cancel operation task - Method not implemented 
     [Documentation]    Test ID: 5.3.2.14.4
-    ...    Test title: GET Cancel NS lifecycle operation - Method not implemented
+    ...    Test title: GET Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.15.3.2 - SOL005 v2.4.1
@@ -63,7 +63,7 @@ GET Cancel operation task - Method not implemented
 	
 PUT Cancel operation task - Method not implemented
     [Documentation]    Test ID: 5.3.2.14.5
-    ...    Test title: PUT Cancel NS lifecycle operation - Method not implemented
+    ...    Test title: PUT Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.15.3.3 - SOL005 v2.4.1
@@ -75,7 +75,7 @@ PUT Cancel operation task - Method not implemented
 
 PATCH Cancel operation task - Method not implemented
     [Documentation]    Test ID: 5.3.2.14.6
-    ...    Test title: PATCH Cancel NS lifecycle operation - Method not implemented
+    ...    Test title: PATCH Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.15.3.4 - SOL005 v2.4.1
@@ -87,7 +87,7 @@ PATCH Cancel operation task - Method not implemented
 
 DELETE Cancel operation task - Method not implemented
     [Documentation]    Test ID: 5.3.2.14.7
-    ...    Test title: DELETE Cancel NS lifecycle operation - Method not implemented
+    ...    Test title: DELETE Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.15.3.5 - SOL005 v2.4.1
diff --git a/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot b/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
index 2d171da4b642b0a5df2754c2ba1899541a737b56..2b32044db8c52f51e621511681a37a7b54272eb3 100644
--- a/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
@@ -10,7 +10,7 @@ Library    JSONSchemaLibrary    schemas/
 *** Test Cases ***
 Post Continue operation task
      [Documentation]    Test ID: 5.3.2.12.1
-    ...    Test title: POST Continue a NS lifecycle operation
+    ...    Test title: Post Continue operation task
     ...    Test objective: The objective is to test that POST method trigger a continue on the LCM operation
     ...    Pre-conditions: NS instance status equal to FAILED_TEMP
     ...    Reference:  section 6.4.13.3.1 - SOL005 v2.4.1
@@ -23,7 +23,7 @@ Post Continue operation task
 	
 Post Continue operation task Not Found
     [Documentation]    Test ID: 5.3.2.12.2
-    ...    Test title: POST Continue a NS lifecycle operation
+    ...    Test title: Post Continue operation task Not Found
     ...    Test objective: The objective is to test that POST method fail if operation is not found
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.13.3.1 - SOL005 v2.4.1
@@ -37,7 +37,7 @@ Post Continue operation task Not Found
 		
 Post Continue operation task Conflict
      [Documentation]    Test ID: 5.3.2.12.3
-    ...    Test title: POST Continue a NS lifecycle operation
+    ...    Test title: Post Continue operation task Conflict
     ...    Test objective: The objective is to test that POST method fail in case of operation status conflict
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.13.3.1 - SOL005 v2.4.1
@@ -51,7 +51,7 @@ Post Continue operation task Conflict
 	
 GET Continue operation task - Method not implemented
     [Documentation]    Test ID: 5.3.2.10.4
-    ...    Test title: GET Continue NS lifecycle operation - Method not implemented
+    ...    Test title: GET Continue operation task - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.10.3.2 - SOL005 v2.4.1
@@ -63,7 +63,7 @@ GET Continue operation task - Method not implemented
 	
 PUT Continue operation task - Method not implemented
     [Documentation]    Test ID: 5.3.2.10.5
-    ...    Test title: PUT Continue NS lifecycle operation - Method not implemented
+    ...    Test title: PUT Continue operation task - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.13.3.3 - SOL005 v2.4.1
@@ -75,10 +75,10 @@ PUT Continue operation task - Method not implemented
 
 PATCH Continue operation task - Method not implemented
     [Documentation]    Test ID: 5.3.2.10.5
-    ...    Test title: PATCH Continue NS lifecycle operation - Method not implemented
+    ...    Test title: PATCH Continue operation task - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference:  section 6.4.14.3.3 - SOL005 v2.4.1
+    ...    Reference:  section 6.4.14.3.4 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -87,10 +87,10 @@ PATCH Continue operation task - Method not implemented
 
 DELETE Continue operation task - Method not implemented
         [Documentation]    Test ID: 5.3.2.10.5
-    ...    Test title: DELETE Continue NS lifecycle operation - Method not implemented
+    ...    Test title: DELETE Continue operation task - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference:  section 6.4.14.3.3 - SOL005 v2.4.1
+    ...    Reference:  section 6.4.14.3.5 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSLifecycleManagement-API/FailOperationTask.robot b/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
index 052f8e029f72e4708b158259785196e0a21dc232..3853ed3e7312e243b0bf350baed3b8e45d3cb350 100644
--- a/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
@@ -10,7 +10,7 @@ Library    JSONSchemaLibrary    schemas/
 *** Test Cases ***
 Post Fail operation task
     [Documentation]    Test ID: 5.3.2.13.1
-    ...    Test title: POST Fail a NS lifecycle operation
+    ...    Test title: Post Fail operation task
     ...    Test objective: The objective is to test that POST method trigger a state change to "finally failed" on the LCM operation
     ...    Pre-conditions: NS instance status equal to FAILED_TEMP
     ...    Reference:  section 6.4.14.3.1 - SOL005 v2.4.1
@@ -23,7 +23,7 @@ Post Fail operation task
 	
 Post Fail operation task Not Found
     [Documentation]    Test ID: 5.3.2.13.2
-    ...    Test title: POST Fail a NS lifecycle operation
+    ...    Test title: Post Fail operation task Not Found
     ...    Test objective: The objective is to test that POST method fail if the LCM operation is not found
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.14.3.1 - SOL005 v2.4.1
@@ -37,7 +37,7 @@ Post Fail operation task Not Found
 		
 Post Fail operation task Conflict
     [Documentation]    Test ID: 5.3.2.13.3
-    ...    Test title: POST Fail a NS lifecycle operation
+    ...    Test title: Post Fail operation task Conflict
     ...    Test objective: The objective is to test that POST method fail in case of status conflict on the LCM operation
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.14.3.1 - SOL005 v2.4.1
@@ -51,7 +51,7 @@ Post Fail operation task Conflict
 
 GET Fail operation task - Method not implemented 
      [Documentation]    Test ID: 5.3.2.13.4
-    ...    Test title: GET Continue NS lifecycle operation - Method not implemented
+    ...    Test title: GET Fail operation task - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.14.3.2 - SOL005 v2.4.1
@@ -63,7 +63,7 @@ GET Fail operation task - Method not implemented
 	
 PUT Fail operation task - Method not implemented
     [Documentation]    Test ID: 5.3.2.13.5
-    ...    Test title: PUT Continue NS lifecycle operation - Method not implemented
+    ...    Test title: PUT Fail operation task - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.14.3.3 - SOL005 v2.4.1
@@ -75,7 +75,7 @@ PUT Fail operation task - Method not implemented
 
 PATCH Fail operation task - Method not implemented
      [Documentation]    Test ID: 5.3.2.13.6
-    ...    Test title: PATCH Continue NS lifecycle operation - Method not implemented
+    ...    Test title: PATCH Fail operation task - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.14.3.4 - SOL005 v2.4.1
@@ -87,7 +87,7 @@ PATCH Fail operation task - Method not implemented
 
 DELETE Fail operation task - Method not implemented
      [Documentation]    Test ID: 5.3.2.13.7
-    ...    Test title: DELETE Continue NS lifecycle operation - Method not implemented
+    ...    Test title: DELETE Fail operation task - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.14.3.5 - SOL005 v2.4.1
diff --git a/SOL005/NSLifecycleManagement-API/HealNSTask.robot b/SOL005/NSLifecycleManagement-API/HealNSTask.robot
index 32f32c23fb94be3669232dc576e120a8b9a91aee..442089bde0cdd0b37d434c60e95aa0617cf75369 100644
--- a/SOL005/NSLifecycleManagement-API/HealNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/HealNSTask.robot
@@ -8,9 +8,9 @@ Library    JSONSchemaLibrary    schemas/
 Suite Setup    Check resource existance
 
 *** Test Cases ***
-Heal a NSInstance
+POST Heal a NSInstance
     [Documentation]    Test ID: 5.3.2.6.1
-    ...    Test title: POST Individual Heal NS instance
+    ...    Test title: POST Heal a NSInstance
     ...    Test objective: The objective is to test that POST method allow to create a Heal NS instance
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.7.3.1 - SOL005 v2.4.1
@@ -21,9 +21,9 @@ Heal a NSInstance
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location
 
-Heal a NSInstance Conflict
+POST Heal a NSInstance Conflict
     [Documentation]    Test ID: 5.3.2.6.2
-    ...    Test title: POST Individual Heal NS instance
+    ...    Test title: POST Heal a NSInstance Conflict
     ...    Test objective: The objective is to test that POST method fail if NS instance is not in NOT_INSTANTIATE state 
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.7.3.1 - SOL005 v2.4.1
@@ -38,7 +38,7 @@ Heal a NSInstance Conflict
     
 GET Heal NSInstance- Method not implemented
     [Documentation]    Test ID: 5.3.2.6.3
-    ...    Test title: GET Individual Heal NS instance - Method not implemented
+    ...    Test title: GET Heal NSInstance- Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.7.3.2 - SOL005 v2.4.1
@@ -50,7 +50,7 @@ GET Heal NSInstance- Method not implemented
     
 PUT Heal NSInstance - Method not implemented
     [Documentation]    Test ID: 5.3.2.6.4
-    ...    Test title: PUT Individual Heal NS instance - Method not implemented
+    ...    Test title: PUT Heal NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.7.3.3 - SOL005 v2.4.1
@@ -62,10 +62,10 @@ PUT Heal NSInstance - Method not implemented
     
 PATCH Heal NSInstance - Method not implemented
     [Documentation]    Test ID: 5.3.2.6.4
-    ...    Test title: PATCH Individual Heal NS instance - Method not implemented
+    ...    Test title: PATCH Heal NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference:  section 6.4.7.3.3 - SOL005 v2.4.1
+    ...    Reference:  section 6.4.7.3.4 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -74,10 +74,10 @@ PATCH Heal NSInstance - Method not implemented
 
 DELETE Heal NSInstance - Method not implemented
     [Documentation]    Test ID: 5.3.2.6.4
-    ...    Test title: DELETE Individual Heal NS instance - Method not implemented
+    ...    Test title: DELETE Heal NSInstance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference:  section 6.4.7.3.3 - SOL005 v2.4.1
+    ...    Reference:  section 6.4.7.3.5 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
index 11b7b1a83cef3ffd054874a58102baa45947a662..e994731fc116f531cd70580569848192748cb80e 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
@@ -10,7 +10,7 @@ Suite Setup    Check resource existance
 *** Test Cases ***
 Post Individual NSInstance - Method not implemented
     [Documentation]    Test ID: 5.3.2.2.1
-    ...    Test title: POST Individual NS instance - Method not implemented
+    ...    Test title: Post Individual NSInstance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new NS instance
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.3.3.1 - SOL005 v2.4.1
@@ -22,7 +22,7 @@ Post Individual NSInstance - Method not implemented
 
 Get Information about an individual NS Instance
     [Documentation]    Test ID: 5.3.2.2.2
-    ...    Test title: GET Individual NS instance
+    ...    Test title: Get Information about an individual NS Instance
     ...    Test objective: The objective is to test that GET method allow to query an NS instance
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.3.3.2 - SOL005 v2.4.1
@@ -36,7 +36,7 @@ Get Information about an individual NS Instance
     
 PUT Individual NSInstance - Method not implemented 
     [Documentation]    Test ID: 5.3.2.2.3
-    ...    Test title: PUT Individual NS instance - Method not implemented
+    ...    Test title: PUT Individual NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to create a new NS instance
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.3.3.3 - SOL005 v2.4.1
@@ -48,7 +48,7 @@ PUT Individual NSInstance - Method not implemented
 
 PATCH Individual NSInstance - Method not implemented 
     [Documentation]    Test ID: 5.3.2.2.4
-    ...    Test title: PATCH Individual NS instance - Method not implemented
+    ...    Test title: PATCH Individual NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to create a new NS instance
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.3.3.4 - SOL005 v2.4.1
@@ -60,7 +60,7 @@ PATCH Individual NSInstance - Method not implemented
 
 DELETE Individual NSInstance
      [Documentation]    Test ID: 5.3.2.2.5
-    ...    Test title: DELETE Individual NS instance
+    ...    Test title: DELETE Individual NSInstance
     ...    Test objective: The objective is to test that DELETE method is allowed to delete a NS instance
     ...    Pre-conditions: none.
     ...    Reference:  section 6.4.3.3.5 - SOL005 v2.4.1
@@ -72,7 +72,7 @@ DELETE Individual NSInstance
 
 DELETE Individual NSInstance Conflict
     [Documentation]    Test ID: 5.3.2.2.5
-    ...    Test title: DELETE Individual NS instance
+    ...    Test title: DELETE Individual NSInstance Conflict
     ...    Test objective: The objective is to test that DELETE method is allowed to delete a NS instance
     ...    Pre-conditions: At least one running instance of a NS
     ...    Reference:  section 6.4.3.3.5 - SOL005 v2.4.1
diff --git a/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot b/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
index a6caf6a8a8d5faa980ca90f95fa196e516be6b2d..1321eef1f1dad98473d64571ef05db865668fd3b 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
@@ -9,7 +9,7 @@ Library    JSONSchemaLibrary    schemas/
 *** Test Cases ***
 Post Individual NS LCM occurences - Method not implemented
     [Documentation]    Test ID: 5.3.2.9.1
-    ...    Test title: POST Individual NS LCM occurrences - Method not implemented
+    ...    Test title: Post Individual NS LCM occurences - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.10.3.1 - SOL005 v2.4.1
@@ -21,7 +21,7 @@ Post Individual NS LCM occurences - Method not implemented
 
 Get stauts information about Individual NS LCM OP OCC   
     [Documentation]    Test ID: 5.3.2.9.2
-    ...    Test title: GET NS LCM Occurrences
+    ...    Test title: Get stauts information about Individual NS LCM OP OCC
     ...    Test objective: The objective is to test that GET method return the LCM occurrence of the NS
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.10.3.2 - SOL005 v2.4.1
@@ -35,7 +35,7 @@ Get stauts information about Individual NS LCM OP OCC
 	
 PUT stauts information about Individual NS LCM OP OCC - Method not implemented
      [Documentation]    Test ID: 5.3.2.9.3
-    ...    Test title: PUT Individual NS LCM occurrences - Method not implemented
+    ...    Test title: PUT stauts information about Individual NS LCM OP OCC - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.10.3.3 - SOL005 v2.4.1
@@ -47,7 +47,7 @@ PUT stauts information about Individual NS LCM OP OCC - Method not implemented
 
 PATCH stauts information about Individual NS LCM OP OCC - Method not implemented
      [Documentation]    Test ID: 5.3.2.9.4
-    ...    Test title: PATCH Individual NS LCM occurrences - Method not implemented
+    ...    Test title: PATCH stauts information about Individual NS LCM OP OCC - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.10.3.4 - SOL005 v2.4.1
@@ -59,7 +59,7 @@ PATCH stauts information about Individual NS LCM OP OCC - Method not implemented
 
 DELETE stauts information about Individual NS LCM OP OCC - Method not implemented
          [Documentation]    Test ID: 5.3.2.9.5
-    ...    Test title: DELETE Individual NS LCM occurrences - Method not implemented
+    ...    Test title: DELETE stauts information about Individual NS LCM OP OCC - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.10.3.5 - SOL005 v2.4.1
diff --git a/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot b/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot
index ee94d6289c3ad774ad020055c674df896b8e658c..063e1506feba5b48138e53092a79f30ca0b4f579 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot
@@ -11,7 +11,7 @@ Suite Setup    Check subscription existance
 *** Test Cases ***
 Post Individual Subscription - Method not implemented
     [Documentation]    Test ID: 5.3.2.16.1
-    ...    Test title: POST Individual NS lifecycle management subscription - Method not implemented
+    ...    Test title: Post Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new NS lifecycle management subscription
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.17.3.1 - SOL005 v2.4.1
@@ -23,7 +23,7 @@ Post Individual Subscription - Method not implemented
 
 Get Information about an individual subscription
      [Documentation]    Test ID: 5.3.2.16.2
-    ...    Test title: GET Individual NS lifecycle management subscription
+    ...    Test title: Get Information about an individual subscription
     ...    Test objective: The objective is to test the retrieval of NS lifecycle management subscription and perform a JSON schema validation of the returned subscription data structure
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.17.3.2 - SOL005 v2.4.1
@@ -36,7 +36,7 @@ Get Information about an individual subscription
 
 PUT an individual subscription - Method not implemented
      [Documentation]    Test ID: 5.3.2.16.3
-    ...    Test title: PUT Individual NS lifecycle management subscription - Method not implemented
+    ...    Test title: PUT an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a NS lifecycle management subscription
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.17.3.3 - SOL005 v2.4.1
@@ -48,10 +48,10 @@ PUT an individual subscription - Method not implemented
 
 PATCH an individual subscription - Method not implemented
      [Documentation]    Test ID: 5.3.2.16.4
-    ...    Test title: PATCH Individual NS lifecycle management subscription - Method not implemented
+    ...    Test title: PATCH an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify a new NS lifecycle management subscription
     ...    Pre-conditions: none
-    ...    Reference:  section 6.4.17.3.1 - SOL005 v2.4.1
+    ...    Reference:  section 6.4.17.3.4 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS lifecycle management subscription is not modified by the operation
@@ -60,10 +60,10 @@ PATCH an individual subscription - Method not implemented
     
 DELETE an individual subscription
      [Documentation]    Test ID: 5.3.2.16.5
-    ...    Test title: POST Individual NS lifecycle management subscription - Method not implemented
+    ...    Test title: DELETE an individual subscription
     ...    Test objective: The objective is to test the deletion of an individual NS lifecycle management subscription
     ...    Pre-conditions: At least one lifecycle management subscription is available in the NFVO
-    ...    Reference:  section 6.4.17.3.1 - SOL005 v2.4.1
+    ...    Reference:  section 6.4.17.3.5 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS lifecycle management subscription is not available anymore on NFVO
diff --git a/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot b/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot
index 6a7cabc778c8d6bc4c5110f04e8e02e92e2b94c7..9d4a26a65bcf54b1a8c9e62931e893f88a5c9620 100644
--- a/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot
@@ -8,9 +8,9 @@ Library    JSONSchemaLibrary    schemas/
 Suite Setup    Check resource existance
 
 *** Test Cases ***
-Instantiate a nsInstance
+Post Instantiate a nsInstance
     [Documentation]    Test ID: 5.3.2.3.1
-    ...    Test title: POST Individual NS instance
+    ...    Test title: Post Instantiate a nsInstance
     ...    Test objective: The objective is to test that POST method allow to create a new NS instance
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.4.3.1 - SOL005 v2.4.1
@@ -21,9 +21,9 @@ Instantiate a nsInstance
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location
 
-Instantiate a nsInstance Conflict
+Post Instantiate a nsInstance Conflict
     [Documentation]    Test ID: 5.3.2.3.2
-    ...    Test title: POST Individual NS instance
+    ...    Test title: Post Instantiate a nsInstance Conflict
     ...    Test objective: The objective is to test that the operation can't be performed due to a conflict with the state of resource
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.4.3.1 - SOL005 v2.4.1
@@ -37,7 +37,7 @@ Instantiate a nsInstance Conflict
     
 GET Instantiate NSInstance - Method not implemented
     [Documentation]    Test ID: 5.3.2.3.3
-    ...    Test title: GET Individual NS instance - Method not implemented
+    ...    Test title: GET Instantiate NSInstance - Method not implemented
     ...    Test objective: The objective is to test that the operation can't be performed due because method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.4.3.2 - SOL005 v2.4.1
@@ -49,7 +49,7 @@ GET Instantiate NSInstance - Method not implemented
     
 PUT Instantiate NSInstance - Method not implemented
     [Documentation]    Test ID: 5.3.2.3.4
-    ...    Test title: PUT Individual NS instance - Method not implemented
+    ...    Test title: PUT Instantiate NSInstance - Method not implemented
     ...    Test objective: The objective is to test that the operation can't be performed due because method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.4.3.3 - SOL005 v2.4.1
@@ -61,7 +61,7 @@ PUT Instantiate NSInstance - Method not implemented
     
 PATCH Instantiate NSInstance - Method not implemented
     [Documentation]    Test ID: 5.3.2.3.5
-    ...    Test title: PATCH Individual NS instance - Method not implemented
+    ...    Test title: PATCH Instantiate NSInstance - Method not implemented
     ...    Test objective: The objective is to test that the operation can't be performed due because method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.4.3.4 - SOL005 v2.4.1
@@ -73,7 +73,7 @@ PATCH Instantiate NSInstance - Method not implemented
 
 DELETE Instantiate NSInstance - Method not implemented
     [Documentation]    Test ID: 5.3.2.3.6
-    ...    Test title: DELETE Individual NS instance - Method not implemented
+    ...    Test title: DELETE Instantiate NSInstance - Method not implemented
     ...    Test objective: The objective is to test that the operation can't be performed due because method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.4.3.5 - SOL005 v2.4.1
diff --git a/SOL005/NSLifecycleManagement-API/NSInstances.robot b/SOL005/NSLifecycleManagement-API/NSInstances.robot
index 61d1cf2018f0b9787f9a2774f45ea4289e4bf107..19e842bb563d94145dc68abe2d961348eb484a65 100644
--- a/SOL005/NSLifecycleManagement-API/NSInstances.robot
+++ b/SOL005/NSLifecycleManagement-API/NSInstances.robot
@@ -7,9 +7,9 @@ Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 
 *** Test Cases ***
-Create a new NsInstance
+POST Create a new NsInstance
     [Documentation]    Test ID: 5.3.2.1.1
-    ...    Test title: POST Individual NS instance
+    ...    Test title: POST Create a new NsInstance
     ...    Test objective: The objective is to test the creation of a new Ns Instances and perform a JSON schema validation of the collected instance data structure
     ...    Pre-conditions: none.
     ...    Reference:  section 6.4.2.3.1 - SOL005 v2.4.1
@@ -23,7 +23,7 @@ Create a new NsInstance
 
 Get information about multiple NS instances  
     [Documentation]    Test ID: 5.3.2.1.2
-    ...    Test title: GET Individual NS instance
+    ...    Test title: Get information about multiple NS instances
     ...    Test objective: The objective is to test the retrieval of all the available NS Instances and perform a JSON schema and content validation of the collected instance data structure
     ...    Pre-conditions: A Ns instance is instantiated.
     ...    Reference:  section 6.4.2.3.2 - SOL005 v2.4.1
@@ -36,7 +36,7 @@ Get information about multiple NS instances
     
 Get information about multiple NS instances Bad Request Invalid attribute-based filtering parameters
     [Documentation]    Test ID: 5.3.2.1.3
-    ...    Test title: GET Individual NS instance
+    ...    Test title: Get information about multiple NS instances Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to test the retrieval of all the available NS Instances using attribute-based filter and perform a JSON schema and content validation of the collected instance data structure
     ...    Pre-conditions: A Ns instance is instantiated.
     ...    Reference:  section 6.4.2.3.2 - SOL005 v2.4.1
@@ -49,7 +49,7 @@ Get information about multiple NS instances Bad Request Invalid attribute-based
     
 Get information about multiple NS instances Bad Request Invalid attribute selector
     [Documentation]    Test ID: 5.3.2.1.4
-    ...    Test title: GET Individual NS instance
+    ...    Test title: Get information about multiple NS instances Bad Request Invalid attribute selector
     ...    Test objective: The objective is to test the retrieval of all the available NS Instances using attribute-based filter and perform a JSON schema and content validation of the collected instance data structure
     ...    Pre-conditions: A Ns instance is instantiated.
     ...    Reference:  section 6.4.2.3.2 - SOL005 v2.4.1
@@ -74,7 +74,7 @@ PUT NSInstances - Method not implemented
     
 PATCH NSInstances - Method not implemented
      [Documentation]    Test ID: 5.3.2.1.6
-    ...    Test title: PATCH Individual NS instance - Method not implemented
+    ...    Test title: PUT NSInstances - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify a NS instance
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.2.3.4 - SOL005 v2.4.1
@@ -86,7 +86,7 @@ PATCH NSInstances - Method not implemented
 
 DELETE NSInstances - Method not implemented
      [Documentation]    Test ID: 5.3.2.1.7
-    ...    Test title: DELETE Individual NS instance - Method not implemented
+    ...    Test title: DELETE NSInstances - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to modify a list of NS instance
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.2.3.5 - SOL005 v2.4.1
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot b/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
index 8cd8ee789a82123fb7f75a195c1a8d6e98d1beab..250ac9bf8a7f626d21402df2be13b5ca694bf8f0 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
@@ -9,7 +9,7 @@ Library    JSONSchemaLibrary    schemas/
 *** Test Cases ***
 Post NS LCM occurences - Method not implemented
     [Documentation]    Test ID: 5.3.2.8.1
-    ...    Test title: POST NS LCM occurrences - Method not implemented
+    ...    Test title: Post NS LCM occurences - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.9.3.1 - SOL005 v2.4.1
@@ -24,7 +24,7 @@ Post NS LCM occurences - Method not implemented
 
 Get status information about multiple NS LCM OP OCC   
      [Documentation]    Test ID: 5.3.2.8.2
-    ...    Test title: GET NS LCM Occurrences
+    ...    Test title: Get status information about multiple NS LCM OP OCC
     ...    Test objective: The objective is to test that GET method return a list of LCM occurrences of the NS
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.9.3.2 - SOL005 v2.4.1
@@ -37,7 +37,7 @@ Get status information about multiple NS LCM OP OCC
 
 Get status information about multiple NS LCM OP OCC Bad Request Invalid attribute-based filtering parameters
     [Documentation]    Test ID: 5.3.2.8.3
-    ...    Test title: GET NS LCM Occurrences
+    ...    Test title: Get status information about multiple NS LCM OP OCC Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to test that GET method fail because the query parameter is not existing
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.9.3.2 - SOL005 v2.4.1
@@ -50,7 +50,7 @@ Get status information about multiple NS LCM OP OCC Bad Request Invalid attribut
 
 Get status information about multiple NS LCM OP OCC Bad Request Invalid attribute selector
     [Documentation]    Test ID: 5.3.2.8.4
-    ...    Test title: GET NS LCM Occurrences
+    ...    Test title: Get status information about multiple NS LCM OP OCC Bad Request Invalid attribute selector
     ...    Test objective: The objective is to test that GET method fail because the attributes selector is not existing
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.9.3.2 - SOL005 v2.4.1
@@ -64,7 +64,7 @@ Get status information about multiple NS LCM OP OCC Bad Request Invalid attribut
 
 PUT status information about multiple NS LCM OP OCC - Method not implemented
     [Documentation]    Test ID: 5.3.2.8.5
-    ...    Test title: PUT Terminate NS instance - Method not implemented
+    ...    Test title: PUT status information about multiple NS LCM OP OCC - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.9.3.3 - SOL005 v2.4.1
@@ -76,7 +76,7 @@ PUT status information about multiple NS LCM OP OCC - Method not implemented
 
 PATCH status information about multiple NS LCM OP OCC - Method not implemented
     [Documentation]    Test ID: 5.3.2.8.6
-    ...    Test title: PATCH Terminate NS instance - Method not implemented
+    ...    Test title: PATCH status information about multiple NS LCM OP OCC - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.9.3.4 - SOL005 v2.4.1
@@ -88,7 +88,7 @@ PATCH status information about multiple NS LCM OP OCC - Method not implemented
 
 DELETE status information about multiple NS LCM OP OCC - Method not implemented
     [Documentation]    Test ID: 5.3.2.8.7
-    ...    Test title: DELETE Terminate NS instance - Method not implemented
+    ...    Test title: DELETE status information about multiple NS LCM OP OCC - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.9.3.5 - SOL005 v2.4.1
diff --git a/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot b/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
index 6fd5179d90fe2dfcc6506c4e9aa2e84f86ff886c..18bf7b6d9425b0458d61f7fe7f2e8fa4b021f5cf 100644
--- a/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
@@ -9,9 +9,9 @@ Library    OperatingSystem
 
 
 *** Test Cases ***
-Deliver a notification - Operation Occurence
+POST Deliver a notification - Operation Occurence
     [Documentation]    Test ID: 5.3.2.17.1
-    ...    Test title: POST delivers a notification from the server to the client
+    ...    Test title: POST Deliver a notification - Operation Occurence
     ...    Test objective: The objective is to test that POST method trigger a notification about lifecycle changes triggered by a NS LCM operation occurrence
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.18.3.1 - SOL005 v2.4.1
@@ -19,9 +19,9 @@ Deliver a notification - Operation Occurence
     ...    Applicability: none
     ...    Post-Conditions: none
     POST Operation occurrence
-Deliver a notification - Id Creation
+POST Deliver a notification - Id Creation
     [Documentation]    Test ID: 5.3.2.17.2
-    ...    Test title: POST delivers a notification from the server to the client
+    ...    Test title: POST Deliver a notification - Id Creation
     ...    Test objective: The objective is to test that POST method trigger a notification about the creation of a NS identifier and the related NS instance resource
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.18.3.1 - SOL005 v2.4.1
@@ -29,9 +29,9 @@ Deliver a notification - Id Creation
     ...    Applicability: none
     ...    Post-Conditions: none    
     POST Id creation
-Deliver a notification - Id deletion
+POST Deliver a notification - Id deletion
     [Documentation]    Test ID: 5.3.2.17.3
-    ...    Test title: POST delivers a notification from the server to the client
+    ...    Test title: POST Deliver a notification - Id deletion
     ...    Test objective: The objective is to test that POST method trigger a notification about the deletion of a NS identifier and the related NS instance resource
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.18.3.1 - SOL005 v2.4.1
@@ -42,7 +42,7 @@ Deliver a notification - Id deletion
 
 GET a notification end point
     [Documentation]    Test ID: 5.3.2.17.4 
-    ...    Test title: GET allows the server to test the notification endpoint that is provided by the client
+    ...    Test title: GET a notification end point
     ...    Test objective: The objective is to test that GET method successfully test the notification endpoint
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.18.3.2 - SOL005 v2.4.1
@@ -53,7 +53,7 @@ GET a notification end point
 
 PUT notification - Method not implemented
     [Documentation]    Test ID: 5.3.2.17.5
-    ...    Test title: PUT notification endpoint  - Method not implemented
+    ...    Test title: PUT notification - Method not implemented
     ...    Test objective: The objective is to test that the PUT method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.18.3.3 - SOL005 v2.4.1
@@ -64,7 +64,7 @@ PUT notification - Method not implemented
 
 PATCH subscriptions - Method not implemented
     [Documentation]    Test ID: 5.3.2.17.6
-    ...    Test title: PATCH notification endpoint  - Method not implemented
+    ...    Test title: PATCH subscriptions - Method not implemented
     ...    Test objective: The objective is to test that the PATCH method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.18.3.4 - SOL005 v2.4.1
@@ -75,7 +75,7 @@ PATCH subscriptions - Method not implemented
 
 DELETE subscriptions - Method not implemented
     [Documentation]    Test ID: 5.3.2.17.7
-    ...    Test title: DELETE notification endpoint  - Method not implemented
+    ...    Test title: DELETE subscriptions - Method not implemented
     ...    Test objective: The objective is to test that the DELETE method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.18.3.5 - SOL005 v2.4.1
diff --git a/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot b/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot
index 082f8cefac5aa0ce56588ed1bc5316314fcdeb30..217d5f361e93f376286c369e29acb8bafcc516ad 100644
--- a/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot
@@ -10,7 +10,7 @@ Library    JSONSchemaLibrary    schemas/
 *** Test Cases ***
 Post Retry operation task
      [Documentation]    Test ID: 5.3.2.10.1
-    ...    Test title: POST Retry a NS lifecycle operation
+    ...    Test title: Post Retry operation task
     ...    Test objective: The objective is to test that POST method trigger a retry of NS lifecycle operation in case of temporary failure
     ...    Pre-conditions: NS instance status equal to FAILED_TEMP
     ...    Reference:  section 6.4.11.3.1 - SOL005 v2.4.1
@@ -24,7 +24,7 @@ Post Retry operation task
 	
 Post Retry operation task Not Found
     [Documentation]    Test ID: 5.3.2.10.2
-    ...    Test title: POST Retry a NS lifecycle operation
+    ...    Test title: Post Retry operation task Not Found
     ...    Test objective: The objective is to test that POST method fail in case of NS lifecycle operation not found
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.11.3.1 - SOL005 v2.4.1
@@ -38,7 +38,7 @@ Post Retry operation task Not Found
 		
 Post Retry operation task Conflict
     [Documentation]    Test ID: 5.3.2.10.3
-    ...    Test title: POST Retry a NS lifecycle operation
+    ...    Test title: Post Retry operation task Conflict
     ...    Test objective: The objective is to test that POST method fail in case of NS lifecycle operation status conflict
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.11.3.1 - SOL005 v2.4.1
@@ -52,7 +52,7 @@ Post Retry operation task Conflict
 
 GET Retry operation task - Method not implemented 
     [Documentation]    Test ID: 5.3.2.10.4
-    ...    Test title: GET Retry NS lifecycle operation - Method not implemented
+    ...    Test title: GET Retry operation task - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.11.3.2 - SOL005 v2.4.1
@@ -64,7 +64,7 @@ GET Retry operation task - Method not implemented
 	
 PUT Retry operation task - Method not implemented
     [Documentation]    Test ID: 5.3.2.10.5
-    ...    Test title: PUT Retry NS lifecycle operation - Method not implemented
+    ...    Test title: PUT Retry operation task - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.11.3.3 - SOL005 v2.4.1
@@ -76,7 +76,7 @@ PUT Retry operation task - Method not implemented
 
 PATCH Retry operation task - Method not implemented
     [Documentation]    Test ID: 5.3.2.10.6
-    ...    Test title: PATCH Retry NS lifecycle operation - Method not implemented
+    ...    Test title: PATCH Retry operation task - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.11.3.4 - SOL005 v2.4.1
@@ -88,7 +88,7 @@ PATCH Retry operation task - Method not implemented
 
 DELETE Retry operation task - Method not implemented
     [Documentation]    Test ID: 5.3.2.10.7
-    ...    Test title: DELETE Retry NS lifecycle operation - Method not implemented
+    ...    Test title: DELETE Retry operation task - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.11.3.5 - SOL005 v2.4.1
diff --git a/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot b/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot
index 70154ea3d16cfed616861f44704840c5e929ff04..a94b61ddb3cb2720fa9dde171d035c2a0750752d 100644
--- a/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot
@@ -10,7 +10,7 @@ Library    JSONSchemaLibrary    schemas/
 *** Test Cases ***
 Post Rollback operation task
      [Documentation]    Test ID: 5.3.2.11.1
-    ...    Test title: POST Rollback a NS lifecycle operation
+    ...    Test title: Post Rollback operation task
     ...    Test objective: The objective is to test that POST method trigger a rollback on the LCM operation
     ...    Pre-conditions: NS instance status equal to FAILED_TEMP
     ...    Reference:  section 6.4.12.3.1 - SOL005 v2.4.1
@@ -24,7 +24,7 @@ Post Rollback operation task
 	
 Post Rollback operation task Not Found
     [Documentation]    Test ID: 5.3.2.11.2
-    ...    Test title: POST Rollback a NS lifecycle operation
+    ...    Test title: Post Rollback operation task Not Found
     ...    Test objective: The objective is to test that POST method fail if operation is not found
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.12.3.1 - SOL005 v2.4.1
@@ -38,7 +38,7 @@ Post Rollback operation task Not Found
 		
 Post Rollback operation task Conflict
     [Documentation]    Test ID: 5.3.2.11.3
-    ...    Test title: POST Rollback a NS lifecycle operation
+    ...    Test title: Post Rollback operation task Conflict
     ...    Test objective: The objective is to test that POST method fail in case of operation status conflict
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.12.3.1 - SOL005 v2.4.1
@@ -52,7 +52,7 @@ Post Rollback operation task Conflict
 
 GET Rollback operation task - Method not implemented 
     [Documentation]    Test ID: 5.3.2.11.4
-    ...    Test title: GET Rollback NS lifecycle operation - Method not implemented
+    ...    Test title: GET Rollback operation task - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.12.3.2 - SOL005 v2.4.1
@@ -64,7 +64,7 @@ GET Rollback operation task - Method not implemented
 	
 PUT Rollback operation task - Method not implemented
     [Documentation]    Test ID: 5.3.2.11.5
-    ...    Test title: PUT Rollback NS lifecycle operation - Method not implemented
+    ...    Test title: PUT Rollback operation task - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.12.3.3 - SOL005 v2.4.1
@@ -76,7 +76,7 @@ PUT Rollback operation task - Method not implemented
 
 PATCH Rollback operation task - Method not implemented
     [Documentation]    Test ID: 5.3.2.11.6
-    ...    Test title: PATCH Rollback NS lifecycle operation - Method not implemented
+    ...    Test title: PATCH Rollback operation task - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.12.3.4 - SOL005 v2.4.1
@@ -88,7 +88,7 @@ PATCH Rollback operation task - Method not implemented
 
 DELETE Rollback operation task - Method not implemented
     [Documentation]    Test ID: 5.3.2.11.7
-    ...    Test title: DELETE Rollback NS lifecycle operation - Method not implemented
+    ...    Test title: DELETE Rollback operation task - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.12.3.5 - SOL005 v2.4.1
diff --git a/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot b/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot
index 79fea132e92faac6975b5a9ee5fb66b9802f1207..7c297851e5bfa51522816f98673dd345518a72ed 100644
--- a/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot
@@ -8,9 +8,9 @@ Library    JSONSchemaLibrary    schemas/
 Suite Setup    Check resource existance
 
 *** Test Cases ***
-Scale a nsInstance
+POST Scale a nsInstance
     [Documentation]    Test ID: 5.3.2.4.1
-    ...    Test title: POST Individual Scale NS instance
+    ...    Test title: POST Scale a nsInstance
     ...    Test objective: The objective is to test that POST method allow to create a Scale NS instance
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.5.3.1 - SOL005 v2.4.1
@@ -21,9 +21,9 @@ Scale a nsInstance
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location
 
-Instantiate a nsInstance Conflict
+POST Instantiate a nsInstance Conflict
     [Documentation]    Test ID: 5.3.2.4.2
-    ...    Test title: POST Individual Scale NS instance
+    ...    Test title: POST Instantiate a nsInstance Conflict
     ...    Test objective: The objective is to test that POST method allow to create a Scale NS instance
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.5.3.1 - SOL005 v2.4.1
@@ -37,7 +37,7 @@ Instantiate a nsInstance Conflict
     
 GET Scale NSInstance- Method not implemented
      [Documentation]    Test ID: 5.3.2.4.3
-    ...    Test title: GET Individual Scale NS instance - Method not implemented
+    ...    Test title: GET Scale NSInstance- Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.5.3.2 - SOL005 v2.4.1
@@ -49,7 +49,7 @@ GET Scale NSInstance- Method not implemented
     
 PUT Scale NSInstance - Method not implemented
      [Documentation]    Test ID: 5.3.2.4.4
-    ...    Test title: PUT Individual Scale NS instance - Method not implemented
+    ...    Test title: PUT Scale NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.5.3.3 - SOL005 v2.4.1
@@ -61,7 +61,7 @@ PUT Scale NSInstance - Method not implemented
     
 PATCH Scale NSInstance - Method not implemented
     [Documentation]    Test ID: 5.3.2.4.5
-    ...    Test title: PATCH Individual Scale NS instance - Method not implemented
+    ...    Test title: PATCH Scale NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.5.3.4 - SOL005 v2.4.1
@@ -73,7 +73,7 @@ PATCH Scale NSInstance - Method not implemented
 
 DELETE Scale NSInstance - Method not implemented
     [Documentation]    Test ID: 5.3.2.4.6
-    ...    Test title: DELETE Individual Scale NS instance - Method not implemented
+    ...    Test title: DELETE Scale NSInstance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.5.3.5 - SOL005 v2.4.1
diff --git a/SOL005/NSLifecycleManagement-API/Subscriptions.robot b/SOL005/NSLifecycleManagement-API/Subscriptions.robot
index bd33532c1c412aa8fd7bcdf27e6afdbede799318..38196cee6a24ab83e8bcf58b8ce841905d3f0835 100644
--- a/SOL005/NSLifecycleManagement-API/Subscriptions.robot
+++ b/SOL005/NSLifecycleManagement-API/Subscriptions.robot
@@ -7,7 +7,7 @@ Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 
 *** Test Cases ***
-Create a new subscription
+POST Create a new subscription
     [Documentation]    Test ID: 5.3.2.15.1
     ...    Test title: POST Create a new subscription
     ...    Test objective: The objective is to test that POST method create a subscription
@@ -22,9 +22,9 @@ Create a new subscription
     Check HTTP Response Body Json Schema Is    subscription
     
 
-Create a new Subscription - DUPLICATION
+POST Create a new Subscription - DUPLICATION
     [Documentation]    Test ID: 5.3.2.15.2
-    ...    Test title: POST Create a new subscription
+    ...    Test title: POST Create a new subscription - DUPLICATION
     ...    Test objective: The objective is to test that POST method create a duplicate subscription
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.16.3.1 - SOL005 v2.4.1
@@ -36,9 +36,9 @@ Create a new Subscription - DUPLICATION
     Check HTTP Response Header Contains    Location
     Check HTTP Response Body Json Schema Is    subscription
 
-Create a new Subscription - NO-DUPLICATION
+POST Create a new Subscription - NO-DUPLICATION
     [Documentation]    Test ID: 5.3.2.15.3
-    ...    Test title: POST Create a new subscription
+    ...    Test title: POST Create a new subscription - NO-DUPLICATION
     ...    Test objective: The objective is to test that POST method create a duplicate subscription
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.16.3.1 - SOL005 v2.4.1
@@ -51,7 +51,7 @@ Create a new Subscription - NO-DUPLICATION
 
 GET Subscriptions
     [Documentation]    Test ID: 5.3.2.15.4
-    ...    Test title: GET retrive the list of existing subscriptions
+    ...    Test title: GET Subscriptions
     ...    Test objective: The objective is to test that GET method  retrive the list of existing subscriptions
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.16.3.2 - SOL005 v2.4.1
@@ -64,7 +64,7 @@ GET Subscriptions
 
 GET Subscription - Filter
     [Documentation]    Test ID: 5.3.2.15.5
-    ...    Test title: GET retrive the list of existing subscriptions
+    ...    Test title: GET Subscription - Filter
     ...    Test objective: The objective is to test that GET method  retrive the list of existing subscriptions
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.16.3.2 - SOL005 v2.4.1
@@ -77,7 +77,7 @@ GET Subscription - Filter
     
 PUT subscriptions - Method not implemented
      [Documentation]    Test ID: 5.3.2.15.6
-    ...    Test title: PUT Individual NS lifecycle management subscription - Method not implemented
+    ...    Test title: PUT subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a NS lifecycle management subscription
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.16.3.3 - SOL005 v2.4.1
@@ -89,7 +89,7 @@ PUT subscriptions - Method not implemented
 
 PATCH subscriptions - Method not implemented
     [Documentation]    Test ID: 5.3.2.15.7
-    ...    Test title: PUT Individual NS lifecycle management subscription - Method not implemented
+    ...    Test title: PATCH subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a NS lifecycle management subscription
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.16.3.4 - SOL005 v2.4.1
@@ -101,7 +101,7 @@ PATCH subscriptions - Method not implemented
 
 DELETE subscriptions - Method not implemented
     [Documentation]    Test ID: 5.3.2.15.6
-    ...    Test title: DELETE Individual NS lifecycle management subscription - Method not implemented
+    ...    Test title: DELETE subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to modify a NS lifecycle management subscription
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.16.3.5 - SOL005 v2.4.1
diff --git a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
index 3ec672022f093475806e6bf3e3c3a1e5aca18376..39e7905e3921f234cbaf414143a3d6c33c3ea73b 100644
--- a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
@@ -8,9 +8,9 @@ Library    JSONSchemaLibrary    schemas/
 Suite Setup    Check resource existance
 
 *** Test Cases ***
-Terminate a NSInstance
+POST Terminate a NSInstance
     [Documentation]    Test ID: 5.3.2.7.1
-    ...    Test title: POST Terminate Individual NS instance
+    ...    Test title: POST Terminate a NSInstance
     ...    Test objective: The objective is to test that POST method allow to terminate the NS
     ...    Pre-conditions: NS instance in INSTANTIATED state
     ...    Reference:  section 6.4.8.3.1 - SOL005 v2.4.1
@@ -21,9 +21,9 @@ Terminate a NSInstance
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location
 
-Terminate a NSInstance Conflict
+POST Terminate a NSInstance Conflict
     [Documentation]    Test ID: 5.3.2.7.2
-    ...    Test title: POST Terminate Individual NS instance
+    ...    Test title: POST Terminate a NSInstance Conflict
     ...    Test objective: The objective is to test that POST method can't terminate the NS because the resource is not in INSTANTIATED state 
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.8.3.1 - SOL005 v2.4.1
@@ -37,7 +37,7 @@ Terminate a NSInstance Conflict
     
 GET Terminate NSInstance- Method not implemented
      [Documentation]    Test ID: 5.3.2.7.3
-    ...    Test title: GET Terminate NS instance - Method not implemented
+    ...    Test title: GET Terminate NSInstance- Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.8.3.2 - SOL005 v2.4.1
@@ -49,7 +49,7 @@ GET Terminate NSInstance- Method not implemented
     
 PUT Terminate NSInstance - Method not implemented
      [Documentation]    Test ID: 5.3.2.7.4
-    ...    Test title: PUT Terminate NS instance - Method not implemented
+    ...    Test title: PUT Terminate NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.8.3.3 - SOL005 v2.4.1
@@ -61,7 +61,7 @@ PUT Terminate NSInstance - Method not implemented
     
 PATCH Terminate NSInstance - Method not implemented
     [Documentation]    Test ID: 5.3.2.7.5
-    ...    Test title: PATCH Terminate NS instance - Method not implemented
+    ...    Test title: PATCH Terminate NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.8.3.4 - SOL005 v2.4.1
@@ -73,10 +73,10 @@ PATCH Terminate NSInstance - Method not implemented
 
 DELETE Terminate NSInstance - Method not implemented
          [Documentation]    Test ID: 5.3.2.7.5
-    ...    Test title: DELETE Terminate NS instance - Method not implemented
+    ...    Test title: DELETE Terminate NSInstance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference:  section 6.4.8.3.4 - SOL005 v2.4.1
+    ...    Reference:  section 6.4.8.3.5 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot b/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot
index 74b0ed580d2be61fd0f8c1af8972624774e203c7..74a22d17eea03eca872391ce3ae8ec3f7b9acc4c 100644
--- a/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot
@@ -8,9 +8,9 @@ Library    JSONSchemaLibrary    schemas/
 Suite Setup    Check resource existance
 
 *** Test Cases ***
-Update a NSInstance
+POST Update a NSInstance
     [Documentation]    Test ID: 5.3.2.5.1
-    ...    Test title: POST Update Individual Scale NS instance
+    ...    Test title: POST Update a NSInstance
     ...    Test objective: The objective is to test that POST method allow to update a Scale NS instance
     ...    Pre-conditions: an existing Scale Instance 
     ...    Reference:  section 6.4.6.3.1 - SOL005 v2.4.1
@@ -21,9 +21,9 @@ Update a NSInstance
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location
 
-Update a NSInstance Conflict
+POST Update a NSInstance Conflict
     [Documentation]    Test ID: 5.3.2.5.2
-    ...    Test title: POST Update Individual Scale NS instance
+    ...    Test title: POST Update a NSInstance Conflict
     ...    Test objective: The objective is to test that POST method fail if a scale Instance is not existing or is not in NOT_INSTANTIATED state
     ...    Pre-conditions: an existing Scale Instance 
     ...    Reference:  section 6.4.6.3.1 - SOL005 v2.4.1
@@ -37,7 +37,7 @@ Update a NSInstance Conflict
     
 GET Update NSInstance- Method not implemented
     [Documentation]    Test ID: 5.3.2.5.3
-    ...    Test title: GET Update Individual Scale NS instance - Method not implemented
+    ...    Test title: GET Update NSInstance- Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.6.3.2 - SOL005 v2.4.1
@@ -49,7 +49,7 @@ GET Update NSInstance- Method not implemented
     
 PUT Update NSInstance - Method not implemented
     [Documentation]    Test ID: 5.3.2.5.4
-    ...    Test title: PUT Update Individual Scale NS instance - Method not implemented
+    ...    Test title: PUT Update NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.6.3.3 - SOL005 v2.4.1
@@ -61,7 +61,7 @@ PUT Update NSInstance - Method not implemented
     
 PATCH Update NSInstance - Method not implemented
     [Documentation]    Test ID: 5.3.2.5.5
-    ...    Test title: PATCH Update Individual Scale NS instance - Method not implemented
+    ...    Test title: PATCH Update NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.6.3.4 - SOL005 v2.4.1
@@ -73,7 +73,7 @@ PATCH Update NSInstance - Method not implemented
 
 DELETE Update NSInstance - Method not implemented
         [Documentation]    Test ID: 5.3.2.5.6
-    ...    Test title: DELETE Update Individual Scale NS instance - Method not implemented
+    ...    Test title: DELETE Update NSInstance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.6.3.5 - SOL005 v2.4.1