Improve naming
Fix typo in message