make id and name more accurate