More renames - mostly in strings this time

More renaming updates, found as part of fixing failing scenario tests.