diff --git a/config/daqsystemtest/moduleconfs.data.xml b/config/daqsystemtest/moduleconfs.data.xml
index e2649a2..5fb598f 100644
--- a/config/daqsystemtest/moduleconfs.data.xml
+++ b/config/daqsystemtest/moduleconfs.data.xml
@@ -693,7 +693,10 @@
  <attr name="template_for" type="class" val="RandomTCMakerModule"/>
  <attr name="trigger_rate_hz" type="float" val="1"/>
  <attr name="time_distribution" type="enum" val="kUniform"/>
- <rel name="tc_readout" class="TCReadoutMap" id="def-random-readout"/>
+ <attr name="candidate_type_name" type="string" val="kRandom"/>
+ <attr name="candidate_backshift_ts" type="s64" val="0"/>
+ <attr name="candidate_window_before_ts" type="u32" val="2000"/>
+ <attr name="candidate_window_after_ts" type="u32" val="5"/>
 </obj>
 
 <obj class="RequestHandler" id="def-data-request-handler">
diff --git a/integtest/fake_data_producer_test.py b/integtest/fake_data_producer_test.py
index 6653dd3..b8a417b 100644
--- a/integtest/fake_data_producer_test.py
+++ b/integtest/fake_data_producer_test.py
@@ -71,11 +71,12 @@
 
 doublewindow_conf.config_substitutions.append(
     data_classes.attribute_substitution(
-        obj_class="TCReadoutMap",
-        obj_id = "def-random-readout",
+        obj_class="RandomTCMakerConf",
+        obj_id = "random-tc-generator",
         updates={
-            "time_before": 2000,
-            "time_after": 2001,
+            "candidate_backshift_ts": 0,
+            "candidate_window_before_ts": 2000,
+            "candidate_window_after_ts": 2001,
         },
     )
 )
diff --git a/integtest/long_window_readout_test.py b/integtest/long_window_readout_test.py
index 41eb63a..41dd639 100644
--- a/integtest/long_window_readout_test.py
+++ b/integtest/long_window_readout_test.py
@@ -131,11 +131,12 @@
 )
 conf_dict.config_substitutions.append(
     data_classes.attribute_substitution(
-        obj_class="TCReadoutMap",
-        obj_id = "def-random-readout",
+        obj_class="RandomTCMakerConf",
+        obj_id = "random-tc-generator",
         updates={
-            "time_before": readout_window_time_before,
-            "time_after": readout_window_time_after,
+            "candidate_backshift_ts": 0,
+            "candidate_window_before_ts": readout_window_time_before,
+            "candidate_window_after_ts": readout_window_time_after,
         },
     )
 )
diff --git a/integtest/readout_type_scan_test.py b/integtest/readout_type_scan_test.py
index a24e37c..aeea78b 100644
--- a/integtest/readout_type_scan_test.py
+++ b/integtest/readout_type_scan_test.py
@@ -229,11 +229,12 @@
 
 daphne_stream_conf.config_substitutions.append(
     data_classes.attribute_substitution(
-        obj_class="TCReadoutMap",
-        obj_id = "def-random-readout",
+        obj_class="RandomTCMakerConf",
+        obj_id = "random-tc-generator",
         updates={
-            "time_before": 62000,
-            "time_after": 500,
+            "candidate_backshift_ts": 0,
+            "candidate_window_before_ts": 62000,
+            "candidate_window_after_ts": 500,
         },
     )
 )
@@ -243,11 +244,12 @@
 daphne_conf.frame_file = "asset://?checksum=a8990a9eb3a505d4ded62dfdfa9e2681" # np02vd_run036012_sample_membrane_pds
 daphne_conf.config_substitutions.append(
     data_classes.attribute_substitution(
-        obj_class="TCReadoutMap",
-        obj_id = "def-random-readout",
+        obj_class="RandomTCMakerConf",
+        obj_id = "random-tc-generator",
         updates={
-            "time_before": 62000,
-            "time_after": 500,
+            "candidate_backshift_ts": 0,
+            "candidate_window_before_ts": 62000,
+            "candidate_window_after_ts": 500,
         },
     )
 )
diff --git a/integtest/trigger_bitwords_test.py b/integtest/trigger_bitwords_test.py
index 5348360..604f762 100644
--- a/integtest/trigger_bitwords_test.py
+++ b/integtest/trigger_bitwords_test.py
@@ -191,7 +191,7 @@
     data_classes.attribute_substitution(
         obj_id="random-tc-generator",
         obj_class="RandomTCMakerConf",
-        updates={"trigger_rate_hz": 40},)
+        updates={"trigger_rate_hz": 40, "candidate_backshift_ts": 0, "candidate_window_before_ts": 62500, "candidate_window_after_ts": 62500},)
 )
 coincidence_bitword_conf.config_substitutions.append(
     data_classes.attribute_substitution(