Sort table and update some name typos