Make naming of selectors argument more consistent