Rename confounds file to desc-confounds_timeseries (#874)

* Rename confounds file. * Remove confounds from init_dwi_derivatives_wf. * Rename expected outputs.
PennLINC · Nov 14, 2024 · c6ac851 · c6ac851
1 parent f670fc3
commit c6ac851
Show file tree

Hide file tree

Showing 24 changed files with 27 additions and 31 deletions.
diff --git a/.circleci/DSCSDSI_outputs.txt b/.circleci/DSCSDSI_outputs.txt
@@ -22,7 +22,7 @@ qsiprep/sub-tester/anat/sub-tester_space-MNI152NLin2009cAsym_label-CSF_probseg.n
 qsiprep/sub-tester/anat/sub-tester_space-MNI152NLin2009cAsym_label-GM_probseg.nii.gz
 qsiprep/sub-tester/anat/sub-tester_space-MNI152NLin2009cAsym_label-WM_probseg.nii.gz
 qsiprep/sub-tester/dwi
-qsiprep/sub-tester/dwi/sub-tester_acq-HASC55AP_confounds.tsv
+qsiprep/sub-tester/dwi/sub-tester_acq-HASC55AP_desc-confounds_timeseries.tsv
 qsiprep/sub-tester/dwi/sub-tester_acq-HASC55AP_space-ACPC_desc-image_qc.csv
 qsiprep/sub-tester/dwi/sub-tester_acq-HASC55AP_space-ACPC_desc-slice_qc.json
 qsiprep/sub-tester/dwi/sub-tester_acq-HASC55AP_dwiqc.json

diff --git a/.circleci/DSDTI_nofmap_outputs.txt b/.circleci/DSDTI_nofmap_outputs.txt
@@ -22,7 +22,7 @@ qsiprep/sub-PNC/anat/sub-PNC_space-MNI152NLin2009cAsym_label-CSF_probseg.nii.gz
 qsiprep/sub-PNC/anat/sub-PNC_space-MNI152NLin2009cAsym_label-GM_probseg.nii.gz
 qsiprep/sub-PNC/anat/sub-PNC_space-MNI152NLin2009cAsym_label-WM_probseg.nii.gz
 qsiprep/sub-PNC/dwi
-qsiprep/sub-PNC/dwi/sub-PNC_acq-realistic_confounds.tsv
+qsiprep/sub-PNC/dwi/sub-PNC_acq-realistic_desc-confounds_timeseries.tsv
 qsiprep/sub-PNC/dwi/sub-PNC_acq-realistic_space-ACPC_desc-image_qc.csv
 qsiprep/sub-PNC/dwi/sub-PNC_acq-realistic_space-ACPC_desc-slice_qc.json
 qsiprep/sub-PNC/dwi/sub-PNC_acq-realistic_dwiqc.json

diff --git a/.circleci/DSDTI_outputs.txt b/.circleci/DSDTI_outputs.txt
@@ -22,7 +22,7 @@ qsiprep/sub-PNC/anat/sub-PNC_space-MNI152NLin2009cAsym_label-CSF_probseg.nii.gz
 qsiprep/sub-PNC/anat/sub-PNC_space-MNI152NLin2009cAsym_label-GM_probseg.nii.gz
 qsiprep/sub-PNC/anat/sub-PNC_space-MNI152NLin2009cAsym_label-WM_probseg.nii.gz
 qsiprep/sub-PNC/dwi
-qsiprep/sub-PNC/dwi/sub-PNC_acq-realistic_confounds.tsv
+qsiprep/sub-PNC/dwi/sub-PNC_acq-realistic_desc-confounds_timeseries.tsv
 qsiprep/sub-PNC/dwi/sub-PNC_acq-realistic_space-ACPC_desc-image_qc.csv
 qsiprep/sub-PNC/dwi/sub-PNC_acq-realistic_space-ACPC_desc-slice_qc.json
 qsiprep/sub-PNC/dwi/sub-PNC_acq-realistic_dwiqc.json

diff --git a/.circleci/DSDTI_synsdc_outputs.txt b/.circleci/DSDTI_synsdc_outputs.txt
@@ -22,7 +22,7 @@ qsiprep/sub-PNC/anat/sub-PNC_space-MNI152NLin2009cAsym_label-CSF_probseg.nii.gz
 qsiprep/sub-PNC/anat/sub-PNC_space-MNI152NLin2009cAsym_label-GM_probseg.nii.gz
 qsiprep/sub-PNC/anat/sub-PNC_space-MNI152NLin2009cAsym_label-WM_probseg.nii.gz
 qsiprep/sub-PNC/dwi
-qsiprep/sub-PNC/dwi/sub-PNC_acq-realistic_confounds.tsv
+qsiprep/sub-PNC/dwi/sub-PNC_acq-realistic_desc-confounds_timeseries.tsv
 qsiprep/sub-PNC/dwi/sub-PNC_acq-realistic_space-ACPC_desc-image_qc.csv
 qsiprep/sub-PNC/dwi/sub-PNC_acq-realistic_space-ACPC_desc-slice_qc.json
 qsiprep/sub-PNC/dwi/sub-PNC_acq-realistic_dwiqc.json

diff --git a/.circleci/IntramodalTemplate_outputs.txt b/.circleci/IntramodalTemplate_outputs.txt
@@ -41,7 +41,7 @@ qsiprep/sub-tester/ses-1
 qsiprep/sub-tester/ses-1/anat
 qsiprep/sub-tester/ses-1/anat/sub-tester_ses-1_from-orig_to-T1w_mode-image_xfm.txt
 qsiprep/sub-tester/ses-1/dwi
-qsiprep/sub-tester/ses-1/dwi/sub-tester_ses-1_acq-HASC55PA_confounds.tsv
+qsiprep/sub-tester/ses-1/dwi/sub-tester_ses-1_acq-HASC55PA_desc-confounds_timeseries.tsv
 qsiprep/sub-tester/ses-1/dwi/sub-tester_ses-1_acq-HASC55PA_space-ACPC_desc-image_qc.csv
 qsiprep/sub-tester/ses-1/dwi/sub-tester_ses-1_acq-HASC55PA_space-ACPC_desc-slice_qc.json
 qsiprep/sub-tester/ses-1/dwi/sub-tester_ses-1_acq-HASC55PA_dwiqc.json
@@ -55,7 +55,7 @@ qsiprep/sub-tester/ses-1/dwi/sub-tester_ses-1_acq-HASC55PA_space-ACPC_desc-prepr
 qsiprep/sub-tester/ses-1/dwi/sub-tester_ses-1_acq-HASC55PA_space-ACPC_dwiref.nii.gz
 qsiprep/sub-tester/ses-2
 qsiprep/sub-tester/ses-2/dwi
-qsiprep/sub-tester/ses-2/dwi/sub-tester_ses-2_acq-HASC55AP_confounds.tsv
+qsiprep/sub-tester/ses-2/dwi/sub-tester_ses-2_acq-HASC55AP_desc-confounds_timeseries.tsv
 qsiprep/sub-tester/ses-2/dwi/sub-tester_ses-2_acq-HASC55AP_space-ACPC_desc-image_qc.csv
 qsiprep/sub-tester/ses-2/dwi/sub-tester_ses-2_acq-HASC55AP_space-ACPC_desc-slice_qc.json
 qsiprep/sub-tester/ses-2/dwi/sub-tester_ses-2_acq-HASC55AP_dwiqc.json

diff --git a/.circleci/get_data.sh b/.circleci/get_data.sh
@@ -289,7 +289,7 @@ Contents:
  - data/multishell_output/qsiprep/sub-ABCD/anat/sub-ABCD_space-MNI152NLin2009cAsym_label-CSF_probseg.nii.gz
  - data/multishell_output/qsiprep/sub-ABCD/anat/sub-ABCD_space-MNI152NLin2009cAsym_label-GM_probseg.nii.gz
  - data/multishell_output/qsiprep/sub-ABCD/anat/sub-ABCD_space-MNI152NLin2009cAsym_label-WM_probseg.nii.gz
- - data/multishell_output/qsiprep/sub-ABCD/dwi/sub-ABCD_acq-10per000_confounds.tsv
+ - data/multishell_output/qsiprep/sub-ABCD/dwi/sub-ABCD_acq-10per000_desc-confounds_timeseries.tsv
  - data/multishell_output/qsiprep/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-ACPC_b0series.nii.gz
  - data/multishell_output/qsiprep/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-ACPC_desc-brain_mask.nii.gz
  - data/multishell_output/qsiprep/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-ACPC_model-eddy_stat-cnr_dwimap.json
@@ -328,7 +328,7 @@ Contents:
  - data/singleshell_output/qsiprep/sub-PNC/anat/sub-PNC_space-MNI152NLin2009cAsym_label-CSF_probseg.nii.gz
  - data/singleshell_output/qsiprep/sub-PNC/anat/sub-PNC_space-MNI152NLin2009cAsym_label-GM_probseg.nii.gz
  - data/singleshell_output/qsiprep/sub-PNC/anat/sub-PNC_space-MNI152NLin2009cAsym_label-WM_probseg.nii.gz
- - data/singleshell_output/qsiprep/sub-PNC/dwi/sub-PNC_acq-realistic_confounds.tsv
+ - data/singleshell_output/qsiprep/sub-PNC/dwi/sub-PNC_acq-realistic_desc-confounds_timeseries.tsv
  - data/singleshell_output/qsiprep/sub-PNC/dwi/sub-PNC_acq-realistic_space-ACPC_b0series.nii.gz
  - data/singleshell_output/qsiprep/sub-PNC/dwi/sub-PNC_acq-realistic_space-ACPC_desc-brain_mask.nii.gz
  - data/singleshell_output/qsiprep/sub-PNC/dwi/sub-PNC_acq-realistic_space-ACPC_model-eddy_stat-cnr_dwimap.json

diff --git a/docs/preprocessing.rst b/docs/preprocessing.rst
@@ -265,7 +265,7 @@ Derivatives related to diffusion images are in the ``dwi`` subfolder ::
     dwi/
       # A tab-separated value file with one column per calculated confound
       # and one row per timepoint/volume
-      <source_entities>_confounds.tsv
+      <source_entities>_desc-confounds_timeseries.tsv
 
 Volumetric outputs are written out in ``ACPC`` space ::
 
@@ -352,7 +352,7 @@ See implementation on :func:`~qsiprep.workflows.dwi.confounds.init_dwi_confs_wf`
 
 
 For each DWI processed by qsiprep, a
-``<output_folder>/qsiprep/sub-<label>/func/<source_entities>_confounds.tsv``
+``<output_folder>/qsiprep/sub-<label>/func/<source_entities>_desc-confounds_timeseries.tsv``
 file will be generated. These are :abbr:`TSV (tab-separated values)` tables,
 which look like the example below::
 

diff --git a/qsiprep/data/io_spec.json b/qsiprep/data/io_spec.json
@@ -27,7 +27,7 @@
       "sub-{subject}[/ses-{session}]/{datatype<dwi>|dwi}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_ce-{ceagent}][_dir-{direction}][_rec-{reconstruction}][_space-{space}][_desc-{desc}]_{suffix<dwiref>|dwiref}.{extension<nii|nii.gz|json>|nii.gz}",
       "sub-{subject}[/ses-{session}]/{datatype<dwi>|dwi}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_ce-{ceagent}][_dir-{direction}][_rec-{reconstruction}][_space-{space}][_desc-{desc}]_{suffix<mask>|mask}.{extension<nii|nii.gz|json>|nii.gz}",
       "sub-{subject}[/ses-{session}]/{datatype<dwi>|dwi}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_ce-{ceagent}][_dir-{direction}][_rec-{reconstruction}][_space-{space}][_desc-{desc}]_{suffix<dwi>|dwi}.{extension<nii|nii.gz|b|b_table.txt|bval|bvec|json>|nii.gz}",
-      "sub-{subject}[/ses-{session}]/{datatype<dwi>|dwi}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_ce-{ceagent}][_dir-{direction}][_rec-{reconstruction}][_space-{space}][_desc-{desc}]_{suffix<confounds|dwi|topupcsv|hmcOptimization|qc>|confounds}.{extension<tsv|csv|json>|tsv}",
+      "sub-{subject}[/ses-{session}]/{datatype<dwi>|dwi}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_ce-{ceagent}][_dir-{direction}][_rec-{reconstruction}][_space-{space}][_desc-{desc}]_{suffix<timeseries|dwi|topupcsv|hmcOptimization|qc>|timeseries}.{extension<tsv|csv|json>|tsv}",
       "sub-{subject}[/ses-{session}]/{datatype<dwi>|dwi}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_ce-{ceagent}][_dir-{direction}][_rec-{reconstruction}][_space-{space}][_desc-{desc}]_{suffix<bvecs>|bvecs}.{extension<nii|nii.gz|json>|nii.gz}",
       "sub-{subject}[/ses-{session}]/{datatype<dwi>|dwi}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_ce-{ceagent}][_dir-{direction}][_rec-{reconstruction}][_space-{space}][_model-{model}][_stat-{statistic}][_desc-{desc}]_{suffix<dwimap>|dwimap}.{extension<nii|nii.gz|json>|nii.gz}",
       "sub-{subject}[/ses-{session}]/{datatype<fmap>|fmap}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_ce-{ceagent}][_dir-{direction}][_rec-{reconstruction}][_space-{space}][_desc-{desc}]_{suffix<fmapreg|fmapregvsm|b0ref>|fmapreg}.{extension<nii|nii.gz|json>|nii.gz}",

diff --git a/qsiprep/interfaces/confounds.py b/qsiprep/interfaces/confounds.py
@@ -209,7 +209,7 @@ def _adjust_indices(left_df, right_df):
 
 
 class DMRISummaryInputSpec(BaseInterfaceInputSpec):
-    confounds_file = File(exists=True, desc="BIDS' _confounds.tsv file")
+    confounds_file = File(exists=True, desc="BIDS' _desc-confounds_timeseries.tsv file")
     sliceqc_file = File(exists=True, desc="output from SliceQC")
     sliceqc_mask = File(exists=True, desc="Mask")
 

diff --git a/qsiprep/interfaces/dwi_merge.py b/qsiprep/interfaces/dwi_merge.py
@@ -252,7 +252,7 @@ def _run_interface(self, runtime):
         self._results["out_bval"] = combine_bvals(combined_bvals, out_bval_path)
         out_bvec_path = op.join(runtime.cwd, "averaged_pairs.bvec")
         self._results["out_bvec"] = combine_bvecs(combined_bvecs, out_bvec_path)
-        out_confounds_path = op.join(runtime.cwd, "averaged_pairs_confounds.tsv")
+        out_confounds_path = op.join(runtime.cwd, "averaged_pairs_desc-confounds_timeseries.tsv")
         error_report.to_csv(out_confounds_path, index=False, sep="\t")
         self._results["merged_denoising_confounds"] = out_confounds_path
         self._results["original_images"] = self.inputs.bids_dwi_files

diff --git a/qsiprep/tests/data/drbuddi_rpe_outputs.txt b/qsiprep/tests/data/drbuddi_rpe_outputs.txt
@@ -7,7 +7,7 @@ logs/CITATION.tex
 sub-tinytensors
 sub-tinytensors.html
 sub-tinytensors/dwi
-sub-tinytensors/dwi/sub-tinytensors_confounds.tsv
+sub-tinytensors/dwi/sub-tinytensors_desc-confounds_timeseries.tsv
 sub-tinytensors/dwi/sub-tinytensors_space-ACPC_desc-brain_mask.nii.gz
 sub-tinytensors/dwi/sub-tinytensors_space-ACPC_model-eddy_stat-cnr_dwimap.json
 sub-tinytensors/dwi/sub-tinytensors_space-ACPC_model-eddy_stat-cnr_dwimap.nii.gz

diff --git a/qsiprep/tests/data/drbuddi_shoreline_epi_outputs.txt b/qsiprep/tests/data/drbuddi_shoreline_epi_outputs.txt
@@ -7,7 +7,7 @@ logs/CITATION.tex
 sub-tinytensors
 sub-tinytensors.html
 sub-tinytensors/dwi
-sub-tinytensors/dwi/sub-tinytensors_dir-PA_confounds.tsv
+sub-tinytensors/dwi/sub-tinytensors_dir-PA_desc-confounds_timeseries.tsv
 sub-tinytensors/dwi/sub-tinytensors_dir-PA_space-ACPC_desc-brain_mask.nii.gz
 sub-tinytensors/dwi/sub-tinytensors_dir-PA_space-ACPC_desc-image_qc.csv
 sub-tinytensors/dwi/sub-tinytensors_dir-PA_space-ACPC_model-none_stat-cnr_dwimap.json

diff --git a/qsiprep/tests/data/drbuddi_tensorline_epi_outputs.txt b/qsiprep/tests/data/drbuddi_tensorline_epi_outputs.txt
@@ -7,7 +7,7 @@ logs/CITATION.tex
 sub-PNC
 sub-PNC.html
 sub-PNC/dwi
-sub-PNC/dwi/sub-PNC_acq-realistic_confounds.tsv
+sub-PNC/dwi/sub-PNC_acq-realistic_desc-confounds_timeseries.tsv
 sub-PNC/dwi/sub-PNC_acq-realistic_space-ACPC_desc-brain_mask.nii.gz
 sub-PNC/dwi/sub-PNC_acq-realistic_space-ACPC_desc-image_qc.csv
 sub-PNC/dwi/sub-PNC_acq-realistic_space-ACPC_desc-preproc_dwi.b

diff --git a/qsiprep/tests/data/dscsdsi_outputs.txt b/qsiprep/tests/data/dscsdsi_outputs.txt
@@ -18,7 +18,7 @@ sub-tester/anat/sub-tester_space-ACPC_desc-preproc_T1w.json
 sub-tester/anat/sub-tester_space-ACPC_desc-preproc_T1w.nii.gz
 sub-tester/anat/sub-tester_space-ACPC_dseg.nii.gz
 sub-tester/dwi
-sub-tester/dwi/sub-tester_acq-HASC55AP_confounds.tsv
+sub-tester/dwi/sub-tester_acq-HASC55AP_desc-confounds_timeseries.tsv
 sub-tester/dwi/sub-tester_acq-HASC55AP_space-ACPC_model-3dSHORE_stat-cnr_dwimap.json
 sub-tester/dwi/sub-tester_acq-HASC55AP_space-ACPC_model-3dSHORE_stat-cnr_dwimap.nii.gz
 sub-tester/dwi/sub-tester_acq-HASC55AP_space-ACPC_desc-brain_mask.nii.gz

diff --git a/qsiprep/tests/data/dsdti_nofmap_outputs.txt b/qsiprep/tests/data/dsdti_nofmap_outputs.txt
@@ -18,7 +18,7 @@ sub-PNC/anat/sub-PNC_space-ACPC_desc-preproc_T1w.json
 sub-PNC/anat/sub-PNC_space-ACPC_desc-preproc_T1w.nii.gz
 sub-PNC/anat/sub-PNC_space-ACPC_dseg.nii.gz
 sub-PNC/dwi
-sub-PNC/dwi/sub-PNC_acq-realistic_confounds.tsv
+sub-PNC/dwi/sub-PNC_acq-realistic_desc-confounds_timeseries.tsv
 sub-PNC/dwi/sub-PNC_acq-realistic_space-ACPC_desc-brain_mask.nii.gz
 sub-PNC/dwi/sub-PNC_acq-realistic_space-ACPC_model-eddy_stat-cnr_dwimap.json
 sub-PNC/dwi/sub-PNC_acq-realistic_space-ACPC_model-eddy_stat-cnr_dwimap.nii.gz

diff --git a/qsiprep/tests/data/dsdti_synfmap_outputs.txt b/qsiprep/tests/data/dsdti_synfmap_outputs.txt
@@ -18,7 +18,7 @@ sub-PNC/anat/sub-PNC_space-ACPC_desc-preproc_T1w.json
 sub-PNC/anat/sub-PNC_space-ACPC_desc-preproc_T1w.nii.gz
 sub-PNC/anat/sub-PNC_space-ACPC_dseg.nii.gz
 sub-PNC/dwi
-sub-PNC/dwi/sub-PNC_acq-realistic_confounds.tsv
+sub-PNC/dwi/sub-PNC_acq-realistic_desc-confounds_timeseries.tsv
 sub-PNC/dwi/sub-PNC_acq-realistic_space-ACPC_desc-brain_mask.nii.gz
 sub-PNC/dwi/sub-PNC_acq-realistic_space-ACPC_model-eddy_stat-cnr_dwimap.json
 sub-PNC/dwi/sub-PNC_acq-realistic_space-ACPC_model-eddy_stat-cnr_dwimap.nii.gz

diff --git a/qsiprep/tests/data/dsdti_topup_outputs.txt b/qsiprep/tests/data/dsdti_topup_outputs.txt
@@ -18,7 +18,7 @@ sub-PNC/anat/sub-PNC_space-ACPC_desc-preproc_T1w.json
 sub-PNC/anat/sub-PNC_space-ACPC_desc-preproc_T1w.nii.gz
 sub-PNC/anat/sub-PNC_space-ACPC_dseg.nii.gz
 sub-PNC/dwi
-sub-PNC/dwi/sub-PNC_acq-realistic_confounds.tsv
+sub-PNC/dwi/sub-PNC_acq-realistic_desc-confounds_timeseries.tsv
 sub-PNC/dwi/sub-PNC_acq-realistic_space-ACPC_desc-brain_mask.nii.gz
 sub-PNC/dwi/sub-PNC_acq-realistic_space-ACPC_model-eddy_stat-cnr_dwimap.json
 sub-PNC/dwi/sub-PNC_acq-realistic_space-ACPC_model-eddy_stat-cnr_dwimap.nii.gz

diff --git a/qsiprep/tests/data/forrest_gump_outputs.txt b/qsiprep/tests/data/forrest_gump_outputs.txt
@@ -20,7 +20,7 @@ sub-01/ses-forrestgump
 sub-01/ses-forrestgump/anat
 sub-01/ses-forrestgump/anat/sub-01_ses-forrestgump_rec-autobox_from-orig_to-anat_mode-image_xfm.txt
 sub-01/ses-forrestgump/dwi
-sub-01/ses-forrestgump/dwi/sub-01_ses-forrestgump_confounds.tsv
+sub-01/ses-forrestgump/dwi/sub-01_ses-forrestgump_desc-confounds_timeseries.tsv
 sub-01/ses-forrestgump/dwi/sub-01_ses-forrestgump_space-ACPC_desc-brain_mask.nii.gz
 sub-01/ses-forrestgump/dwi/sub-01_ses-forrestgump_space-ACPC_model-eddy_stat-cnr_dwimap.json
 sub-01/ses-forrestgump/dwi/sub-01_ses-forrestgump_space-ACPC_model-eddy_stat-cnr_dwimap.nii.gz

diff --git a/qsiprep/tests/data/intramodal_template_outputs.txt b/qsiprep/tests/data/intramodal_template_outputs.txt
@@ -41,7 +41,7 @@ sub-tester/ses-1
 sub-tester/ses-1/anat
 sub-tester/ses-1/anat/sub-tester_ses-1_from-orig_to-anat_mode-image_xfm.txt
 sub-tester/ses-1/dwi
-sub-tester/ses-1/dwi/sub-tester_ses-1_acq-HASC55PA_confounds.tsv
+sub-tester/ses-1/dwi/sub-tester_ses-1_acq-HASC55PA_desc-confounds_timeseries.tsv
 sub-tester/ses-1/dwi/sub-tester_ses-1_acq-HASC55PA_space-ACPC_desc-brain_mask.nii.gz
 sub-tester/ses-1/dwi/sub-tester_ses-1_acq-HASC55PA_space-ACPC_desc-image_qc.csv
 sub-tester/ses-1/dwi/sub-tester_ses-1_acq-HASC55PA_space-ACPC_model-none_stat-cnr_dwimap.json
@@ -55,7 +55,7 @@ sub-tester/ses-1/dwi/sub-tester_ses-1_acq-HASC55PA_space-ACPC_desc-slice_qc.json
 sub-tester/ses-1/dwi/sub-tester_ses-1_acq-HASC55PA_space-ACPC_dwiref.nii.gz
 sub-tester/ses-2
 sub-tester/ses-2/dwi
-sub-tester/ses-2/dwi/sub-tester_ses-2_acq-HASC55AP_confounds.tsv
+sub-tester/ses-2/dwi/sub-tester_ses-2_acq-HASC55AP_desc-confounds_timeseries.tsv
 sub-tester/ses-2/dwi/sub-tester_ses-2_acq-HASC55AP_space-ACPC_desc-brain_mask.nii.gz
 sub-tester/ses-2/dwi/sub-tester_ses-2_acq-HASC55AP_space-ACPC_desc-image_qc.csv
 sub-tester/ses-2/dwi/sub-tester_ses-2_acq-HASC55AP_space-ACPC_model-none_stat-cnr_dwimap.json

diff --git a/qsiprep/tests/data/maternal_brain_project_outputs.txt b/qsiprep/tests/data/maternal_brain_project_outputs.txt
@@ -20,7 +20,7 @@ sub-01/ses-01
 sub-01/ses-01/anat
 sub-01/ses-01/anat/sub-01_ses-01_rec-autobox_from-orig_to-anat_mode-image_xfm.txt
 sub-01/ses-01/dwi
-sub-01/ses-01/dwi/sub-01_ses-01_confounds.tsv
+sub-01/ses-01/dwi/sub-01_ses-01_desc-confounds_timeseries.tsv
 sub-01/ses-01/dwi/sub-01_ses-01_hmcOptimization.csv
 sub-01/ses-01/dwi/sub-01_ses-01_space-ACPC_model-3dSHORE_stat-cnr_dwimap.json
 sub-01/ses-01/dwi/sub-01_ses-01_space-ACPC_model-3dSHORE_stat-cnr_dwimap.nii.gz

diff --git a/qsiprep/workflows/dwi/base.py b/qsiprep/workflows/dwi/base.py
@@ -441,15 +441,14 @@ def init_dwi_preproc_wf(
         DerivativesDataSink(
             source_file=source_file,
             base_directory=str(output_dir),
-            suffix="confounds",
+            desc="confounds",
+            suffix="timeseries",
         ),
         name="ds_confounds",
         run_without_submitting=True,
         mem_gb=DEFAULT_MEMORY_MIN_GB,
     )
-    workflow.connect([
-        (confounds_wf, ds_confounds, [('outputnode.confounds_file', 'in_file')]),
-    ])  # fmt:skip
+    workflow.connect([(confounds_wf, ds_confounds, [("outputnode.confounds_file", "in_file")])])
 
     # Carpetplot and confounds plot
     conf_plot = pe.Node(DMRISummary(), name="conf_plot", mem_gb=mem_gb["resampled"])

diff --git a/qsiprep/workflows/dwi/derivatives.py b/qsiprep/workflows/dwi/derivatives.py
@@ -35,7 +35,6 @@ def init_dwi_derivatives_wf(source_file) -> Workflow:
                 "t1_b0_ref",
                 "gradient_table_t1",
                 "btable_t1",
-                "confounds",
                 "hmc_optimization_data",
                 "series_qc",
             ]

diff --git a/qsiprep/workflows/dwi/distortion_group_merge.py b/qsiprep/workflows/dwi/distortion_group_merge.py
@@ -287,7 +287,6 @@ def init_distortion_group_merge_wf(
             ('t1_b0_ref', 'inputnode.t1_b0_ref'),
             ('gradient_table_t1', 'inputnode.gradient_table_t1'),
             ('btable_t1', 'inputnode.btable_t1'),
-            ('confounds', 'inputnode.confounds'),
             ('hmc_optimization_data', 'inputnode.hmc_optimization_data')]),
     ])  # fmt:skip
 

diff --git a/qsiprep/workflows/dwi/finalize.py b/qsiprep/workflows/dwi/finalize.py
@@ -427,7 +427,6 @@ def init_dwi_finalize_wf(
           ('t1_b0_ref', 'inputnode.t1_b0_ref'),
           ('gradient_table_t1', 'inputnode.gradient_table_t1'),
           ('btable_t1', 'inputnode.btable_t1'),
-          ('confounds', 'inputnode.confounds'),
           ('hmc_optimization_data', 'inputnode.hmc_optimization_data')]),
         (inputnode, gradient_plot, [
             ('bvec_files', 'orig_bvec_files'),