diff --git a/app/src/generic/java/org/tasks/injection/FlavorModule.kt b/app/src/generic/java/org/tasks/injection/FlavorModule.kt
index 9553a9d04..c324e6fdb 100644
--- a/app/src/generic/java/org/tasks/injection/FlavorModule.kt
+++ b/app/src/generic/java/org/tasks/injection/FlavorModule.kt
@@ -6,14 +6,14 @@ import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import org.tasks.location.AndroidGeofencing
 import org.tasks.location.Geocoder
+import org.tasks.location.GeocoderNominatim
 import org.tasks.location.Geofencing
-import org.tasks.location.NominatimGeocoder
 
 @Module
 @InstallIn(SingletonComponent::class)
 class FlavorModule {
     @Provides
-    fun getGeocoder(geocoder: NominatimGeocoder): Geocoder = geocoder
+    fun getGeocoder(geocoder: GeocoderNominatim): Geocoder = geocoder
 
     @Provides
     fun getGeofencing(geofencing: AndroidGeofencing): Geofencing = geofencing
diff --git a/app/src/googleplay/java/org/tasks/injection/FlavorModule.kt b/app/src/googleplay/java/org/tasks/injection/FlavorModule.kt
index 4b81e5542..06976c881 100644
--- a/app/src/googleplay/java/org/tasks/injection/FlavorModule.kt
+++ b/app/src/googleplay/java/org/tasks/injection/FlavorModule.kt
@@ -4,16 +4,13 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import org.tasks.location.Geocoder
-import org.tasks.location.Geofencing
-import org.tasks.location.GoogleGeofencing
-import org.tasks.location.MapboxGeocoder
+import org.tasks.location.*
 
 @Module
 @InstallIn(SingletonComponent::class)
 class FlavorModule {
     @Provides
-    fun getGeocoder(geocoder: MapboxGeocoder): Geocoder = geocoder
+    fun getGeocoder(geocoder: GeocoderMapbox): Geocoder = geocoder
 
     @Provides
     fun getGeofencing(geofencing: GoogleGeofencing): Geofencing = geofencing
diff --git a/app/src/main/java/org/tasks/location/AndroidGeocoder.kt b/app/src/main/java/org/tasks/location/GeocoderAndroid.kt
similarity index 88%
rename from app/src/main/java/org/tasks/location/AndroidGeocoder.kt
rename to app/src/main/java/org/tasks/location/GeocoderAndroid.kt
index 48aca521a..0d5a33271 100644
--- a/app/src/main/java/org/tasks/location/AndroidGeocoder.kt
+++ b/app/src/main/java/org/tasks/location/GeocoderAndroid.kt
@@ -1,15 +1,12 @@
 package org.tasks.location
 
 import android.content.Context
-import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.tasks.data.Place
 import org.tasks.data.Place.Companion.newPlace
-import javax.inject.Inject
 
-@Suppress("unused")
-class AndroidGeocoder @Inject constructor(@ApplicationContext context: Context) : Geocoder {
+class GeocoderAndroid constructor(context: Context) : Geocoder {
     private val geocoder = if (android.location.Geocoder.isPresent()) {
         android.location.Geocoder(context)
     } else {
diff --git a/app/src/main/java/org/tasks/location/MapboxGeocoder.kt b/app/src/main/java/org/tasks/location/GeocoderMapbox.kt
similarity index 98%
rename from app/src/main/java/org/tasks/location/MapboxGeocoder.kt
rename to app/src/main/java/org/tasks/location/GeocoderMapbox.kt
index 70cf469e0..6da26878c 100644
--- a/app/src/main/java/org/tasks/location/MapboxGeocoder.kt
+++ b/app/src/main/java/org/tasks/location/GeocoderMapbox.kt
@@ -17,7 +17,7 @@ import org.tasks.preferences.Preferences
 import java.io.IOException
 import javax.inject.Inject
 
-class MapboxGeocoder @Inject constructor(
+class GeocoderMapbox @Inject constructor(
         @ApplicationContext context: Context,
         private val preferences: Preferences,
         private val interceptor: DebugNetworkInterceptor,
diff --git a/app/src/main/java/org/tasks/location/NominatimGeocoder.kt b/app/src/main/java/org/tasks/location/GeocoderNominatim.kt
similarity index 98%
rename from app/src/main/java/org/tasks/location/NominatimGeocoder.kt
rename to app/src/main/java/org/tasks/location/GeocoderNominatim.kt
index eff246414..f1708e21e 100644
--- a/app/src/main/java/org/tasks/location/NominatimGeocoder.kt
+++ b/app/src/main/java/org/tasks/location/GeocoderNominatim.kt
@@ -14,7 +14,7 @@ import org.tasks.preferences.Preferences
 import java.io.IOException
 import javax.inject.Inject
 
-class NominatimGeocoder @Inject constructor(
+class GeocoderNominatim @Inject constructor(
         private val preferences: Preferences,
         private val interceptor: DebugNetworkInterceptor,
 ) : Geocoder {
diff --git a/app/src/main/java/org/tasks/location/MapboxSearchProvider.kt b/app/src/main/java/org/tasks/location/MapboxSearchProvider.kt
index b36bba783..c35870a58 100644
--- a/app/src/main/java/org/tasks/location/MapboxSearchProvider.kt
+++ b/app/src/main/java/org/tasks/location/MapboxSearchProvider.kt
@@ -11,7 +11,7 @@ import okhttp3.Request
 import org.tasks.DebugNetworkInterceptor
 import org.tasks.R
 import org.tasks.data.Place
-import org.tasks.location.MapboxGeocoder.Companion.toPlace
+import org.tasks.location.GeocoderMapbox.Companion.toPlace
 import org.tasks.preferences.Preferences
 import java.io.IOException
 import javax.inject.Inject
diff --git a/app/src/test/java/org/tasks/location/MapboxGeocoderTest.kt b/app/src/test/java/org/tasks/location/GeocoderMapboxTest.kt
similarity index 91%
rename from app/src/test/java/org/tasks/location/MapboxGeocoderTest.kt
rename to app/src/test/java/org/tasks/location/GeocoderMapboxTest.kt
index 590b40b48..a7d64d2a2 100644
--- a/app/src/test/java/org/tasks/location/MapboxGeocoderTest.kt
+++ b/app/src/test/java/org/tasks/location/GeocoderMapboxTest.kt
@@ -3,9 +3,9 @@ package org.tasks.location
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.tasks.TestUtilities.readFile
-import org.tasks.location.MapboxGeocoder.Companion.jsonToPlace
+import org.tasks.location.GeocoderMapbox.Companion.jsonToPlace
 
-class MapboxGeocoderTest {
+class GeocoderMapboxTest {
     @Test
     fun poiGeocode() {
         val place = jsonToPlace(readFile("mapbox/poi.json"))!!
diff --git a/app/src/test/java/org/tasks/location/NominatimGeocoderTest.kt b/app/src/test/java/org/tasks/location/GeocoderNominatimTest.kt
similarity index 85%
rename from app/src/test/java/org/tasks/location/NominatimGeocoderTest.kt
rename to app/src/test/java/org/tasks/location/GeocoderNominatimTest.kt
index c45483c30..9892793aa 100644
--- a/app/src/test/java/org/tasks/location/NominatimGeocoderTest.kt
+++ b/app/src/test/java/org/tasks/location/GeocoderNominatimTest.kt
@@ -4,10 +4,10 @@ import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.tasks.TestUtilities.readFile
 
-class NominatimGeocoderTest {
+class GeocoderNominatimTest {
     @Test
     fun pitchGeocode() {
-        val place = NominatimGeocoder.jsonToPlace(readFile("nominatim/pitch.json"))!!
+        val place = GeocoderNominatim.jsonToPlace(readFile("nominatim/pitch.json"))!!
 
         assertEquals("Guaranteed Rate Field", place.name)
         assertEquals(-87.63362064328714, place.longitude, 0.0)
@@ -20,7 +20,7 @@ class NominatimGeocoderTest {
 
     @Test
     fun houseGeocode() {
-        val place = NominatimGeocoder.jsonToPlace(readFile("nominatim/house.json"))!!
+        val place = GeocoderNominatim.jsonToPlace(readFile("nominatim/house.json"))!!
 
         assertEquals("1 Løvenbergvegen", place.name)
         assertEquals(11.1658572, place.longitude, 0.0)