Improve naming
Fix typo