diff --git a/src/calng/CalibrationManager.py b/src/calng/CalibrationManager.py
index c3957145f1f7ecc28b87252039cf79c344054147..2678a612229492ee1e7697cf2009b681870db9c1 100644
--- a/src/calng/CalibrationManager.py
+++ b/src/calng/CalibrationManager.py
@@ -492,7 +492,7 @@ class CalibrationManager(DeviceClientBase, Device):
     # List of tuple (remote key, local key, descriptor)
     _managed_daq_keys = [
         (
-            'DataDispatcher.trainStride', 'daqTrainStride',
+            'pipeline.dispatcher.trainStride', 'daqTrainStride',
             UInt32(displayedName='DAQ train stride',
                    unitSymbol=Unit.COUNT,
                    defaultValue=5,
@@ -625,7 +625,10 @@ class CalibrationManager(DeviceClientBase, Device):
             # going up first.
             return
 
-        elif class_id == 'DataAggregator' and self._is_daq_device(device_id):
+        elif (
+            class_id.startswith('DataAggregator')
+            and self._is_daq_device(device_id)
+        ):
             # This device is a data aggregator belonging to the detector
             # installation
             self._daq_device_ids.add(device_id)
diff --git a/src/calng/scenes.py b/src/calng/scenes.py
index 417e72e04da6cc47e2be2293e86b73665bd52dab..aeaaa42ad6d1c69c30403f67f25b231349339dc0 100644
--- a/src/calng/scenes.py
+++ b/src/calng/scenes.py
@@ -697,7 +697,7 @@ class CompactDaqOverview(HorizontalLayout):
                     font_size=9,
                 ),
                 DisplayLabelModel(
-                    keys=[f"{device_id}.DataDispatcher.trainStride"],
+                    keys=[f"{device_id}.pipeline.dispatcher.trainStride"],
                     width=4 * BASE_INC,
                     height=BASE_INC,
                 ),