Fix typo and name creation