fix typos & naming