Improve the name of some selectors and variables