Revising setup/teardown script names