Updates and fixes to renaming