change attribute names, fix typos