rename classes & fix typos