Scenarios: renamed a few