Scenarios refactoring and renaming