Improve naming
Improve message wording