Refactor name to search_api file and class