Rename ids, and fix typos