Improve naming