diff --git a/src/appendices/contributors.md b/src/appendices/contributors.md
index a359956c8e..a15f418e65 100644
--- a/src/appendices/contributors.md
+++ b/src/appendices/contributors.md
@@ -289,6 +289,7 @@ If you contributed to the BIDS ecosystem and your name is not listed, please add
 | Parul Sethi                                          | 📖🔧⚠️💻                               |
 | Patricia Clement                                     | 💬🐛💻📖🔣💡📋🤔📆⚠️📢                 |
 | Patrick Park                                         | 📖💡💬💻                               |
+| Paul Wighton                                         | 📖                                     |
 | Paule-Joanne Toussaint                               | 📖                                     |
 | Peer Herholz                                         | 💬📖👀🔧✅📢                           |
 | Petra Ritter                                         | 📖                                     |
diff --git a/src/derivatives/atlas.md b/src/derivatives/atlas.md
index cb28b83a8f..c632cf9b29 100644
--- a/src/derivatives/atlas.md
+++ b/src/derivatives/atlas.md
@@ -8,21 +8,21 @@ segmentations, and other knowledge annotations such as landmarks defined with
 respect to individual or template brains that are supported by spaces
 such as surfaces and regular grids (images).
 
-For derivatives with atlases in their provenance corresponding to individual subjects,
-the organization follows the standards for BIDS raw and derivatives.
+The organization follows the standards for BIDS raw and derivatives.
 The following entities MAY be employed to specify template- and atlas-derived results:
 
 -    [`tpl-<label>`](../glossary.md#template-entities) is REQUIRED to specify derivatives defining
-     a [template](../common-principles.md).
+     a [template](../common-principles.md).  MUST NOT be used alongside `atlas-<label>`
+-    [`atlas-<label>`](../glossary.md#atlas-entities) is REQUIRED to specify derivatives defining an [atlas](../common-principles.md).  MUST NOT be used alongside `template-<label>`
 -    [`space-<label>`](../glossary.md#space-entities) is REQUIRED to disambiguate derivatives defined with
      respect to different [coordinate systems](../appendices/coordinate-systems.md), following the general
-     BIDS-Derivatives specifications.
+     BIDS-Derivatives specifications.  It is also REQUIRED when [`tpl-<label>`](../glossary.md#template-entities) is used,
+     and the template is NOT serving as the authoritative definition of a space.
 -    [`cohort-<label>`](../glossary.md#cohort-entities) is REQUIRED to disambiguate derivatives defined with
-     respect to different cohort instances of a single [space (coordinate system)](../appendices/coordinate-systems.md).
+     respect to different cohort instances.
      Please note that [`cohort-<label>`](../glossary.md#cohort-entities) MUST NOT be used if neither
-     [`tpl-<label>`](../glossary.md#template-entities) nor [`space-<label>`](../glossary.md#space-entities) are used.
--    [`atlas-<label>`](../glossary.md#atlas-entities) is REQUIRED to encode files pertaining
-     or derived from the atlas identified by the entity's label.
+     [`tpl-<label>`](../glossary.md#template-entities) nor [`space-<label>`](../glossary.md#space-entities)
+     nor [`atlas-<labl>`](../glossary.md#atlas-entities) are used.
 -    [`seg-<label>`](../glossary.md#segmentation-entities) is REQUIRED when a single atlas has several different
      realizations (for instance, segmentations and parcellations created with different criteria) that
      need disambiguation.
@@ -30,23 +30,21 @@ The following entities MAY be employed to specify template- and atlas-derived re
      when the atlas has more than one 'brain unit' resolutions, typically relating to the area covered
      by regions.
 
-The general filename pattern for subject derivatives with templates and atlases in their provenance
+The general filename pattern for subject-level derivatives with templates and atlases 
 follows the general BIDS-Derivatives pattern:
 
 ```Text
 <pipeline_name>/
     sub-<label>/
         <datatype>/
-            <source_entities>[_space-<space>][_cohort-<label>][_atlas-<label>][seg-<label>][_scale-<label>][_res-<label>][_den-<label>][_desc-<label>]_<suffix>.<extension>
+            <source_entities>[_atlas-<label>][_space-<space>][_cohort-<label>][seg-<label>][_scale-<label>][_res-<label>][_den-<label>][_desc-<label>]_<suffix>.<extension>
+            <source_entities>[_tpl-<label>][_space-<space>][_cohort-<label>][seg-<label>][_scale-<label>][_res-<label>][_den-<label>][_desc-<label>]_<suffix>.<extension>
 ```
 
-[`atlas-<label>`](../glossary.md#atlas-entities), [`seg-<label>`](../glossary.md#segmentation-entities),
-and [`scale-<label>`](../glossary.md#scale-entities) are discussed later in section
-[Filenames of derivatives with atlases in their provenance](#filenames-of-derivatives-with-atlases-in-their-provenance).
-
 For derivatives of template- and altas-generating pipelines, which typically aggregate
 several sessions and/or subjects, the derivatives-specific
-[`tpl-<label>` entity](../glossary.md#template-entities) is dual in terms of usage to BIDS raw's
+[`tpl-<label>` entity](../glossary.md#template-entities) and
+[`atlas-<label>` entity](../glossary.md#atlas-entities) are dual in terms of usage to BIDS raw's
 [`sub-<label>`](../glossary.md#subject-entities), and MAY be employed as follows:
 
 ```Text
@@ -55,6 +53,7 @@ several sessions and/or subjects, the derivatives-specific
         [cohort-<label>/]
            [<datatype>/]
                tpl-<label>_<source_entities>[_cohort-<label>][_atlas-<label>][seg-<label>][_scale-<label>][_res-<label>][_den-<label>][_desc-<label>]_<suffix>.<extension>
+               atlas-<label>_<source_entities>[_cohort-<label>][_atlas-<label>][seg-<label>][_scale-<label>][_res-<label>][_den-<label>][_desc-<label>]_<suffix>.<extension>
 ```
 
 where [`suffix`](../glossary.md#suffix-common_principles) will generally be existing BIDS raw modalities
@@ -65,10 +64,9 @@ In terms of [`extension`](../glossary.md#extension-common_principles), `nii[.gz]
 Please note that the [`<datatype>/` directory](../glossary.md#data_type-common_principles) is RECOMMENDED.
 The [`<datatype>/` directory](../glossary.md#data_type-common_principles) MAY be omitted in the case
 only one data type (such as `anat/`) is stored under the `tpl-<label>` directory.
-The [`cohort-<label>` directory and entity](../glossary.md#cohort-entities) MUST be specified for templates
+The [`cohort-<label>` directory and entity](../glossary.md#cohort-entities) MAY be specified for templates
 with several cohorts.
-The [`cohort-<label>` directory and entity](../glossary.md#cohort-entities) are dual in terms of usage to BIDS raw's
-[`session-<label>`](../glossary.md#session-entities).
+
 Both subject-level and template-level results can coexist in a single pipeline directory:
 
 ```Text
@@ -97,8 +95,8 @@ A guide for using macros can be found at
    "colin27-pipeline": {
       "sub-01": {
          "anat": {
-            "sub-01_label-brain_mask.nii.gz": "",
-            "sub-01_label-head_mask.nii.gz": "",
+            "sub-01_seg-brain_mask.nii.gz": "",
+            "sub-01_seg_head_mask.nii.gz": '',
             "sub-01_T1w.nii.gz": "",
             "sub-01_T1w.json": "",
          },
@@ -118,8 +116,8 @@ A guide for using macros can be found at
    "colin27-pipeline": {
       "sub-01": {
          "anat": {
-            "sub-01_res-1_label-brain_mask.nii.gz": "",
-            "sub-01_res-1_label-head_mask.nii.gz": "",
+            "sub-01_res-1_seg-brain_mask.nii.gz": "",
+            "sub-01_res-1_seg-head_mask.nii.gz": "",
             "sub-01_res-1_T1w.nii.gz": "",
             "sub-01_res-1_T1w.json": "",
             "sub-01_res-2_T1w.nii.gz": "",
@@ -132,17 +130,15 @@ A guide for using macros can be found at
 
 ## Multi-subject template and atlases and deriving an existing template/atlas
 
-Atlasing multiple individual brains is a higher-than-first-level analysis,
+Aggregating individual data is a higher-than-first-level analysis,
 as it requires first generating derivatives for the individuals (for example,
 a transformation to align them into a standardized space) and later aggregate
 and distill the sample-pooled knowledge and feature maps.
-Similarly, deriving from an existing template and atlases is also
-a higher-than-first-level analysis as it builds on a previous analysis.
 
 **Multi-subject templates**.
-While at the subject level analysis it is the individual brain that establishes
+While at the subject-level analysis, it is the individual brain that establishes
 stereotaxy.
-At higher-than-first-level stereotaxy is supported by templates, which are
+At higher-than-first-level, stereotaxy is supported by templates, which are
 encoded through the [`tpl-<label>` entity](../glossary.md#template-entities).
 For the pipeline that generated the MNI152NLin2009cAsym, the outputs would look
 like the following example:
@@ -155,22 +151,22 @@ A guide for using macros can be found at
    "mni152nlin2009casym-pipeline": {
       "tpl-MNI152NLin2009cAsym": {
          "anat": {
-            "tpl-MNI152NLin2009cAsym_res-1_label-brain_mask.nii.gz": "",
-            "tpl-MNI152NLin2009cAsym_res-1_label-eye_mask.nii.gz": "",
-            "tpl-MNI152NLin2009cAsym_res-1_label-face_mask.nii.gz": "",
-            "tpl-MNI152NLin2009cAsym_res-1_label-head_mask.nii.gz": "",
-            "tpl-MNI152NLin2009cAsym_res-1_label-CSF_probseg.nii.gz": "",
-            "tpl-MNI152NLin2009cAsym_res-1_label-GM_probseg.nii.gz": "",
-            "tpl-MNI152NLin2009cAsym_res-1_label-WM_probseg.nii.gz": "",
+            "tpl-MNI152NLin2009cAsym_res-1_seg-brain_mask.nii.gz": "",
+            "tpl-MNI152NLin2009cAsym_res-1_seg-eye_mask.nii.gz": "",
+            "tpl-MNI152NLin2009cAsym_res-1_seg-face_mask.nii.gz": "",
+            "tpl-MNI152NLin2009cAsym_res-1_seg-head_mask.nii.gz": "",
+            "atlas-MNI152NLin2009cAsym_res-1_seg-CSF_probseg.nii.gz": "",
+            "atlas-MNI152NLin2009cAsym_res-1_seg-GM_probseg.nii.gz": "",
+            "atlas-MNI152NLin2009cAsym_res-1_seg-WM_probseg.nii.gz": "",
             "tpl-MNI152NLin2009cAsym_res-1_T1w.nii.gz": "",
             "tpl-MNI152NLin2009cAsym_res-1_T1w.json": "",
-            "tpl-MNI152NLin2009cAsym_res-2_label-brain_mask.nii.gz": "",
-            "tpl-MNI152NLin2009cAsym_res-2_label-eye_mask.nii.gz": "",
-            "tpl-MNI152NLin2009cAsym_res-2_label-face_mask.nii.gz": "",
-            "tpl-MNI152NLin2009cAsym_res-2_label-head_mask.nii.gz": "",
-            "tpl-MNI152NLin2009cAsym_res-2_label-CSF_probseg.nii.gz": "",
-            "tpl-MNI152NLin2009cAsym_res-2_label-GM_probseg.nii.gz": "",
-            "tpl-MNI152NLin2009cAsym_res-2_label-WM_probseg.nii.gz": "",
+            "tpl-MNI152NLin2009cAsym_res-2_seg-brain_mask.nii.gz": "",
+            "tpl-MNI152NLin2009cAsym_res-2_seg-eye_mask.nii.gz": "",
+            "tpl-MNI152NLin2009cAsym_res-2_seg-face_mask.nii.gz": "",
+            "tpl-MNI152NLin2009cAsym_res-2_seg-head_mask.nii.gz": "",
+            "atlas-MNI152NLin2009cAsym_res-2_seg-CSF_probseg.nii.gz": "",
+            "atlas-MNI152NLin2009cAsym_res-2_seg-GM_probseg.nii.gz": "",
+            "atlas-MNI152NLin2009cAsym_res-2_seg-WM_probseg.nii.gz": "",
             "tpl-MNI152NLin2009cAsym_res-2_T1w.nii.gz": "",
             "tpl-MNI152NLin2009cAsym_res-2_T1w.json": "",
          },
@@ -181,7 +177,7 @@ A guide for using macros can be found at
 
 **Multi-cohort templates.**
 In the case that the template-generating pipeline derives
-several cohorts, the file structure must employ the
+several cohorts, the file structure MAY employ the
 [`cohort-<label>` directory and entity](../glossary.md#cohort-entities).
 
 <!-- This block generates a file tree.
@@ -196,17 +192,17 @@ A guide for using macros can be found at
                "tpl-MNIPediatricAsym_cohort-1_res-1_PD.nii.gz": "",
                "tpl-MNIPediatricAsym_cohort-1_res-1_T1w.nii.gz": "",
                "tpl-MNIPediatricAsym_cohort-1_res-1_T2w.nii.gz": "",
-               "tpl-MNIPediatricAsym_cohort-1_res-1_desc-brain_mask.nii.gz": "",
-               "tpl-MNIPediatricAsym_cohort-1_res-1_label-CSF_probseg.nii.gz": "",
-               "tpl-MNIPediatricAsym_cohort-1_res-1_label-GM_probseg.nii.gz": "",
-               "tpl-MNIPediatricAsym_cohort-1_res-1_label-WM_probseg.nii.gz": "",
+               "atlas-MNIPediatricAsym_cohort-1_res-1_desc-brain_mask.nii.gz": "",
+               "atlas-MNIPediatricAsym_cohort-1_res-1_seg-CSF_probseg.nii.gz": "",
+               "atlas-MNIPediatricAsym_cohort-1_res-1_seg-GM_probseg.nii.gz": "",
+               "atlas-MNIPediatricAsym_cohort-1_res-1_seg-WM_probseg.nii.gz": "",
                "tpl-MNIPediatricAsym_cohort-1_res-2_PD.nii.gz": "",
                "tpl-MNIPediatricAsym_cohort-1_res-2_T1w.nii.gz": "",
                "tpl-MNIPediatricAsym_cohort-1_res-2_T2w.nii.gz": "",
-               "tpl-MNIPediatricAsym_cohort-1_res-2_desc-brain_mask.nii.gz": "",
-               "tpl-MNIPediatricAsym_cohort-1_res-2_label-CSF_probseg.nii.gz": "",
-               "tpl-MNIPediatricAsym_cohort-1_res-2_label-GM_probseg.nii.gz": "",
-               "tpl-MNIPediatricAsym_cohort-1_res-2_label-WM_probseg.nii.gz": "",
+               "atlas-MNIPediatricAsym_cohort-1_res-2_desc-brain_mask.nii.gz": "",
+               "atlas-MNIPediatricAsym_cohort-1_res-2_seg-CSF_probseg.nii.gz": "",
+               "atlas-MNIPediatricAsym_cohort-1_res-2_seg-GM_probseg.nii.gz": "",
+               "atlas-MNIPediatricAsym_cohort-1_res-2_seg-WM_probseg.nii.gz": "",
             },
          },
          "...": "",
@@ -215,17 +211,17 @@ A guide for using macros can be found at
                "tpl-MNIPediatricAsym_cohort-6_res-1_PD.nii.gz": "",
                "tpl-MNIPediatricAsym_cohort-6_res-1_T1w.nii.gz": "",
                "tpl-MNIPediatricAsym_cohort-6_res-1_T2w.nii.gz": "",
-               "tpl-MNIPediatricAsym_cohort-6_res-1_desc-brain_mask.nii.gz": "",
-               "tpl-MNIPediatricAsym_cohort-6_res-1_label-CSF_probseg.nii.gz": "",
-               "tpl-MNIPediatricAsym_cohort-6_res-1_label-GM_probseg.nii.gz": "",
-               "tpl-MNIPediatricAsym_cohort-6_res-1_label-WM_probseg.nii.gz": "",
+               "atlas-MNIPediatricAsym_cohort-6_res-1_desc-brain_mask.nii.gz": "",
+               "atlas-MNIPediatricAsym_cohort-6_res-1_seg-CSF_probseg.nii.gz": "",
+               "atlas-MNIPediatricAsym_cohort-6_res-1_seg-GM_probseg.nii.gz": "",
+               "atlas-MNIPediatricAsym_cohort-6_res-1_seg-WM_probseg.nii.gz": "",
                "tpl-MNIPediatricAsym_cohort-6_res-2_PD.nii.gz": "",
                "tpl-MNIPediatricAsym_cohort-6_res-2_T1w.nii.gz": "",
                "tpl-MNIPediatricAsym_cohort-6_res-2_T2w.nii.gz": "",
-               "tpl-MNIPediatricAsym_cohort-6_res-2_desc-brain_mask.nii.gz": "",
-               "tpl-MNIPediatricAsym_cohort-6_res-2_label-CSF_probseg.nii.gz": "",
-               "tpl-MNIPediatricAsym_cohort-6_res-2_label-GM_probseg.nii.gz": "",
-               "tpl-MNIPediatricAsym_cohort-6_res-2_label-WM_probseg.nii.gz": "",
+               "atlas-MNIPediatricAsym_cohort-6_res-2_desc-brain_mask.nii.gz": "",
+               "atlas-MNIPediatricAsym_cohort-6_res-2_seg-CSF_probseg.nii.gz": "",
+               "atlas-MNIPediatricAsym_cohort-6_res-2_seg-GM_probseg.nii.gz": "",
+               "atlas-MNIPediatricAsym_cohort-6_res-2_seg-WM_probseg.nii.gz": "",
             },
          },
       },
@@ -267,7 +263,7 @@ A guide for using macros can be found at
       },
       "tpl-MNI152NLin2009cAsym": {
          "anat": {
-            "tpl-MNI152NLin2009cAsym_res-1_label-brain_mask.nii.gz": "",
+            "atlas-MNI152NLin2009cAsym_res-1_seg-brain_mask.nii.gz": "",
             "...": "",
             "tpl-MNI152NLin2009cAsym_res-2_T1w.json": "",
          },
@@ -277,7 +273,7 @@ A guide for using macros can be found at
 }}
 
 **Defining atlases and templates referenced to a pre-existing template.**
-Once a standard space is instantiated by a reference template,
+Once a standard space is defined by a reference template,
 atlasing knowledge MAY be specified employing the
 [`atlas-<label>` entity](../glossary.md#atlas-entities).
 
@@ -297,8 +293,8 @@ A guide for using macros can be found at
             "sub-01_atlas-AAL_dseg.nii.gz": "",
             "sub-01_atlas-AAL_dseg.tsv": "",
             "sub-01_atlas-AAL_probseg.nii.gz": "",
-            "sub-01_label-brain_mask.nii.gz": "",
-            "sub-01_label-head_mask.nii.gz": "",
+            "sub-01_atlas-AAL_seg-brain_mask.nii.gz": "",
+            "sub-01_atlas-AAL_seg-head_mask.nii.gz": "",
             "sub-01_T1w.nii.gz": "",
             "sub-01_T1w.json": "",
          },
@@ -337,18 +333,19 @@ A guide for using macros can be found at
    "colin27-pipeline": {
       "sub-01": {
          "anat": {
-            "sub-01_space-MNI305_atlas-AAL_dseg.json": "",
-            "sub-01_space-MNI305_atlas-AAL_dseg.nii.gz": "",
-            "sub-01_space-MNI305_atlas-AAL_dseg.tsv": "",
-            "sub-01_space-MNI305_atlas-AAL_probseg.nii.gz": "",
-            "sub-01_space-MNI305_label-brain_mask.nii.gz": "",
-            "sub-01_space-MNI305_label-head_mask.nii.gz": "",
-            "sub-01_space-MNI305_T1w.nii.gz": "",
-            "sub-01_space-MNI305_T1w.json": "",
-            "sub-01_space-T1w_label-brain_mask.nii.gz": "",
-            "sub-01_space-T1w_label-head_mask.nii.gz": "",
-            "sub-01_space-T1w_T1w.nii.gz": "",
-            "sub-01_space-T1w_T1w.json": "",
+            "atlas-AAL_space-MNI305_dseg.json": "",
+            "atlas-AAL_space-MNI305_dseg.nii.gz": "",
+            "atlas-AAL_space-MNI305_dseg.tsv": "",
+            "atlas-AAL_space-MNI305_probseg.nii.gz": "",
+            "atlas-AAL_space-MNI305_seg-brain_mask.nii.gz": "",
+            "atlas-AAL_space-MNI305_seg-head_mask.nii.gz": "",
+            "atlas-AAL_space-colin27_dseg.json": "",
+            "atlas-AAL_space-colin27_dseg.nii.gz": "",
+            "atlas-AAL_space-colin27_dseg.tsv": "",
+            "atlas-AAL_space-colin27_probseg.nii.gz": "",
+            "atlas-AAL_space-colin27_seg-brain_mask.nii.gz": "",
+            "atlas-AAL_space-colin27_seg-head_mask.nii.gz": "",
+            "...", "",
          },
       },
    }
@@ -357,7 +354,10 @@ A guide for using macros can be found at
 
 For example, the [PS13 template](https://doi.org/10.18112/openneuro.ds004401.v1.3.0),
 a molecular imaging brain template of Cyclooxygenase-1 (PET),
-was generated in two standard spaces: `MNI152Lin` and `fsaverage`:
+was generated in two standard spaces: `MNI152Lin` and `fsaverage`.  Here, the use of 
+[`space-<label>` entity](../glossary.md#space-entities) in conjuction with the 
+[`tpl-<label>` entity](../glossary.md#template-entities) signifies that these templates do
+NOT serve as the autoritative defintion of a space:
 
 <!-- This block generates a file tree.
 A guide for using macros can be found at
@@ -367,10 +367,8 @@ A guide for using macros can be found at
    "ps13-pipeline": {
       "tpl-ps13": {
          "pet": {
-            "tpl-ps13_space-fsaverage_atlas-ps13_desc-nopvc_dseg.nii.gz": "",
-            "tpl-ps13_space-fsaverage_atlas-ps13_desc-pvc_dseg.nii.gz": "",
-            "tpl-ps13_space-fsaverage_atlas-ps13_dseg.json": "",
-            "tpl-ps13_space-fsaverage_atlas-ps13_dseg.tsv": "",
+            "atlas-fsaverage_dseg.nii.gz": "",
+            "atlas-fsaverage_dseg.json": "",
             "tpl-ps13_space-fsaverage_desc-nopvc_pet.json": "",
             "tpl-ps13_space-fsaverage_desc-nopvc_pet.nii.gz": "",
             "tpl-ps13_space-fsaverage_desc-pvc_pet.json": "",
@@ -395,10 +393,10 @@ A guide for using macros can be found at
             "tpl-ps13_space-fsaverage_stat-std_desc-nopvc_pet.nii.gz": "",
             "tpl-ps13_space-fsaverage_stat-std_desc-pvc_pet.json": "",
             "tpl-ps13_space-fsaverage_stat-std_desc-pvc_pet.nii.gz": "",
-            "tpl-ps13_space-MNI152Lin_atlas-ps13_desc-nopvc_dseg.nii.gz": "",
-            "tpl-ps13_space-MNI152Lin_atlas-ps13_desc-pvc_dseg.nii.gz": "",
-            "tpl-ps13_space-MNI152Lin_atlas-ps13_dseg.json": "",
-            "tpl-ps13_space-MNI152Lin_atlas-ps13_dseg.tsv": "",
+            "tpl-ps13_seg-fsaverage_pet.json": "",
+            "tpl-ps13_seg-fsaverage_json.tsv": "",
+            "tpl-ps13_space-MNI152Lin_desc-nopvc_pet.nii.gz": "",
+            "tpl-ps13_space-MNI152Lin_desc-pvc_pet.nii.gz": "",
             "tpl-ps13_space-MNI152Lin_res-1p5_desc-spmvbmNopvc_pet.json": "",
             "tpl-ps13_space-MNI152Lin_res-1p5_desc-spmvbmNopvc_pet.nii.gz": "",
             "tpl-ps13_space-MNI152Lin_res-1p5_desc-spmvbmPvc_pet.json": "",
@@ -429,9 +427,6 @@ A guide for using macros can be found at
 })
 }}
 
-If the pipeline generates two different atlases for at least one template space
-in the output, then [`atlas-<label>`](../glossary.md#atlas-entities) is REQUIRED
-for the whole dataset.
 For example, let's imagine the PS13 atlas is revised in 2034, and based on the
 original pipeline and data, it generates now a new manual segmentation
 in the `MNI152Lin` space with some new regions defined.
@@ -443,25 +438,12 @@ A guide for using macros can be found at
 -->
 {{ MACROS___make_filetree_example({
    "ps13rev2034-pipeline": {
-      "tpl-fsaverage": {
+      "tpl-ps13rev2034": {
          "pet": {
-            "tpl-ps13_space-fsaverage_atlas-ps13_desc-nopvc_dseg.nii.gz": "",
-            "tpl-ps13_space-fsaverage_atlas-ps13_desc-pvc_dseg.nii.gz": "",
-            "tpl-ps13_space-fsaverage_atlas-ps13_dseg.json": "",
-            "tpl-ps13_space-fsaverage_atlas-ps13_dseg.tsv": "",
-            "tpl-ps13_space-fsaverage_atlas-ps13_hemi-L_den-164k_desc-nopvc_pet.json": "",
-            "tpl-ps13_space-fsaverage_atlas-ps13_stat-std_desc-pvc_pet.nii.gz": "",
             "...": "",
-            "tpl-ps13_space-MNI152Lin_atlas-ps13_desc-nopvc_dseg.nii.gz": "",
-            "tpl-ps13_space-MNI152Lin_atlas-ps13_desc-pvc_dseg.nii.gz": "",
-            "tpl-ps13_space-MNI152Lin_atlas-ps13_dseg.json": "",
-            "tpl-ps13_space-MNI152Lin_atlas-ps13_dseg.tsv": "",
-            "tpl-ps13_space-MNI152Lin_atlas-ps13_res-1p5_desc-spmvbmNopvc_pet.json": "",
-            "tpl-ps13_space-MNI152Lin_atlas-ps13_res-2_stat-std_desc-pvc_pet.nii.gz": "",
-            "tpl-ps13_space-MNI152Lin_atlas-ps13rev2034_desc-nopvc_dseg.nii.gz": "",
-            "tpl-ps13_space-MNI152Lin_atlas-ps13rev2034_desc-pvc_dseg.nii.gz": "",
-            "tpl-ps13_space-MNI152Lin_atlas-ps13rev2034_dseg.json": "",
-            "tpl-ps13_space-MNI152Lin_atlas-ps13rev2034_dseg.tsv": "",
+            "atlas-ps13rev2034_space-MNI152Lin_seg-manual_dseg.nii.gz": "",
+            "atlas-ps13rev2034_space-MNI152Lin_seg-manual_dseg.json": "",
+            "atlas-ps13rev2034_space-MNI152Lin_seg-manual_dseg.tsv": "",
             "...": "",
          },
       }
@@ -475,15 +457,14 @@ In this case, a feature template map is generated from all the participant(s)
 in the study, and the atlas' artifacts are produced with reference to that
 template.
 
-Either by generating the template space with aligning to a pre-existing template,
+Either by generating the template space aligning to a pre-existing template,
 or by estimating a transform between templates by means of image registration,
 a new template definition MUST be employed if the new template generates
 a new [*space*](../common-principles.md#definitions).
+
 For example, let's imagine that PS13 first generated a template nuclear imaging
 map and after that, a corresponding [*atlas*](../common-principles.md#definitions)
 was defined.
-In that case, the [`atlas-<label>`](../glossary.md#atlas-entities) SHOULD be omitted
-except several atlases need specification:
 
 <!-- This block generates a file tree.
 A guide for using macros can be found at
@@ -493,10 +474,10 @@ A guide for using macros can be found at
    "ps13-pipeline": {
       "tpl-PS13": {
          "pet": {
-            "tpl-PS13_desc-nopvc_dseg.nii.gz": "",
-            "tpl-PS13_desc-pvc_dseg.nii.gz": "",
-            "tpl-PS13_dseg.json": "",
-            "tpl-PS13_dseg.tsv": "",
+            "atlas-PS13_desc-nopvc_dseg.nii.gz": "",
+            "atlas-PS13_desc-pvc_dseg.nii.gz": "",
+            "atlas-PS13_dseg.json": "",
+            "atlas-PS13_dseg.tsv": "",
             "tpl-PS13_stat-std_desc-fnirtNopvc_pet.json": "",
             "tpl-PS13_stat-std_desc-fnirtNopvc_pet.nii.gz": "",
             "tpl-PS13_stat-std_desc-fnirtPvc_pet.json": "",
@@ -512,7 +493,7 @@ A guide for using macros can be found at
 }}
 
 Let's complete the above example by adding two new atlases to the existing
-template and (*default*) atlas:
+template:
 
 <!-- This block generates a file tree.
 A guide for using macros can be found at
@@ -522,18 +503,18 @@ A guide for using macros can be found at
    "ps13-with-atlases-pipeline": {
       "tpl-PS13": {
          "pet": {
-            "tpl-PS13_atlas-Economo1916_desc-nopvc_dseg.nii.gz": "",
-            "tpl-PS13_atlas-Economo1916_desc-pvc_dseg.nii.gz": "",
-            "tpl-PS13_atlas-Economo1916_dseg.json": "",
-            "tpl-PS13_atlas-Economo1916_dseg.tsv": "",
-            "tpl-PS13_atlas-RamonCajal1908_desc-nopvc_dseg.nii.gz": "",
-            "tpl-PS13_atlas-RamonCajal1908_desc-pvc_dseg.nii.gz": "",
-            "tpl-PS13_atlas-RamonCajal1908_dseg.json": "",
-            "tpl-PS13_atlas-RamonCajal1908_dseg.tsv": "",
-            "tpl-PS13_desc-nopvc_dseg.nii.gz": "",
-            "tpl-PS13_desc-pvc_dseg.nii.gz": "",
-            "tpl-PS13_dseg.json": "",
-            "tpl-PS13_dseg.tsv": "",
+            "atlas-Economo1916_desc-nopvc_dseg.nii.gz": "",
+            "atlas-Economo1916_desc-pvc_dseg.nii.gz": "",
+            "atlas-Economo1916_dseg.json": "",
+            "atlas-Economo1916_dseg.tsv": "",
+            "atlas-RamonCajal1908_desc-nopvc_dseg.nii.gz": "",
+            "atlas-RamonCajal1908_desc-pvc_dseg.nii.gz": "",
+            "atlas-RamonCajal1908_dseg.json": "",
+            "atlas-RamonCajal1908_dseg.tsv": "",
+            "atlas-PS13_desc-nopvc_dseg.nii.gz": "",
+            "atlas-PS13_desc-pvc_dseg.nii.gz": "",
+            "atlas-PS13_dseg.json": "",
+            "atlas-PS13_dseg.tsv": "",
             "tpl-PS13_stat-std_desc-fnirtNopvc_pet.json": "",
             "tpl-PS13_stat-std_desc-fnirtNopvc_pet.nii.gz": "",
             "tpl-PS13_stat-std_desc-fnirtPvc_pet.json": "",
@@ -551,15 +532,6 @@ A guide for using macros can be found at
 where the `atlas-RamonCajal1908` and `atlas-Economo1916` hypothetically define
 two different atlases (please note that, often, atlases are named after
 the first author and indicating a year of a reference communication).
-The original *default* or *implicit* atlas' artifacts such as
-the `tpl-PS13_desc-nopvc_dseg.nii.gz` segmentation,
-which were originally generated with the PS13 template,
-MAY take an [`atlas-<label>`](../glossary.md#atlas-entities) if they
-need to be differentiated from the original template and atlas dataset.
-However, it is RECOMMENDED that these *default* or *implicit* atlases employed
-in the *custom* space they were generated only define
-[`atlas-<label>`](../glossary.md#atlas-entities)
-if it is necessary to disambiguate two or more atlases.
 
 A further example of these template-and-atlas specifications
 is the *Spatially Unbiased Infratentorial Template (SUIT)*
@@ -578,20 +550,20 @@ A guide for using macros can be found at
             "README.md": "",
             "dataset_description.json": "",
             "tpl-SUIT_T1w.nii.gz": "",
-            "tpl-SUIT_atlas-Buckner2011_dseg.json": "",
-            "tpl-SUIT_atlas-Buckner2011_seg-17n_dseg.label.gii": "",
-            "tpl-SUIT_atlas-Buckner2011_seg-17n_dseg.nii.gz": "",
-            "tpl-SUIT_atlas-Buckner2011_seg-17n_dseg.tsv": "",
-            "tpl-SUIT_atlas-Buckner2011_seg-17n_stat-confidence_probseg.nii.gz": "",
-            "tpl-SUIT_atlas-Buckner2011_seg-7n_dseg.label.gii": "",
-            "tpl-SUIT_atlas-Buckner2011_seg-7n_dseg.nii.gz": "",
-            "tpl-SUIT_atlas-Buckner2011_seg-7n_dseg.tsv": "",
-            "tpl-SUIT_atlas-Buckner2011_seg-7n_stat-confidence_probseg.nii.gz": "",
-            "tpl-SUIT_atlas-Diedrichsen2009_dseg.json": "",
-            "tpl-SUIT_atlas-Diedrichsen2009_dseg.label.gii": "",
-            "tpl-SUIT_atlas-Diedrichsen2009_dseg.nii.gz": "",
-            "tpl-SUIT_atlas-Diedrichsen2009_dseg.tsv": "",
-            "tpl-SUIT_atlas-Diedrichsen2009_probseg.nii.gz": "",
+            "atlas-Buckner2011_space-SUIT_dseg.json": "",
+            "atlas-Buckner2011_space-SUIT_seg-17n_dseg.label.gii": "",
+            "atlas-Buckner2011_space-SUIT_seg-17n_dseg.nii.gz": "",
+            "atlas-Buckner2011_space-SUIT_seg-17n_dseg.tsv": "",
+            "atlas-Buckner2011_space-SUIT_seg-17n_stat-confidence_probseg.nii.gz": "",
+            "atlas-Buckner2011_space-SUIT_seg-7n_dseg.label.gii": "",
+            "atlas-Buckner2011_space-SUIT_seg-7n_dseg.nii.gz": "",
+            "atlas-Buckner2011_space-SUIT_seg-7n_dseg.tsv": "",
+            "atlas-Buckner2011_space-SUIT_seg-7n_stat-confidence_probseg.nii.gz": "",
+            "atlas-Diedrichsen2009_dseg.json": "",
+            "atlas-Diedrichsen2009_dseg.label.gii": "",
+            "atlas-Diedrichsen2009_dseg.nii.gz": "",
+            "atlas-Diedrichsen2009_dseg.tsv": "",
+            "atlas-Diedrichsen2009_probseg.nii.gz": "",
             "tpl-SUIT_flat.surf.gii": "",
             "tpl-SUIT_sulc.shape.gii": "",
          },
@@ -634,12 +606,12 @@ A guide for using macros can be found at
             "sub-67_T1w.nii.gz": "",
          },
       },
-      "tpl-MNI152NLin2009cAsym": {
+      "atlas-MIAL67ThalamicNuclei": {
          "anat": {
-            "tpl-MNI152NLin2009cAsym_atlas-MIAL67ThalamicNuclei_dseg.json": "",
-            "tpl-MNI152NLin2009cAsym_atlas-MIAL67ThalamicNuclei_dseg.tsv": "",
-            "tpl-MNI152NLin2009cAsym_atlas-MIAL67ThalamicNuclei_res-1_dseg.nii.gz": "",
-            "tpl-MNI152NLin2009cAsym_atlas-MIAL67ThalamicNuclei_res-1_probseg.nii.gz": "",
+            "atlas-MIAL67ThalamicNuclei_space-MNI152NLin2009cAsym_dseg.json": "",
+            "atlas-MIAL67ThalamicNuclei_space-MNI152NLin2009cAsym_dseg.tsv": "",
+            "atlas-MIAL67ThalamicNuclei_space-MNI152NLin2009cAsym_res-1_dseg.nii.gz": "",
+            "atlas-MIAL67ThalamicNuclei_space-MNI152NLin2009cAsym_res-1_probseg.nii.gz": "",
          },
       },
    }
@@ -676,12 +648,12 @@ A guide for using macros can be found at
             "sub-67_T1w.nii.gz": "",
          },
       },
-      "tpl-MNI152NLin2009cAsym": {
+      "atlas-MIAL67ThalamicNuclei": {
          "anat": {
-            "tpl-MNI152NLin2009cAsym_atlas-MIAL67ThalamicNuclei_dseg.json": "",
-            "tpl-MNI152NLin2009cAsym_atlas-MIAL67ThalamicNuclei_dseg.tsv": "",
-            "tpl-MNI152NLin2009cAsym_atlas-MIAL67ThalamicNuclei_res-1_dseg.nii.gz": "",
-            "tpl-MNI152NLin2009cAsym_atlas-MIAL67ThalamicNuclei_res-1_probseg.nii.gz": "",
+            "atlas-MIAL67ThalamicNuclei_space-MNI152NLin2009cAsym_dseg.json": "",
+            "atlas-MIAL67ThalamicNuclei_space-MNI152NLin2009cAsym_dseg.tsv": "",
+            "atlas-MIAL67ThalamicNuclei_space-MNI152NLin2009cAsym_res-1_dseg.nii.gz": "",
+            "atlas-MIAL67ThalamicNuclei_space-MNI152NLin2009cAsym_res-1_probseg.nii.gz": "",
          },
       },
    }
@@ -718,16 +690,12 @@ A guide for using macros can be found at
             "sub-67_T1w.nii.gz": "",
          },
       },
-      "tpl-MNI152NLin2009cAsym": {
-         "anat": {
-            "tpl-MNI152NLin2009cAsym_atlas-MIAL67ThalamicNuclei_res-1_dseg.nii.gz": "",
-            "tpl-MNI152NLin2009cAsym_atlas-MIAL67ThalamicNuclei_res-1_probseg.nii.gz": "",
-         },
-      },
-      "tpl-MNI152NLin6Asym": {
+      "atlas-MIAL67ThalamicNuclei": {
          "anat": {
-            "tpl-MNI152NLin6Asym_atlas-MIAL67ThalamicNuclei_res-1_dseg.nii.gz": "",
-            "tpl-MNI152NLin6Asym_atlas-MIAL67ThalamicNuclei_res-1_probseg.nii.gz": "",
+            "atlas-MIAL67ThalamicNuclei_space-MNI152NLin2009cAsym_res-1_dseg.nii.gz": "",
+            "atlas-MIAL67ThalamicNuclei_space-MNI152NLin2009cAsym_res-1_probseg.nii.gz": "",
+            "atlas-MIAL67ThalamicNuclei_space-MNI152NLin6Asym_res-1_dseg.nii.gz": "",
+            "atlas-MIAL67ThalamicNuclei_space-MNI152NLin6Asym_res-1_probseg.nii.gz": "",
          },
       },
    }
@@ -765,10 +733,10 @@ A guide for using macros can be found at
             "sub-67_T1w.nii.gz": "",
          },
       },
-      "tpl-MNI152NLin2009cAsym": {
+      "atlas-MIAL67ThalamicNuclei": {
          "anat": {
-            "tpl-MNI152NLin2009cAsym_atlas-MIAL67ThalamicNuclei_res-1_dseg.nii.gz": "",
-            "tpl-MNI152NLin2009cAsym_atlas-MIAL67ThalamicNuclei_res-1_probseg.nii.gz": "",
+            "atlas-MIAL67ThalamicNuclei_space-MNI152NLin2009cAsym_res-1_dseg.nii.gz": "",
+            "atlas-MIAL67ThalamicNuclei_space-MNI152NLin2009cAsym_res-1_probseg.nii.gz": "",
          },
       },
    }
@@ -809,17 +777,13 @@ A guide for using macros can be found at
             "sub-67_T1w.nii.gz": "",
          },
       },
-      "tpl-MNI152NLin2009cAsym": {
-         "anat": {
-            "tpl-MNI152NLin2009cAsym_from-MNI152NLin6Asym_mode-image_xfm.h5": "",
-            "tpl-MNI152NLin2009cAsym_atlas-MIAL67ThalamicNuclei_res-1_dseg.nii.gz": "",
-            "tpl-MNI152NLin2009cAsym_atlas-MIAL67ThalamicNuclei_res-1_probseg.nii.gz": "",
-         },
-      },
-      "tpl-MNI152NLin6Asym": {
+      "atlas-MIAL67ThalamicNuclei": {
          "anat": {
-            "tpl-MNI152NLin6Asym_atlas-MIAL67ThalamicNuclei_res-1_dseg.nii.gz": "",
-            "tpl-MNI152NLin6Asym_atlas-MIAL67ThalamicNuclei_res-1_probseg.nii.gz": "",
+            "to-MNI152NLin2009cAsym_from-MNI152NLin6Asym_mode-image_xfm.h5": "",
+            "atlas-MIAL67ThalamicNuclei_space-MNI152NLin2009cAsym_res-1_dseg.nii.gz": "",
+            "atlas-MIAL67ThalamicNuclei_space-MNI152NLin2009cAsym_res-1_probseg.nii.gz": "",
+            "atlas-MIAL67ThalamicNuclei_space-MNI152NLin6Asym_res-1_dseg.nii.gz": "",
+            "atlas-MIAL67ThalamicNuclei_space-MNI152NLin6Asym_res-1_probseg.nii.gz": "",
          },
       },
    }
@@ -828,53 +792,6 @@ A guide for using macros can be found at
 
 The next subsection describes this latter use-case in further depth.
 
-## Filenames of derivatives with atlases in their provenance
-
-Like for the [`space-<label>` entity](../glossary.md#space-entities),
-outputs derived from atlases MUST employ
-[`atlas-<label>`](../glossary.md#atlas-entities),
-[`seg-<label>`](../glossary.md#segmentation-entities), and
-[`scale-<label>`](../glossary.md#scale-entities) when necessary:
-
-<!-- This block generates a file tree.
-A guide for using macros can be found at
- https://github.com/bids-standard/bids-specification/blob/master/macros_doc.md
--->
-{{ MACROS___make_filetree_example({
-   "bold-pipeline": {
-      "atlas-Schaefer2018_dseg.json": "",
-      "atlas-Schaefer2018_seg-7n_scale-100_dseg.tsv": "",
-      "atlas-Schaefer2018_seg-7n_scale-200_dseg.tsv": "",
-      "atlas-Schaefer2018_seg-7n_scale-300_dseg.tsv": "",
-      "atlas-Schaefer2018_seg-17n_scale-100_dseg.tsv": "",
-      "atlas-Schaefer2018_seg-17n_scale-200_dseg.tsv": "",
-      "atlas-Schaefer2018_seg-17n_scale-300_dseg.tsv": "",
-      "atlas-Schaefer2018_seg-kong17n_scale-100_dseg.tsv": "",
-      "atlas-Schaefer2018_seg-kong17n_scale-200_dseg.tsv": "",
-      "atlas-Schaefer2018_seg-kong17n_scale-300_dseg.tsv": "",
-      "sub-01": {
-         "anat": {
-            "sub-01_hemi-L_atlas-Schaefer2018_seg-7n_scale-100_den-164k_dseg.label.gii": "",
-            "sub-01_hemi-L_atlas-Schaefer2018_seg-7n_scale-200_den-164k_dseg.label.gii": "",
-            "sub-01_hemi-L_atlas-Schaefer2018_seg-7n_scale-300_den-164k_dseg.label.gii": "",
-            "sub-01_hemi-L_atlas-Schaefer2018_seg-17n_scale-100_den-164k_dseg.label.gii": "",
-            "sub-01_hemi-L_atlas-Schaefer2018_seg-17n_scale-200_den-164k_dseg.label.gii": "",
-            "sub-01_hemi-L_atlas-Schaefer2018_seg-17n_scale-300_den-164k_dseg.label.gii": "",
-            "sub-01_hemi-L_atlas-Schaefer2018_seg-kong17n_scale-100_den-164k_dseg.label.gii": "",
-            "sub-01_hemi-L_atlas-Schaefer2018_seg-kong17n_scale-200_den-164k_dseg.label.gii": "",
-            "sub-01_hemi-L_atlas-Schaefer2018_seg-kong17n_scale-300_den-164k_dseg.label.gii": "",
-            "...": "",
-            "sub-01_hemi-R_atlas-Schaefer2018_seg-kong17n_scale-300_den-164k_dseg.label.gii": "",
-         },
-         "bold": {
-            "sub-01_task-rest_hemi-L_den-164k_bold.func.gii": "",
-            "sub-01_task-rest_hemi-R_den-164k_bold.func.gii": "",
-         }
-      },
-   }
-})
-}}
-
 ## Tabular data
 
 The `[probseg|dseg|mask].tsv` file indexes and labels each node/parcel/region within the atlas.
diff --git a/src/schema/objects/common_principles.yaml b/src/schema/objects/common_principles.yaml
index 7cd3394683..b4c35cd23b 100644
--- a/src/schema/objects/common_principles.yaml
+++ b/src/schema/objects/common_principles.yaml
@@ -14,8 +14,8 @@ atlas:
     is [Bijsterbosch et al. (2020)](https://doi.org/10.1038/s41593-020-00726-z).
 
     To further differentiate the concept of *atlas* and *template* throughout the specification,
-    *template* will designate a standardized stereotaxy frame where
-    some feature or features are mapped through spatial normalization and then possibly averaged.
+    *template* will designate an aggregation of ordinal data which MAY define a standardized stereotaxy
+    frame where some feature or features are mapped through spatial normalization and then possibly averaged.
     Conversely, *atlas* will designate a specific methodology or algorithm to
     create meaningful knowledge annotations about the brain such as landmarks or segmentations.
 data_acquisition:
@@ -156,7 +156,10 @@ space:
   description: |
     A reference [coordinate system](SPEC_ROOT/appendices/coordinate-systems.md) of analysis
     engendered by the spatiotemporal distribution of neuroimaging features such as
-    those given by subjects' and templates' data.
+    those given by subjects' and templates' data.  Every image file defines it's own space,
+    which is commonly referred to as the native space of an image.  When a new space is
+    deliberately created, it is done by creating a template which serves as the authoritative
+    definition of that space. The template name MUST match the name of the space it is defining.
 suffix:
   display_name: suffix
   description: |
@@ -181,12 +184,14 @@ task:
 template:
   display_name: Template
   description: |
-    An average feature map obtained by aggregation of subjects and/or sessions that allows the
-    spatial location of brain anatomy and function of the templated cohort.
-    Templates operationalize the concept of *standardized spatial frame of analysis*,
-    a common *Space* in which subjects' data can be spatially-normalized into for group inference.
+    An average feature map obtained by aggregation of subjects and/or sessions that MAY serve as the
+    *authoritative definition* of a *space*.
+    Templates MAY operationalize the concept of *standardized spatial frame of analysis*,
+    a common *space* in which subjects' data can be spatially-normalized into for group inference.
     Like subjects' feature maps generate a *native* spatial frame of reference for analyses,
-    templates engender a *generic* or *standard* space of analysis were subjects can be spatiotemporally
+    templates MAY engender a *generic* or *standard* space of analysis were subjects can be spatiotemporally
     aligned into.
-    In other words, *templates* (that is, specific feature maps) are *authoritative definitions* of *spaces*
-    in that they instantiate the abstract concept of *space*.
+    When a template serves as the authoritative definition of a space, the `space_` entity MUST NOT be used.
+    Rather, the name of the template is the name of the space it defines.  When a template is simply an aggregation of
+    imaging data, and is NOT serving as the authoritative definition of a space, then the `space_` entity MUST be used 
+    to denote the sapce the aggregation of data is in.