fix name/id conflation