more renaming fixes