diff --git a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionManager.java b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionManager.java
index 9dfd13785..2c0cf74f0 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionManager.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionManager.java
@@ -139,11 +139,11 @@ public class BluetoothConnectionManager {
 
         bluetoothGatt = device.connectGatt(context, false, connectCallback, BluetoothDevice.TRANSPORT_AUTO, 0, handler);
 
-        observer.onConnect(sensorHandler.createEmptySensorData(bluetoothGatt.getDevice().getAddress()));
+        observer.onConnect(sensorHandler.createEmptySensorData(device.getAddress(), device.getName()));
     }
 
     private synchronized void clearData() {
-        observer.onDisconnect(sensorHandler.createEmptySensorData(bluetoothGatt.getDevice().getAddress()));
+        observer.onDisconnect(sensorHandler.createEmptySensorData(bluetoothGatt.getDevice().getAddress(), bluetoothGatt.getDevice().getName()));
     }
 
     synchronized void disconnect() {
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerBarometricPressure.java b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerBarometricPressure.java
index 44adebbc9..ef7aeba37 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerBarometricPressure.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerBarometricPressure.java
@@ -22,7 +22,7 @@ public class BluetoothHandlerBarometricPressure implements SensorHandlerInterfac
     }
 
     @Override
-    public Aggregator<?, ?> createEmptySensorData(String address) {
+    public Aggregator<?, ?> createEmptySensorData(String address, String name) {
         return null; //TODO
     }
 
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerCyclingCadence.java b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerCyclingCadence.java
index 74ad56d33..2e8d8e48c 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerCyclingCadence.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerCyclingCadence.java
@@ -24,8 +24,8 @@ public class BluetoothHandlerCyclingCadence implements SensorHandlerInterface {
     }
 
     @Override
-    public AggregatorCyclingCadence createEmptySensorData(String address) {
-        return new AggregatorCyclingCadence(address);
+    public AggregatorCyclingCadence createEmptySensorData(String address, String name) {
+        return new AggregatorCyclingCadence(address, name);
     }
 
     @Override
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerCyclingDistanceSpeed.java b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerCyclingDistanceSpeed.java
index a0cb87a48..f3d6ec9a4 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerCyclingDistanceSpeed.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerCyclingDistanceSpeed.java
@@ -26,8 +26,8 @@ public class BluetoothHandlerCyclingDistanceSpeed implements SensorHandlerInterf
     }
 
     @Override
-    public AggregatorCyclingDistanceSpeed createEmptySensorData(String address) {
-        return new AggregatorCyclingDistanceSpeed(address);
+    public AggregatorCyclingDistanceSpeed createEmptySensorData(String address, String name) {
+        return new AggregatorCyclingDistanceSpeed(address, name);
     }
 
     @Override
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerManagerCyclingPower.java b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerManagerCyclingPower.java
index 149ec9207..275f8dc60 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerManagerCyclingPower.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerManagerCyclingPower.java
@@ -26,8 +26,8 @@ public class BluetoothHandlerManagerCyclingPower implements SensorHandlerInterfa
     }
 
     @Override
-    public AggregatorCyclingPower createEmptySensorData(String address) {
-        return new AggregatorCyclingPower(address);
+    public AggregatorCyclingPower createEmptySensorData(String address, String name) {
+        return new AggregatorCyclingPower(address, name);
     }
 
     @Override
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerManagerHeartRate.java b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerManagerHeartRate.java
index 10ace7bc0..a9ff6e832 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerManagerHeartRate.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerManagerHeartRate.java
@@ -36,8 +36,8 @@ public class BluetoothHandlerManagerHeartRate implements SensorHandlerInterface
     }
 
     @Override
-    public AggregatorHeartRate createEmptySensorData(String address) {
-        return new AggregatorHeartRate(address);
+    public AggregatorHeartRate createEmptySensorData(String address, String name) {
+        return new AggregatorHeartRate(address, name);
     }
 
     @Override
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerRunningSpeedAndCadence.java b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerRunningSpeedAndCadence.java
index 1a7f8a6f4..962d43fbf 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerRunningSpeedAndCadence.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerRunningSpeedAndCadence.java
@@ -29,8 +29,8 @@ public class BluetoothHandlerRunningSpeedAndCadence implements SensorHandlerInte
     }
 
     @Override
-    public AggregatorRunning createEmptySensorData(String address) {
-        return new AggregatorRunning(address);
+    public AggregatorRunning createEmptySensorData(String address, String name) {
+        return new AggregatorRunning(address, name);
     }
 
     @Override
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingCadence.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingCadence.java
index 61a348354..ced035630 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingCadence.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingCadence.java
@@ -14,10 +14,6 @@ public class AggregatorCyclingCadence extends Aggregator<BluetoothHandlerCycling
 
     private final String TAG = AggregatorCyclingCadence.class.getSimpleName();
 
-    public AggregatorCyclingCadence(String sensorAddress) {
-        super(sensorAddress);
-    }
-
     public AggregatorCyclingCadence(String sensorAddress, String sensorName) {
         super(sensorAddress, sensorName);
     }
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingDistanceSpeed.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingDistanceSpeed.java
index 71374c019..021242784 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingDistanceSpeed.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingDistanceSpeed.java
@@ -17,10 +17,6 @@ public class AggregatorCyclingDistanceSpeed extends Aggregator<BluetoothHandlerC
 
     private Distance wheelCircumference;
 
-    public AggregatorCyclingDistanceSpeed(String sensorAddress) {
-        super(sensorAddress);
-    }
-
     public AggregatorCyclingDistanceSpeed(String sensorAddress, String sensorName) {
         super(sensorAddress, sensorName);
     }
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingPower.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingPower.java
index e60e08ee6..134101e76 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingPower.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingPower.java
@@ -6,10 +6,6 @@ import de.dennisguse.opentracks.data.models.Power;
 
 public class AggregatorCyclingPower extends Aggregator<Power, Power> {
 
-    public AggregatorCyclingPower(String address) {
-        super(address);
-    }
-
     public AggregatorCyclingPower(String name, String address) {
         super(name, address);
     }
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorHeartRate.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorHeartRate.java
index 68879cb59..9bc470c87 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorHeartRate.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorHeartRate.java
@@ -6,10 +6,6 @@ import de.dennisguse.opentracks.data.models.HeartRate;
 
 public class AggregatorHeartRate extends Aggregator<HeartRate, HeartRate> {
 
-    public AggregatorHeartRate(String address) {
-        super(address);
-    }
-
     public AggregatorHeartRate(String name, String address) {
         super(name, address);
     }
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorRunning.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorRunning.java
index 425f20705..55737fc95 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorRunning.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorRunning.java
@@ -14,10 +14,6 @@ public final class AggregatorRunning extends Aggregator<BluetoothHandlerRunningS
 
     private static final String TAG = AggregatorRunning.class.getSimpleName();
 
-    public AggregatorRunning(String sensorAddress) {
-        super(sensorAddress);
-    }
-
     public AggregatorRunning(String sensorAddress, String sensorName) {
         super(sensorAddress, sensorName);
     }
diff --git a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorHandlerInterface.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorHandlerInterface.java
index 89e409f5a..3406c907f 100644
--- a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorHandlerInterface.java
+++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorHandlerInterface.java
@@ -11,7 +11,7 @@ public interface SensorHandlerInterface {
 
     List<ServiceMeasurementUUID> getServices();
 
-    Aggregator<?, ?> createEmptySensorData(String address);
+    Aggregator<?, ?> createEmptySensorData(String address, String name);
 
     void handlePayload(SensorManager.SensorDataChangedObserver observer, ServiceMeasurementUUID serviceMeasurementUUID, String sensorName, String address, BluetoothGattCharacteristic characteristic);
 }