Fix typo and change names