Support auto-rename when public_id has random component