diff --git a/app/src/googleplay/java/org/tasks/injection/LocationModule.kt b/app/src/googleplay/java/org/tasks/injection/LocationModule.kt
index fbf009cf5..9ae25cd1a 100644
--- a/app/src/googleplay/java/org/tasks/injection/LocationModule.kt
+++ b/app/src/googleplay/java/org/tasks/injection/LocationModule.kt
@@ -30,7 +30,7 @@ internal class LocationModule {
         return if (preferences.useGooglePlaces()
                 && playServices.isPlayServicesAvailable
                 && inventory.hasPro) {
-            GooglePlacesSearchProvider(context)
+            PlaceSearchGoogle(context)
         } else {
             mapboxSearchProvider
         }
diff --git a/app/src/googleplay/java/org/tasks/location/GooglePlacesSearchProvider.kt b/app/src/googleplay/java/org/tasks/location/PlaceSearchGoogle.kt
similarity index 98%
rename from app/src/googleplay/java/org/tasks/location/GooglePlacesSearchProvider.kt
rename to app/src/googleplay/java/org/tasks/location/PlaceSearchGoogle.kt
index 3ab9ae289..17f65cdac 100644
--- a/app/src/googleplay/java/org/tasks/location/GooglePlacesSearchProvider.kt
+++ b/app/src/googleplay/java/org/tasks/location/PlaceSearchGoogle.kt
@@ -17,7 +17,7 @@ import org.tasks.data.Place
 import org.tasks.data.Place.Companion.newPlace
 import kotlin.coroutines.suspendCoroutine
 
-class GooglePlacesSearchProvider(private val context: Context) : PlaceSearchProvider {
+class PlaceSearchGoogle(private val context: Context) : PlaceSearch {
     private var token: AutocompleteSessionToken? = null
     private var placesClient: PlacesClient? = null
 
diff --git a/app/src/main/java/org/tasks/location/PlaceSearchProvider.kt b/app/src/main/java/org/tasks/location/PlaceSearch.kt
similarity index 87%
rename from app/src/main/java/org/tasks/location/PlaceSearchProvider.kt
rename to app/src/main/java/org/tasks/location/PlaceSearch.kt
index b4439c15b..d029e061c 100644
--- a/app/src/main/java/org/tasks/location/PlaceSearchProvider.kt
+++ b/app/src/main/java/org/tasks/location/PlaceSearch.kt
@@ -2,10 +2,9 @@ package org.tasks.location
 
 import android.os.Bundle
 import androidx.annotation.DrawableRes
-import org.tasks.Callback
 import org.tasks.data.Place
 
-interface PlaceSearchProvider {
+interface PlaceSearch {
     fun restoreState(savedInstanceState: Bundle?)
 
     fun saveState(outState: Bundle)
diff --git a/app/src/main/java/org/tasks/location/MapboxSearchProvider.kt b/app/src/main/java/org/tasks/location/PlaceSearchMapbox.kt
similarity index 97%
rename from app/src/main/java/org/tasks/location/MapboxSearchProvider.kt
rename to app/src/main/java/org/tasks/location/PlaceSearchMapbox.kt
index c35870a58..2f7807f13 100644
--- a/app/src/main/java/org/tasks/location/MapboxSearchProvider.kt
+++ b/app/src/main/java/org/tasks/location/PlaceSearchMapbox.kt
@@ -16,11 +16,11 @@ import org.tasks.preferences.Preferences
 import java.io.IOException
 import javax.inject.Inject
 
-class MapboxSearchProvider @Inject constructor(
+class PlaceSearchMapbox @Inject constructor(
         @ApplicationContext context: Context,
         private val preferences: Preferences,
         private val interceptor: DebugNetworkInterceptor,
-) : PlaceSearchProvider {
+) : PlaceSearch {
     val token = context.getString(R.string.mapbox_key)
 
     override fun restoreState(savedInstanceState: Bundle?) {}
diff --git a/app/src/main/java/org/tasks/location/PlaceSearchViewModel.kt b/app/src/main/java/org/tasks/location/PlaceSearchViewModel.kt
index 3c2e5c6a9..1d3005217 100644
--- a/app/src/main/java/org/tasks/location/PlaceSearchViewModel.kt
+++ b/app/src/main/java/org/tasks/location/PlaceSearchViewModel.kt
@@ -10,7 +10,7 @@ import javax.inject.Inject
 
 @HiltViewModel
 class PlaceSearchViewModel @Inject constructor(
-        private val searchProvider: PlaceSearchProvider
+        private val search: PlaceSearch
 ): ViewModel() {
     private val searchResults = MutableLiveData<List<PlaceSearchResult>>()
     private val error = MutableLiveData<Event<String>>()
@@ -27,11 +27,11 @@ class PlaceSearchViewModel @Inject constructor(
     }
 
     fun saveState(outState: Bundle) {
-        searchProvider.saveState(outState)
+        search.saveState(outState)
     }
 
     fun restoreState(savedInstanceState: Bundle?) {
-        searchProvider.restoreState(savedInstanceState)
+        search.restoreState(savedInstanceState)
     }
 
     fun query(query: String?, bias: MapPosition?) = viewModelScope.launch {
@@ -39,7 +39,7 @@ class PlaceSearchViewModel @Inject constructor(
             searchResults.postValue(emptyList())
         } else {
             try {
-                searchResults.value = searchProvider.search(query, bias)
+                searchResults.value = search.search(query, bias)
             } catch (e: Exception) {
                 e.message?.let { setError(it) }
             }
@@ -48,7 +48,7 @@ class PlaceSearchViewModel @Inject constructor(
 
     fun fetch(result: PlaceSearchResult) = viewModelScope.launch {
         try {
-            selection.value = searchProvider.fetch(result)
+            selection.value = search.fetch(result)
         } catch (e: Exception) {
             e.message?.let { setError(it) }
         }
@@ -58,5 +58,5 @@ class PlaceSearchViewModel @Inject constructor(
         error.value = Event(message)
     }
 
-    fun getAttributionRes(dark: Boolean) = searchProvider.getAttributionRes(dark)
+    fun getAttributionRes(dark: Boolean) = search.getAttributionRes(dark)
 }
\ No newline at end of file
diff --git a/app/src/test/java/org/tasks/location/MapboxPlaceSearchTest.kt b/app/src/test/java/org/tasks/location/PlaceSearchMapboxTest.kt
similarity index 91%
rename from app/src/test/java/org/tasks/location/MapboxPlaceSearchTest.kt
rename to app/src/test/java/org/tasks/location/PlaceSearchMapboxTest.kt
index 1dab4350c..9c5b82dc9 100644
--- a/app/src/test/java/org/tasks/location/MapboxPlaceSearchTest.kt
+++ b/app/src/test/java/org/tasks/location/PlaceSearchMapboxTest.kt
@@ -4,9 +4,9 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.tasks.TestUtilities.readFile
-import org.tasks.location.MapboxSearchProvider.Companion.jsonToSearchResults
+import org.tasks.location.PlaceSearchMapbox.Companion.jsonToSearchResults
 
-class MapboxPlaceSearchTest {
+class PlaceSearchMapboxTest {
     @Test
     fun searchWithMultipleResults() {
         val results = jsonToSearchResults(readFile("mapbox/search.json"))