Handle generate name conflicts