Multiple renames + logic change