Fixes to rename