diff --git a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionManager.java b/src/main/java/de/dennisguse/opentracks/sensors/AbstractBluetoothConnectionManager.java
similarity index 95%
rename from src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionManager.java
rename to src/main/java/de/dennisguse/opentracks/sensors/AbstractBluetoothConnectionManager.java
index 4fd4fa595..366469931 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionManager.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/AbstractBluetoothConnectionManager.java
@@ -40,9 +40,9 @@ import de.dennisguse.opentracks.sensors.sensorData.SensorData;
  * Manages connection to a Bluetooth LE sensor and subscribes for onChange-notifications.
  * Also parses the transferred data into {@link SensorDataObserver}.
  */
-public abstract class BluetoothConnectionManager<DataType> {
+public abstract class AbstractBluetoothConnectionManager<DataType> {
 
-    private static final String TAG = BluetoothConnectionManager.class.getSimpleName();
+    private static final String TAG = AbstractBluetoothConnectionManager.class.getSimpleName();
 
     private final SensorDataObserver observer;
 
@@ -136,12 +136,12 @@ public abstract class BluetoothConnectionManager<DataType> {
         }
     };
 
-    BluetoothConnectionManager(ServiceMeasurementUUID serviceUUUID, SensorDataObserver observer) {
+    AbstractBluetoothConnectionManager(ServiceMeasurementUUID serviceUUUID, SensorDataObserver observer) {
         this.serviceMeasurementUUIDs = List.of(serviceUUUID);
         this.observer = observer;
     }
 
-    BluetoothConnectionManager(List<ServiceMeasurementUUID> serviceUUUID, SensorDataObserver observer) {
+    AbstractBluetoothConnectionManager(List<ServiceMeasurementUUID> serviceUUUID, SensorDataObserver observer) {
         this.serviceMeasurementUUIDs = serviceUUUID;
         this.observer = observer;
     }
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManagerCyclingCadence.java b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionManagerCyclingCadence.java
similarity index 85%
rename from src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManagerCyclingCadence.java
rename to src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionManagerCyclingCadence.java
index b6a2cb9af..98dd68ba7 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManagerCyclingCadence.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionManagerCyclingCadence.java
@@ -8,11 +8,11 @@ import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingCadence;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingCadenceAndDistanceSpeed;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingPower;
 
-public class BluetoothRemoteSensorManagerCyclingCadence extends BluetoothConnectionManager<Cadence> {
+public class BluetoothConnectionManagerCyclingCadence extends AbstractBluetoothConnectionManager<Cadence> {
 
-    private static final String TAG = BluetoothRemoteSensorManagerCyclingCadence.class.getSimpleName();
+    private static final String TAG = BluetoothConnectionManagerCyclingCadence.class.getSimpleName();
 
-    BluetoothRemoteSensorManagerCyclingCadence(SensorDataObserver observer) {
+    BluetoothConnectionManagerCyclingCadence(SensorDataObserver observer) {
         super(BluetoothUtils.CYCLING_CADENCE, observer);
     }
 
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManagerCyclingDistanceSpeed.java b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionManagerCyclingDistanceSpeed.java
similarity index 82%
rename from src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManagerCyclingDistanceSpeed.java
rename to src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionManagerCyclingDistanceSpeed.java
index e6bfba003..538183ea6 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManagerCyclingDistanceSpeed.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionManagerCyclingDistanceSpeed.java
@@ -5,9 +5,9 @@ import android.bluetooth.BluetoothGattCharacteristic;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingCadenceAndDistanceSpeed;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingDistanceSpeed;
 
-public class BluetoothRemoteSensorManagerCyclingDistanceSpeed extends BluetoothConnectionManager<SensorDataCyclingDistanceSpeed.Data> {
+public class BluetoothConnectionManagerCyclingDistanceSpeed extends AbstractBluetoothConnectionManager<SensorDataCyclingDistanceSpeed.Data> {
 
-    BluetoothRemoteSensorManagerCyclingDistanceSpeed(SensorDataObserver observer) {
+    BluetoothConnectionManagerCyclingDistanceSpeed(SensorDataObserver observer) {
         super(BluetoothUtils.CYCLING_SPEED_CADENCE, observer);
     }
 
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManagerCyclingPower.java b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionManagerCyclingPower.java
similarity index 82%
rename from src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManagerCyclingPower.java
rename to src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionManagerCyclingPower.java
index f94b8bf76..7803ed416 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManagerCyclingPower.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionManagerCyclingPower.java
@@ -7,9 +7,9 @@ import androidx.annotation.NonNull;
 import de.dennisguse.opentracks.data.models.Power;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataCyclingPower;
 
-public class BluetoothRemoteSensorManagerCyclingPower extends BluetoothConnectionManager<Power> {
+public class BluetoothConnectionManagerCyclingPower extends AbstractBluetoothConnectionManager<Power> {
 
-    BluetoothRemoteSensorManagerCyclingPower(@NonNull SensorDataObserver observer) {
+    BluetoothConnectionManagerCyclingPower(@NonNull SensorDataObserver observer) {
         super(BluetoothUtils.CYCLING_POWER, observer);
     }
 
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManagerHeartRate.java b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionManagerHeartRate.java
similarity index 82%
rename from src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManagerHeartRate.java
rename to src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionManagerHeartRate.java
index fa831edcf..b8271920b 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManagerHeartRate.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionManagerHeartRate.java
@@ -7,9 +7,9 @@ import androidx.annotation.NonNull;
 import de.dennisguse.opentracks.data.models.HeartRate;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataHeartRate;
 
-public class BluetoothRemoteSensorManagerHeartRate extends BluetoothConnectionManager<HeartRate> {
+public class BluetoothConnectionManagerHeartRate extends AbstractBluetoothConnectionManager<HeartRate> {
 
-    BluetoothRemoteSensorManagerHeartRate(@NonNull SensorDataObserver observer) {
+    BluetoothConnectionManagerHeartRate(@NonNull SensorDataObserver observer) {
         super(BluetoothUtils.HEARTRATE, observer);
     }
 
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManagerRunningSpeedAndCadence.java b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionRunningSpeedAndCadence.java
similarity index 76%
rename from src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManagerRunningSpeedAndCadence.java
rename to src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionRunningSpeedAndCadence.java
index 73b11b38c..42c952628 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManagerRunningSpeedAndCadence.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionRunningSpeedAndCadence.java
@@ -6,9 +6,9 @@ import androidx.annotation.NonNull;
 
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataRunning;
 
-public class BluetoothRemoteSensorManagerRunningSpeedAndCadence extends BluetoothConnectionManager<SensorDataRunning.Data> {
+public class BluetoothConnectionRunningSpeedAndCadence extends AbstractBluetoothConnectionManager<SensorDataRunning.Data> {
 
-    BluetoothRemoteSensorManagerRunningSpeedAndCadence(@NonNull SensorDataObserver observer) {
+    BluetoothConnectionRunningSpeedAndCadence(@NonNull SensorDataObserver observer) {
         super(BluetoothUtils.RUNNING_SPEED_CADENCE, observer);
     }
 
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManager.java b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManager.java
index a91abaa2d..95b5b1b17 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManager.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManager.java
@@ -52,7 +52,7 @@ import de.dennisguse.opentracks.util.PermissionRequester;
  *
  * @author Sandor Dornbush
  */
-public class BluetoothRemoteSensorManager implements SensorConnector, BluetoothConnectionManager.SensorDataObserver {
+public class BluetoothRemoteSensorManager implements SensorConnector, AbstractBluetoothConnectionManager.SensorDataObserver {
 
     private static final String TAG = BluetoothRemoteSensorManager.class.getSimpleName();
 
@@ -65,11 +65,11 @@ public class BluetoothRemoteSensorManager implements SensorConnector, BluetoothC
 
     private Distance preferenceWheelCircumference;
 
-    private final BluetoothRemoteSensorManagerHeartRate heartRate = new BluetoothRemoteSensorManagerHeartRate(this);
-    private final BluetoothRemoteSensorManagerCyclingCadence cyclingCadence = new BluetoothRemoteSensorManagerCyclingCadence(this);
-    private final BluetoothRemoteSensorManagerCyclingDistanceSpeed cyclingSpeed = new BluetoothRemoteSensorManagerCyclingDistanceSpeed(this);
-    private final BluetoothRemoteSensorManagerCyclingPower cyclingPower = new BluetoothRemoteSensorManagerCyclingPower(this);
-    private final BluetoothRemoteSensorManagerRunningSpeedAndCadence runningSpeedAndCadence = new BluetoothRemoteSensorManagerRunningSpeedAndCadence(this);
+    private final BluetoothConnectionManagerHeartRate heartRate = new BluetoothConnectionManagerHeartRate(this);
+    private final BluetoothConnectionManagerCyclingCadence cyclingCadence = new BluetoothConnectionManagerCyclingCadence(this);
+    private final BluetoothConnectionManagerCyclingDistanceSpeed cyclingSpeed = new BluetoothConnectionManagerCyclingDistanceSpeed(this);
+    private final BluetoothConnectionManagerCyclingPower cyclingPower = new BluetoothConnectionManagerCyclingPower(this);
+    private final BluetoothConnectionRunningSpeedAndCadence runningSpeedAndCadence = new BluetoothConnectionRunningSpeedAndCadence(this);
 
     private final SensorDataSet sensorDataSet = new SensorDataSet();
 
@@ -147,7 +147,7 @@ public class BluetoothRemoteSensorManager implements SensorConnector, BluetoothC
         return bluetoothAdapter != null && bluetoothAdapter.isEnabled();
     }
 
-    private synchronized void connect(BluetoothConnectionManager<?> connectionManager, String address) {
+    private synchronized void connect(AbstractBluetoothConnectionManager<?> connectionManager, String address) {
         if (!isEnabled()) {
             Log.w(TAG, "Bluetooth not enabled.");
             return;
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorData.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorData.java
index ba39afcb6..365d6bc48 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorData.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorData.java
@@ -1,7 +1,6 @@
 package de.dennisguse.opentracks.sensors.sensorData;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import java.time.Instant;
@@ -32,16 +31,6 @@ public abstract class SensorData<T> {
         this.time = time;
     }
 
-    @NonNull
-    public String getSensorAddress() {
-        return sensorAddress;
-    }
-
-    @Nullable
-    public String getSensorName() {
-        return sensorName;
-    }
-
     public String getSensorNameOrAddress() {
         return sensorName != null ? sensorName : sensorAddress;
     }