More renames - mostly in strings this time
Merge pull request #1841 from christav/scenario-test-fixes

More renames - mostly in strings this time