more renaming work