Improve naming for autocomplete