more renaming of _type