name and id fix