Improve naming and messages