fix up id names