Fixes to renaming