Rename improvements