diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
index 918c54a825168008202c08fcc3e9f30338a1cd3e..60f9d33b93ee769dbbceb128e7a0c73f142d58c6 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
@@ -8,31 +8,31 @@ Library    OperatingSystem
 Library    Collections
 
 *** Test Cases ***
-Virtual Quota Available Notification
+Virtualised Resource Quota Available Notification
     [Documentation]    Test ID: 7.3.7.5.1
-    ...    Test title: Virtual Quota Available Notification
-    ...    Test objective: The objective is to test the dispatch of Virtual Quota Available Notification, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
-    ...    Pre-conditions: A subscription for Virtual Quota Available Notification is available in the VNFM.
+    ...    Test title: Virtualised Resource Quota Available Notification
+    ...    Test objective: The objective is to test the dispatch of Virtualised Resource Quota Available Notification, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
+    ...    Pre-conditions: A subscription for Virtualised Resource Quota Available Notification is available in the VNFM.
     ...    Reference: Clause 11.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Trigger a dispatch of virtual quota available notification (external action) 
-    Check Virtual Quota Available Notification Http POST Request Body Json Schema Is    VrQuotaAvailNotification
-    Check Virtual Quota Available Notification Http POST Request Body notificationType attribute Is    VrQuotaAvailNotification
+    Trigger a dispatch of virtualised resource quota available notification (external action) 
+    Check Virtualised Resource Quota Available Notification Http POST Request Body Json Schema Is    VrQuotaAvailNotification
+    Check Virtualised Resource Quota Available Notification Http POST Request Body notificationType attribute Is    VrQuotaAvailNotification
    
 *** Keywords ***
 
-Trigger a dispatch of virtual quota available notification (external action) 
+Trigger a dispatch of virtualised resource quota available notification (external action) 
     #do nothing
     Log    do nothing  
     
-Check Virtual Quota Available Notification Http POST Request Body Json Schema Is  
+Check Virtualised Resource Quota Available Notification Http POST Request Body Json Schema Is  
     [Arguments]    ${element}
     ${schema}=	Get File	schemas/${element}.schema.json
     Configure Notification Forward    ${schema}    ${callback_endpoint}    ${callback_endpoint_fwd}
 
-Check Virtual Quota Available Notification Http POST Request Body notificationType attribute Is
+Check Virtualised Resource Quota Available Notification Http POST Request Body notificationType attribute Is
     [Arguments]    ${type}
     Configure Virtual Quota Available Notification Handler    ${callback_endpoint_fwd}    ${type}
     Wait Until Keyword Succeeds    2 min   10 sec   Verify Mock Expectation    ${notification_request}
@@ -45,8 +45,9 @@ Configure Virtual Quota Available Notification Handler
     set to dictionary   ${json}    notificationType    ${type}
     ${BODY}=    evaluate    json.dumps(${json})    json
     Log  Creating mock request and response to handle status notification
-    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
-    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}
+    Set Global Variable    ${req}    ${notification_request}
+    &{notification_response}=  Create Mock Response    status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
     
 Configure Notification Forward