Renamed more isntances of typeahead