diff --git a/notebooks/Gotthard2/Characterize_Darks_Gotthard2_NBC.ipynb b/notebooks/Gotthard2/Characterize_Darks_Gotthard2_NBC.ipynb
index 07f3ee0d68a4acc37dcf4ef5dafbc7ce4cdc7905..547fc77e307aee0b3e820c525ed0434d0e2b7af6 100644
--- a/notebooks/Gotthard2/Characterize_Darks_Gotthard2_NBC.ipynb
+++ b/notebooks/Gotthard2/Characterize_Darks_Gotthard2_NBC.ipynb
@@ -135,8 +135,8 @@
     "run_dc = RunDirectory(in_folder / f\"r{run_nums[0]:04d}\")\n",
     "proposal = list(filter(None, str(in_folder).strip('/').split('/')))[-2]\n",
     "file_loc = raw_data_location_string(proposal, run_nums)\n",
-    "receiver_names = [f\"*{receiver_template.format(x)}*\" for x in receiver_affixes]\n",
-    "data_sources = sorted(list(run_dc.select(receiver_names).all_sources))"
+    "receiver_names = [f\"*{receiver_template.format(x)}:daqOutput\" for x in receiver_affixes]\n",
+    "data_sources = list(run_dc.select(receiver_names).all_sources)"
    ]
   },
   {
diff --git a/notebooks/Gotthard2/Correction_Gotthard2_NBC.ipynb b/notebooks/Gotthard2/Correction_Gotthard2_NBC.ipynb
index 38a5d0ed47f9eb3adab268569aaf236768180b11..03ece08777ef83059deb6f1a7945e7a326c9c757 100644
--- a/notebooks/Gotthard2/Correction_Gotthard2_NBC.ipynb
+++ b/notebooks/Gotthard2/Correction_Gotthard2_NBC.ipynb
@@ -241,7 +241,7 @@
     "print(f\"Process modules: {db_modules} for run {run}\")\n",
     "\n",
     "# Create the correction receiver name.\n",
-    "receiver_names = [f\"*{receiver_template.format(x)}*\" for x in receiver_affixes]\n",
+    "receiver_names = [f\"*{receiver_template.format(x)}:daqOutput\" for x in receiver_affixes]\n",
     "data_sources = list(run_dc.select(receiver_names).all_sources)\n",
     "\n",
     "if not corr_receiver:\n",