fix name and id