Clean up and renaming to 'scenario'.