Fix id and name