diff --git a/SOL002/VNFFaultManagement-API/NotificationConsumer.robot b/SOL002/VNFFaultManagement-API/NotificationConsumer.robot
index ae6d726f6ebdff31c509190dee101dcea2602696..039fcec989df6a1a176a0e6c1e39d6f0157287dd 100644
--- a/SOL002/VNFFaultManagement-API/NotificationConsumer.robot
+++ b/SOL002/VNFFaultManagement-API/NotificationConsumer.robot
@@ -9,36 +9,36 @@ Suite Setup    Check resource existence and get CallbackUri
 
 *** Test Cases ***
 VNF Fault Alarm Notification
-    [Documentation]    Test ID: 6.3.4.7.1
+    [Documentation]    Test ID: 6.3.4.8.1
     ...    Test title: VNF Fault Alarm Notification
-    ...    Test objective: The objective is to test that the POST request triggers VNF Fault Alarm Notification
+    ...    Test objective: The objective is to test that VNF Fault Alarm Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm notifications is available in the VNFM.
     ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
+    ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post Alarm Notification
     Check HTTP Response Status Code Is    204
     
 VNF Fault Alarm Cleared Notification
-    [Documentation]    Test ID: 6.3.4.7.2
+    [Documentation]    Test ID: 6.3.4.8.2
     ...    Test title: VNF Fault Alarm Cleared Notification
-    ...    Test objective: The objective is to test that the POST request triggers VNF Fault Alarm Cleared Notification
+    ...    Test objective: The objective is to test that VNF Fault Alarm Cleared Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm cleared notifications is available in the VNFM.
     ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
+    ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post Alarm Cleared Notification
     Check HTTP Response Status Code Is    204
     
 VNF Fault Alarm List Rebuilt Notification
-    [Documentation]    Test ID: 6.3.4.7.3
+    [Documentation]    Test ID: 6.3.4.8.3
     ...    Test title: VNF Fault List Rebuilt Alarm List Rebuilt Notification
-    ...    Test objective: The objective is to test that the POST request triggers VNF Fault Alarm List Rebuilt Notification
+    ...    Test objective: The objective is to test that VNF Fault Alarm List Rebuilt Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A VNF instance is instantiated, and a subscription for fault alarm list rebuilt notifications is available in the VNFM.
     ...    Reference: Clause 7.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
-    ...    Config ID: Config_prod_VNFM
+    ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
     Post Alarm List Rebuilt Notification