diff --git a/docs/workflows.rst b/docs/workflows.rst
index 86ef3a4dc..9f7cfce97 100644
--- a/docs/workflows.rst
+++ b/docs/workflows.rst
@@ -394,10 +394,11 @@ Parcellation and functional connectivity estimation
 The ``filtered, denoised BOLD`` is fed into a functional connectivity workflow,
 which extracts parcel-wise time series from the BOLD using several atlases:
 
-   a.  Schaefer 100,200,300,400,500,600,700,800,900,1000
-   b.  Glasser 360
-   c.  Gordon 333
-   d.  Tian Subcortical Atlas :footcite:p:`tian2020topographic`
+   a. Schaefer 100, 200, 300, 400, 500, 600, 700, 800, 900, and 1000 parcel resolutions
+   b. Glasser 360
+   c. Gordon 333
+   d. Tian Subcortical Atlas :footcite:p:`tian2020topographic`
+   e. HCP Subcortical Atlas :footcite:p:`glasser2013minimal`
 
 The resulting parcellated time series for each atlas is then used to generate static functional
 connectivity matrices, as measured with Pearson correlation coefficients.
diff --git a/xcp_d/data/atlases/atlas-ciftiSubcortical_dseg.tsv b/xcp_d/data/atlases/atlas-HCP_dseg.tsv
similarity index 100%
rename from xcp_d/data/atlases/atlas-ciftiSubcortical_dseg.tsv
rename to xcp_d/data/atlases/atlas-HCP_dseg.tsv
diff --git a/xcp_d/data/atlases/tpl-MNI152NLin6Asym_atlas-ciftiSubcortical_res-02_dseg.json b/xcp_d/data/atlases/tpl-MNI152NLin6Asym_atlas-HCP_res-02_dseg.json
similarity index 81%
rename from xcp_d/data/atlases/tpl-MNI152NLin6Asym_atlas-ciftiSubcortical_res-02_dseg.json
rename to xcp_d/data/atlases/tpl-MNI152NLin6Asym_atlas-HCP_res-02_dseg.json
index f42caa5f6..9a677bc74 100644
--- a/xcp_d/data/atlases/tpl-MNI152NLin6Asym_atlas-ciftiSubcortical_res-02_dseg.json
+++ b/xcp_d/data/atlases/tpl-MNI152NLin6Asym_atlas-HCP_res-02_dseg.json
@@ -1,8 +1,9 @@
 {
     "BIDSVersion": "1.8.0",
-    "Description": "The subcortical labels from the CIFTI template.",
-    "Name": "CIFTI Subcortical",
+    "Description": "The subcortical labels from the HCP CIFTI template. This should match 'tpl-MNI152NLin6Asym_res-02_atlas-HCP_dseg.nii.gz' from templateflow.",
+    "Name": "HCP CIFTI Subcortical",
     "ReferencesAndLinks": [
+        "https://doi.org/10.1016/j.neuroimage.2013.04.127",
         "https://github.com/DCAN-Labs/dcan_bold_processing/blob/6a4739bfa4580fd4593f6c786c539ba9c582779b/templates/parcellations/subcortical/fsLR/subcortical.subcortical.32k_fs_LR.dlabel.nii"
     ],
     "Resolution": {
diff --git a/xcp_d/data/atlases/tpl-MNI152NLin6Asym_atlas-ciftiSubcortical_res-02_dseg.nii.gz b/xcp_d/data/atlases/tpl-MNI152NLin6Asym_atlas-HCP_res-02_dseg.nii.gz
similarity index 100%
rename from xcp_d/data/atlases/tpl-MNI152NLin6Asym_atlas-ciftiSubcortical_res-02_dseg.nii.gz
rename to xcp_d/data/atlases/tpl-MNI152NLin6Asym_atlas-HCP_res-02_dseg.nii.gz
diff --git a/xcp_d/data/atlases/tpl-fsLR_atlas-ciftiSubcortical_den-32k_dseg.dlabel.nii b/xcp_d/data/atlases/tpl-fsLR_atlas-HCP_den-32k_dseg.dlabel.nii
similarity index 100%
rename from xcp_d/data/atlases/tpl-fsLR_atlas-ciftiSubcortical_den-32k_dseg.dlabel.nii
rename to xcp_d/data/atlases/tpl-fsLR_atlas-HCP_den-32k_dseg.dlabel.nii
diff --git a/xcp_d/data/atlases/tpl-fsLR_atlas-ciftiSubcortical_den-32k_dseg.json b/xcp_d/data/atlases/tpl-fsLR_atlas-HCP_den-32k_dseg.json
similarity index 87%
rename from xcp_d/data/atlases/tpl-fsLR_atlas-ciftiSubcortical_den-32k_dseg.json
rename to xcp_d/data/atlases/tpl-fsLR_atlas-HCP_den-32k_dseg.json
index 61d5a3cf8..63c8c4215 100644
--- a/xcp_d/data/atlases/tpl-fsLR_atlas-ciftiSubcortical_den-32k_dseg.json
+++ b/xcp_d/data/atlases/tpl-fsLR_atlas-HCP_den-32k_dseg.json
@@ -3,9 +3,10 @@
     "Density": {
         "32k": "2 mm3 subcortical data."
     },
-    "Description": "The subcortical labels from the CIFTI template.",
-    "Name": "CIFTI Subcortical",
+    "Description": "The subcortical labels from the HCP CIFTI template.",
+    "Name": "HCP CIFTI Subcortical",
     "ReferencesAndLinks": [
+        "https://doi.org/10.1016/j.neuroimage.2013.04.127",
         "https://github.com/DCAN-Labs/dcan_bold_processing/blob/6a4739bfa4580fd4593f6c786c539ba9c582779b/templates/parcellations/subcortical/fsLR/subcortical.subcortical.32k_fs_LR.dlabel.nii"
     ],
     "SpatialReference": {
diff --git a/xcp_d/data/boilerplate.bib b/xcp_d/data/boilerplate.bib
index 74e0824ba..c3ee43b5b 100644
--- a/xcp_d/data/boilerplate.bib
+++ b/xcp_d/data/boilerplate.bib
@@ -209,7 +209,7 @@ @article{power_fd_dvars
 	file = {Accepted Version:/Users/adebimpe/Zotero/storage/2GWXNAAS/Power et al. - 2014 - Methods to detect, characterize, and remove motion.pdf:application/pdf},
 }
 
-@article{hcppipelines,
+@article{glasser2013minimal,
 	title = {The minimal preprocessing pipelines for the {Human} {Connectome} {Project}},
 	volume = {80},
 	issn = {1095-9572},
diff --git a/xcp_d/tests/data/test_ds001419_cifti_outputs.txt b/xcp_d/tests/data/test_ds001419_cifti_outputs.txt
index a7fd6e7b8..5d80f0caa 100644
--- a/xcp_d/tests/data/test_ds001419_cifti_outputs.txt
+++ b/xcp_d/tests/data/test_ds001419_cifti_outputs.txt
@@ -15,7 +15,7 @@ xcp_d/space-fsLR_atlas-Schaefer717_den-91k_dseg.dlabel.nii
 xcp_d/space-fsLR_atlas-Schaefer817_den-91k_dseg.dlabel.nii
 xcp_d/space-fsLR_atlas-Schaefer917_den-91k_dseg.dlabel.nii
 xcp_d/space-fsLR_atlas-Tian_den-91k_dseg.dlabel.nii
-xcp_d/space-fsLR_atlas-ciftiSubcortical_den-91k_dseg.dlabel.nii
+xcp_d/space-fsLR_atlas-HCP_den-91k_dseg.dlabel.nii
 xcp_d/sub-01
 xcp_d/sub-01.html
 xcp_d/sub-01/anat
@@ -122,13 +122,13 @@ xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-fsLR_atlas-Tian_den-91k_times
 xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-fsLR_atlas-Tian_measure-pearsoncorrelation_conmat.tsv
 xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-fsLR_atlas-Tian_reho.tsv
 xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-fsLR_atlas-Tian_timeseries.tsv
-xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-fsLR_atlas-ciftiSubcortical_coverage.tsv
-xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-fsLR_atlas-ciftiSubcortical_den-91k_coverage.pscalar.nii
-xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-fsLR_atlas-ciftiSubcortical_den-91k_measure-pearsoncorrelation_conmat.pconn.nii
-xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-fsLR_atlas-ciftiSubcortical_den-91k_timeseries.ptseries.nii
-xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-fsLR_atlas-ciftiSubcortical_measure-pearsoncorrelation_conmat.tsv
-xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-fsLR_atlas-ciftiSubcortical_reho.tsv
-xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-fsLR_atlas-ciftiSubcortical_timeseries.tsv
+xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-fsLR_atlas-HCP_coverage.tsv
+xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-fsLR_atlas-HCP_den-91k_coverage.pscalar.nii
+xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-fsLR_atlas-HCP_den-91k_measure-pearsoncorrelation_conmat.pconn.nii
+xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-fsLR_atlas-HCP_den-91k_timeseries.ptseries.nii
+xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-fsLR_atlas-HCP_measure-pearsoncorrelation_conmat.tsv
+xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-fsLR_atlas-HCP_reho.tsv
+xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-fsLR_atlas-HCP_timeseries.tsv
 xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-fsLR_den-91k_desc-denoisedSmoothed_bold.dtseries.nii
 xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-fsLR_den-91k_desc-denoisedSmoothed_bold.json
 xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-fsLR_den-91k_desc-denoised_bold.dtseries.nii
@@ -234,13 +234,13 @@ xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-fsLR_atlas-Tian_den-91k_times
 xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-fsLR_atlas-Tian_measure-pearsoncorrelation_conmat.tsv
 xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-fsLR_atlas-Tian_reho.tsv
 xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-fsLR_atlas-Tian_timeseries.tsv
-xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-fsLR_atlas-ciftiSubcortical_coverage.tsv
-xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-fsLR_atlas-ciftiSubcortical_den-91k_coverage.pscalar.nii
-xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-fsLR_atlas-ciftiSubcortical_den-91k_measure-pearsoncorrelation_conmat.pconn.nii
-xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-fsLR_atlas-ciftiSubcortical_den-91k_timeseries.ptseries.nii
-xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-fsLR_atlas-ciftiSubcortical_measure-pearsoncorrelation_conmat.tsv
-xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-fsLR_atlas-ciftiSubcortical_reho.tsv
-xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-fsLR_atlas-ciftiSubcortical_timeseries.tsv
+xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-fsLR_atlas-HCP_coverage.tsv
+xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-fsLR_atlas-HCP_den-91k_coverage.pscalar.nii
+xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-fsLR_atlas-HCP_den-91k_measure-pearsoncorrelation_conmat.pconn.nii
+xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-fsLR_atlas-HCP_den-91k_timeseries.ptseries.nii
+xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-fsLR_atlas-HCP_measure-pearsoncorrelation_conmat.tsv
+xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-fsLR_atlas-HCP_reho.tsv
+xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-fsLR_atlas-HCP_timeseries.tsv
 xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-fsLR_den-91k_desc-denoisedSmoothed_bold.dtseries.nii
 xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-fsLR_den-91k_desc-denoisedSmoothed_bold.json
 xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-fsLR_den-91k_desc-denoised_bold.dtseries.nii
@@ -275,8 +275,8 @@ xcp_d/sub-01/func/sub-01_task-imagery_space-fsLR_atlas-Schaefer917_den-91k_times
 xcp_d/sub-01/func/sub-01_task-imagery_space-fsLR_atlas-Schaefer917_timeseries.tsv
 xcp_d/sub-01/func/sub-01_task-imagery_space-fsLR_atlas-Tian_den-91k_timeseries.ptseries.nii
 xcp_d/sub-01/func/sub-01_task-imagery_space-fsLR_atlas-Tian_timeseries.tsv
-xcp_d/sub-01/func/sub-01_task-imagery_space-fsLR_atlas-ciftiSubcortical_den-91k_timeseries.ptseries.nii
-xcp_d/sub-01/func/sub-01_task-imagery_space-fsLR_atlas-ciftiSubcortical_timeseries.tsv
+xcp_d/sub-01/func/sub-01_task-imagery_space-fsLR_atlas-HCP_den-91k_timeseries.ptseries.nii
+xcp_d/sub-01/func/sub-01_task-imagery_space-fsLR_atlas-HCP_timeseries.tsv
 xcp_d/sub-01/func/sub-01_task-imagery_space-fsLR_den-91k_desc-denoisedSmoothed_bold.dtseries.nii
 xcp_d/sub-01/func/sub-01_task-imagery_space-fsLR_den-91k_desc-denoised_bold.dtseries.nii
 xcp_d/sub-01/func/sub-01_task-imagery_space-fsLR_den-91k_desc-interpolated_bold.dtseries.nii
diff --git a/xcp_d/tests/data/test_ds001419_nifti_outputs.txt b/xcp_d/tests/data/test_ds001419_nifti_outputs.txt
index 8fce3db52..19b287bfc 100644
--- a/xcp_d/tests/data/test_ds001419_nifti_outputs.txt
+++ b/xcp_d/tests/data/test_ds001419_nifti_outputs.txt
@@ -15,7 +15,7 @@ xcp_d/space-MNI152NLin2009cAsym_atlas-Schaefer717_res-2_dseg.nii.gz
 xcp_d/space-MNI152NLin2009cAsym_atlas-Schaefer817_res-2_dseg.nii.gz
 xcp_d/space-MNI152NLin2009cAsym_atlas-Schaefer917_res-2_dseg.nii.gz
 xcp_d/space-MNI152NLin2009cAsym_atlas-Tian_res-2_dseg.nii.gz
-xcp_d/space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_res-2_dseg.nii.gz
+xcp_d/space-MNI152NLin2009cAsym_atlas-HCP_res-2_dseg.nii.gz
 xcp_d/sub-01
 xcp_d/sub-01.html
 xcp_d/sub-01/anat
@@ -37,7 +37,7 @@ xcp_d/sub-01/func/sub-01_task-imagery_space-MNI152NLin2009cAsym_atlas-Schaefer71
 xcp_d/sub-01/func/sub-01_task-imagery_space-MNI152NLin2009cAsym_atlas-Schaefer817_timeseries.tsv
 xcp_d/sub-01/func/sub-01_task-imagery_space-MNI152NLin2009cAsym_atlas-Schaefer917_timeseries.tsv
 xcp_d/sub-01/func/sub-01_task-imagery_space-MNI152NLin2009cAsym_atlas-Tian_timeseries.tsv
-xcp_d/sub-01/func/sub-01_task-imagery_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_timeseries.tsv
+xcp_d/sub-01/func/sub-01_task-imagery_space-MNI152NLin2009cAsym_atlas-HCP_timeseries.tsv
 xcp_d/sub-01/func/sub-01_task-imagery_space-MNI152NLin2009cAsym_res-2_desc-denoisedSmoothed_bold.json
 xcp_d/sub-01/func/sub-01_task-imagery_space-MNI152NLin2009cAsym_res-2_desc-denoisedSmoothed_bold.nii.gz
 xcp_d/sub-01/func/sub-01_task-imagery_space-MNI152NLin2009cAsym_res-2_desc-denoised_bold.json
@@ -125,12 +125,12 @@ xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-MNI152NLin2009cAsym_atlas-Tia
 xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-MNI152NLin2009cAsym_atlas-Tian_measure-pearsoncorrelation_desc-33volumes_conmat.tsv
 xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-MNI152NLin2009cAsym_atlas-Tian_reho.tsv
 xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-MNI152NLin2009cAsym_atlas-Tian_timeseries.tsv
-xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_coverage.tsv
-xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_measure-pearsoncorrelation_conmat.tsv
-xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_measure-pearsoncorrelation_desc-26volumes_conmat.tsv
-xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_measure-pearsoncorrelation_desc-33volumes_conmat.tsv
-xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_reho.tsv
-xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_timeseries.tsv
+xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-MNI152NLin2009cAsym_atlas-HCP_coverage.tsv
+xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-MNI152NLin2009cAsym_atlas-HCP_measure-pearsoncorrelation_conmat.tsv
+xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-MNI152NLin2009cAsym_atlas-HCP_measure-pearsoncorrelation_desc-26volumes_conmat.tsv
+xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-MNI152NLin2009cAsym_atlas-HCP_measure-pearsoncorrelation_desc-33volumes_conmat.tsv
+xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-MNI152NLin2009cAsym_atlas-HCP_reho.tsv
+xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-MNI152NLin2009cAsym_atlas-HCP_timeseries.tsv
 xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-MNI152NLin2009cAsym_desc-linc_qc.csv
 xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-MNI152NLin2009cAsym_res-2_desc-denoisedSmoothed_bold.json
 xcp_d/sub-01/func/sub-01_task-imagery_run-01_space-MNI152NLin2009cAsym_res-2_desc-denoisedSmoothed_bold.nii.gz
@@ -221,12 +221,12 @@ xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-MNI152NLin2009cAsym_atlas-Tia
 xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-MNI152NLin2009cAsym_atlas-Tian_measure-pearsoncorrelation_desc-33volumes_conmat.tsv
 xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-MNI152NLin2009cAsym_atlas-Tian_reho.tsv
 xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-MNI152NLin2009cAsym_atlas-Tian_timeseries.tsv
-xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_coverage.tsv
-xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_measure-pearsoncorrelation_conmat.tsv
-xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_measure-pearsoncorrelation_desc-26volumes_conmat.tsv
-xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_measure-pearsoncorrelation_desc-33volumes_conmat.tsv
-xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_reho.tsv
-xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_timeseries.tsv
+xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-MNI152NLin2009cAsym_atlas-HCP_coverage.tsv
+xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-MNI152NLin2009cAsym_atlas-HCP_measure-pearsoncorrelation_conmat.tsv
+xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-MNI152NLin2009cAsym_atlas-HCP_measure-pearsoncorrelation_desc-26volumes_conmat.tsv
+xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-MNI152NLin2009cAsym_atlas-HCP_measure-pearsoncorrelation_desc-33volumes_conmat.tsv
+xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-MNI152NLin2009cAsym_atlas-HCP_reho.tsv
+xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-MNI152NLin2009cAsym_atlas-HCP_timeseries.tsv
 xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-MNI152NLin2009cAsym_desc-linc_qc.csv
 xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-MNI152NLin2009cAsym_res-2_desc-denoisedSmoothed_bold.json
 xcp_d/sub-01/func/sub-01_task-imagery_run-02_space-MNI152NLin2009cAsym_res-2_desc-denoisedSmoothed_bold.nii.gz
@@ -317,12 +317,12 @@ xcp_d/sub-01/func/sub-01_task-rest_space-MNI152NLin2009cAsym_atlas-Tian_measure-
 xcp_d/sub-01/func/sub-01_task-rest_space-MNI152NLin2009cAsym_atlas-Tian_measure-pearsoncorrelation_desc-33volumes_conmat.tsv
 xcp_d/sub-01/func/sub-01_task-rest_space-MNI152NLin2009cAsym_atlas-Tian_reho.tsv
 xcp_d/sub-01/func/sub-01_task-rest_space-MNI152NLin2009cAsym_atlas-Tian_timeseries.tsv
-xcp_d/sub-01/func/sub-01_task-rest_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_coverage.tsv
-xcp_d/sub-01/func/sub-01_task-rest_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_measure-pearsoncorrelation_conmat.tsv
-xcp_d/sub-01/func/sub-01_task-rest_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_measure-pearsoncorrelation_desc-26volumes_conmat.tsv
-xcp_d/sub-01/func/sub-01_task-rest_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_measure-pearsoncorrelation_desc-33volumes_conmat.tsv
-xcp_d/sub-01/func/sub-01_task-rest_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_reho.tsv
-xcp_d/sub-01/func/sub-01_task-rest_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_timeseries.tsv
+xcp_d/sub-01/func/sub-01_task-rest_space-MNI152NLin2009cAsym_atlas-HCP_coverage.tsv
+xcp_d/sub-01/func/sub-01_task-rest_space-MNI152NLin2009cAsym_atlas-HCP_measure-pearsoncorrelation_conmat.tsv
+xcp_d/sub-01/func/sub-01_task-rest_space-MNI152NLin2009cAsym_atlas-HCP_measure-pearsoncorrelation_desc-26volumes_conmat.tsv
+xcp_d/sub-01/func/sub-01_task-rest_space-MNI152NLin2009cAsym_atlas-HCP_measure-pearsoncorrelation_desc-33volumes_conmat.tsv
+xcp_d/sub-01/func/sub-01_task-rest_space-MNI152NLin2009cAsym_atlas-HCP_reho.tsv
+xcp_d/sub-01/func/sub-01_task-rest_space-MNI152NLin2009cAsym_atlas-HCP_timeseries.tsv
 xcp_d/sub-01/func/sub-01_task-rest_space-MNI152NLin2009cAsym_desc-linc_qc.csv
 xcp_d/sub-01/func/sub-01_task-rest_space-MNI152NLin2009cAsym_res-2_desc-denoisedSmoothed_bold.json
 xcp_d/sub-01/func/sub-01_task-rest_space-MNI152NLin2009cAsym_res-2_desc-denoisedSmoothed_bold.nii.gz
diff --git a/xcp_d/tests/data/test_fmriprep_without_freesurfer_outputs.txt b/xcp_d/tests/data/test_fmriprep_without_freesurfer_outputs.txt
index 5bb44a5ff..36a63a8ba 100644
--- a/xcp_d/tests/data/test_fmriprep_without_freesurfer_outputs.txt
+++ b/xcp_d/tests/data/test_fmriprep_without_freesurfer_outputs.txt
@@ -18,7 +18,7 @@ xcp_d/space-MNI152NLin2009cAsym_atlas-Schaefer717_dseg.nii.gz
 xcp_d/space-MNI152NLin2009cAsym_atlas-Schaefer817_dseg.nii.gz
 xcp_d/space-MNI152NLin2009cAsym_atlas-Schaefer917_dseg.nii.gz
 xcp_d/space-MNI152NLin2009cAsym_atlas-Tian_dseg.nii.gz
-xcp_d/space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_dseg.nii.gz
+xcp_d/space-MNI152NLin2009cAsym_atlas-HCP_dseg.nii.gz
 xcp_d/sub-01
 xcp_d/sub-01.html
 xcp_d/sub-01/anat
@@ -83,10 +83,10 @@ xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-1_space-MNI152NLin2009cAsym_a
 xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-1_space-MNI152NLin2009cAsym_atlas-Tian_measure-pearsoncorrelation_conmat.tsv
 xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-1_space-MNI152NLin2009cAsym_atlas-Tian_reho.tsv
 xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-1_space-MNI152NLin2009cAsym_atlas-Tian_timeseries.tsv
-xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-1_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_coverage.tsv
-xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-1_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_measure-pearsoncorrelation_conmat.tsv
-xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-1_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_reho.tsv
-xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-1_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_timeseries.tsv
+xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-1_space-MNI152NLin2009cAsym_atlas-HCP_coverage.tsv
+xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-1_space-MNI152NLin2009cAsym_atlas-HCP_measure-pearsoncorrelation_conmat.tsv
+xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-1_space-MNI152NLin2009cAsym_atlas-HCP_reho.tsv
+xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-1_space-MNI152NLin2009cAsym_atlas-HCP_timeseries.tsv
 xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-1_space-MNI152NLin2009cAsym_desc-denoisedSmoothed_bold.json
 xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-1_space-MNI152NLin2009cAsym_desc-denoisedSmoothed_bold.nii.gz
 xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-1_space-MNI152NLin2009cAsym_desc-denoised_bold.json
@@ -154,10 +154,10 @@ xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-2_space-MNI152NLin2009cAsym_a
 xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-2_space-MNI152NLin2009cAsym_atlas-Tian_measure-pearsoncorrelation_conmat.tsv
 xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-2_space-MNI152NLin2009cAsym_atlas-Tian_reho.tsv
 xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-2_space-MNI152NLin2009cAsym_atlas-Tian_timeseries.tsv
-xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-2_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_coverage.tsv
-xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-2_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_measure-pearsoncorrelation_conmat.tsv
-xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-2_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_reho.tsv
-xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-2_space-MNI152NLin2009cAsym_atlas-ciftiSubcortical_timeseries.tsv
+xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-2_space-MNI152NLin2009cAsym_atlas-HCP_coverage.tsv
+xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-2_space-MNI152NLin2009cAsym_atlas-HCP_measure-pearsoncorrelation_conmat.tsv
+xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-2_space-MNI152NLin2009cAsym_atlas-HCP_reho.tsv
+xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-2_space-MNI152NLin2009cAsym_atlas-HCP_timeseries.tsv
 xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-2_space-MNI152NLin2009cAsym_desc-denoisedSmoothed_bold.json
 xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-2_space-MNI152NLin2009cAsym_desc-denoisedSmoothed_bold.nii.gz
 xcp_d/sub-01/func/sub-01_task-mixedgamblestask_run-2_space-MNI152NLin2009cAsym_desc-denoised_bold.json
diff --git a/xcp_d/tests/data/test_nibabies_outputs.txt b/xcp_d/tests/data/test_nibabies_outputs.txt
index 7e7b02521..94ff6fd6b 100644
--- a/xcp_d/tests/data/test_nibabies_outputs.txt
+++ b/xcp_d/tests/data/test_nibabies_outputs.txt
@@ -15,7 +15,7 @@ xcp_d/space-MNIInfant_atlas-Schaefer717_cohort-1_dseg.nii.gz
 xcp_d/space-MNIInfant_atlas-Schaefer817_cohort-1_dseg.nii.gz
 xcp_d/space-MNIInfant_atlas-Schaefer917_cohort-1_dseg.nii.gz
 xcp_d/space-MNIInfant_atlas-Tian_cohort-1_dseg.nii.gz
-xcp_d/space-MNIInfant_atlas-ciftiSubcortical_cohort-1_dseg.nii.gz
+xcp_d/space-MNIInfant_atlas-HCP_cohort-1_dseg.nii.gz
 xcp_d/sub-01
 xcp_d/sub-01.html
 xcp_d/sub-01/ses-1mo
@@ -94,11 +94,11 @@ xcp_d/sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_space-MNIInfan
 xcp_d/sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_space-MNIInfant_atlas-Tian_cohort-1_measure-pearsoncorrelation_conmat.tsv
 xcp_d/sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_space-MNIInfant_atlas-Tian_cohort-1_reho.tsv
 xcp_d/sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_space-MNIInfant_atlas-Tian_cohort-1_timeseries.tsv
-xcp_d/sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_space-MNIInfant_atlas-ciftiSubcortical_cohort-1_alff.tsv
-xcp_d/sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_space-MNIInfant_atlas-ciftiSubcortical_cohort-1_coverage.tsv
-xcp_d/sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_space-MNIInfant_atlas-ciftiSubcortical_cohort-1_measure-pearsoncorrelation_conmat.tsv
-xcp_d/sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_space-MNIInfant_atlas-ciftiSubcortical_cohort-1_reho.tsv
-xcp_d/sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_space-MNIInfant_atlas-ciftiSubcortical_cohort-1_timeseries.tsv
+xcp_d/sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_space-MNIInfant_atlas-HCP_cohort-1_alff.tsv
+xcp_d/sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_space-MNIInfant_atlas-HCP_cohort-1_coverage.tsv
+xcp_d/sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_space-MNIInfant_atlas-HCP_cohort-1_measure-pearsoncorrelation_conmat.tsv
+xcp_d/sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_space-MNIInfant_atlas-HCP_cohort-1_reho.tsv
+xcp_d/sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_space-MNIInfant_atlas-HCP_cohort-1_timeseries.tsv
 xcp_d/sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_space-MNIInfant_cohort-1_alff.json
 xcp_d/sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_space-MNIInfant_cohort-1_alff.nii.gz
 xcp_d/sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_space-MNIInfant_cohort-1_desc-denoised_bold.json
diff --git a/xcp_d/tests/data/test_pnc_cifti_outputs.txt b/xcp_d/tests/data/test_pnc_cifti_outputs.txt
index 02f319d84..94cf420fc 100644
--- a/xcp_d/tests/data/test_pnc_cifti_outputs.txt
+++ b/xcp_d/tests/data/test_pnc_cifti_outputs.txt
@@ -15,7 +15,7 @@ xcp_d/space-fsLR_atlas-Schaefer717_den-91k_dseg.dlabel.nii
 xcp_d/space-fsLR_atlas-Schaefer817_den-91k_dseg.dlabel.nii
 xcp_d/space-fsLR_atlas-Schaefer917_den-91k_dseg.dlabel.nii
 xcp_d/space-fsLR_atlas-Tian_den-91k_dseg.dlabel.nii
-xcp_d/space-fsLR_atlas-ciftiSubcortical_den-91k_dseg.dlabel.nii
+xcp_d/space-fsLR_atlas-HCP_den-91k_dseg.dlabel.nii
 xcp_d/sub-1648798153
 xcp_d/sub-1648798153.html
 xcp_d/sub-1648798153/ses-PNC1
@@ -170,13 +170,13 @@ xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleb
 xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-fsLR_atlas-Tian_measure-pearsoncorrelation_conmat.tsv
 xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-fsLR_atlas-Tian_reho.tsv
 xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-fsLR_atlas-Tian_timeseries.tsv
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-fsLR_atlas-ciftiSubcortical_coverage.tsv
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-fsLR_atlas-ciftiSubcortical_den-91k_coverage.pscalar.nii
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-fsLR_atlas-ciftiSubcortical_den-91k_measure-pearsoncorrelation_conmat.pconn.nii
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-fsLR_atlas-ciftiSubcortical_den-91k_timeseries.ptseries.nii
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-fsLR_atlas-ciftiSubcortical_measure-pearsoncorrelation_conmat.tsv
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-fsLR_atlas-ciftiSubcortical_reho.tsv
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-fsLR_atlas-ciftiSubcortical_timeseries.tsv
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-fsLR_atlas-HCP_coverage.tsv
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-fsLR_atlas-HCP_den-91k_coverage.pscalar.nii
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-fsLR_atlas-HCP_den-91k_measure-pearsoncorrelation_conmat.pconn.nii
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-fsLR_atlas-HCP_den-91k_timeseries.ptseries.nii
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-fsLR_atlas-HCP_measure-pearsoncorrelation_conmat.tsv
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-fsLR_atlas-HCP_reho.tsv
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-fsLR_atlas-HCP_timeseries.tsv
 xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-fsLR_den-91k_desc-denoisedSmoothed_bold.dtseries.nii
 xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-fsLR_den-91k_desc-denoisedSmoothed_bold.json
 xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-fsLR_den-91k_desc-denoised_bold.dtseries.nii
diff --git a/xcp_d/tests/data/test_pnc_cifti_t2wonly_outputs.txt b/xcp_d/tests/data/test_pnc_cifti_t2wonly_outputs.txt
index 6e80ed6d1..104030903 100644
--- a/xcp_d/tests/data/test_pnc_cifti_t2wonly_outputs.txt
+++ b/xcp_d/tests/data/test_pnc_cifti_t2wonly_outputs.txt
@@ -15,7 +15,7 @@ xcp_d/space-fsLR_atlas-Schaefer717_den-91k_dseg.dlabel.nii
 xcp_d/space-fsLR_atlas-Schaefer817_den-91k_dseg.dlabel.nii
 xcp_d/space-fsLR_atlas-Schaefer917_den-91k_dseg.dlabel.nii
 xcp_d/space-fsLR_atlas-Tian_den-91k_dseg.dlabel.nii
-xcp_d/space-fsLR_atlas-ciftiSubcortical_den-91k_dseg.dlabel.nii
+xcp_d/space-fsLR_atlas-HCP_den-91k_dseg.dlabel.nii
 xcp_d/sub-1648798153
 xcp_d/sub-1648798153.html
 xcp_d/sub-1648798153/ses-PNC1
@@ -169,13 +169,13 @@ xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-idemo_space-fsLR
 xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-idemo_space-fsLR_atlas-Tian_measure-pearsoncorrelation_conmat.tsv
 xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-idemo_space-fsLR_atlas-Tian_reho.tsv
 xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-idemo_space-fsLR_atlas-Tian_timeseries.tsv
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-idemo_space-fsLR_atlas-ciftiSubcortical_coverage.tsv
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-idemo_space-fsLR_atlas-ciftiSubcortical_den-91k_coverage.pscalar.nii
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-idemo_space-fsLR_atlas-ciftiSubcortical_den-91k_measure-pearsoncorrelation_conmat.pconn.nii
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-idemo_space-fsLR_atlas-ciftiSubcortical_den-91k_timeseries.ptseries.nii
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-idemo_space-fsLR_atlas-ciftiSubcortical_measure-pearsoncorrelation_conmat.tsv
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-idemo_space-fsLR_atlas-ciftiSubcortical_reho.tsv
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-idemo_space-fsLR_atlas-ciftiSubcortical_timeseries.tsv
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-idemo_space-fsLR_atlas-HCP_coverage.tsv
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-idemo_space-fsLR_atlas-HCP_den-91k_coverage.pscalar.nii
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-idemo_space-fsLR_atlas-HCP_den-91k_measure-pearsoncorrelation_conmat.pconn.nii
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-idemo_space-fsLR_atlas-HCP_den-91k_timeseries.ptseries.nii
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-idemo_space-fsLR_atlas-HCP_measure-pearsoncorrelation_conmat.tsv
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-idemo_space-fsLR_atlas-HCP_reho.tsv
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-idemo_space-fsLR_atlas-HCP_timeseries.tsv
 xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-idemo_space-fsLR_den-91k_desc-denoisedSmoothed_bold.dtseries.nii
 xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-idemo_space-fsLR_den-91k_desc-denoisedSmoothed_bold.json
 xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-idemo_space-fsLR_den-91k_desc-denoised_bold.dtseries.nii
diff --git a/xcp_d/tests/data/test_pnc_nifti_outputs.txt b/xcp_d/tests/data/test_pnc_nifti_outputs.txt
index 41a75d5ba..638e082bd 100644
--- a/xcp_d/tests/data/test_pnc_nifti_outputs.txt
+++ b/xcp_d/tests/data/test_pnc_nifti_outputs.txt
@@ -15,7 +15,7 @@ xcp_d/space-MNI152NLin6Asym_atlas-Schaefer717_res-2_dseg.nii.gz
 xcp_d/space-MNI152NLin6Asym_atlas-Schaefer817_res-2_dseg.nii.gz
 xcp_d/space-MNI152NLin6Asym_atlas-Schaefer917_res-2_dseg.nii.gz
 xcp_d/space-MNI152NLin6Asym_atlas-Tian_res-2_dseg.nii.gz
-xcp_d/space-MNI152NLin6Asym_atlas-ciftiSubcortical_res-2_dseg.nii.gz
+xcp_d/space-MNI152NLin6Asym_atlas-HCP_res-2_dseg.nii.gz
 xcp_d/sub-1648798153
 xcp_d/sub-1648798153.html
 xcp_d/sub-1648798153/ses-PNC1
@@ -107,12 +107,12 @@ xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-frac2back_space-
 xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-frac2back_space-MNI152NLin6Asym_atlas-Tian_measure-pearsoncorrelation_desc-33volumes_conmat.tsv
 xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-frac2back_space-MNI152NLin6Asym_atlas-Tian_reho.tsv
 xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-frac2back_space-MNI152NLin6Asym_atlas-Tian_timeseries.tsv
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-frac2back_space-MNI152NLin6Asym_atlas-ciftiSubcortical_coverage.tsv
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-frac2back_space-MNI152NLin6Asym_atlas-ciftiSubcortical_measure-pearsoncorrelation_conmat.tsv
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-frac2back_space-MNI152NLin6Asym_atlas-ciftiSubcortical_measure-pearsoncorrelation_desc-26volumes_conmat.tsv
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-frac2back_space-MNI152NLin6Asym_atlas-ciftiSubcortical_measure-pearsoncorrelation_desc-33volumes_conmat.tsv
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-frac2back_space-MNI152NLin6Asym_atlas-ciftiSubcortical_reho.tsv
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-frac2back_space-MNI152NLin6Asym_atlas-ciftiSubcortical_timeseries.tsv
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-frac2back_space-MNI152NLin6Asym_atlas-HCP_coverage.tsv
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-frac2back_space-MNI152NLin6Asym_atlas-HCP_measure-pearsoncorrelation_conmat.tsv
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-frac2back_space-MNI152NLin6Asym_atlas-HCP_measure-pearsoncorrelation_desc-26volumes_conmat.tsv
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-frac2back_space-MNI152NLin6Asym_atlas-HCP_measure-pearsoncorrelation_desc-33volumes_conmat.tsv
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-frac2back_space-MNI152NLin6Asym_atlas-HCP_reho.tsv
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-frac2back_space-MNI152NLin6Asym_atlas-HCP_timeseries.tsv
 xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-frac2back_space-MNI152NLin6Asym_desc-linc_qc.csv
 xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-frac2back_space-MNI152NLin6Asym_res-2_desc-denoisedSmoothed_bold.json
 xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-frac2back_space-MNI152NLin6Asym_res-2_desc-denoisedSmoothed_bold.nii.gz
@@ -203,12 +203,12 @@ xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleb
 xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-MNI152NLin6Asym_atlas-Tian_measure-pearsoncorrelation_desc-33volumes_conmat.tsv
 xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-MNI152NLin6Asym_atlas-Tian_reho.tsv
 xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-MNI152NLin6Asym_atlas-Tian_timeseries.tsv
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-MNI152NLin6Asym_atlas-ciftiSubcortical_coverage.tsv
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-MNI152NLin6Asym_atlas-ciftiSubcortical_measure-pearsoncorrelation_conmat.tsv
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-MNI152NLin6Asym_atlas-ciftiSubcortical_measure-pearsoncorrelation_desc-26volumes_conmat.tsv
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-MNI152NLin6Asym_atlas-ciftiSubcortical_measure-pearsoncorrelation_desc-33volumes_conmat.tsv
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-MNI152NLin6Asym_atlas-ciftiSubcortical_reho.tsv
-xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-MNI152NLin6Asym_atlas-ciftiSubcortical_timeseries.tsv
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-MNI152NLin6Asym_atlas-HCP_coverage.tsv
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-MNI152NLin6Asym_atlas-HCP_measure-pearsoncorrelation_conmat.tsv
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-MNI152NLin6Asym_atlas-HCP_measure-pearsoncorrelation_desc-26volumes_conmat.tsv
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-MNI152NLin6Asym_atlas-HCP_measure-pearsoncorrelation_desc-33volumes_conmat.tsv
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-MNI152NLin6Asym_atlas-HCP_reho.tsv
+xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-MNI152NLin6Asym_atlas-HCP_timeseries.tsv
 xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-MNI152NLin6Asym_desc-linc_qc.csv
 xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-MNI152NLin6Asym_res-2_desc-denoisedSmoothed_bold.json
 xcp_d/sub-1648798153/ses-PNC1/func/sub-1648798153_ses-PNC1_task-rest_acq-singleband_space-MNI152NLin6Asym_res-2_desc-denoisedSmoothed_bold.nii.gz
diff --git a/xcp_d/utils/atlas.py b/xcp_d/utils/atlas.py
index af07ec0f8..a84080f96 100644
--- a/xcp_d/utils/atlas.py
+++ b/xcp_d/utils/atlas.py
@@ -35,7 +35,7 @@ def get_atlas_names(subset):
         ],
         "subcortical": [
             "Tian",
-            "ciftiSubcortical",
+            "HCP",
         ],
     }
     atlases["all"] = sorted(list(set(atlases["cortical"] + atlases["subcortical"])))
@@ -54,7 +54,7 @@ def get_atlas_nifti(atlas_name):
     atlas_name : {"Schaefer117", "Schaefer217", "Schaefer317", "Schaefer417", \
                   "Schaefer517", "Schaefer617", "Schaefer717", "Schaefer817", \
                   "Schaefer917", "Schaefer1017", "Glasser", "Gordon", \
-                  "Tian", "ciftiSubcortical"}
+                  "Tian", "HCP"}
         The name of the NIFTI atlas to fetch.
 
     Returns
@@ -106,7 +106,7 @@ def get_atlas_cifti(atlas_name):
     atlas_name : {"Schaefer117", "Schaefer217", "Schaefer317", "Schaefer417", \
                   "Schaefer517", "Schaefer617", "Schaefer717", "Schaefer817", \
                   "Schaefer917", "Schaefer1017", "Glasser", "Gordon", \
-                  "Tian", "ciftiSubcortical"}
+                  "Tian", "HCP"}
         The name of the CIFTI atlas to fetch.
 
     Returns
diff --git a/xcp_d/utils/bids.py b/xcp_d/utils/bids.py
index d41c077e9..5e38fe999 100644
--- a/xcp_d/utils/bids.py
+++ b/xcp_d/utils/bids.py
@@ -712,7 +712,7 @@ def get_preproc_pipeline_info(input_type, fmri_dir):
     elif input_type == "dcan":
         info_dict["references"] = "[@Feczko_Earl_perrone_Fair_2021;@feczko2021adolescent]"
     elif input_type == "hcp":
-        info_dict["references"] = "[@hcppipelines]"
+        info_dict["references"] = "[@glasser2013minimal]"
     elif input_type == "nibabies":
         info_dict["references"] = "[@goncalves_mathias_2022_7072346]"
     else:
diff --git a/xcp_d/utils/doc.py b/xcp_d/utils/doc.py
index 8e8bc67c4..82219cf61 100644
--- a/xcp_d/utils/doc.py
+++ b/xcp_d/utils/doc.py
@@ -512,7 +512,7 @@
     The list of atlas names is generated by :func:`xcp_d.utils.atlas.get_atlas_names`.
     The atlases include: "Schaefer117", "Schaefer217", "Schaefer317", "Schaefer417",
     "Schaefer517", "Schaefer617", "Schaefer717", "Schaefer817", "Schaefer917",
-    "Schaefer1017", "Glasser", "Gordon", "Tian", and "ciftiSubcortical".
+    "Schaefer1017", "Glasser", "Gordon", "Tian", and "HCP".
 """
 
 docdict[
diff --git a/xcp_d/workflows/connectivity.py b/xcp_d/workflows/connectivity.py
index 3b576d055..eedb897a4 100644
--- a/xcp_d/workflows/connectivity.py
+++ b/xcp_d/workflows/connectivity.py
@@ -678,7 +678,7 @@ def init_functional_connectivity_cifti_wf(
     workflow = Workflow(name=name)
     workflow.__desc__ = f"""
 Processed functional timeseries were extracted from residual BOLD using
-Connectome Workbench [@hcppipelines] for the following atlases:
+Connectome Workbench [@glasser2013minimal] for the following atlases:
 the Schaefer 17-network 100, 200, 300, 400, 500, 600, 700, 800, 900, and 1000 parcel
 atlas [@Schaefer_2017], the Glasser atlas [@Glasser_2016],
 the Gordon atlas [@Gordon_2014], and the Tian subcortical atlas [@tian2020topographic].