Changed typeahead naming to be more intuitive