diff --git a/robot/resources/policy_interface.robot b/robot/resources/policy_interface.robot
index 9ff95f0..82b5cda 100644
--- a/robot/resources/policy_interface.robot
+++ b/robot/resources/policy_interface.robot
@@ -135,7 +135,7 @@
     [Documentation]   Undeploy, Delete and Create Operational and Monitoring policies for vFWCL
     [Arguments]    ${model_invariant_id}
     Run Keyword And Ignore Error     Run Undeploy vFW Monitoring Policy
-    Run Keyword And Ignore Error     Run Undeploy vFW Operational Policy
+    Run Keyword And Ignore Error     Run Undeploy Policy
     # Need to wait a little for undeploy
     Validate the vFWCL Policy
     Run Keyword and Ignore Error     Run Delete vFW Monitoring Policy
@@ -188,7 +188,7 @@
      [Return]    ${resp}
      Should Be Equal As Strings    ${resp.status_code}     200
 
-Run Undeploy vFW Operational Policy
+Run Undeploy Policy
      [Documentation]    Runs Policy PAP Undeploy a Policy from PDP Groups
      #[Arguments]    ${policy_name}
      ${auth}=    Create List    ${POLICY_HEALTHCHECK_USERNAME}    ${POLICY_HEALTHCHECK_PASSWORD}
diff --git a/robot/testsuites/closed-loop.robot b/robot/testsuites/closed-loop.robot
index 6f1a9db..73273e1 100644
--- a/robot/testsuites/closed-loop.robot
+++ b/robot/testsuites/closed-loop.robot
@@ -28,7 +28,7 @@
     Validate the vFWCL Policy
     Run Keyword And Ignore Error     Run Undeploy vFW Monitoring Policy
     Validate the vFWCL Policy
-    Run Keyword And Ignore Error     Run Undeploy vFW Operational Policy
+    Run Keyword And Ignore Error     Run Undeploy Policy
     Validate the vFWCL Policy
     Run Keyword and Ignore Error     Run Delete vFW Monitoring Policy
     Validate the vFWCL Policy