Improve naming and example