Merge "Rename EntryProvider as SpaSearchProvider"