scenarios: renamed a few