Change naming based on changes in the search mapping model