Add fix for ID clash while renaming