diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/battery/BatteryManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/battery/BatteryManager.java
index 23715570..72c5623f 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/battery/BatteryManager.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/battery/BatteryManager.java
@@ -10,7 +10,7 @@ import android.support.annotation.NonNull;
 import java.util.UUID;
 
 import no.nordicsemi.android.ble.BleManager;
-import no.nordicsemi.android.ble.common.data.BatteryLevelDataCallback;
+import no.nordicsemi.android.ble.common.callback.BatteryLevelDataCallback;
 import no.nordicsemi.android.ble.data.Data;
 import no.nordicsemi.android.log.LogContract;
 
diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMManager.java
index 18932a0c..10a6869f 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMManager.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMManager.java
@@ -32,8 +32,8 @@ import android.support.annotation.Nullable;
 import java.util.Calendar;
 import java.util.UUID;
 
-import no.nordicsemi.android.ble.common.data.BloodPressureMeasurementDataCallback;
-import no.nordicsemi.android.ble.common.data.IntermediateCuffPressureDataCallback;
+import no.nordicsemi.android.ble.common.callback.BloodPressureMeasurementDataCallback;
+import no.nordicsemi.android.ble.common.callback.IntermediateCuffPressureDataCallback;
 import no.nordicsemi.android.ble.data.Data;
 import no.nordicsemi.android.log.LogContract;
 import no.nordicsemi.android.nrftoolbox.battery.BatteryManager;
diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCManager.java
index dcc43577..188a3130 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCManager.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCManager.java
@@ -33,7 +33,7 @@ import android.support.annotation.NonNull;
 
 import java.util.UUID;
 
-import no.nordicsemi.android.ble.common.data.CyclingSpeedAndCadenceDataCallback;
+import no.nordicsemi.android.ble.common.callback.CyclingSpeedAndCadenceDataCallback;
 import no.nordicsemi.android.ble.data.Data;
 import no.nordicsemi.android.log.LogContract;
 import no.nordicsemi.android.nrftoolbox.battery.BatteryManager;