fix typo and aligning names