diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java
index 201fe3ddd..3ad3681a9 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java
@@ -725,7 +725,7 @@ public class ExportImportTest {
         SensorManager sensorManager = trackPointCreator.getSensorManager();
 
         if (altitudeGain == null) {
-            sensorManager.getAltitudeSumManager().setAggregator(new AggregatorBarometer("test", null));
+            sensorManager.getAltitudeChangeHandler().setAggregator(new AggregatorBarometer("test", null));
             return;
         }
 
@@ -741,7 +741,7 @@ public class ExportImportTest {
                 return true;
             }
         };
-        sensorManager.getAltitudeSumManager().setAggregator(aggregatorBarometer);
+        sensorManager.getAltitudeChangeHandler().setAggregator(aggregatorBarometer);
     }
 
     private void sendLocation(TrackPointCreator trackPointCreator, String time, double latitude, double longitude, float accuracy, float verticalAccuracy, float speed, double altitude, Float altitudeGain) {
diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceRecordingTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceRecordingTest.java
index ae74caa10..2d2b74e05 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceRecordingTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceRecordingTest.java
@@ -972,7 +972,7 @@ public class TrackRecordingServiceRecordingTest {
     }
 
     private void mockAltitudeChange(TrackPointCreator trackPointCreator, float altitudeGain) {
-        trackPointCreator.getSensorManager().getAltitudeSumManager().setAggregator(new AggregatorBarometer("", "") {
+        trackPointCreator.getSensorManager().getAltitudeChangeHandler().setAggregator(new AggregatorBarometer("", "") {
             @Override
             public boolean hasReceivedData() {
                 return true;
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/GainManager.java b/src/main/java/de/dennisguse/opentracks/sensors/AltitudeChangeHandler.java
similarity index 90%
rename from src/main/java/de/dennisguse/opentracks/sensors/GainManager.java
rename to src/main/java/de/dennisguse/opentracks/sensors/AltitudeChangeHandler.java
index 64a67ff0c..f909fc077 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/GainManager.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/AltitudeChangeHandler.java
@@ -15,9 +15,9 @@ import de.dennisguse.opentracks.sensors.sensorData.AggregatorBarometer;
  * Estimates the altitude gain and altitude loss using the device's pressure sensor (i.e., barometer).
  */
 //TODO Rename class
-public class GainManager extends SensorHandler<AtmosphericPressure> {
+public class AltitudeChangeHandler extends SensorHandler<AtmosphericPressure> {
 
-    public GainManager(SensorManager sensorManager) {
+    public AltitudeChangeHandler(SensorManager sensorManager) {
         super(sensorManager);
     }
 
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java b/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java
index 0bf27eec2..ab67bdef6 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java
@@ -17,7 +17,6 @@ import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.HeartRate;
 import de.dennisguse.opentracks.data.models.Position;
 import de.dennisguse.opentracks.data.models.Speed;
-import de.dennisguse.opentracks.sensors.driver.BluetoothDriver;
 import de.dennisguse.opentracks.sensors.sensorData.Aggregator;
 import de.dennisguse.opentracks.sensors.sensorData.AggregatorBarometer;
 import de.dennisguse.opentracks.sensors.sensorData.AggregatorCyclingCadence;
@@ -53,7 +52,7 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
     private CyclingPowerHandler cyclingPowerHandler;
     private RunningSpeedCadenceDistanceHandler runningSpeedCadenceDistanceHandler;
 
-    private GainManager altitudeSumManager;
+    private AltitudeChangeHandler altitudeChangeHandler;
 
     private GpsManager gpsManager;
 
@@ -71,7 +70,7 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
         this.handler = handler;
 
         gpsManager = new GpsManager(observer, this);
-        altitudeSumManager = new GainManager(this);
+        altitudeChangeHandler = new AltitudeChangeHandler(this);
         this.heartRateHandler = new HeartRateHandler(this);
         this.temperatureHandler = new TemperatureHandler(this);
         this.cyclingCadenceHandler = new CyclingCadenceHandler(this);
@@ -79,7 +78,7 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
         this.cyclingPowerHandler = new CyclingPowerHandler(this);
         this.runningSpeedCadenceDistanceHandler = new RunningSpeedCadenceDistanceHandler(this);
 
-        altitudeSumManager.start(context, handler);
+        altitudeChangeHandler.start(context, handler);
         heartRateHandler.start(context, handler);
         temperatureHandler.start(context, handler);
         cyclingCadenceHandler.start(context, handler);
@@ -113,8 +112,8 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
         runningSpeedCadenceDistanceHandler.stop();
         runningSpeedCadenceDistanceHandler = null;
 
-        altitudeSumManager.stop();
-        altitudeSumManager = null;
+        altitudeChangeHandler.stop();
+        altitudeChangeHandler = null;
 
         gpsManager.stop();
         gpsManager = null;
@@ -124,7 +123,7 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
     }
 
     public void reset() {
-        if (gpsManager == null || altitudeSumManager == null) {
+        if (gpsManager == null || altitudeChangeHandler == null) {
             Log.d(TAG, "No recording running and no reset necessary.");
             return;
         }
@@ -137,7 +136,7 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
         if (cyclingDistanceSpeedHandler.getAggregator() != null) cyclingDistanceSpeedHandler.getAggregator().resetAggregated();
         if (cyclingPowerHandler.getAggregator() != null) cyclingPowerHandler.getAggregator().resetAggregated();
         if (runningSpeedCadenceDistanceHandler.getAggregator() != null) runningSpeedCadenceDistanceHandler.getAggregator().resetAggregated();
-        if (altitudeSumManager.getAggregator() != null) altitudeSumManager.getAggregator().resetAggregated();
+        if (altitudeChangeHandler.getAggregator() != null) altitudeChangeHandler.getAggregator().resetAggregated();
         if (gpsManager.getAggregatorGPS() != null) gpsManager.getAggregatorGPS().resetAggregated();
     }
 
@@ -147,18 +146,8 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
 
     @Deprecated
     @VisibleForTesting
-    public GainManager getAltitudeSumManager() {
-        return altitudeSumManager;
-    }
-
-    @Deprecated
-    @VisibleForTesting
-    public void setAltitudeSumManager(GainManager altitudeSumManager) {
-        this.altitudeSumManager = altitudeSumManager;
-    }
-
-    private synchronized void connect(BluetoothDriver connectionManager, String address) {
-        connectionManager.connect(context, handler, address);
+    public AltitudeChangeHandler getAltitudeChangeHandler() {
+        return altitudeChangeHandler;
     }
 
     @Override
@@ -166,8 +155,8 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
         if (gpsManager != null) {
             gpsManager.onSharedPreferenceChanged(sharedPreferences, key);
 
-            if (PreferencesUtils.isKey(altitudeSumManager.getSensorPreferenceKey(), key)) {
-                altitudeSumManager.connect();
+            if (PreferencesUtils.isKey(altitudeChangeHandler.getSensorPreferenceKey(), key)) {
+                altitudeChangeHandler.connect();
             }
 
             if (PreferencesUtils.isKey(heartRateHandler.getSensorPreferenceKey(), key)) {
@@ -292,8 +281,8 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
         Log.i(TAG, "Removing all aggregators");
 
         //TODO This is to ExportImportTest alive; refactor test.
-        if (this.altitudeSumManager != null) {
-            this.altitudeSumManager.setAggregator(null);
+        if (this.altitudeChangeHandler != null) {
+            this.altitudeChangeHandler.setAggregator(null);
         }
         if (this.heartRateHandler != null) {
             this.heartRateHandler.setAggregator(null);
@@ -320,7 +309,7 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange
 
     public SensorDataSet getSensorDataSet(Instant now) {
         AggregatorGPS gps = gpsManager.getAggregatorGPS();
-        AggregatorBarometer barometer = (AggregatorBarometer) altitudeSumManager.getAggregator();
+        AggregatorBarometer barometer = (AggregatorBarometer) altitudeChangeHandler.getAggregator();
 
         return new SensorDataSet(
                 gps != null && gps.hasReceivedData() ? gps.getAggregatedValueWithSensorName(now) : new SensorData<>(Position.of(now), ""),