Fix wording
Fix scenario names