more renaming of stuff