diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/handlers/GPSHandlerTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/handlers/GPSManagerTest.java
similarity index 98%
rename from src/androidTest/java/de/dennisguse/opentracks/services/handlers/GPSHandlerTest.java
rename to src/androidTest/java/de/dennisguse/opentracks/services/handlers/GPSManagerTest.java
index d83727926..2021c424d 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/services/handlers/GPSHandlerTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/services/handlers/GPSManagerTest.java
@@ -26,7 +26,7 @@ import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 
 @RunWith(MockitoJUnitRunner.class)
-public class GPSHandlerTest {
+public class GPSManagerTest {
 
     private final Context context = ApplicationProvider.getApplicationContext();
 
@@ -34,7 +34,7 @@ public class GPSHandlerTest {
     private TrackPointCreator trackPointCreator;
 
     @InjectMocks
-    private GPSHandler locationHandler;
+    private GPSManager locationHandler;
 
     @BeforeClass
     public static void preSetUp() {
diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/handlers/TrackPointCreatorTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/handlers/TrackPointCreatorTest.java
index e10fb963e..0b6519fe5 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/services/handlers/TrackPointCreatorTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/services/handlers/TrackPointCreatorTest.java
@@ -25,7 +25,7 @@ public class TrackPointCreatorTest {
     private TrackPointCreator.Callback server;
 
     @Mock
-    private GPSHandler locationHandler;
+    private GPSManager locationHandler;
 
     private TrackPointCreator subject;
 
diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/GPSHandler.java b/src/main/java/de/dennisguse/opentracks/services/handlers/GPSManager.java
similarity index 97%
rename from src/main/java/de/dennisguse/opentracks/services/handlers/GPSHandler.java
rename to src/main/java/de/dennisguse/opentracks/services/handlers/GPSManager.java
index 0d1ae1092..2174b0a54 100644
--- a/src/main/java/de/dennisguse/opentracks/services/handlers/GPSHandler.java
+++ b/src/main/java/de/dennisguse/opentracks/services/handlers/GPSManager.java
@@ -26,9 +26,9 @@ import de.dennisguse.opentracks.util.LocationUtils;
 import de.dennisguse.opentracks.util.PermissionRequester;
 
 @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-public class GPSHandler implements SensorConnector, LocationListenerCompat, GpsStatus.GpsStatusListener, SharedPreferences.OnSharedPreferenceChangeListener {
+public class GPSManager implements SensorConnector, LocationListenerCompat, GpsStatus.GpsStatusListener, SharedPreferences.OnSharedPreferenceChangeListener {
 
-    private final String TAG = GPSHandler.class.getSimpleName();
+    private final String TAG = GPSManager.class.getSimpleName();
 
     public static final String LOCATION_PROVIDER = LocationManager.GPS_PROVIDER;
 
@@ -41,7 +41,7 @@ public class GPSHandler implements SensorConnector, LocationListenerCompat, GpsS
     private Duration gpsInterval;
     private Distance thresholdHorizontalAccuracy;
 
-    public GPSHandler(TrackPointCreator trackPointCreator) {
+    public GPSManager(TrackPointCreator trackPointCreator) {
         this.trackPointCreator = trackPointCreator;
     }
 
diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java b/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java
index 598468d34..744760401 100644
--- a/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java
+++ b/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java
@@ -33,25 +33,25 @@ public class TrackPointCreator implements SensorManager.SensorDataSetChangeObser
     @NonNull
     private Clock clock = new MonotonicClock();
 
-    private final GPSHandler gpsHandler;
+    private final GPSManager gpsManager;
     private SensorManager sensorManager;
 
     public TrackPointCreator(Callback service, Context context, Handler handler) {
         this.service = service;
-        this.gpsHandler = new GPSHandler(this);
+        this.gpsManager = new GPSManager(this);
         this.sensorManager = new SensorManager(context, handler, this);
     }
 
     @VisibleForTesting
-    TrackPointCreator(GPSHandler gpsHandler, Callback service) {
+    TrackPointCreator(GPSManager gpsManager, Callback service) {
         this.service = service;
-        this.gpsHandler = gpsHandler;
+        this.gpsManager = gpsManager;
     }
 
     public synchronized void start(@NonNull Context context, @NonNull Handler handler) {
         this.context = context;
 
-        gpsHandler.start(context, handler);
+        gpsManager.start(context, handler);
         sensorManager.start(context, handler);
     }
 
@@ -73,7 +73,7 @@ public class TrackPointCreator implements SensorManager.SensorDataSetChangeObser
     }
 
     public synchronized void stop() {
-        gpsHandler.stop(context);
+        gpsManager.stop(context);
 
         this.context = null;
     }
@@ -94,7 +94,7 @@ public class TrackPointCreator implements SensorManager.SensorDataSetChangeObser
     public void onNewTrackPoint(@NonNull TrackPoint trackPoint) {
         addSensorData(trackPoint);
 
-        boolean stored = service.newTrackPoint(trackPoint, gpsHandler.getThresholdHorizontalAccuracy());
+        boolean stored = service.newTrackPoint(trackPoint, gpsManager.getThresholdHorizontalAccuracy());
         if (stored) {
             reset();
         }
@@ -153,8 +153,8 @@ public class TrackPointCreator implements SensorManager.SensorDataSetChangeObser
     }
 
     @VisibleForTesting
-    public GPSHandler getGpsHandler() {
-        return gpsHandler;
+    public GPSManager getGpsHandler() {
+        return gpsManager;
     }
 
     void sendGpsStatus(GpsStatusValue gpsStatusValue) {