Some more renaming edits.