Use consistent naming in tempest suite