Rename ScenarioTest and friends