| Library | resources/libraries/python/honeycomb/HcPersistence.py
| Resource | resources/libraries/robot/default.robot
| Resource | resources/libraries/robot/honeycomb/honeycomb.robot
-| Suite Setup | Run Keywords | Setup All DUTs Before Test | AND
+| ...
+| Suite Setup | Run Keywords | Configure all DUTs before test | AND
| ... | Configure Honeycomb for testing | ${node} | AND
| ... | Configure ODL Client for testing | ${node} | AND
| ... | Set Global Variable | ${node}
-| Suite Teardown
-| ... | Archive Honeycomb log file | ${node}
+| ...
+| Suite Teardown | Archive Honeycomb log file | ${node}
*** Keywords ***
| Configure Honeycomb for testing
| | Configure Persistence | ${node} | disable
| | Configure jVPP timeout | ${node} | ${14}
| | Clear Persisted Honeycomb Configuration | ${node}
-| | Setup Honeycomb Service On DUTs | ${node}
+| | Configure Honeycomb service on DUTs | ${node}
| Configure ODL Client for testing
| | [Arguments] | ${node}
| | Run Keyword If | '${use_odl_client}' != '${NONE}'
| | ... | Run Keywords
| | ... | Set Global Variable | ${use_odl_client} | AND
-| | ... | Setup ODL Client Service On DUT | ${node} | ${use_odl_client}
+| | ... | Configure ODL Client Service On DUT | ${node} | ${use_odl_client}
| | ... | ELSE | Log | Variable HC_ODL is not present. Not using ODL.
| | ... | level=INFO