fix naming problems, fix typos