diff --git a/robot/resources/aai/create_complex.robot b/robot/resources/aai/create_complex.robot
index 185d44d..e1be288 100644
--- a/robot/resources/aai/create_complex.robot
+++ b/robot/resources/aai/create_complex.robot
@@ -43,7 +43,7 @@
     [Documentation]    Removes a complex
     [Arguments]    ${physical_location_id}
     ${get_resp}=    Run A&AI Get Request     ${COMPLEX_INDEX_PATH}${ROOT_COMPLEX_PATH}/${physical_location_id}
-    Run Keyword If    '${get_resp.status_code}' == '200'    Delete Zone Exists    ${physical_location_id}   ${get_resp.json()}
+    Run Keyword If    '${get_resp.status_code}' == '200'    Delete Complex    ${physical_location_id}   ${get_resp.json()}
 
 Delete Complex
     [Arguments]    ${physical_location_id}    ${json}
diff --git a/robot/resources/aai/create_service.robot b/robot/resources/aai/create_service.robot
index bcf14e3..49864b8 100644
--- a/robot/resources/aai/create_service.robot
+++ b/robot/resources/aai/create_service.robot
@@ -67,7 +67,7 @@
 Update Service Dictionary
     [Arguments]    ${dict}    ${json}
     ${list}=    Evaluate    ${json}['service']
-    :for   ${map}    in    @{list}
+    :FOR   ${map}    IN    @{list}
     \    ${status}    ${service_type}=     Run Keyword And Ignore Error    Get From Dictionary    ${map}    service-description
     \    Run Keyword If    '${status}' == 'PASS'    Set To Dictionary    ${dict}    ${service_type}=${map}
     Log    ${dict}
diff --git a/robot/resources/aai/create_tenant.robot b/robot/resources/aai/create_tenant.robot
index 95f1c25..99d3a08 100644
--- a/robot/resources/aai/create_tenant.robot
+++ b/robot/resources/aai/create_tenant.robot
@@ -89,7 +89,7 @@
 Update Tenant Dictionary
     [Arguments]    ${dict}    ${json}
     ${list}=    Evaluate    ${json}['tenant']
-    :for   ${map}    in    @{list}
+    :FOR   ${map}    IN    @{list}
     \    ${status}    ${tenant_id}=     Run Keyword And Ignore Error    Get From Dictionary    ${map}    tenant-id
     \    Run Keyword If    '${status}' == 'PASS'    Set To Dictionary    ${dict}    ${tenant_id}=${map}
     Log    ${dict}