From a13418a18d1e9473500a73b19a821da9a30aab1c Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Fri, 8 Jul 2022 00:02:26 -0400
Subject: [PATCH 01/28] Upstream validation features up to and including:

e956afc69f7901a5848d2d91187d3036a6d7eb4b
---
 dandi/bids_validator_xs.py            | 161 ++++++++++++++++----------
 dandi/tests/fixtures.py               |   2 +-
 dandi/tests/test_bids_validator_xs.py |  76 +++++-------
 3 files changed, 132 insertions(+), 107 deletions(-)

diff --git a/dandi/bids_validator_xs.py b/dandi/bids_validator_xs.py
index 3de0bde3d..3e0cd95cf 100644
--- a/dandi/bids_validator_xs.py
+++ b/dandi/bids_validator_xs.py
@@ -1,3 +1,7 @@
+"""
+THIS FILE IS BUNDLED FROM THE bids-specification PACKAGE.
+Schema loading- and processing-related functions.
+"""
 from copy import deepcopy
 import datetime
 from functools import lru_cache
@@ -5,8 +9,6 @@
 import os
 import re
 
-import appdirs
-
 from . import utils
 from .support.bids import schema
 
@@ -19,7 +21,10 @@
 DIR_ENTITIES = ["subject", "session"]
 
 
-def _get_paths(bids_paths):
+def _get_paths(
+    bids_paths,
+    pseudofile_suffixes=[],
+):
     """
     Get all paths from a list of directories, excluding hidden subdirectories from distribution.
 
@@ -28,6 +33,9 @@ def _get_paths(bids_paths):
     bids_paths : list or str
         Directories from which to get paths, may also contain file paths, which will remain
         unchanged.
+    pseudofile_suffixes : list of str
+        Directory suffixes prompting the validation of the directory name and limiting further
+        directory walk.
 
     Notes
     -----
@@ -50,9 +58,6 @@ def _get_paths(bids_paths):
         ".bidsignore",
         "dandiset.yaml",
     ]
-    # Inelegant hard-coded solution.
-    # Could be replaced by a maximum depth limit if BIDS root auto-detection is implemented.
-    treat_as_file_suffix = [".ngff"]
 
     path_list = []
     for bids_path in bids_paths:
@@ -60,13 +65,12 @@ def _get_paths(bids_paths):
         if os.path.isfile(bids_path):
             path_list.append(bids_path)
             continue
-        for root, dirs, file_names in os.walk(bids_path, topdown=False):
-            if any(root.endswith(i) for i in treat_as_file_suffix):
-                continue
-            if any(f"{i}/" in root for i in treat_as_file_suffix):
-                continue
-            if any(f"{i}\\" in root for i in treat_as_file_suffix):
-                continue
+        for root, dirs, file_names in os.walk(bids_path, topdown=True):
+            if any(root.endswith(i) for i in pseudofile_suffixes):
+                # Add the directory name to the validation paths list.
+                path_list.append(f"{root}/")
+                # Do not index the contents of the directory.
+                dirs[:] = []
             # will break if BIDS ever puts meaningful data under `/.{dandi,datalad,git}*/`
             if any(exclude_subdir in root for exclude_subdir in exclude_subdirs):
                 continue
@@ -160,20 +164,20 @@ def _add_extensions(regex_string, variant):
 
 
 def _add_subdirs(
-    regex_string, variant, datatype, entity_definitions, modality_datatypes
+    regex_string, variant, datatype, entity_definitions, formats, modality_datatypes
 ):
     """Add appropriate subdirectories as required by entities present."""
 
-    label = "([a-zA-Z0-9]*?)"
-
     regex_dirs = "/"
     for dir_entity in DIR_ENTITIES:
         if dir_entity in variant["entities"].keys():
-            shorthand = entity_definitions[dir_entity]["entity"]
+            format_selection = formats[entity_definitions[dir_entity]["format"]]
+            variable_field = f"({format_selection['pattern']})"
+            shorthand = entity_definitions[dir_entity]["name"]
             if variant["entities"][dir_entity] == "required":
-                regex_subdir = f"{shorthand}-(?P<{dir_entity}>{label})/"
+                regex_subdir = f"{shorthand}-(?P<{dir_entity}>{variable_field})/"
             else:
-                regex_subdir = f"(|{shorthand}-(?P<{dir_entity}>{label})/)"
+                regex_subdir = f"(|{shorthand}-(?P<{dir_entity}>{variable_field})/)"
             regex_dirs = f"{regex_dirs}{regex_subdir}"
     if datatype in modality_datatypes:
         regex_dirs = f"{regex_dirs}{datatype}/"
@@ -204,7 +208,7 @@ def load_top_level(
     Parameters
     ----------
     my_schema : dict
-        A nested dictionary, as returned by `dandi.support.bids.schema.load_schema()`.
+        A nested dictionary, as returned by `schemacode.schema.load_schema()`.
 
     Returns
     -------
@@ -241,17 +245,11 @@ def load_entities(
     Parameters
     ----------
     my_schema : dict
-        A nested dictionary, as returned by `dandi.support.bids.schema.load_schema()`.
+        A nested dictionary, as returned by `schemacode.schema.load_schema()`.
 
     Notes
     -----
 
-    * Couldn't find where the `label` type is defined as alphanumeric, hard-coding
-        `entity_definitions["subject"]["format"]`-type entries as`[a-zA-Z0-9]*?` for the time
-        being.
-        Apparently there is a `label` (alphanumeric) versus `index` (integer) specification:
-        https://github.com/bids-standard/bids-specification/issues/956#issuecomment-992967479
-        but this is not yet used in the YAML.
     * Suggest to BIDS-specification to remove the periods from the extensions, the leading period
         is not part of the extension, but a delimiter defining the fact that it's an extension.
         Code sections marked as `Making it period-safe` should be edited when this fix is in,
@@ -266,8 +264,6 @@ def load_entities(
         A list of dictionaries, with keys including 'regex' and 'mandatory'.
     """
 
-    label = "([a-zA-Z0-9]*?)"
-
     # Parsing tabular_metadata as a datatype, might be done automatically if the YAML is moved
     # to the same subdirectory
     my_schema["rules"]["datatypes"]["tabular_metadata"] = my_schema["rules"][
@@ -276,6 +272,8 @@ def load_entities(
     datatypes = my_schema["rules"]["datatypes"]
     entity_order = my_schema["rules"]["entities"]
     entity_definitions = my_schema["objects"]["entities"]
+    formats = my_schema["objects"]["formats"]
+
     # Descriptions are not needed and very large.
     for i in entity_definitions.values():
         i.pop("description", None)
@@ -290,7 +288,7 @@ def load_entities(
 
     regex_schema = []
     for datatype in datatypes:
-        for variant in datatypes[datatype]:
+        for variant in datatypes[datatype].values():
             regex_entities = ""
             for entity in entity_order:
                 # Slightly awkward construction to account for new-style file specification.
@@ -298,7 +296,7 @@ def load_entities(
                 # https://github.com/bids-standard/bids-specification/pull/987
                 try:
                     if entity in variant["entities"]:
-                        entity_shorthand = entity_definitions[entity]["entity"]
+                        entity_shorthand = entity_definitions[entity]["name"]
                         if "enum" in entity_definitions[entity].keys():
                             # Entity key-value pattern with specific allowed values
                             # tested, works!
@@ -306,7 +304,10 @@ def load_entities(
                                 "|".join(entity_definitions[entity]["enum"]),
                             )
                         else:
-                            variable_field = label
+                            format_selection = formats[
+                                entity_definitions[entity]["format"]
+                            ]
+                            variable_field = f"({format_selection['pattern']})"
                         regex_entities = _add_entity(
                             regex_entities,
                             entity,
@@ -320,7 +321,12 @@ def load_entities(
             regex_string = _add_suffixes(regex_entities, variant)
             regex_string = _add_extensions(regex_string, variant)
             regex_string = _add_subdirs(
-                regex_string, variant, datatype, entity_definitions, modality_datatypes
+                regex_string,
+                variant,
+                datatype,
+                entity_definitions,
+                formats,
+                modality_datatypes,
             )
 
             regex_string = f".*?{regex_string}$"
@@ -349,6 +355,8 @@ def load_all(
     -------
     all_regex : list of dict
         A list of dictionaries, with keys including 'regex' and 'mandatory'.
+    my_schema : list of dict
+        Nested dictionaries representing the full schema.
     """
 
     my_schema = schema.load_schema(schema_dir)
@@ -360,13 +368,14 @@ def load_all(
     )
     all_regex.extend(top_level_regex)
 
-    return all_regex
+    return all_regex, my_schema
 
 
 def validate_all(
     bids_paths,
     regex_schema,
     debug=False,
+    pseudofile_suffixes=[],
 ):
     """
     Validate `bids_paths` based on a `regex_schema` dictionary list, including regexes.
@@ -380,6 +389,11 @@ def validate_all(
     debug : tuple, optional
         Whether to print itemwise notices for checks on the console, and include them in the
         validation result.
+    pseudofile_suffixes : list of str, optional
+        Any suffixes which identify BIDS-valid directory data.
+        These pseudo-file suffixes will be validated based on the directory name, with the
+        directory contents not being indexed for validation.
+        By default, no pseudo-file suffixes are checked.
 
     Returns
     -------
@@ -398,7 +412,7 @@ def validate_all(
     """
 
     tracking_schema = deepcopy(regex_schema)
-    paths_list = _get_paths(bids_paths)
+    paths_list = _get_paths(bids_paths, pseudofile_suffixes=pseudofile_suffixes)
     tracking_paths = deepcopy(paths_list)
     if debug:
         itemwise_results = []
@@ -453,7 +467,7 @@ def validate_all(
 
 def write_report(
     validation_result,
-    report_path="{logdir}/bids-validator-report_{datetime}-{pid}.log",
+    report_path="/var/tmp/bids-validator/report_{datetime}-{pid}.log",
     datetime_format="%Y%m%d%H%M%SZ",
 ):
     """Write a human-readable report based on the validation result.
@@ -466,10 +480,10 @@ def write_report(
         The "itemwise" value, if present, should be a list of dictionaries, with keys including
         "path", "regex", and "match".
     report_path : str, optional
-        A path under which the report is to be saved, `datetime`, `logdir`, and `pid`
+        A path under which the report is to be saved, `datetime`, and `pid`
         are available as variables for string formatting, and will be expanded to the
-        current datetime (as per the `datetime_format` parameter), application log
-        directory, and process ID, respectively.
+        current datetime (as per the `datetime_format` parameter)
+        and process ID, respectively.
     datetime_format : str, optional
         A datetime format, optionally used for the report path.
 
@@ -478,10 +492,7 @@ def write_report(
     * Not using f-strings in order to prevent arbitrary code execution.
     """
 
-    logdir = appdirs.user_log_dir("dandi-cli", "dandi")
-
     report_path = report_path.format(
-        logdir=logdir,
         datetime=datetime.datetime.utcnow().strftime(datetime_format),
         pid=os.getpid(),
     )
@@ -501,8 +512,8 @@ def write_report(
                 else:
                     comparison_result = "no match"
                 f.write(
-                    f'- Comparing the `{comparison["path"]}` path to the `{comparison["regex"]}` "\
-                    resulted in {comparison_result}.\n'
+                    f'- Comparing the `{comparison["path"]}` path to the `{comparison["regex"]}` '
+                    f"pattern resulted in {comparison_result}.\n"
                 )
         except KeyError:
             pass
@@ -513,7 +524,7 @@ def write_report(
         for regex_entry in validation_result["schema_listing"]:
             f.write(f'\n\t- `{regex_entry["regex"]}`')
         f.write("\n")
-        if validation_result["path_tracking"]:
+        if len(validation_result["path_tracking"]) > 0:
             f.write("The following files were not matched by any regex schema entry:")
             f.write("\n\t* `")
             f.write("`\n\t* `".join(validation_result["path_tracking"]))
@@ -548,7 +559,7 @@ def select_schema_dir(
     bids_paths,
     schema_reference_root,
     schema_version,
-    schema_min_version="1.7.0+012+dandi001",
+    schema_min_version="1.7.0+369",
 ):
     """
     Select schema directory, according to a fallback logic whereby the schema path is
@@ -593,6 +604,7 @@ def select_schema_dir(
     schema_reference_root = os.path.abspath(os.path.expanduser(schema_reference_root))
     if schema_version:
         if "/" in schema_version:
+            schema_dir = schema_version
             if schema_version.startswith("{module_path}"):
                 schema_dir = schema_version.format(module_path=module_path)
             schema_dir = os.path.abspath(os.path.expanduser(schema_dir))
@@ -689,12 +701,42 @@ def log_errors(validation_result):
         lgr.warning("The `%s` file was not matched by any regex schema entry.", i)
 
 
+def _get_directory_suffixes(my_schema):
+    """Query schema for suffixes which identify directory entities.
+
+    Parameters
+    ----------
+    my_schema : dict
+        Nested directory as produced by `schemacode.schema.load_schema()`.
+
+    Returns
+    -------
+    list of str
+        Directory pseudofile suffixes excluding trailing slashes.
+
+    Notes
+    -----
+    * Yes this seems super-awkward to do explicitly, after all, the trailing slash is
+        already in so it should automagically work, but no:
+        - Subdirectory names need to be dynamically excluded from validation input.
+        - Backslash directory delimiters are still in use, which is regrettable.
+    """
+    pseudofile_suffixes = []
+    for i in my_schema["objects"]["extensions"].values():
+        i_value = i["value"]
+        if i_value.endswith("/"):
+            if i_value != "/":
+                pseudofile_suffixes.append(i_value[:-1])
+    return pseudofile_suffixes
+
+
 def validate_bids(
     bids_paths,
     schema_reference_root="{module_path}/support/bids/schemadata/",
     schema_version=None,
     debug=False,
     report_path=False,
+    suppress_errors=False,
 ):
     """
     Validate paths according to BIDS schema.
@@ -734,6 +776,12 @@ def validate_bids(
     >>> bids_paths = '~/.data2/datalad/000026/rawdata'
     >>> schema_version='{module_path}/data/schema/'
     >>> validator.validate_bids(bids_paths, schema_version=schema_version, debug=False)"
+
+    Notes
+    -----
+    * Needs to account for inheritance principle, probably somewhere deeper in the logic, might be
+        as simple as pattern parsing and multiplying patterns to which inheritance applies.
+        https://github.com/bids-standard/bids-specification/pull/969#issuecomment-1132119492
     """
 
     if isinstance(bids_paths, str):
@@ -742,25 +790,16 @@ def validate_bids(
     bids_schema_dir = select_schema_dir(
         bids_paths, schema_reference_root, schema_version
     )
-    regex_schema = load_all(bids_schema_dir)
+    regex_schema, my_schema = load_all(bids_schema_dir)
+    pseudofile_suffixes = _get_directory_suffixes(my_schema)
     validation_result = validate_all(
         bids_paths,
         regex_schema,
         debug=debug,
+        pseudofile_suffixes=pseudofile_suffixes,
     )
-    # Record schema version.
-    # Not sure whether to incorporate in validation_result.
-    if bids_schema_dir == os.path.join(
-        os.path.abspath(os.path.dirname(__file__)),
-        "data",
-        "schema",
-    ):
-        # Declare we are using live version,
-        # string will evaluate as larger than numbered versions.
-        schema_version = "99999.0.0"
-    else:
-        _, schema_version = os.path.split(bids_schema_dir)
-    validation_result["bids_schema_version"] = schema_version
+
+    log_errors(validation_result)
 
     if report_path:
         if isinstance(report_path, str):
@@ -768,6 +807,4 @@ def validate_bids(
         else:
             write_report(validation_result)
 
-    log_errors(validation_result)
-
     return validation_result
diff --git a/dandi/tests/fixtures.py b/dandi/tests/fixtures.py
index 7a8b21998..5120a7d0d 100644
--- a/dandi/tests/fixtures.py
+++ b/dandi/tests/fixtures.py
@@ -226,7 +226,7 @@ def fixture() -> Iterator[str]:
 
 
 nwb_test_data = get_gitrepo_fixture("http://github.com/dandi-datasets/nwb_test_data")
-bids_examples = get_gitrepo_fixture("https://github.com/dandi/bids-examples")
+bids_examples = get_gitrepo_fixture("https://github.com/bids-standard/bids-examples")
 
 LOCAL_DOCKER_DIR = Path(__file__).with_name("data") / "dandiarchive-docker"
 LOCAL_DOCKER_ENV = LOCAL_DOCKER_DIR.name
diff --git a/dandi/tests/test_bids_validator_xs.py b/dandi/tests/test_bids_validator_xs.py
index 42b13071b..56c9d1d70 100644
--- a/dandi/tests/test_bids_validator_xs.py
+++ b/dandi/tests/test_bids_validator_xs.py
@@ -1,22 +1,19 @@
 import os
 
-BIDS_EXAMPLES_BLACKLIST = [
-    "invalid_pet001",
-]
 BIDS_EXAMPLES_WHITELIST = [
     "asl003",
     "eeg_cbm",
     "hcp_example_bids",
     "micr_SEM",
-    "micr_SEM-dandi",
+    "micr_SEMzarr",
     "micr_SPIM",
     "pet001",
     "pet003",
-    "qmri_megre",
     "qmri_tb1tfl",
-    "qmri_vfa",
+    "qmri_vfa/derivatives/qMRLab",
 ]
-TEST_SCHEMA_PATH = "{module_path}/support/bids/schemadata/1.7.0+012+dandi001"
+
+TEST_SCHEMA_PATH = "{module_path}/support/bids/schemadata/1.7.0+369"
 
 
 def test__add_entity():
@@ -133,24 +130,29 @@ def test__add_subdirs():
     datatype = "tabular_metadata"
     entity_definitions = {
         "acquisition": {
-            "name": "Acquisition",
-            "entity": "acq",
+            "display_name": "Acquisition",
+            "name": "acq",
             "type": "string",
             "format": "label",
         },
         "session": {
-            "name": "Session",
-            "entity": "ses",
+            "display_name": "Session",
+            "name": "ses",
             "type": "string",
             "format": "label",
         },
         "subject": {
-            "name": "Subject",
-            "entity": "sub",
+            "display_name": "Subject",
+            "name": "sub",
             "type": "string",
             "format": "label",
         },
     }
+    formats = {
+        "label": {
+            "pattern": "[0-9a-zA-Z]+",
+        }
+    }
     modality_datatypes = [
         "anat",
         "dwi",
@@ -165,11 +167,11 @@ def test__add_subdirs():
         "micr",
     ]
     _regex_string = _add_subdirs(
-        regex_string, variant, datatype, entity_definitions, modality_datatypes
+        regex_string, variant, datatype, entity_definitions, formats, modality_datatypes
     )
 
     assert (
-        _regex_string == "/sub-(?P<subject>([a-zA-Z0-9]*?))/sub-(?P=subject)"
+        _regex_string == "/sub-(?P<subject>([0-9a-zA-Z]+))/sub-(?P=subject)"
         "_sessions\\.(tsv|json)"
     )
 
@@ -239,9 +241,10 @@ def test_load_all():
 
     schema_path = os.path.join(
         os.path.abspath(os.path.dirname(__file__)),
-        "../support/bids/schemadata/1.7.0+012+dandi001",
+        "../support/bids/schemadata/1.7.0+369",
     )
-    schema_all = load_all(schema_path)
+
+    schema_all, _ = load_all(schema_path)
 
     # Check if expected keys are present in all entries
     for entry in schema_all:
@@ -307,35 +310,21 @@ def test_write_report(tmp_path):
     assert report_text == expected_report_text
 
 
-def test_bids_datasets(bids_examples):
+def test_bids_datasets(bids_examples, tmp_path):
     from dandi.bids_validator_xs import validate_bids
 
-    # Validate per dataset, with automatic schema selection:
+    # Validate per dataset with explicit schema specification:
     for i in os.listdir(bids_examples):
         if i in BIDS_EXAMPLES_WHITELIST:
             result = validate_bids(
                 os.path.join(bids_examples, i),
+                schema_version=TEST_SCHEMA_PATH,
+                report_path=True,
+                debug=True,
             )
             # Have all files been validated?
             assert len(result["path_tracking"]) == 0
 
-
-def test_error_datasets(bids_examples):
-    from dandi.bids_validator_xs import validate_bids
-
-    # Validate per dataset, with automatic schema selection:
-    for i in os.listdir(bids_examples):
-        if i in BIDS_EXAMPLES_BLACKLIST:
-            result = validate_bids(
-                os.path.join(bids_examples, i),
-            )
-            # Are there non-validated files?
-            assert len(result["path_tracking"]) != 0
-
-
-def test_bids_datasets_selected_paths(bids_examples, tmp_path):
-    from dandi.bids_validator_xs import validate_bids
-
     # Create input for file list based validation
     selected_dir = os.path.join(bids_examples, BIDS_EXAMPLES_WHITELIST[0])
     selected_paths = []
@@ -343,19 +332,18 @@ def test_bids_datasets_selected_paths(bids_examples, tmp_path):
         for f in files:
             selected_path = os.path.join(root, f)
             selected_paths.append(selected_path)
-    # Does explicit schema specification work?
-    result = validate_bids(selected_paths, schema_version=TEST_SCHEMA_PATH)
-
-    # Does terminal debug output work?
+    # Does terminal debug output and schema auto-fallback work?
     result = validate_bids(selected_paths, debug=True)
+    # Does default log path specification work?
+    result = validate_bids(
+        selected_paths, schema_version=TEST_SCHEMA_PATH, report_path=True
+    )
 
-    # Does the default report path work?
-    result = validate_bids(selected_paths, report_path=True)
-
-    # Does custom report path specification work?
+    # Does custom log path specification work?
     result = validate_bids(
         selected_paths,
         schema_version=TEST_SCHEMA_PATH,
+        debug=True,
         report_path=os.path.join(tmp_path, "test_bids.log"),
     )
     # Have all files been validated?

From 46988a3904a74f9182208f6ef82958bb1461a331 Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Fri, 8 Jul 2022 00:03:54 -0400
Subject: [PATCH 02/28] Schema update

---
 .../1.7.0+012/rules/associated_data.yaml      |  11 -
 .../1.7.0+012/rules/tabular_metadata.yaml     |  20 -
 .../{1.7.0+012 => 1.7.0+369}/README.md        |  67 ++-
 .../bids/schemadata/1.7.0+369/SCHEMA_VERSION  |   1 +
 .../schemadata/1.7.0+369/meta/context.yaml    | 262 +++++++++
 .../objects/associated_data.yaml              |  20 +-
 .../objects/columns.yaml                      | 140 ++++-
 .../objects/datatypes.yaml                    |  33 +-
 .../objects/entities.yaml                     | 143 ++---
 .../1.7.0+369/objects/extensions.yaml         | 299 +++++++++++
 .../schemadata/1.7.0+369/objects/formats.yaml | 124 +++++
 .../objects/metadata.yaml                     | 496 +++++++++++++++---
 .../objects/modalities.yaml                   |  14 +-
 .../objects/suffixes.yaml                     | 304 +++++++----
 .../objects/top_level_files.yaml              |  24 +-
 .../1.7.0+369/rules/associated_data.yaml      |  11 +
 .../1.7.0+369/rules/checks/asl.yaml           | 279 ++++++++++
 .../1.7.0+369/rules/checks/dwi.yaml           |  61 +++
 .../1.7.0+369/rules/checks/events.yaml        |  16 +
 .../1.7.0+369/rules/checks/fmap.yaml          |  26 +
 .../1.7.0+369/rules/checks/func.yaml          |  16 +
 .../rules/common_derivatives_validation.yaml  |  18 +
 .../1.7.0+369/rules/dataset_metadata.yaml     |  67 +++
 .../rules/datatypes/anat.yaml                 |  54 +-
 .../rules/datatypes/beh.yaml                  |  11 +-
 .../derivatives/common_derivatives.yaml       | 413 +++++++++++++++
 .../common_imaging_derivatives.yaml           | 220 ++++++++
 .../rules/datatypes/dwi.yaml                  |  21 +-
 .../rules/datatypes/eeg.yaml                  |  38 +-
 .../rules/datatypes/fmap.yaml                 |  42 +-
 .../rules/datatypes/func.yaml                 |  24 +-
 .../rules/datatypes/ieeg.yaml                 |  36 +-
 .../rules/datatypes/meg.yaml                  |  70 ++-
 .../rules/datatypes/micr.yaml                 |  12 +-
 .../rules/datatypes/perf.yaml                 |  24 +-
 .../rules/datatypes/pet.yaml                  |  24 +-
 .../rules/entities.yaml                       |   0
 .../rules/modalities.yaml                     |   0
 .../1.7.0+369/rules/sidecars/anat.yaml        |  34 ++
 .../1.7.0+369/rules/sidecars/asl.yaml         | 285 ++++++++++
 .../1.7.0+369/rules/sidecars/beh.yaml         |  21 +
 .../1.7.0+369/rules/sidecars/continuous.yaml  |  26 +
 .../derivatives/common_derivatives.yaml       |  85 +++
 .../1.7.0+369/rules/sidecars/dwi.yaml         |  25 +
 .../1.7.0+369/rules/sidecars/eeg.yaml         | 166 ++++++
 .../1.7.0+369/rules/sidecars/entities.yaml    |  81 +++
 .../1.7.0+369/rules/sidecars/fmap.yaml        |  87 +++
 .../1.7.0+369/rules/sidecars/func.yaml        | 110 ++++
 .../1.7.0+369/rules/sidecars/ieeg.yaml        | 144 +++++
 .../1.7.0+369/rules/sidecars/meg.yaml         | 261 +++++++++
 .../1.7.0+369/rules/sidecars/micr.yaml        |  79 +++
 .../1.7.0+369/rules/sidecars/mri.yaml         | 263 ++++++++++
 .../1.7.0+369/rules/sidecars/pet.yaml         | 183 +++++++
 .../derivatives/common_derivatives.yaml       |  11 +
 .../1.7.0+369/rules/tabular_data/eeg.yaml     |  43 ++
 .../1.7.0+369/rules/tabular_data/ieeg.yaml    |  49 ++
 .../1.7.0+369/rules/tabular_data/meg.yaml     |  23 +
 .../1.7.0+369/rules/tabular_data/perf.yaml    |   8 +
 .../1.7.0+369/rules/tabular_data/pet.yaml     |  52 ++
 .../1.7.0+369/rules/tabular_data/physio.yaml  |   9 +
 .../1.7.0+369/rules/tabular_data/task.yaml    |  15 +
 .../1.7.0+369/rules/tabular_metadata.yaml     |  18 +
 .../rules/top_level_files.yaml                |   3 +
 63 files changed, 5064 insertions(+), 458 deletions(-)
 delete mode 100644 dandi/support/bids/schemadata/1.7.0+012/rules/associated_data.yaml
 delete mode 100644 dandi/support/bids/schemadata/1.7.0+012/rules/tabular_metadata.yaml
 rename dandi/support/bids/schemadata/{1.7.0+012 => 1.7.0+369}/README.md (86%)
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/SCHEMA_VERSION
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/meta/context.yaml
 rename dandi/support/bids/schemadata/{1.7.0+012 => 1.7.0+369}/objects/associated_data.yaml (50%)
 rename dandi/support/bids/schemadata/{1.7.0+012 => 1.7.0+369}/objects/columns.yaml (81%)
 rename dandi/support/bids/schemadata/{1.7.0+012 => 1.7.0+369}/objects/datatypes.yaml (61%)
 rename dandi/support/bids/schemadata/{1.7.0+012 => 1.7.0+369}/objects/entities.yaml (84%)
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/objects/extensions.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/objects/formats.yaml
 rename dandi/support/bids/schemadata/{1.7.0+012 => 1.7.0+369}/objects/metadata.yaml (84%)
 rename dandi/support/bids/schemadata/{1.7.0+012 => 1.7.0+369}/objects/modalities.yaml (62%)
 rename dandi/support/bids/schemadata/{1.7.0+012 => 1.7.0+369}/objects/suffixes.yaml (79%)
 rename dandi/support/bids/schemadata/{1.7.0+012 => 1.7.0+369}/objects/top_level_files.yaml (80%)
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/associated_data.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/checks/asl.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/checks/dwi.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/checks/events.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/checks/fmap.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/checks/func.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/common_derivatives_validation.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/dataset_metadata.yaml
 rename dandi/support/bids/schemadata/{1.7.0+012 => 1.7.0+369}/rules/datatypes/anat.yaml (86%)
 rename dandi/support/bids/schemadata/{1.7.0+012 => 1.7.0+369}/rules/datatypes/beh.yaml (81%)
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/derivatives/common_derivatives.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/derivatives/common_imaging_derivatives.yaml
 rename dandi/support/bids/schemadata/{1.7.0+012 => 1.7.0+369}/rules/datatypes/dwi.yaml (75%)
 rename dandi/support/bids/schemadata/{1.7.0+012 => 1.7.0+369}/rules/datatypes/eeg.yaml (78%)
 rename dandi/support/bids/schemadata/{1.7.0+012 => 1.7.0+369}/rules/datatypes/fmap.yaml (85%)
 rename dandi/support/bids/schemadata/{1.7.0+012 => 1.7.0+369}/rules/datatypes/func.yaml (86%)
 rename dandi/support/bids/schemadata/{1.7.0+012 => 1.7.0+369}/rules/datatypes/ieeg.yaml (79%)
 rename dandi/support/bids/schemadata/{1.7.0+012 => 1.7.0+369}/rules/datatypes/meg.yaml (78%)
 rename dandi/support/bids/schemadata/{1.7.0+012 => 1.7.0+369}/rules/datatypes/micr.yaml (83%)
 rename dandi/support/bids/schemadata/{1.7.0+012 => 1.7.0+369}/rules/datatypes/perf.yaml (82%)
 rename dandi/support/bids/schemadata/{1.7.0+012 => 1.7.0+369}/rules/datatypes/pet.yaml (83%)
 rename dandi/support/bids/schemadata/{1.7.0+012 => 1.7.0+369}/rules/entities.yaml (100%)
 rename dandi/support/bids/schemadata/{1.7.0+012 => 1.7.0+369}/rules/modalities.yaml (100%)
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/anat.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/asl.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/beh.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/continuous.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/derivatives/common_derivatives.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/dwi.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/eeg.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/entities.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/fmap.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/func.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/ieeg.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/meg.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/micr.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/mri.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/pet.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/derivatives/common_derivatives.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/eeg.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/ieeg.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/meg.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/perf.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/pet.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/physio.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/task.yaml
 create mode 100644 dandi/support/bids/schemadata/1.7.0+369/rules/tabular_metadata.yaml
 rename dandi/support/bids/schemadata/{1.7.0+012 => 1.7.0+369}/rules/top_level_files.yaml (93%)

diff --git a/dandi/support/bids/schemadata/1.7.0+012/rules/associated_data.yaml b/dandi/support/bids/schemadata/1.7.0+012/rules/associated_data.yaml
deleted file mode 100644
index 609fcafaa..000000000
--- a/dandi/support/bids/schemadata/1.7.0+012/rules/associated_data.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-# This file describes the requirement levels of folders which may appear
-# within a dataset folder without following BIDS format.
-code:
-  required: false
-derivatives:
-  required: false
-sourcedata:
-  required: false
-stimuli:
-  required: false
diff --git a/dandi/support/bids/schemadata/1.7.0+012/rules/tabular_metadata.yaml b/dandi/support/bids/schemadata/1.7.0+012/rules/tabular_metadata.yaml
deleted file mode 100644
index e04d10c1f..000000000
--- a/dandi/support/bids/schemadata/1.7.0+012/rules/tabular_metadata.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-# scans.tsv
-- suffixes:
-  - scans
-  extensions:
-  - .tsv
-  - .json
-  entities:
-    subject: required
-    # session is required if session is present in the dataset.
-    session: optional
-# sessions.tsv
-# This file may only exist if session is present in the dataset.
-- suffixes:
-  - sessions
-  extensions:
-  - .tsv
-  - .json
-  entities:
-    subject: required
diff --git a/dandi/support/bids/schemadata/1.7.0+012/README.md b/dandi/support/bids/schemadata/1.7.0+369/README.md
similarity index 86%
rename from dandi/support/bids/schemadata/1.7.0+012/README.md
rename to dandi/support/bids/schemadata/1.7.0+369/README.md
index c3d142cba..81e3b9d63 100644
--- a/dandi/support/bids/schemadata/1.7.0+012/README.md
+++ b/dandi/support/bids/schemadata/1.7.0+369/README.md
@@ -1,9 +1,9 @@
 # BIDS-schema
 
-Portions of the BIDS specification are defined using YAML files, in order to
+Portions of the BIDS specification are defined using YAML files in order to
 make the specification machine-readable.
 
-Currently, the portions of the specification that rely on this schema are
+Currently the portions of the specification that rely on this schema are
 the entity tables, entity definitions, filename templates, and metadata tables.
 Any changes to the specification should be mirrored in the schema.
 
@@ -32,14 +32,14 @@ The types of objects currently supported in the schema are:
 -   suffixes,
 -   metadata,
 -   top-level files,
--   and non-BIDS associated folders.
+-   and non-BIDS associated directories.
 
-Each of these object types has a single file in the `objects/` folder.
+Each of these object types has a single file in the `objects/` directory.
 
 -   `modalities.yaml`: The modalities, or types of technology, used to acquire data in a BIDS dataset.
     These modalities are not reflected directly in the specification.
     For example, while both fMRI and DWI data are acquired with an MRI,
-    in a BIDS dataset they are stored in different folders reflecting the two different `datatypes`.
+    in a BIDS dataset they are stored in different directories reflecting the two different `datatypes`.
 
 -   `datatypes.yaml`: Data types supported by the specification.
     The only information provided in the file is:
@@ -48,7 +48,7 @@ Each of these object types has a single file in the `objects/` folder.
     1.  each datatype's full name
     1.  a free text description of the datatype.
 
--   `entities.yaml`: Entities (key/value pairs in folder and filenames).
+-   `entities.yaml`: Entities (key-value pairs in directory and filenames).
 
 -   `metadata.yaml`: All valid metadata fields that are explicitly supported in BIDS sidecar JSON files.
 
@@ -58,7 +58,7 @@ Each of these object types has a single file in the `objects/` folder.
 
 -   `top_level_files.yaml`: Valid top-level files which may appear in a BIDS dataset.
 
--   `associated_data.yaml`: Folders that may appear within a dataset folder without following BIDS rules.
+-   `associated_data.yaml`: Directories that may appear within a dataset directory without following BIDS rules.
 
 ### On re-used objects with different definitions
 
@@ -73,7 +73,7 @@ For objects with `snake_case` names, two underscores must be used.
 There should also be a comment near the object definition in the YAML file describing the nature of the different objects.
 
 For example, the TSV column `"reference"` means different things when used for EEG data, as compared to iEEG data.
-As such, there are two definitions in `columns.yaml` for the `"reference"` column: `"reference__eeg"` and `"reference_ieeg"`.
+As such, there are two definitions in `columns.yaml` for the `"reference"` column: `"reference__eeg"` and `"reference__ieeg"`.
 
 ```yaml
 # reference column for channels.tsv files for EEG data
@@ -115,7 +115,7 @@ The `description` field is a freeform description of the modality.
 ### `datatypes.yaml`
 
 This file contains a dictionary in which each datatype is defined.
-Keys are the folder names associated with each datatype (for example, `anat` for anatomical MRI),
+Keys are the directory names associated with each datatype (for example, `anat` for anatomical MRI),
 and each associated value is a dictionary with two keys: `name` and `description`.
 
 The `name` field is the full name of the datatype.
@@ -123,7 +123,7 @@ The `description` field is a freeform description of the datatype.
 
 ### `entities.yaml`
 
-This file contains a dictionary in which each entity (key/value pair in filenames) is defined.
+This file contains a dictionary in which each entity (key-value pair in filenames) is defined.
 Keys are long-form versions of the entities, which are distinct from both the entities as
 they appear in filenames _and_ their full names.
 For example, the key for the "Contrast Enhancing Agent" entity, which appears in filenames as `ce-<label>`,
@@ -155,11 +155,11 @@ The `format` field defines the specific format the value should take.
 Entities are broadly divided into either `label` or `index` types.
 
 When `format` is `index`, then the entity's associated value should be a non-zero integer, optionally with leading zeros.
-For example, `run` should have an index, so a valid key-value pair in a filename would be `run-01`.
+For example, `run` should have an index, so a valid entity would be `run-01`.
 
 When `format` is `label`, then the value should be an alphanumeric string.
 Beyond limitations on which characters are allowed, labels have few restrictions.
-For example, `acq` should have a label, so a valid key-value pair might be `acq-someLabel`.
+For example, `acq` should have a label, so a valid entity might be `acq-someLabel`.
 
 For a small number of entities, only certain labels are allowed.
 In those cases, instead of a `format` field, there will be an `enum` field, which will provide a list of allowed values.
@@ -218,7 +218,7 @@ There are additional fields which may define rules that apply to a given type.
 
        -   `dataset_relative` (relative paths from dataset root),
 
-       -   `participant_relative` (relative paths from participant folder).
+       -   `participant_relative` (relative paths from participant directory).
 
     -   `enum` defines a list of valid values for the field.
         The minimum string length (`minLength`) defaults to 1.
@@ -269,7 +269,7 @@ There are additional fields which may define rules that apply to a given type.
 -   `object`: If `type` is `object`, then there MAY be any of the following
     fields at the same level as `type`: `additionalProperties`,
     `properties`.
-    Objects are defined as sets of key/value pairs.
+    Objects are defined as sets of key-value pairs.
     Keys MUST be strings, while values may have specific attributes,
     which is what `additionalProperties` describes.
     Here is an example of a field which MUST be an object,
@@ -388,21 +388,21 @@ The `description` field is a freeform description of the file.
 
 ### `associated_data.yaml`
 
-This file contains a dictionary in which each non-BIDS folder is defined.
-Keys are folder names, and each associated value is a dictionary with two keys: `name` and `description`.
+This file contains a dictionary in which each non-BIDS directory is defined.
+Keys are directory names, and each associated value is a dictionary with two keys: `name` and `description`.
 
-The `name` field is the full name of the folder.
-The `description` field is a freeform description of the folder.
+The `name` field is the full name of the directory.
+The `description` field is a freeform description of the directory.
 
 ## Rule files
 
-The files in the `rules/` folder are less standardized than the files in `objects/`,
+The files in the `rules/` directory are less standardized than the files in `objects/`,
 because rules governing how different object types interact in a valid dataset are more variable
 than the object definitions.
 
 -   `modalities.yaml`: This file simply groups `datatypes` under their associated modality.
 
--   `datatypes/*.yaml`: Files in the `datatypes` folder contain information about valid filenames within a given datatype.
+-   `datatypes/*.yaml`: Files in the `datatypes` directory contain information about valid filenames within a given datatype.
     Specifically, each datatype's YAML file contains a list of dictionaries.
     Each dictionary contains a list of suffixes, entities, and file extensions which may constitute a valid BIDS filename.
 
@@ -410,7 +410,7 @@ than the object definitions.
 
 -   `top_level_files.yaml`: Requirement levels and valid file extensions of top-level files.
 
--   `associated_data.yaml`: Requirement levels of associated non-BIDS folders.
+-   `associated_data.yaml`: Requirement levels of associated non-BIDS directories.
 
 ### `modalities.yaml`
 
@@ -419,7 +419,7 @@ The `datatypes` dictionary contains a list of datatypes that fall under that mod
 
 ### `datatypes/*.yaml`
 
-The files in this folder are currently the least standardized of any part of the schema.
+The files in this directory are currently the least standardized of any part of the schema.
 
 Each file corresponds to a single `datatype`.
 Within the file is a list of dictionaries.
@@ -496,5 +496,24 @@ In cases where there is a data file and a metadata file, the `.json` extension f
 
 ### `associated_data.yaml`
 
-This file contains a dictionary in which each key is a folder and the value is a dictionary with one key: `required`.
-The `required` entry contains a boolean value to indicate if that folder is required for BIDS datasets or not.
+This file contains a dictionary in which each key is a directory and the value is a dictionary with one key: `required`.
+The `required` entry contains a boolean value to indicate if that directory is required for BIDS datasets or not.
+
+## Version of the schema
+
+File `SCHEMA_VERSION` in the top of the directory contains a semantic
+version (`MAJOR.MINOR.PATCH`) for the schema (how it is organized).
+Note that while in `0.` series, breaking changes are
+permitted without changing the `MAJOR` (leading) component of the version.
+Going forward, the 2nd, `MINOR` indicator should be
+incremented whenever schema organization introduces "breaking changes":
+changes which would cause existing tools reading schema to
+adjust their code to be able to read it again.
+Additions of new components to the schema should increment the last,
+`PATCH`, component of the version so that tools could selectively
+enable/disable loading specific components of the schema.
+With the release of `1.0.0` version of the schema,
+we expect that the `MAJOR` component
+will be incremented whenever schema organization introduces "breaking changes",
+`MINOR` - when adding new components to the schema,
+and `PATCH` - when fixing errors in existing components.
diff --git a/dandi/support/bids/schemadata/1.7.0+369/SCHEMA_VERSION b/dandi/support/bids/schemadata/1.7.0+369/SCHEMA_VERSION
new file mode 100644
index 000000000..0d91a54c7
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/SCHEMA_VERSION
@@ -0,0 +1 @@
+0.3.0
diff --git a/dandi/support/bids/schemadata/1.7.0+369/meta/context.yaml b/dandi/support/bids/schemadata/1.7.0+369/meta/context.yaml
new file mode 100644
index 000000000..6a531d9b1
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/meta/context.yaml
@@ -0,0 +1,262 @@
+#
+# The context provides the namespaces available to rules.
+# These namespaces are used by selectors to define the scope of application
+# for a rule, as well as assertions, to determine whether the rule is satisfied.
+#
+# Not all components of the context will be defined; for example a NIfTI header
+# will only be defined when examining a NIfTI file.
+#
+# The dataset namespace is constructed once and is available when visiting all
+# files.
+#
+# The subject namespace is constructed once per subject, and is available when
+# visiting all files within that subject.
+#
+# All other (current) namespaces are defined on individual files.
+# Sidecar metadata and file associations are built according to the inheritance
+# principle.
+#
+---
+context:
+    type: object
+    properties:
+        dataset:
+            description: "Properties and contents of the entire dataset"
+            type: object
+            properties:
+                dataset_description:
+                    description: "Contents of /dataset_description.json"
+                    type: object
+                files:
+                    description: "List of all files in dataset"
+                    type: array
+                tree:
+                    description: "Tree view of all files in dataset"
+                    type: object
+                ignored:
+                    description: "Set of ignored files"
+                    type: array
+                modalities:
+                    description: "Modalities present in the dataset"
+                    type: array
+                subjects:
+                    description: "Collections of subjects in dataset"
+                    type: object
+                    properties:
+                        sub_dirs:
+                            description: "Subjects as determined by sub-*/ directories"
+                            type: array
+                            items:
+                                type: string
+                        participant_id:
+                            description: "The participant_id column of participants.tsv"
+                            type: array
+                            items:
+                                type: string
+                        phenotype:
+                            description: "The union of participant_id columns in phenotype files"
+                            type: array
+                            items:
+                                type: string
+        subject:
+            description: "Properties and contents of the current subject"
+            type: object
+            properties:
+                sessions:
+                    description: "Collections of sessions in subject"
+                    type: object
+                    properties:
+                        ses_dirs:
+                            description: "Sessions as determined by ses-*/ directories"
+                            type: array
+                            items:
+                                type: string
+                        session_id:
+                            description: "The session_id column of sessions.tsv"
+                            type: array
+                            items:
+                                type: string
+                        phenotype:
+                            description: "The union of session_id columns in phenotype files"
+                            type: array
+                            items:
+                                type: string
+
+        # Properties of the current file
+        path:
+            description: "Path of the current file"
+            type: string
+        entities:
+            description: "Entities parsed from the current filename"
+            type: object
+        datatype:
+            description: "Datatype of current file, for examples, anat"
+            type: string
+        suffix:
+            description: "Suffix of current file"
+            type: string
+        extension:
+            description: "Extension of current file including initial dot"
+            type: string
+        modality:
+            description: "Modality of current file, for examples, MRI"
+            type: string
+
+        sidecar:
+            description: "Sidecar metadata constructed via the inheritance principle"
+            type: object
+        associations:
+            # Note that this is not intended to be an exhaustive list of associated files
+            # or to expose every attribute of those files. It is specifically those files
+            # and attributes for which a rule needs to be applied from an originating file.
+            description: |
+                Associated files, indexed by suffix, selected according to the inheritance principle
+            type: object
+            properties:
+                events:
+                    description: "Events file"
+                    type: object
+                    properties:
+                        path:
+                            description: "Path to associated events file"
+                            type: string
+                        onset:
+                            description: "Contents of the onset column"
+                            type: array
+                            items:
+                                type: string
+                aslcontext:
+                    description: "ASL context file"
+                    type: object
+                    properties:
+                        path:
+                            description: "Path to associated aslcontext file"
+                            type: string
+                        n_rows:
+                            description: "Number of rows in aslcontext.tsv"
+                            type: integer
+                        volume_type:
+                            description: "Contents of the volume_type column"
+                            type: array
+                            items:
+                                type: string
+                m0scan:
+                    description: "M0 scan file"
+                    type: object
+                    properties:
+                        path:
+                            description: "Path to associated M0 scan file"
+                            type: string
+                magnitude:
+                    description: "Magnitude image file"
+                    type: object
+                    properties:
+                        path:
+                            description: "Path to associated magnitude file"
+                            type: string
+                magnitude1:
+                    description: "Magnitude1 image file"
+                    type: object
+                    properties:
+                        path:
+                            description: "Path to associated magnitude1 file"
+                            type: string
+                bval:
+                    description: "B value file"
+                    type: object
+                    properties:
+                        path:
+                            description: "Path to associated bval file"
+                            type: string
+                        n_cols:
+                            description: "Number of columns in bval file"
+                            type: integer
+                bvec:
+                    description: "B vector file"
+                    type: object
+                    properties:
+                        path:
+                            description: "Path to associated bvec file"
+                            type: string
+                        n_cols:
+                            description: "Number of columns in bvec file"
+                            type: integer
+
+        # The following properties are populated if the current file is of an appropriate type
+        columns:
+            description: "TSV columns, indexed by column header, values are arrays with column contents"
+            type: object
+            additionalProperties:
+                type: array
+        json:
+            description: "Contents of the current JSON file"
+            type: object
+        nifti_header:
+            name: "NIfTI Header"
+            description: "Parsed contents of NIfTI header referenced elsewhere in schema."
+            type: object
+            properties:
+                dim_info:
+                    name: "Dimension Information"
+                    description: "Metadata about dimensions data."
+                    type: object
+                    properties:
+                        freq:
+                            name: "Frequency"
+                            description: "These fields encode which spatial dimension (1, 2, or 3)."
+                            type: integer
+                        phase:
+                            name: "Phase"
+                            description: "Corresponds to which acquisition dimension for MRI data."
+                            type: integer
+                        slice:
+                            name: "Slice"
+                            description: "Slice dimensions."
+                            type: integer
+                dim:
+                    name: "Data Dimensions"
+                    description: "Data seq dimensions."
+                    type: array
+                    minItems: 8
+                    maxItems: 8
+                    items:
+                        type: integer
+                pixdim:
+                    name: "Pixel Dimension"
+                    description: "Grid spacings (unit per dimension)."
+                    type: array
+                    minItems: 8
+                    maxItems: 8
+                    items:
+                        type: number
+                xyzt_units:
+                    name: "XYZT Units"
+                    description: "Units of pixdim[1..4]"
+                    type: object
+                    properties:
+                        xyz:
+                            name: "XYZ Units"
+                            description: "String representing the unit of voxel spacing."
+                            type: string
+                            enum:
+                            - "unknown"
+                            - "meter"
+                            - "mm"
+                            - "um"
+                        t:
+                            name: "Time Unit"
+                            description: "String representing the unit of inter-volume intervals."
+                            type: string
+                            enum:
+                            - "unknown"
+                            - "sec"
+                            - "msec"
+                            - "usec"
+                qform_code:
+                    name: "qform code"
+                    description: "Use of the quaternion fields."
+                    type: integer
+                sform_code:
+                    name: "sform code"
+                    description: "Use of the affine fields."
+                    type: integer
diff --git a/dandi/support/bids/schemadata/1.7.0+012/objects/associated_data.yaml b/dandi/support/bids/schemadata/1.7.0+369/objects/associated_data.yaml
similarity index 50%
rename from dandi/support/bids/schemadata/1.7.0+012/objects/associated_data.yaml
rename to dandi/support/bids/schemadata/1.7.0+369/objects/associated_data.yaml
index 901e17bda..63e78fb0b 100644
--- a/dandi/support/bids/schemadata/1.7.0+012/objects/associated_data.yaml
+++ b/dandi/support/bids/schemadata/1.7.0+369/objects/associated_data.yaml
@@ -1,29 +1,29 @@
 ---
-# This file describes folders that may appear within a dataset folder
+# This file describes directories that may appear within a dataset directory
 # without following BIDS rules.
-# Information about whether these folders are required or not is present in
+# Information about whether these directories are required or not is present in
 # `rules/associated_data.yaml`.
 code:
-  name: Code
+  display_name: Code
   description: |
-    A folder in which to store any code used to generate the derivatives from the
+    A directory in which to store any code used to generate the derivatives from the
     source data.
 derivatives:
-  name: Derivative data
+  display_name: Derivative data
   description: |
     Derivative data
 sourcedata:
-  name: Source data
+  display_name: Source data
   description: |
     Data before harmonization, reconstruction, and/or file format conversion
     (for example, E-Prime event logs or DICOM files).
 stimuli:
-  name: Stimulus files
+  display_name: Stimulus files
   description: |
-    The stimulus files can be added in a `/stimuli` folder
-    (under the root folder of the dataset; with optional subfolders)
+    The stimulus files can be added in a `/stimuli` directory
+    (under the root directory of the dataset; with optional subdirectories)
     AND using a stim_file column in *_events.tsv mentioning which stimulus file was
     used for a given event.
 
     There are no restrictions on the file formats of the stimuli files, but they should be
-    stored in the `/stimuli` folder.
+    stored in the `/stimuli` directory.
diff --git a/dandi/support/bids/schemadata/1.7.0+012/objects/columns.yaml b/dandi/support/bids/schemadata/1.7.0+369/objects/columns.yaml
similarity index 81%
rename from dandi/support/bids/schemadata/1.7.0+012/objects/columns.yaml
rename to dandi/support/bids/schemadata/1.7.0+369/objects/columns.yaml
index 1c34c936b..b4cf79852 100644
--- a/dandi/support/bids/schemadata/1.7.0+012/objects/columns.yaml
+++ b/dandi/support/bids/schemadata/1.7.0+369/objects/columns.yaml
@@ -1,68 +1,81 @@
 ---
 HED:
   name: HED
+  display_name: HED Tag
   description: |
     Hierarchical Event Descriptor (HED) Tag.
-    See [Appendix III](/99-appendices/03-hed.html) for details.
+    See [Appendix III](SPEC_ROOT/99-appendices/03-hed.md) for details.
   type: string
 abbreviation:
   name: abbreviation
+  display_name: Abbreviation
   description: |
     The unique label abbreviation
   type: string
 acq_time__scans:
   name: acq_time
+  display_name: Scan acquisition time
   description: |
     Acquisition time refers to when the first data point in each run was acquired.
     Furthermore, if this header is provided, the acquisition times of all files
     from the same recording MUST be identical.
-    Datetime format and their anonymization are described in [Units](/02-common-principles.html#units).
+    Datetime format and their anonymization are described in
+    [Units](SPEC_ROOT/02-common-principles.md#units).
   type: string
   format: datetime
 acq_time__sessions:
   name: acq_time
+  display_name: Session acquisition time
   description: |
     Acquisition time refers to when the first data point of the first run was acquired.
-    Datetime format and their anonymization are described in [Units](/02-common-principles.html#units).
+    Datetime format and their anonymization are described in
+    [Units](SPEC_ROOT/02-common-principles.md#units).
   type: string
   format: datetime
 age:
   name: age
+  display_name: Subject age
   description: |
     Numeric value in years (float or integer value).
   type: number
   unit: year
 cardiac:
   name: cardiac
+  display_name: Cardiac measurement
   description: |
     continuous pulse measurement
   type: number
 color:
   name: color
+  display_name: Color label
   description: |
     Hexadecimal. Label color for visualization.
   type: string
   unit: hexadecimal
 derived_from:
   name: derived_from
+  display_name: Derived from
   description: |
-    `sample-<label>` key/value pair from which a sample is derived,
+    `sample-<label>` entity from which a sample is derived,
     for example a slice of tissue (`sample-02`) derived from a block of tissue (`sample-01`).
   type: string
   pattern: ^sample-[0-9a-zA-Z]+$
 description:
   name: description
+  display_name: Description
   description: |
     Brief free-text description of the channel, or other information of interest.
   type: string
 dimension:
   name: dimension
+  display_name: Dimension
   description: |
     Size of the group (grid/strip/probe) that this electrode belongs to.
     Must be of form `[AxB]` with the smallest dimension first (for example, `[1x8]`).
   type: string
 duration:
   name: duration
+  display_name: Event duration
   description: |
     Duration of the event (measured from onset) in seconds.
     Must always be either zero or positive (or `n/a` if unavailable).
@@ -77,12 +90,14 @@ duration:
     - n/a
 filename:
   name: filename
+  display_name: Filename
   description: |
     Relative paths to files.
   type: string
   format: participant_relative
-group:
+group__channel:
   name: group
+  display_name: Channel group
   description: |
     Which group of channels (grid/strip/seeg/depth) this channel belongs to.
     This is relevant because one group has one cable-bundle and noise can be shared.
@@ -92,6 +107,7 @@ group:
   - type: number
 handedness:
   name: handedness
+  display_name: Subject handedness
   description: |
     String value indicating one of "left", "right", "ambidextrous".
 
@@ -121,6 +137,7 @@ handedness:
   - n/a
 hemisphere:
   name: hemisphere
+  display_name: Electrode hemisphere
   description: |
     The hemisphere in which the electrode is placed.
   type: string
@@ -129,6 +146,7 @@ hemisphere:
   - R
 high_cutoff:
   name: high_cutoff
+  display_name: High cutoff
   description: |
     Frequencies used for the low-pass filter applied to the channel in Hz.
     If no low-pass filter applied, use `n/a`.
@@ -143,23 +161,27 @@ high_cutoff:
     - n/a
 hplc_recovery_fractions:
   name: hplc_recovery_fractions
+  display_name: HPLC recovery fractions
   description: |
     HPLC recovery fractions (the fraction of activity that gets loaded onto the HPLC).
   type: number
   unit: arbitrary
 impedance:
   name: impedance
+  display_name: Electrode impedance
   description: |
     Impedance of the electrode, units MUST be in `kOhm`.
   type: number
   unit: kOhm
 index:
   name: index
+  display_name: Label index
   description: |
     The label integer index.
   type: integer
 low_cutoff:
   name: low_cutoff
+  display_name: Low cutoff
   description: |
     Frequencies used for the high-pass filter applied to the channel in Hz.
     If no high-pass filter applied, use `n/a`.
@@ -171,22 +193,26 @@ low_cutoff:
     - n/a
 manufacturer:
   name: manufacturer
+  display_name: Manufacturer
   description: |
     The manufacturer for each electrode.
     Can be used if electrodes were manufactured by more than one company.
   type: string
 mapping:
   name: mapping
+  display_name: Label mapping
   description: |
     Corresponding integer label in the standard BIDS label lookup.
   type: integer
 material:
   name: material
+  display_name: Electrode material
   description: |
     Material of the electrode (for example, `Tin`, `Ag/AgCl`, `Gold`).
   type: string
 metabolite_parent_fraction:
   name: metabolite_parent_fraction
+  display_name: Metabolite parent fraction
   description: |
     Parent fraction of the radiotracer (0-1).
   type: number
@@ -194,6 +220,7 @@ metabolite_parent_fraction:
   maximum: 1
 metabolite_polar_fraction:
   name: metabolite_polar_fraction
+  display_name: Metabolite polar fraction
   description: |
     Polar metabolite fraction of the radiotracer (0-1).
   type: number
@@ -202,23 +229,27 @@ metabolite_polar_fraction:
 # name column for channels.tsv files
 name__channels:
   name: name
+  display_name: Channel name
   description: |
     Label of the channel.
   type: string
 # name column for electrodes.tsv files
 name__electrodes:
   name: name
+  display_name: Electrode name
   description: |
     Name of the electrode contact point.
   type: string
 # name column for dseg.tsv files
 name__segmentations:
   name: name
+  display_name: Label name
   description: |
     The unique label name.
   type: string
 notch:
   name: notch
+  display_name: Notch frequencies
   description: |
     Frequencies used for the notch filter applied to the channel, in Hz.
     If no notch filter applied, use `n/a`.
@@ -230,6 +261,7 @@ notch:
     - n/a
 onset:
   name: onset
+  display_name: Event onset
   description: |
     Onset (in seconds) of the event, measured from the beginning of the acquisition
     of the first data point stored in the corresponding task data file.
@@ -248,6 +280,7 @@ onset:
   unit: s
 pathology:
   name: pathology
+  display_name: Pathology
   description: |
     String value describing the pathology of the sample or type of control.
     When different from `healthy`, pathology SHOULD be specified.
@@ -256,6 +289,7 @@ pathology:
   type: string
 participant_id:
   name: participant_id
+  display_name: Participant ID
   description: |
     A participant identifier of the form `sub-<label>`,
     matching a participant entity found in the dataset.
@@ -263,12 +297,14 @@ participant_id:
   pattern: ^sub-[0-9a-zA-Z]+$
 plasma_radioactivity:
   name: plasma_radioactivity
+  display_name: Plasma radioactivity
   description: |
     Radioactivity in plasma, in unit of plasma radioactivity (for example, `kBq/mL`).
   type: number
 # reference column for channels.tsv files for EEG data
 reference__eeg:
   name: reference
+  display_name: Electrode reference
   description: |
     Name of the reference electrode(s).
     This column is not needed when it is common to all channels.
@@ -277,6 +313,7 @@ reference__eeg:
 # reference column for channels.tsv files for iEEG data
 reference__ieeg:
   name: reference
+  display_name: Electrode reference
   description: |
     Specification of the reference (for example, `mastoid`, `ElectrodeName01`, `intracranial`, `CAR`, `other`, `n/a`).
     If the channel is not an electrode channel (for example, a microphone channel) use `n/a`.
@@ -287,11 +324,13 @@ reference__ieeg:
     - n/a
 respiratory:
   name: respiratory
+  display_name: Respiratory measurement
   description: |
     continuous breathing measurement
   type: number
 response_time:
   name: response_time
+  display_name: Response time
   description: |
     Response time measured in seconds.
     A negative response time can be used to represent preemptive responses and
@@ -304,12 +343,14 @@ response_time:
     - n/a
 sample:
   name: sample
+  display_name: Sample index
   description: |
     Onset of the event according to the sampling scheme of the recorded modality
     (that is, referring to the raw data file that the `events.tsv` file accompanies).
   type: integer
 sample_id:
   name: sample_id
+  display_name: Sample ID
   description: |
     A sample identifier of the form `sample-<label>`,
     matching a sample entity found in the dataset.
@@ -317,6 +358,7 @@ sample_id:
   pattern: ^sample-[0-9a-zA-Z]+$
 sample_type:
   name: sample_type
+  display_name: Sample type
   description: |
     Biosample type defined by
     [ENCODE Biosample Type](https://www.encodeproject.org/profiles/biosample_type).
@@ -333,12 +375,14 @@ sample_type:
   - technical sample
 sampling_frequency:
   name: sampling_frequency
+  display_name: Channel sampling frequency
   description: |
     Sampling rate of the channel in Hz.
   type: number
   unit: Hz
 session_id:
   name: session_id
+  display_name: Session ID
   description: |
     A session identifier of the form `ses-<label>`,
     matching a session found in the dataset.
@@ -346,6 +390,7 @@ session_id:
   pattern: ^ses-[0-9a-zA-Z]+$
 sex:
   name: sex
+  display_name: Sex
   description: |
     String value indicating phenotypical sex, one of "male", "female", "other".
 
@@ -374,12 +419,14 @@ sex:
   - n/a
 size:
   name: size
+  display_name: Electrode size
   description: |
     Surface area of the electrode, units MUST be in `mm^2`.
   type: number
-  unit: mm2
+  unit: 'mm^2'
 software_filters:
   name: software_filters
+  display_name: Software filters
   description: |
     List of temporal and/or spatial software filters applied
     (for example, `SSS`, `SpatialCompensation`).
@@ -392,6 +439,7 @@ software_filters:
     - n/a
 species:
   name: species
+  display_name: Species
   description: |
     The `species` column SHOULD be a binomial species name from the
     [NCBI Taxonomy](https://www.ncbi.nlm.nih.gov/Taxonomy/Browser/wwwtax.cgi)
@@ -401,6 +449,7 @@ species:
   type: string
 status:
   name: status
+  display_name: Channel status
   description: |
     Data quality observed on the channel.
     A channel is considered `bad` if its data quality is compromised by excessive noise.
@@ -413,18 +462,20 @@ status:
   - n/a
 status_description:
   name: status_description
+  display_name: Channel status description
   description: |
     Freeform text description of noise or artifact affecting data quality on the channel.
-    It is meant to explain why the channel was declared bad in `[status]`.
+    It is meant to explain why the channel was declared bad in the `status` column.
   type: string
 stim_file:
   name: stim_file
+  display_name: Stimulus file
   description: |
     Represents the location of the stimulus file (such as an image, video, or
     audio file) presented at the given onset time.
     There are no restrictions on the file formats of the stimuli files,
-    but they should be stored in the `/stimuli` folder
-    (under the root folder of the dataset; with optional subfolders).
+    but they should be stored in the `/stimuli` directory
+    (under the root directory of the dataset; with optional subdirectories).
     The values under the `stim_file` column correspond to a path relative to
     `/stimuli`.
     For example `images/cat03.jpg` will be translated to `/stimuli/images/cat03.jpg`.
@@ -432,12 +483,14 @@ stim_file:
   format: stimuli_relative
 strain:
   name: strain
+  display_name: Strain
   description: |
     For species different from `homo sapiens`, string value indicating
     the strain of the species, for example: `C57BL/6J`.
   type: string
 strain_rrid:
   name: strain_rrid
+  display_name: Strain RRID
   description: |
     For species different from `homo sapiens`, research resource identifier
     ([RRID](https://scicrunch.org/resources/Organisms/search))
@@ -446,6 +499,7 @@ strain_rrid:
   format: rrid
 time:
   name: time
+  display_name: Time
   description: |
     Time, in seconds, relative to `TimeZero` defined by the `*_pet.json`.
     For example, 5.
@@ -453,6 +507,7 @@ time:
   unit: s
 trial_type:
   name: trial_type
+  display_name: Trial type
   description: |
     Primary categorisation of each trial to identify them as instances of the
     experimental conditions.
@@ -462,12 +517,39 @@ trial_type:
   type: string
 trigger:
   name: trigger
+  display_name: Trigger
   description: |
     continuous measurement of the scanner trigger signal
   type: number
 # type column in channels.tsv files
-type__channels:
+type__eeg_channels:
   name: type
+  display_name: Channel type
+  description: |
+    Type of channel; MUST use the channel types listed below.
+    Note that the type MUST be in upper-case.
+  type: string
+  enum:
+  - AUDIO
+  - EEG
+  - EOG
+  - ECG
+  - EMG
+  - EYEGAZE
+  - GSR
+  - HEOG
+  - MISC
+  - PPG
+  - PUPIL
+  - REF
+  - RESP
+  - SYSCLOCK
+  - TEMP
+  - TRIG
+  - VEOG
+type__meg_channels:
+  name: type
+  display_name: Channel type
   description: |
     Type of channel; MUST use the channel types listed below.
     Note that the type MUST be in upper-case.
@@ -501,22 +583,53 @@ type__channels:
   - HLU
   - FITERR
   - OTHER
+type__ieeg_channels:
+  name: type
+  display_name: Channel type
+  description: |
+    Type of channel; MUST use the channel types listed below.
+    Note that the type MUST be in upper-case.
+  type: string
+  enum:
+  - EEG
+  - ECOG
+  - SEEG
+  - DBS
+  - VEOG
+  - HEOG
+  - EOG
+  - ECG
+  - EMG
+  - TRIG
+  - AUDIO
+  - PD
+  - EYEGAZE
+  - PUPIL
+  - MISC
+  - SYSCLOCK
+  - ADC
+  - DAC
+  - REF
+  - OTHER
 # type column for electrodes.tsv files
 type__electrodes:
   name: type
+  display_name: Electrode type
   description: |
     Type of the electrode (for example, cup, ring, clip-on, wire, needle).
   type: string
 units:
   name: units
+  display_name: Units
   description: |
     Physical unit of the value represented in this channel,
     for example, `V` for Volt, or `fT/cm` for femto Tesla per centimeter
-    (see [Units](/02-common-principles.html#units)).
+    (see [Units](SPEC_ROOT/02-common-principles.md#units)).
   type: string
   format: unit
 value:
   name: value
+  display_name: Marker value
   description: |
     Marker value associated with the event (for example, the value of a TTL
     trigger that was recorded at the onset of the event).
@@ -525,6 +638,7 @@ value:
   - type: string
 volume_type:
   name: volume_type
+  display_name: ASL volume type
   description: |
     The `*_aslcontext.tsv` table consists of a single column of labels identifying
     the `volume_type` of each volume in the corresponding `*_asl.nii[.gz]` file.
@@ -537,22 +651,26 @@ volume_type:
   - cbf
 whole_blood_radioactivity:
   name: whole_blood_radioactivity
+  display_name: Whole blood radioactivity
   description: |
     Radioactivity in whole blood samples,
     in unit of radioactivity measurements in whole blood samples (for example, `kBq/mL`).
   type: number
 x:
   name: x
+  display_name: X position
   description: |
     Recorded position along the x-axis.
   type: number
 y:
   name: y
+  display_name: Y position
   description: |
     Recorded position along the y-axis.
   type: number
 z:
   name: z
+  display_name: Z position
   description: |
     Recorded position along the z-axis.
   anyOf:
diff --git a/dandi/support/bids/schemadata/1.7.0+012/objects/datatypes.yaml b/dandi/support/bids/schemadata/1.7.0+369/objects/datatypes.yaml
similarity index 61%
rename from dandi/support/bids/schemadata/1.7.0+012/objects/datatypes.yaml
rename to dandi/support/bids/schemadata/1.7.0+369/objects/datatypes.yaml
index 06c059eed..13d5907d7 100644
--- a/dandi/support/bids/schemadata/1.7.0+012/objects/datatypes.yaml
+++ b/dandi/support/bids/schemadata/1.7.0+369/objects/datatypes.yaml
@@ -2,43 +2,54 @@
 # This file defines valid BIDS datatypes, along with their full names and descriptions.
 # For rules regarding how suffixes relate to datatypes, see files in `rules/datatypes/`.
 anat:
-  name: Anatomical Magnetic Resonance Imaging
+  value: anat
+  display_name: Anatomical Magnetic Resonance Imaging
   description: |
     Magnetic resonance imaging sequences designed to characterize static, anatomical features.
 beh:
-  name: Behavioral Data
+  value: beh
+  display_name: Behavioral Data
   description: |
     Behavioral data.
 dwi:
-  name: Diffusion-Weighted Imaging
+  value: dwi
+  display_name: Diffusion-Weighted Imaging
   description: |
     Diffusion-weighted imaging (DWI).
 eeg:
-  name: Electroencephalography
+  value: eeg
+  display_name: Electroencephalography
   description: Electroencephalography
 fmap:
-  name: Field maps
+  value: fmap
+  display_name: Field maps
   description: |
     MRI scans for estimating B0 inhomogeneity-induced distortions.
 func:
-  name: Task-Based Magnetic Resonance Imaging
+  value: func
+  display_name: Task-Based Magnetic Resonance Imaging
   description: |
     Task (including resting state) imaging data
 ieeg:
-  name: Intracranial electroencephalography
+  value: ieeg
+  display_name: Intracranial electroencephalography
   description: |
     Intracranial electroencephalography (iEEG) or electrocorticography (ECoG) data
 meg:
-  name: Magnetoencephalography
+  value: meg
+  display_name: Magnetoencephalography
   description: Magnetoencephalography
 micr:
-  name: Microscopy
+  value: micr
+  display_name: Microscopy
   description: Microscopy
 perf:
-  name: Perfusion imaging
+  value: perf
+  display_name: Perfusion imaging
   description: |
     Blood perfusion imaging data, including arterial spin labeling (ASL)
 pet:
-  name: Positron Emission Tomography
+  value: pet
+  display_name: Positron Emission Tomography
   description: |
     Positron emission tomography data
diff --git a/dandi/support/bids/schemadata/1.7.0+012/objects/entities.yaml b/dandi/support/bids/schemadata/1.7.0+369/objects/entities.yaml
similarity index 84%
rename from dandi/support/bids/schemadata/1.7.0+012/objects/entities.yaml
rename to dandi/support/bids/schemadata/1.7.0+369/objects/entities.yaml
index 657b835ee..4d46ec99a 100644
--- a/dandi/support/bids/schemadata/1.7.0+012/objects/entities.yaml
+++ b/dandi/support/bids/schemadata/1.7.0+369/objects/entities.yaml
@@ -4,10 +4,10 @@
 # The appropriate order of entities in filenames is defined in `rules/entities.yaml`,
 # rather than this file (`objects/entities.yaml`).
 acquisition:
-  name: Acquisition
-  entity: acq
+  name: acq
+  display_name: Acquisition
   description: |
-    The `acq-<label>` key/value pair corresponds to a custom label the
+    The `acq-<label>` entity corresponds to a custom label the
     user MAY use to distinguish a different set of parameters used for
     acquiring the same modality.
     For example this should be used when a study includes two T1w images - one
@@ -26,8 +26,8 @@ acquisition:
   type: string
   format: label
 atlas:
-  name: Atlas
-  entity: atlas
+  name: atlas
+  display_name: Atlas
   description: |
     The `atlas-<label>` key/value pair corresponds to a custom label the user
     MAY use to distinguish a different atlas used for similar type of data.
@@ -36,10 +36,10 @@ atlas:
   type: string
   format: label
 ceagent:
-  name: Contrast Enhancing Agent
-  entity: ce
+  name: ce
+  display_name: Contrast Enhancing Agent
   description: |
-    The `ce-<label>` key/value can be used to distinguish
+    The `ce-<label>` entity can be used to distinguish
     sequences using different contrast enhanced images.
     The label is the name of the contrast agent.
     The key `"ContrastBolusIngredient"` MAY also be added in the JSON file,
@@ -47,8 +47,8 @@ ceagent:
   type: string
   format: label
 chunk:
-  name: Chunk
-  entity: chunk
+  name: chunk
+  display_name: Chunk
   description: |
     The `chunk-<index>` key/value pair is used to distinguish between different
     regions, 2D images or 3D volumes files, of the same physical sample with
@@ -56,8 +56,8 @@ chunk:
   type: string
   format: index
 density:
-  name: Density
-  entity: den
+  name: den
+  display_name: Density
   description: |
     Density of non-parametric surfaces.
     MUST have a corresponding `Density` metadata field to provide
@@ -67,30 +67,30 @@ density:
   type: string
   format: label
 description:
-  name: Description
-  entity: desc
+  name: desc
+  display_name: Description
   description: |
     When necessary to distinguish two files that do not otherwise have a
-    distinguishing entity, the `_desc-<label>` keyword-value SHOULD be used.
+    distinguishing entity, the `_desc-<label>` entity SHOULD be used.
 
     This entity is only applicable to derivative data.
   type: string
   format: label
 direction:
-  name: Phase-Encoding Direction
-  entity: dir
+  name: dir
+  display_name: Phase-Encoding Direction
   description: |
-    The `dir-<label>` key/value can be set to an arbitrary alphanumeric label
+    The `dir-<label>` entity can be set to an arbitrary alphanumeric label
     (for example, `dir-LR` or `dir-AP`) to distinguish different phase-encoding
     directions.
   type: string
   format: label
 echo:
-  name: Echo
-  entity: echo
+  name: echo
+  display_name: Echo
   description: |
     If files belonging to an entity-linked file collection are acquired at different
-    echo times, the `_echo-<index>` key/value pair MUST be used to distinguish
+    echo times, the `_echo-<index>` entity MUST be used to distinguish
     individual files.
     This entity represents the `"EchoTime"` metadata field. Please note that the `<index>`
     denotes the number/index (in the form of a nonnegative integer), not the
@@ -99,11 +99,11 @@ echo:
   type: string
   format: index
 flip:
-  name: Flip Angle
-  entity: flip
+  name: flip
+  display_name: Flip Angle
   description: |
     If files belonging to an entity-linked file collection are acquired at different
-    flip angles, the `_flip-<index>` key/value pair MUST be used to distinguish
+    flip angles, the `_flip-<index>` entity pair MUST be used to distinguish
     individual files.
     This entity represents the `"FlipAngle"` metadata field. Please note that the `<index>`
     denotes the number/index (in the form of a nonnegative integer), not the `"FlipAngle"`
@@ -111,8 +111,8 @@ flip:
   type: string
   format: index
 hemisphere:
-  name: Hemisphere
-  entity: hemi
+  name: hemi
+  display_name: Hemisphere
   description: |
     The `hemi-<label>` entity indicates which hemibrain is described by the file.
     Allowed label values for this entity are `L` and `R`, for the left and right
@@ -123,11 +123,11 @@ hemisphere:
   - "L"
   - "R"
 inversion:
-  name: Inversion Time
-  entity: inv
+  name: inv
+  display_name: Inversion Time
   description: |
     If files belonging to an entity-linked file collection are acquired at different
-    inversion times, the `_inv-<index>` key/value pair MUST be used to distinguish
+    inversion times, the `_inv-<index>` entity MUST be used to distinguish
     individual files.
     This entity represents the `"InversionTime` metadata field. Please note that the `<index>`
     denotes the number/index (in the form of a nonnegative integer), not the `"InversionTime"`
@@ -135,8 +135,8 @@ inversion:
   type: string
   format: index
 label:
-  name: Label
-  entity: label
+  name: label
+  display_name: Label
   description: |
     Tissue-type label, following a prescribed vocabulary.
     Applies to binary masks and probabilistic/partial volume segmentations
@@ -146,20 +146,20 @@ label:
   type: string
   format: label
 modality:
-  name: Corresponding Modality
-  entity: mod
+  name: mod
+  display_name: Corresponding Modality
   description: |
-    The `mod-<label>` key/value pair corresponds to modality label for defacing
+    The `mod-<label>` entity corresponds to modality label for defacing
     masks, for example, T1w, inplaneT1, referenced by a defacemask image.
     For example, `sub-01_mod-T1w_defacemask.nii.gz`.
   type: string
   format: label
 mtransfer:
-  name: Magnetization Transfer
-  entity: mt
+  name: mt
+  display_name: Magnetization Transfer
   description: |
     If files belonging to an entity-linked file collection are acquired at different
-    magnetization transfer (MT) states, the `_mt-<label>` key/value pair MUST be used to
+    magnetization transfer (MT) states, the `_mt-<label>` entity MUST be used to
     distinguish individual files.
     This entity represents the `"MTState"` metadata field. Allowed label values for this
     entity are `on` and `off`, for images acquired in presence and absence of an MT pulse,
@@ -169,12 +169,12 @@ mtransfer:
   - "on"
   - "off"
 part:
-  name: Part
-  entity: part
+  name: part
+  display_name: Part
   description: |
     This entity is used to indicate which component of the complex
     representation of the MRI signal is represented in voxel data.
-    The `part-<label>` key/value pair is associated with the DICOM Tag
+    The `part-<label>` entity is associated with the DICOM Tag
     `0008, 9208`.
     Allowed label values for this entity are `phase`, `mag`, `real` and `imag`,
     which are typically used in `part-mag`/`part-phase` or
@@ -184,7 +184,7 @@ part:
     The sidecar JSON file MUST include the units of the `phase` image.
     The possible options are `"rad"` or `"arbitrary"`.
 
-    When there is only a magnitude image of a given type, the `part` key MAY be
+    When there is only a magnitude image of a given type, the `part` entity MAY be
     omitted.
   type: string
   enum:
@@ -193,8 +193,8 @@ part:
   - real
   - imag
 processing:
-  name: Processed (on device)
-  entity: proc
+  name: proc
+  display_name: Processed (on device)
   description: |
     The proc label is analogous to rec for MR and denotes a variant of
     a file that was a result of particular processing performed on the device.
@@ -207,17 +207,17 @@ processing:
   type: string
   format: label
 reconstruction:
-  name: Reconstruction
-  entity: rec
+  name: rec
+  display_name: Reconstruction
   description: |
-    The `rec-<label>` key/value can be used to distinguish
+    The `rec-<label>` entity can be used to distinguish
     different reconstruction algorithms (for example `MoCo` for the ones using motion
     correction).
   type: string
   format: label
 recording:
-  name: Recording
-  entity: recording
+  name: recording
+  display_name: Recording
   description: |
     More than one continuous recording file can be included (with different
     sampling frequencies).
@@ -226,8 +226,8 @@ recording:
   type: string
   format: label
 resolution:
-  name: Resolution
-  entity: res
+  name: res
+  display_name: Resolution
   description: |
     Resolution of regularly sampled N-dimensional data.
     MUST have a corresponding `"Resolution"` metadata field to provide
@@ -237,10 +237,11 @@ resolution:
   type: string
   format: label
 run:
-  name: Run
-  entity: run
+  name: run
+  display_name: Run
   description: |
-    If several scans with the same acquisition parameters are acquired in the same session,
+    If several data acquisitions (for example, MRI scans or EEG recordings)
+    with the same acquisition parameters are acquired in the same session,
     they MUST be indexed with the [`run-<index>`](../99-appendices/09-entities.md#run) entity:
     `_run-1`, `_run-2`, `_run-3`, and so on (only nonnegative integers are allowed as
     run labels).
@@ -253,20 +254,20 @@ run:
   type: string
   format: index
 sample:
-  name: Sample
-  entity: sample
+  name: sample
+  display_name: Sample
   description: |
     A sample pertaining to a subject such as tissue, primary cell
     or cell-free sample.
-    The `sample-<label>` key/value pair is used to distinguish between different
+    The `sample-<label>` entity is used to distinguish between different
     samples from the same subject.
     The label MUST be unique per subject and is RECOMMENDED to be unique
     throughout the dataset.
   type: string
   format: label
 session:
-  name: Session
-  entity: ses
+  name: ses
+  display_name: Session
   description: |
     A logical grouping of neuroimaging and behavioral data consistent across
     subjects.
@@ -286,8 +287,8 @@ session:
   type: string
   format: label
 space:
-  name: Space
-  entity: space
+  name: space
+  display_name: Space
   description: |
     The space entity can be used to indicate
     the way in which electrode positions are interpreted
@@ -304,8 +305,8 @@ space:
   type: string
   format: label
 split:
-  name: Split
-  entity: split
+  name: split
+  display_name: Split
   description: |
     In the case of long data recordings that exceed a file size of 2Gb, the
     .fif files are conventionally split into multiple parts.
@@ -326,8 +327,8 @@ split:
   type: string
   format: index
 stain:
-  name: Stain
-  entity: stain
+  name: stain
+  display_name: Stain
   description: |
     The `stain-<label>` key/pair values can be used to distinguish image files
     from the same sample using different stains or antibodies for contrast enhancement.
@@ -338,15 +339,15 @@ stain:
   type: string
   format: label
 subject:
-  name: Subject
-  entity: sub
+  name: sub
+  display_name: Subject
   description: |
     A person or animal participating in the study.
   type: string
   format: label
 task:
-  name: Task
-  entity: task
+  name: task
+  display_name: Task
   description: |
     Each task has a unique label that MUST only consist of letters and/or
     numbers (other characters, including spaces and underscores, are not
@@ -355,10 +356,10 @@ task:
   type: string
   format: label
 tracer:
-  name: Tracer
-  entity: trc
+  name: trc
+  display_name: Tracer
   description: |
-    The `trc-<label>` key/value can be used to distinguish
+    The `trc-<label>` entity can be used to distinguish
     sequences using different tracers.
     The key `"TracerName"` MUST also be included in the associated JSON file,
     although the label may be different.
diff --git a/dandi/support/bids/schemadata/1.7.0+369/objects/extensions.yaml b/dandi/support/bids/schemadata/1.7.0+369/objects/extensions.yaml
new file mode 100644
index 000000000..871f14b8c
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/objects/extensions.yaml
@@ -0,0 +1,299 @@
+---
+# This file describes valid file extensions in the specification.
+ave:
+  value: .ave
+  display_name: AVE  # not sure what ave stands for
+  description: |
+    File containing data averaged by segments of interest.
+
+    Used by KIT, Yokogawa, and Ricoh MEG systems.
+bdf:
+  value: .bdf
+  display_name: Biosemi Data Format
+  description: |
+    A [Biosemi](https://www.biosemi.com/) Data Format file.
+
+    Each recording consists of a single `.bdf` file.
+    [`bdf+`](https://www.teuniz.net/edfbrowser/bdfplus%20format%20description.html) files are permitted.
+    The capital `.BDF` extension MUST NOT be used.
+bval:
+  value: .bval
+  display_name: FSL-Format Gradient Amplitudes
+  description: |
+    A space-delimited file containing gradient directions (b-vectors) of diffusion measurement.
+
+    The `bval` file contains the *b*-values (in s/mm<sup>2</sup>) corresponding to the
+    volumes in the relevant NIfTI file, with 0 designating *b*=0 volumes.
+bvec:
+  value: .bvec
+  display_name: FSL-Format Gradient Directions
+  description: |
+    A space-delimited file containing gradient directions (b-vectors) of diffusion measurement.
+
+    This file contains 3 rows with *N* space-delimited floating-point numbers,
+    corresponding to the *N* volumes in the corresponding NIfTI file.
+
+    The first row contains the *x* elements, the second row contains the *y* elements and
+    the third row contains the *z* elements of a unit vector in the direction of the applied
+    diffusion gradient, where the *i*-th elements in each row correspond together to
+    the *i*-th volume, with `[0,0,0]` for *non-diffusion-weighted* (also called *b*=0 or *low-b*)
+    volumes.
+
+    Following the FSL format for the `bvec` specification, the coordinate system of
+    the *b* vectors MUST be defined with respect to the coordinate system defined by
+    the header of the corresponding `_dwi` NIfTI file and not the scanner's device
+    coordinate system (see [Coordinate systems](../99-appendices/08-coordinate-systems.md)).
+    The most relevant limitation imposed by this choice is that the gradient information cannot
+    be directly stored in this format if the scanner generates *b*-vectors in *scanner coordinates*.
+chn:
+  value: .chn
+  display_name: KRISS CHN
+  description: |
+    A file generated by KRISS MEG systems containing the position of the center of the MEG coils.
+
+    Each experimental run on the KRISS system produces a file with extension `.kdf`.
+    Additional files that may be available in the same folder include
+    the digitized positions of the head points (`\_digitizer.txt`),
+    the position of the center of the MEG coils (`.chn`),
+    and the event markers (`.trg`).
+con:
+  value: .con
+  display_name: KIT/Yokogawa/Ricoh Continuous Data
+  description: |
+    Raw continuous data from a KIT/Yokogawa/Ricoh MEG system.
+
+    Successor to the `.sqd` extension for raw continuous data.
+dat:
+  value: .dat
+  display_name: MEG Fine-Calibration Format
+  description: |
+    A fine-calibration file used for Neuromag/Elekta/MEGIN MEG recording hardware.
+CTF:
+  value: .ds/
+  display_name: CTF MEG Dataset Folder
+  description: |
+    A folder for MEG data, typically containing a `.meg4` file for the data and a `.res4` file for the resources.
+edf:
+  value: .edf
+  display_name: European Data Format
+  description: |
+    A [European data format](https://www.edfplus.info/) file.
+
+    Each recording consists of a single `.edf`` file.
+    [`edf+`](https://www.edfplus.info/specs/edfplus.html) files are permitted.
+    The capital `.EDF` extension MUST NOT be used.
+eeg:
+  value: .eeg
+  display_name: BrainVision Binary Data
+  description: |
+    A binary data file in the
+    [BrainVision Core Data Format](https://www.brainproducts.com/productdetails.php?id=21&tab=5).
+    These files come in three-file sets, including a `.vhdr`, a `.vmrk`, and a `.eeg` file.
+fdt:
+  value: .fdt
+  display_name: EEGLAB FDT
+  description: |
+    An [EEGLAB](https://sccn.ucsd.edu/eeglab) file.
+
+    The format used by the MATLAB toolbox [EEGLAB](https://sccn.ucsd.edu/eeglab).
+    Each recording consists of a `.set` file with an optional `.fdt` file.
+fif:
+  value: .fif
+  display_name: Functional Imaging File Format
+  description: |
+    An MEG file format used by Neuromag, Elekta, and MEGIN.
+jpg:
+  value: .jpg
+  display_name: Joint Photographic Experts Group Format
+  description: |
+    A JPEG image file.
+json:
+  value: .json
+  display_name: JavaScript Object Notation
+  description: |
+    A JSON file.
+
+    In the BIDS specification, JSON files are primarily used as "sidecar" files, in which metadata describing "data"
+    files are encoded.
+    These sidecar files follow the inheritance principle.
+
+    There are also a few special cases of JSON files being first-order data files, such as `genetic_info.json`.
+kdf:
+  value: .kdf
+  display_name: KRISS KDF
+  description: |
+    A KRISS (file with extension `.kdf`) file.
+
+    Each experimental run on the KRISS system produces a file with extension `.kdf`.
+    Additional files that may be available in the same folder include
+    the digitized positions of the head points (`\_digitizer.txt`),
+    the position of the center of the MEG coils (`.chn`),
+    and the event markers (`.trg`).
+md:
+  value: .md
+  display_name: Markdown
+  description: |
+    A Markdown file.
+mefd:
+  value: .mefd/
+  display_name: Multiscale Electrophysiology File Format Version 3.0
+  description: |
+    A folder in the [MEF3](https://osf.io/e3sf9/) format.
+
+    Each recording consists of a `.mefd` directory.
+mhd:
+  value: .mhd
+  display_name: ITAB Binary Header
+  description: |
+    Produced by ITAB-ARGOS153 systems. This file a binary header file, and is generated along with a
+    raw data file with the `.raw` extension.
+mrk:
+  value: .mrk
+  display_name: MRK
+  description: |
+    A file containing MEG sensor coil positions.
+
+    Used by KIT, Yokogawa, and Ricoh MEG systems.
+    Successor to the `.sqd` extension for marker files.
+OMEZARR:
+  value: .ome.zarr/
+  display_name: OME Next Generation File Format
+  description: |
+    An OME-NGFF file.
+
+    OME-NGFF is a [Zarr](https://zarr.readthedocs.io)-based format, organizing data arrays in nested directories.
+    This format was developed by the Open Microscopy Environment to provide data stream access to very large data.
+nii:
+  value: .nii
+  display_name: NIfTI
+  description: |
+    A Neuroimaging Informatics Technology Initiative (NIfTI) data file.
+niigz:
+  value: .nii.gz
+  display_name: Compressed NIfTI
+  description: |
+    A compressed Neuroimaging Informatics Technology Initiative (NIfTI) data file.
+nwb:
+  value: .nwb
+  display_name: Neurodata Without Borders Format
+  description: |
+    A [Neurodata Without Borders](https://nwb-schema.readthedocs.io) file.
+
+    Each recording consists of a single `.nwb` file.
+OMEBigTiff:
+  value: .ome.btf
+  display_name: Open Microscopy Environment BigTIFF
+  description: |
+    A [BigTIFF](https://www.awaresystems.be/imaging/tiff/bigtiff.html) image file, for very large images.
+OMETiff:
+  value: .ome.tif
+  display_name: Open Microscopy Environment Tag Image File Format
+  description: |
+    An [OME-TIFF](https://docs.openmicroscopy.org/ome-model/6.1.2/ome-tiff/specification.html#) image file.
+png:
+  value: .png
+  display_name: Portable Network Graphics
+  description: |
+    A [Portable Network Graphics](http://www.libpng.org/pub/png/) file.
+pos:
+  value: .pos
+  display_name: Head Point Position
+  description: |
+    File containing digitized positions of the head points.
+
+    This may be produced by a 4D neuroimaging/BTi MEG system or a CTF MEG system.
+raw:
+  value: .raw
+  display_name: RAW
+  description: |
+    When produced by a KIT / Yokogawa / Ricoh MEG system, this file contains trial-based evoked fields.
+
+    When produced by an ITAB-ARGOS153 system, this file contains raw data and is generated along with
+    an associated binary header file  with the `.mhd` extension.
+rst:
+  value: .rst
+  display_name: reStructuredText
+  description: |
+    A [reStructuredText](https://docutils.sourceforge.io/rst.html) file.
+set:
+  value: .set
+  display_name: EEGLAB SET
+  description: |
+    An [EEGLAB](https://sccn.ucsd.edu/eeglab) file.
+
+    The format used by the MATLAB toolbox [EEGLAB](https://sccn.ucsd.edu/eeglab).
+    Each recording consists of a `.set` file with an optional `.fdt` file.
+sqd:
+  value: .sqd
+  display_name: SQD
+  description: |
+    A file containing either raw MEG data or MEG sensor coil positions.
+    While this extension is still valid, it has been succeeded by `.con` for raw MEG data and `.mrk` for
+    marker information.
+
+    Used by KIT, Yokogawa, and Ricoh MEG systems.
+tif:
+  value: .tif
+  display_name: Tag Image File Format
+  description: |
+    A [Tag Image File Format](https://en.wikipedia.org/wiki/TIFF) file.
+trg:
+  value: .trg
+  display_name: KRISS TRG
+  description: |
+    A file generated by KRISS MEG systems containing the event markers.
+
+    Each experimental run on the KRISS system produces a file with extension `.kdf`.
+    Additional files that may be available in the same folder include
+    the digitized positions of the head points (`\_digitizer.txt`),
+    the position of the center of the MEG coils (`.chn`),
+    and the event markers (`.trg`).
+tsv:
+  value: .tsv
+  display_name: Tab-Delimited
+  description: |
+    A tab-delimited file.
+tsvgz:
+  value: .tsv.gz
+  display_name: Compressed Tab-Delimited
+  description: |
+    A gzipped tab-delimited file.
+    This file extension is only used for very large tabular data, such as physiological recordings.
+    For smaller data, the unzipped `.tsv` extension is preferred.
+txt:
+  value: .txt
+  display_name: Text
+  description: |
+    A free-form text file.
+
+    Tab-delimited files should have the `.tsv` extension rather than a `.txt` extension.
+vhdr:
+  value: .vhdr
+  display_name: BrainVision Text Header
+  description: |
+    A text header file in the
+    [BrainVision Core Data Format](https://www.brainproducts.com/productdetails.php?id=21&tab=5).
+    These files come in three-file sets, including a `.vhdr`, a `.vmrk`, and a `.eeg` file.
+vmrk:
+  value: .vmrk
+  display_name: BrainVision Marker
+  description: |
+    A text marker file in the
+    [BrainVision Core Data Format](https://www.brainproducts.com/productdetails.php?id=21&tab=5).
+    These files come in three-file sets, including a `.vhdr`, a `.vmrk`, and a `.eeg` file.
+Any:
+  value: .*
+  display_name: Any Extension
+  description: |
+    Any extension is allowed.
+None:
+  value: ""
+  display_name: No extension
+  description: |
+    A file with no extension.
+Directory:
+  value: /
+  display_name: Folder
+  description: |
+    A folder with no extension.
+    Corresponds to BTi/4D data.
diff --git a/dandi/support/bids/schemadata/1.7.0+369/objects/formats.yaml b/dandi/support/bids/schemadata/1.7.0+369/objects/formats.yaml
new file mode 100644
index 000000000..c9d58a373
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/objects/formats.yaml
@@ -0,0 +1,124 @@
+---
+# This file defines valid patterns for different formats
+# Entity patterns
+index:
+  display_name: Index
+  description: |
+    Non-negative, non-zero integers, optionally prefixed with leading zeros for sortability.
+    An index may not be all zeros.
+  pattern: '[0-9]*[1-9]+[0-9]*'
+label:
+  display_name: Label
+  description: |
+    Freeform labels without special characters.
+  pattern: '[0-9a-zA-Z]+'
+# Metadata types
+boolean:
+  display_name: Boolean
+  description: |
+    A boolean.
+    Must be either "true" or "false".
+  pattern: '(true|false)'
+integer:
+  display_name: Integer
+  description: |
+    An integer which may be positive or negative.
+  pattern: '[+-]?\d+'
+number:
+  display_name: Number
+  description: |
+    A number which may be an integer or float, positive or negative.
+  pattern: '[+-]?([0-9]+([.][0-9]*)?|[.][0-9]+)([eE][+-]?[0-9]+)?'
+string:
+  display_name: String
+  description: |
+    The basic string type (not a specific format).
+    This should allow any free-form string.
+  pattern: '.*'
+# String formats
+bids_uri:
+  display_name: BIDS uniform resource indicator
+  description: |
+    A BIDS uniform resource indicator.
+
+    The validation for this format is minimal.
+    It simply ensures that the value is a string with any characters that may appear in a valid URI,
+    starting with "bids:".
+  pattern: 'bids:[0-9a-zA-Z/#:\?\_\-\.]+'
+dataset_relative:
+  display_name: Path relative to the BIDS dataset directory
+  description: |
+    A path to a file, relative to the dataset directory.
+
+    The validation for this format is minimal.
+    It simply ensures that the value is a string with any characters that may appear in a valid path,
+    without starting with "/" (an absolute path).
+  pattern: '(?!/)[0-9a-zA-Z/\_\-\.]+'
+date:
+  display_name: Date
+  description: |
+    A date in the form `"YYYY-MM-DD[Z]"`,
+    where [Z] is an optional, valid timezone code.
+  pattern: '[0-9]{4}-[0-9]{2}-[0-9]{2}([A-Z]{2,4})?'
+datetime:
+  display_name: Datetime
+  description: |
+    A datetime in the form `"YYYY-MM-DDThh:mm:ss[.000000][Z]"`,
+    where [.000000] is an optional subsecond resolution between 1 and 6 decimal points,
+    and [Z] is an optional, valid timezone code.
+  pattern: '[0-9]{4}-[0-9]{2}-[0-9]{2}T(?:2[0-3]|[01][0-9]):[0-5][0-9]:[0-5][0-9](\.[0-9]{1,6})?([A-Z]{2,4})?'
+file_relative:
+  display_name: Path relative to the parent file
+  description: |
+    A path to a file, relative to the file in which the field is defined.
+
+    The validation for this format is minimal.
+    It simply ensures that the value is a string with any characters that may appear in a valid path,
+    without starting with "/" (an absolute path).
+  pattern: '(?!/)[0-9a-zA-Z/\_\-\.]+'
+participant_relative:
+  display_name: Path relative to the participant directory
+  description: |
+    A path to a file, relative to the participant's directory in the dataset.
+
+    The validation for this format is minimal.
+    It simply ensures that the value is a string with any characters that may appear in a valid path,
+    without starting with "/" (an absolute path) or "sub/"
+    (a relative path starting with the participant directory, rather than relative to that directory).
+  pattern: '(?!/)(?!sub-)[0-9a-zA-Z/\_\-\.]+'
+rrid:
+  display_name: Research resource identifier
+  description: |
+    A [research resource identifier](https://scicrunch.org/resources).
+  pattern: 'RRID:.+_.+'
+stimuli_relative:
+  display_name: Path relative to the stimuli directory
+  description: |
+    A path to a stimulus file, relative to a `/stimuli` directory somewhere.
+
+    The validation for this format is minimal.
+    It simply ensures that the value is a string with any characters that may appear in a valid path,
+    without starting with "/" (an absolute path) or "stimuli/"
+    (a relative path starting with the stimuli directory, rather than relative to that directory).
+  pattern: '(?!/)(?!stimuli/)[0-9a-zA-Z/\_\-\.]+'
+time:
+  display_name: Time
+  description: |
+    A time in the form `"hh:mm:ss"`.
+  pattern: '(?:2[0-3]|[01]?[0-9]):[0-5][0-9]:[0-5][0-9]'
+unit:
+  display_name: A standardized unit
+  description: |
+    A unit.
+    SI units in CMIXF formatting are RECOMMENDED
+    (see [Units](/02-common-principles.html#units)).
+
+    Currently this matches any string.
+
+    TODO: Somehow reference the actual unit options in the Units appendix.
+  pattern: '.*'
+uri:
+  display_name: Uniform resource indicator
+  description: |
+    A uniform resource indicator.
+  pattern: '(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?'
diff --git a/dandi/support/bids/schemadata/1.7.0+012/objects/metadata.yaml b/dandi/support/bids/schemadata/1.7.0+369/objects/metadata.yaml
similarity index 84%
rename from dandi/support/bids/schemadata/1.7.0+012/objects/metadata.yaml
rename to dandi/support/bids/schemadata/1.7.0+369/objects/metadata.yaml
index 8a010bb03..fadca711c 100644
--- a/dandi/support/bids/schemadata/1.7.0+012/objects/metadata.yaml
+++ b/dandi/support/bids/schemadata/1.7.0+369/objects/metadata.yaml
@@ -4,12 +4,14 @@
 # This file **does not** define how and when metadata fields can be used with a given file.
 Acknowledgements:
   name: Acknowledgements
+  display_name: Acknowledgements
   description: |
     Text acknowledging contributions of individuals or institutions beyond
     those listed in Authors or Funding.
   type: string
 AcquisitionDuration:
   name: AcquisitionDuration
+  display_name: Acquisition Duration
   description: |
     Duration (in seconds) of volume acquisition.
     Corresponds to DICOM Tag 0018, 9073 `Acquisition Duration`.
@@ -19,11 +21,13 @@ AcquisitionDuration:
   unit: s
 AcquisitionMode:
   name: AcquisitionMode
+  display_name: Acquisition Mode
   description: |
     Type of acquisition of the PET data (for example, `"list mode"`).
   type: string
 AcquisitionVoxelSize:
   name: AcquisitionVoxelSize
+  display_name: Acquisition Voxel Size
   description: |
     An array of numbers with a length of 3, in millimeters.
     This parameter denotes the original acquisition voxel size,
@@ -40,11 +44,13 @@ AcquisitionVoxelSize:
     unit: mm
 Anaesthesia:
   name: Anaesthesia
+  display_name: Anaesthesia
   description: |
     Details of anaesthesia used, if any.
   type: string
 AnalyticalApproach:
   name: AnalyticalApproach
+  display_name: Analytical Approach
   description: |
     Methodology or methodologies used to analyse the `"GeneticLevel"`.
     Values MUST be taken from the
@@ -59,9 +65,10 @@ AnalyticalApproach:
       type: string
 AnatomicalLandmarkCoordinateSystem:
   name: AnatomicalLandmarkCoordinateSystem
+  display_name: Anatomical Landmark Coordinate System
   description: |
     Defines the coordinate system for the anatomical landmarks.
-    See [Appendix VIII](/99-appendices/08-coordinate-systems.html)
+    See [Appendix VIII](SPEC_ROOT/99-appendices/08-coordinate-systems.md)
     for a list of restricted keywords for coordinate systems.
     If `"Other"`, provide definition of the coordinate system in
     `"AnatomicalLandmarkCoordinateSystemDescription"`.
@@ -72,6 +79,7 @@ AnatomicalLandmarkCoordinateSystem:
   - $ref: _StandardTemplateDeprecatedCoordSys
 AnatomicalLandmarkCoordinateSystemDescription:
   name: AnatomicalLandmarkCoordinateSystemDescription
+  display_name: Anatomical Landmark Coordinate System Description
   description: |
     Free-form text description of the coordinate system.
     May also include a link to a documentation page or paper describing the
@@ -79,6 +87,7 @@ AnatomicalLandmarkCoordinateSystemDescription:
   type: string
 AnatomicalLandmarkCoordinateUnits:
   name: AnatomicalLandmarkCoordinateUnits
+  display_name: Anatomical Landmark Coordinate Units
   description: |
     Units of the coordinates of `"AnatomicalLandmarkCoordinateSystem"`.
   type: string
@@ -89,8 +98,9 @@ AnatomicalLandmarkCoordinateUnits:
   - n/a
 AnatomicalLandmarkCoordinates:
   name: AnatomicalLandmarkCoordinates
+  display_name: Anatomical Landmark Coordinates
   description: |
-    Key:value pairs of the labels and 3-D digitized locations of anatomical landmarks,
+    Key-value pairs of the labels and 3-D digitized locations of anatomical landmarks,
     interpreted following the `"AnatomicalLandmarkCoordinateSystem"`
     (for example, `{"NAS": [12.7,21.3,13.9], "LPA": [5.2,11.3,9.6],
     "RPA": [20.2,11.3,9.1]}`.
@@ -106,8 +116,9 @@ AnatomicalLandmarkCoordinates:
 # Redefinition of AnatomicalLandmarkCoordinates for MRI data
 AnatomicalLandmarkCoordinates__mri:
   name: AnatomicalLandmarkCoordinates
+  display_name: Anatomical Landmark Coordinates
   description: |
-    Key:value pairs of any number of additional anatomical landmarks and their
+    Key-value pairs of any number of additional anatomical landmarks and their
     coordinates in voxel units (where first voxel has index 0,0,0)
     relative to the associated anatomical MRI
     (for example, `{"AC": [127,119,149], "PC": [128,93,141],
@@ -124,6 +135,7 @@ AnatomicalLandmarkCoordinates__mri:
     maxItems: 3
 ArterialSpinLabelingType:
   name: ArterialSpinLabelingType
+  display_name: Arterial Spin Labeling Type
   description: |
     The arterial spin labeling type.
   type: string
@@ -133,12 +145,15 @@ ArterialSpinLabelingType:
   - PASL
 AssociatedEmptyRoom:
   name: AssociatedEmptyRoom
+  display_name: Associated Empty Room
   description: |
-    Relative path in BIDS folder structure to empty-room file associated with
+    A path pointing to an empty-room file associated with
     the subject's MEG recording.
+    The path is relative to the BIDS dataset root.
     The path needs to use forward slashes instead of backward slashes
     (for example,
-    "sub-emptyroom/ses-/meg/sub-emptyroom_ses-_task-noise_run-_meg.ds").
+    "sub-emptyroom/ses-rest/meg/sub-emptyroom_ses-rest_task-noise_run-01_meg.ds").
+    Supplying a list of several paths to empty-room files is possible.
   anyOf:
   - type: array
     items:
@@ -148,21 +163,25 @@ AssociatedEmptyRoom:
     format: dataset_relative
 Atlas:
   name: Atlas
+  display_name: Atlas
   description: |
     Which atlas (if any) was used to generate the mask.
   type: string
 AttenuationCorrection:
   name: AttenuationCorrection
+  display_name: Attenuation Correction
   description: |
     Short description of the attenuation correction method used.
   type: string
 AttenuationCorrectionMethodReference:
   name: AttenuationCorrectionMethodReference
+  display_name: Attenuation Correction Method Reference
   description: |
     Reference paper for the attenuation correction method used.
   type: string
 Authors:
   name: Authors
+  display_name: Authors
   description: |
     List of individuals who contributed to the creation/curation of the dataset.
   type: array
@@ -170,6 +189,7 @@ Authors:
     type: string
 B0FieldIdentifier:
   name: B0FieldIdentifier
+  display_name: B0 Field Identifier
   description: |
     The presence of this key states that this particular 3D or 4D image MAY be
     used for fieldmap estimation purposes.
@@ -186,6 +206,7 @@ B0FieldIdentifier:
       type: string
 B0FieldSource:
   name: B0FieldSource
+  display_name: B0 Field Source
   description: |
     At least one existing `"B0FieldIdentifier"` defined by images in the
     participant's tree.
@@ -202,16 +223,19 @@ B0FieldSource:
       type: string
 BIDSVersion:
   name: BIDSVersion
+  display_name: BIDS Version
   description: |
     The version of the BIDS standard that was used.
   type: string
 BackgroundSuppression:
   name: BackgroundSuppression
+  display_name: Background Suppression
   description: |
     Boolean indicating if background suppression is used.
   type: boolean
 BackgroundSuppressionNumberPulses:
   name: BackgroundSuppressionNumberPulses
+  display_name: Background Suppression Number Pulses
   description: |
     The number of background suppression pulses used.
     Note that this excludes any effect of background suppression pulses applied
@@ -220,6 +244,7 @@ BackgroundSuppressionNumberPulses:
   minimum: 0
 BackgroundSuppressionPulseTime:
   name: BackgroundSuppressionPulseTime
+  display_name: Background Suppression Pulse Time
   description: |
     Array of numbers containing timing, in seconds,
     of the background suppression pulses with respect to the start of the
@@ -233,6 +258,7 @@ BackgroundSuppressionPulseTime:
     unit: s
 BasedOn:
   name: BasedOn
+  display_name: Based On
   description: |
     List of files in a file collection to generate the map.
     Fieldmaps are also listed, if involved in the processing.
@@ -245,29 +271,34 @@ BasedOn:
       format: participant_relative
 BloodDensity:
   name: BloodDensity
+  display_name: Blood Density
   description: |
     Measured blood density. Unit of blood density should be in `"g/mL"`.
   type: number
   unit: g/mL
 BodyPart:
   name: BodyPart
+  display_name: Body Part
   description: |
     Body part of the organ / body region scanned.
   type: string
 BodyPartDetails:
   name: BodyPartDetails
+  display_name: Body Part Details
   description: |
     Additional details about body part or location (for example: `"corpus callosum"`).
   type: string
 BodyPartDetailsOntology:
   name: BodyPartDetailsOntology
+  display_name: Body Part Details Ontology
   description: |
-    [URI](/02-common-principles.html#uniform-resource-indicator) of ontology used for
+    [URI](SPEC_ROOT/02-common-principles.md#uniform-resource-indicator) of ontology used for
     BodyPartDetails (for example: `"https://www.ebi.ac.uk/ols/ontologies/uberon"`).
   type: string
   format: uri
 BolusCutOffDelayTime:
   name: BolusCutOffDelayTime
+  display_name: Bolus Cut Off Delay Time
   description: |
     Duration between the end of the labeling and the start of the bolus cut-off
     saturation pulse(s), in seconds.
@@ -288,18 +319,21 @@ BolusCutOffDelayTime:
       minimum: 0
 BolusCutOffFlag:
   name: BolusCutOffFlag
+  display_name: Bolus Cut Off Flag
   description: |
     Boolean indicating if a bolus cut-off technique is used.
     Corresponds to DICOM Tag 0018, 925C `ASL Bolus Cut-off Flag`.
   type: boolean
 BolusCutOffTechnique:
   name: BolusCutOffTechnique
+  display_name: Bolus Cut Off Technique
   description: |
     Name of the technique used, for example `"Q2TIPS"`, `"QUIPSS"`, `"QUIPSSII"`.
     Corresponds to DICOM Tag 0018, 925E `ASL Bolus Cut-off Technique`.
   type: string
 BrainLocation:
   name: BrainLocation
+  display_name: Brain Location
   description: |
     Refers to the location in space of the `"TissueOrigin"`.
     Values may be an MNI coordinate,
@@ -312,6 +346,7 @@ BrainLocation:
   type: string
 CASLType:
   name: CASLType
+  display_name: CASL Type
   description: |
     Describes if a separate coil is used for labeling.
   type: string
@@ -320,17 +355,20 @@ CASLType:
   - double-coil
 CapManufacturer:
   name: CapManufacturer
+  display_name: Cap Manufacturer
   description: |
     Name of the cap manufacturer (for example, `"EasyCap"`).
   type: string
 CapManufacturersModelName:
   name: CapManufacturersModelName
+  display_name: Cap Manufacturers Model Name
   description: |
     Manufacturer's designation of the EEG cap model
     (for example, `"actiCAP 64 Ch Standard-2"`).
   type: string
 CellType:
   name: CellType
+  display_name: Cell Type
   description: |
     Describes the type of cell analyzed.
     Values SHOULD come from the
@@ -338,6 +376,7 @@ CellType:
   type: string
 ChunkTransformationMatrix:
   name: ChunkTransformationMatrix
+  display_name: Chunk Transformation Matrix
   description: |
     3x3 or 4x4 affine transformation matrix describing spatial chunk transformation,
     for 2D and 3D respectively (for examples: `[[2, 0, 0], [0, 3, 0], [0, 0, 1]]`
@@ -367,6 +406,7 @@ ChunkTransformationMatrix:
         type: number
 ChunkTransformationMatrixAxis:
   name: ChunkTransformationMatrixAxis
+  display_name: Chunk Transformation Matrix Axis
   description: |
     Describe the axis of the ChunkTransformationMatrix
     (for examples: `["X", "Y"]` or `["Z", "Y", "X"]`).
@@ -377,8 +417,9 @@ ChunkTransformationMatrixAxis:
     maxItems: 3
 Code:
   name: Code
+  display_name: Code
   description: |
-    [URI](/02-common-principles.html#uniform-resource-indicator)
+    [URI](SPEC_ROOT/02-common-principles.md#uniform-resource-indicator)
     of the code used to present the stimuli.
     Persistent identifiers such as DOIs are preferred.
     If multiple versions of code may be hosted at the same location,
@@ -387,21 +428,24 @@ Code:
   format: uri
 CogAtlasID:
   name: CogAtlasID
+  display_name: Cognitive Atlas ID
   description: |
-    [URI](/02-common-principles.html#uniform-resource-indicator)
+    [URI](SPEC_ROOT/02-common-principles.md#uniform-resource-indicator)
     of the corresponding [Cognitive Atlas](https://www.cognitiveatlas.org/)
     Task term.
   type: string
   format: uri
 CogPOID:
   name: CogPOID
+  display_name: Cognitive Paradigm Ontology ID
   description: |
-    [URI](/02-common-principles.html#uniform-resource-indicator)
+    [URI](SPEC_ROOT/02-common-principles.md#uniform-resource-indicator)
     of the corresponding [CogPO](http://www.cogpo.org/) term.
   type: string
   format: uri
 CoilCombinationMethod:
   name: CoilCombinationMethod
+  display_name: Coil Combination Method
   description: |
     Almost all fMRI studies using phased-array coils use root-sum-of-squares
     (rSOS) combination, but other methods exist.
@@ -411,6 +455,7 @@ CoilCombinationMethod:
   type: string
 Columns:
   name: Columns
+  display_name: Columns
   description: |
     Names of columns in file.
   type: array
@@ -418,12 +463,14 @@ Columns:
     type: string
 ContinuousHeadLocalization:
   name: ContinuousHeadLocalization
+  display_name: Continuous Head Localization
   description: |
     `true` or `false` value indicating whether continuous head localisation
     was performed.
   type: boolean
 ContrastBolusIngredient:
   name: ContrastBolusIngredient
+  display_name: Contrast Bolus Ingredient
   description: |
     Active ingredient of agent.
     Corresponds to DICOM Tag 0018, 1048 `Contrast/Bolus Ingredient`.
@@ -436,6 +483,7 @@ ContrastBolusIngredient:
   - XENON
 DCOffsetCorrection:
   name: DCOffsetCorrection
+  display_name: DC Offset Correction
   description: |
     A description of the method (if any) used to correct for a DC offset.
     If the method used was subtracting the mean value for each channel,
@@ -443,16 +491,18 @@ DCOffsetCorrection:
   type: string
 DatasetDOI:
   name: DatasetDOI
+  display_name: DatasetDOI
   description: |
     The Digital Object Identifier of the dataset (not the corresponding paper).
     DOIs SHOULD be expressed as a valid
-    [URI](/02-common-principles.html#uniform-resource-indicator);
+    [URI](SPEC_ROOT/02-common-principles.md#uniform-resource-indicator);
     bare DOIs such as `10.0.2.3/dfjj.10` are
-    [DEPRECATED](/02-common-principles.html#definitions).
+    [DEPRECATED](SPEC_ROOT/02-common-principles.md#definitions).
   type: string
   format: uri
 DatasetType:
   name: DatasetType
+  display_name: Dataset Type
   description: |
     The interpretation of the dataset.
     For backwards compatibility, the default value is `"raw"`.
@@ -462,6 +512,7 @@ DatasetType:
   - derivative
 DecayCorrectionFactor:
   name: DecayCorrectionFactor
+  display_name: Decay Correction Factor
   description: |
     Decay correction factor for each frame.
   type: array
@@ -469,6 +520,7 @@ DecayCorrectionFactor:
     type: number
 DelayAfterTrigger:
   name: DelayAfterTrigger
+  display_name: Delay After Trigger
   description: |
     Duration (in seconds) from trigger delivery to scan onset.
     This delay is commonly caused by adjustments and loading times.
@@ -479,6 +531,7 @@ DelayAfterTrigger:
   unit: s
 DelayTime:
   name: DelayTime
+  display_name: Delay Time
   description: |
     User specified time (in seconds) to delay the acquisition of data for the
     following volume.
@@ -492,10 +545,11 @@ DelayTime:
   unit: s
 Density:
   name: Density
+  display_name: Density
   description: |
     Specifies the interpretation of the density keyword.
-    If an object is used, then the keys should be values for the ``den`` entity
-    and values should be descriptions of those ``den`` values.
+    If an object is used, then the keys should be values for the `den` entity
+    and values should be descriptions of those `den` values.
   anyOf:
   - type: string
   - type: object
@@ -503,6 +557,7 @@ Density:
       type: string
 Derivative:
   name: Derivative
+  display_name: Derivative
   description: |
     Indicates that values in the corresponding column are transformations of values
     from other columns (for example a summary score based on a subset of items in a
@@ -510,11 +565,13 @@ Derivative:
   type: boolean
 Description:
   name: Description
+  display_name: Description
   description: |
     Free-form natural language description.
   type: string
 DeviceSerialNumber:
   name: DeviceSerialNumber
+  display_name: Device Serial Number
   description: |
     The serial number of the equipment that produced the measurements.
     A pseudonym can also be used to prevent the equipment from being
@@ -522,6 +579,7 @@ DeviceSerialNumber:
   type: string
 DewarPosition:
   name: DewarPosition
+  display_name: Dewar Position
   description: |
     Position of the dewar during the MEG scan:
     `"upright"`, `"supine"` or `"degrees"` of angle from vertical:
@@ -529,16 +587,28 @@ DewarPosition:
   type: string
 DigitizedHeadPoints:
   name: DigitizedHeadPoints
+  display_name: Digitized Head Points
   description: |
     `true` or `false` value indicating whether head points outlining the
     scalp/face surface are contained within this recording.
   type: boolean
+DigitizedHeadPoints__coordsystem:
+  name: DigitizedHeadPoints
+  display_name: Digitized Head Points
+  description: |
+    Relative path to the file containing the locations of digitized head points
+    collected during the session (for example, `"sub-01_headshape.pos"`).
+    RECOMMENDED for all MEG systems, especially for CTF and BTi/4D.
+    For Elekta/Neuromag the head points will be stored in the fif file.
+  type: string
+  format: file_relative
 DigitizedHeadPointsCoordinateSystem:
   name: DigitizedHeadPointsCoordinateSystem
+  display_name: Digitized Head Points Coordinate System
   description: |
     Defines the coordinate system for the digitized head points.
     See
-    [Appendix VIII](/99-appendices/08-coordinate-systems.html)
+    [Appendix VIII](SPEC_ROOT/99-appendices/08-coordinate-systems.md)
     for a list of restricted keywords for coordinate systems.
     If `"Other"`, provide definition of the coordinate system in
     `"DigitizedHeadPointsCoordinateSystemDescription"`.
@@ -549,6 +619,7 @@ DigitizedHeadPointsCoordinateSystem:
   - $ref: _StandardTemplateDeprecatedCoordSys
 DigitizedHeadPointsCoordinateSystemDescription:
   name: DigitizedHeadPointsCoordinateSystemDescription
+  display_name: Digitized Head Points Coordinate System Description
   description: |
     Free-form text description of the coordinate system.
     May also include a link to a documentation page or paper describing the
@@ -556,6 +627,7 @@ DigitizedHeadPointsCoordinateSystemDescription:
   type: string
 DigitizedHeadPointsCoordinateUnits:
   name: DigitizedHeadPointsCoordinateUnits
+  display_name: Digitized Head Points Coordinate Units
   description: |
     Units of the coordinates of `"DigitizedHeadPointsCoordinateSystem"`.
   type: string
@@ -566,12 +638,14 @@ DigitizedHeadPointsCoordinateUnits:
   - n/a
 DigitizedLandmarks:
   name: DigitizedLandmarks
+  display_name: Digitized Landmarks
   description: |
     `true` or `false` value indicating whether anatomical landmark points
     (fiducials) are contained within this recording.
   type: boolean
 DispersionConstant:
   name: DispersionConstant
+  display_name: Dispersion Constant
   description: |
     External dispersion time constant resulting from tubing in default unit
     seconds.
@@ -579,18 +653,21 @@ DispersionConstant:
   unit: s
 DispersionCorrected:
   name: DispersionCorrected
+  display_name: Dispersion Corrected
   description: |
     Boolean flag specifying whether the blood data have been dispersion-corrected.
     NOTE: not customary for manual samples, and hence should be set to `false`.
   type: boolean
 DoseCalibrationFactor:
   name: DoseCalibrationFactor
+  display_name: Dose Calibration Factor
   description: |
     Multiplication factor used to transform raw data (in counts/sec) to meaningful unit (Bq/ml).
     Corresponds to DICOM Tag 0054, 1322 `Dose Calibration Factor`.
   type: number
 DwellTime:
   name: DwellTime
+  display_name: Dwell Time
   description: |
     Actual dwell time (in seconds) of the receiver per point in the readout
     direction, including any oversampling.
@@ -606,29 +683,33 @@ DwellTime:
   unit: s
 ECGChannelCount:
   name: ECGChannelCount
+  display_name: ECG Channel Count
   description: |
     Number of ECG channels.
   type: integer
   minimum: 0
 ECOGChannelCount:
   name: ECOGChannelCount
+  display_name: ECOG Channel Count
   description: |
     Number of ECoG channels.
   type: integer
   minimum: 0
 EEGChannelCount:
   name: EEGChannelCount
+  display_name: EEG Channel Count
   description: |
     Number of EEG channels recorded simultaneously (for example, `21`).
   type: integer
   minimum: 0
 EEGCoordinateSystem:
   name: EEGCoordinateSystem
+  display_name: EEG Coordinate System
   description: |
     Defines the coordinate system for the EEG sensors.
 
     See
-    [Appendix VIII](/99-appendices/08-coordinate-systems.html)
+    [Appendix VIII](SPEC_ROOT/99-appendices/08-coordinate-systems.md)
     for a list of restricted keywords for coordinate systems.
     If `"Other"`, provide definition of the coordinate system in
     `EEGCoordinateSystemDescription`.
@@ -639,6 +720,7 @@ EEGCoordinateSystem:
   - $ref: _StandardTemplateDeprecatedCoordSys
 EEGCoordinateSystemDescription:
   name: EEGCoordinateSystemDescription
+  display_name: EEG Coordinate System Description
   description: |
     Free-form text description of the coordinate system.
     May also include a link to a documentation page or paper describing the
@@ -646,6 +728,7 @@ EEGCoordinateSystemDescription:
   type: string
 EEGCoordinateUnits:
   name: EEGCoordinateUnits
+  display_name: EEG Coordinate Units
   description: |
     Units of the coordinates of `EEGCoordinateSystem`.
   type: string
@@ -656,12 +739,14 @@ EEGCoordinateUnits:
   - n/a
 EEGGround:
   name: EEGGround
+  display_name: EEG Ground
   description: |
     Description of the location of the ground electrode
     (for example, `"placed on right mastoid (M2)"`).
   type: string
 EEGPlacementScheme:
   name: EEGPlacementScheme
+  display_name: EEG Placement Scheme
   description: |
     Placement scheme of EEG electrodes.
     Either the name of a standardized placement system (for example, `"10-20"`)
@@ -669,6 +754,7 @@ EEGPlacementScheme:
   type: string
 EEGReference:
   name: EEGReference
+  display_name: EEG Reference
   description: |
     General description of the reference scheme used and (when applicable) of
     location of the reference electrode in the raw recordings
@@ -679,31 +765,34 @@ EEGReference:
   type: string
 EMGChannelCount:
   name: EMGChannelCount
+  display_name: EMG Channel Count
   description: |
     Number of EMG channels.
   type: integer
   minimum: 0
 EOGChannelCount:
   name: EOGChannelCount
+  display_name: EOG Channel Count
   description: |
     Number of EOG channels.
   type: integer
   minimum: 0
 EchoTime:
   name: EchoTime
+  display_name: Echo Time
   description: |
     The echo time (TE) for the acquisition, specified in seconds.
     Corresponds to DICOM Tag 0018, 0081 `Echo Time`
     (please note that the DICOM term is in milliseconds not seconds).
     The data type number may apply to files from any MRI modality concerned with
     a single value for this field, or to the files in a
-    [file collection](/99-appendices/10-file-collections.html)
+    [file collection](SPEC_ROOT/99-appendices/10-file-collections.md)
     where the value of this field is iterated using the
-    [echo entity](/99-appendices/09-entities.html#echo).
+    [`echo` entity](SPEC_ROOT/99-appendices/09-entities.md#echo).
     The data type array provides a value for each volume in a 4D dataset and
     should only be used when the volume timing is critical for interpretation
     of the data, such as in
-    [ASL](/04-modality-specific-files/01-magnetic-resonance-imaging-data.html#\
+    [ASL](SPEC_ROOT/04-modality-specific-files/01-magnetic-resonance-imaging-data.md#\
     arterial-spin-labeling-perfusion-data)
     or variable echo time fMRI sequences.
   anyOf:
@@ -717,6 +806,7 @@ EchoTime:
       exclusiveMinimum: 0
 EchoTime1:
   name: EchoTime1
+  display_name: Echo Time1
   description: |
     The time (in seconds) when the first (shorter) echo occurs.
   type: number
@@ -724,6 +814,7 @@ EchoTime1:
   exclusiveMinimum: 0
 EchoTime2:
   name: EchoTime2
+  display_name: Echo Time2
   description: |
     The time (in seconds) when the second (longer) echo occurs.
   type: number
@@ -732,6 +823,7 @@ EchoTime2:
 # Redefinition of EchoTime for fieldmap data
 EchoTime__fmap:
   name: EchoTime
+  display_name: Echo Time
   description: |
     The time (in seconds) when the echo corresponding to this map was acquired.
   type: number
@@ -739,6 +831,7 @@ EchoTime__fmap:
   exclusiveMinimum: 0
 EffectiveEchoSpacing:
   name: EffectiveEchoSpacing
+  display_name: Effective Echo Spacing
   description: |
     The "effective" sampling interval, specified in seconds,
     between lines in the phase-encoding direction,
@@ -755,6 +848,7 @@ EffectiveEchoSpacing:
   unit: s
 ElectricalStimulation:
   name: ElectricalStimulation
+  display_name: Electrical Stimulation
   description: |
     Boolean field to specify if electrical stimulation was done during the
     recording (options are `true` or `false`). Parameters for event-like
@@ -762,6 +856,7 @@ ElectricalStimulation:
   type: boolean
 ElectricalStimulationParameters:
   name: ElectricalStimulationParameters
+  display_name: Electrical Stimulation Parameters
   description: |
     Free form description of stimulation parameters, such as frequency or shape.
     Specific onsets can be specified in the events.tsv file.
@@ -769,6 +864,7 @@ ElectricalStimulationParameters:
   type: string
 ElectrodeManufacturer:
   name: ElectrodeManufacturer
+  display_name: Electrode Manufacturer
   description: |
     Can be used if all electrodes are of the same manufacturer
     (for example, `"AD-TECH"`, `"DIXI"`).
@@ -777,12 +873,14 @@ ElectrodeManufacturer:
   type: string
 ElectrodeManufacturersModelName:
   name: ElectrodeManufacturersModelName
+  display_name: Electrode Manufacturers Model Name
   description: |
     If different electrode types are used,
     please use the corresponding table in the `_electrodes.tsv` file.
   type: string
 EpochLength:
   name: EpochLength
+  display_name: Epoch Length
   description: |
     Duration of individual epochs in seconds (for example, `1`)
     in case of epoched data.
@@ -791,17 +889,20 @@ EpochLength:
   minimum: 0
 EstimationAlgorithm:
   name: EstimationAlgorithm
+  display_name: Estimation Algorithm
   description: |
     Type of algorithm used to perform fitting
     (for example, `"linear"`, `"non-linear"`, `"LM"` and such).
   type: string
 EstimationReference:
   name: EstimationReference
+  display_name: Estimation Reference
   description: |
     Reference to the study/studies on which the implementation is based.
   type: string
 EthicsApprovals:
   name: EthicsApprovals
+  display_name: Ethics Approvals
   description: |
     List of ethics committee approvals of the research protocols and/or
     protocol identifiers.
@@ -810,11 +911,12 @@ EthicsApprovals:
     type: string
 FiducialsCoordinateSystem:
   name: FiducialsCoordinateSystem
+  display_name: Fiducials Coordinate System
   description: |
     Defines the coordinate system for the fiducials.
     Preferably the same as the `"EEGCoordinateSystem"`.
     See
-    [Appendix VIII](/99-appendices/08-coordinate-systems.html)
+    [Appendix VIII](SPEC_ROOT/99-appendices/08-coordinate-systems.md)
     for a list of restricted keywords for coordinate systems.
     If `"Other"`, provide definition of the coordinate system in
     `"FiducialsCoordinateSystemDescription"`.
@@ -825,6 +927,7 @@ FiducialsCoordinateSystem:
   - $ref: _StandardTemplateDeprecatedCoordSys
 FiducialsCoordinateSystemDescription:
   name: FiducialsCoordinateSystemDescription
+  display_name: Fiducials Coordinate System Description
   description: |
     Free-form text description of the coordinate system.
     May also include a link to a documentation page or paper describing the
@@ -832,6 +935,7 @@ FiducialsCoordinateSystemDescription:
   type: string
 FiducialsCoordinateUnits:
   name: FiducialsCoordinateUnits
+  display_name: Fiducials Coordinate Units
   description: |
     Units in which the coordinates that are  listed in the field
     `"FiducialsCoordinateSystem"` are represented.
@@ -843,8 +947,9 @@ FiducialsCoordinateUnits:
   - n/a
 FiducialsCoordinates:
   name: FiducialsCoordinates
+  display_name: Fiducials Coordinates
   description: |
-    Key:value pairs of the labels and 3-D digitized position of anatomical
+    Key-value pairs of the labels and 3-D digitized position of anatomical
     landmarks, interpreted following the `"FiducialsCoordinateSystem"`
     (for example, `{"NAS": [12.7,21.3,13.9], "LPA": [5.2,11.3,9.6],
     "RPA": [20.2,11.3,9.1]}`).
@@ -859,6 +964,7 @@ FiducialsCoordinates:
     maxItems: 3
 FiducialsDescription:
   name: FiducialsDescription
+  display_name: Fiducials Description
   description: |
     Free-form text description of how the fiducials such as vitamin-E capsules
     were placed relative to anatomical landmarks,
@@ -867,18 +973,19 @@ FiducialsDescription:
   type: string
 FlipAngle:
   name: FlipAngle
+  display_name: Flip Angle
   description: |
     Flip angle (FA) for the acquisition, specified in degrees.
     Corresponds to: DICOM Tag 0018, 1314 `Flip Angle`.
     The data type number may apply to files from any MRI modality concerned with
     a single value for this field, or to the files in a
-    [file collection](/99-appendices/10-file-collections.html)
+    [file collection](SPEC_ROOT/99-appendices/10-file-collections.md)
     where the value of this field is iterated using the
-    [flip entity](/99-appendices/09-entities.html#flip).
+    [`flip` entity](SPEC_ROOT/99-appendices/09-entities.md#flip).
     The data type array provides a value for each volume in a 4D dataset and
     should only be used when the volume timing is critical for interpretation of
     the data, such as in
-    [ASL](/04-modality-specific-files/01-magnetic-resonance-imaging-data.html#\
+    [ASL](SPEC_ROOT/04-modality-specific-files/01-magnetic-resonance-imaging-data.md#\
     arterial-spin-labeling-perfusion-data)
     or variable flip angle fMRI sequences.
   anyOf:
@@ -894,6 +1001,7 @@ FlipAngle:
       maximum: 360
 FrameDuration:
   name: FrameDuration
+  display_name: Frame Duration
   description: |
     Time duration of each frame in default unit seconds.
     This corresponds to DICOM Tag 0018, 1242 `Actual Frame Duration` converted
@@ -904,6 +1012,7 @@ FrameDuration:
   unit: s
 FrameTimesStart:
   name: FrameTimesStart
+  display_name: Frame Times Start
   description: |
     Start times for all frames relative to `"TimeZero"` in default unit seconds.
   type: array
@@ -912,6 +1021,7 @@ FrameTimesStart:
   unit: s
 Funding:
   name: Funding
+  display_name: Funding
   description: |
     List of sources of funding (grant numbers).
   type: array
@@ -919,6 +1029,7 @@ Funding:
     type: string
 GeneratedBy:
   name: GeneratedBy
+  display_name: Generated By
   description: |
     Used to specify provenance of the dataset.
   type: array
@@ -947,6 +1058,7 @@ GeneratedBy:
             format: uri
 GeneticLevel:
   name: GeneticLevel
+  display_name: Genetic Level
   description: |
     Describes the level of analysis.
     Values MUST be one of `"Genetic"`, `"Genomic"`, `"Epigenomic"`,
@@ -956,46 +1068,42 @@ GeneticLevel:
   - type: array
     items:
       $ref: _GeneticLevelEnum
-Genetics.Database:
-  name: Genetics.Database
-  description: |
-    [URI](/02-common-principles.html#uniform-resource-indicator)
-    of database where the dataset is hosted.
-  type: string
-  format: uri
-Genetics.Dataset:
-  name: Genetics.Dataset
-  description: |
-    [URI](/02-common-principles.html#uniform-resource-indicator)
-    where data can be retrieved.
-  type: string
-  format: uri
-Genetics.Descriptors:
-  name: Genetics.Descriptors
-  description: |
-    List of relevant descriptors (for example, journal articles) for dataset
-    using a valid
-    [URI](/02-common-principles.html#uniform-resource-indicator)
-    when possible.
-  anyOf:
-  - type: string
-  - type: array
-    items:
-      type: string
 Genetics:
   name: Genetics
+  display_name: Genetics
   description: |
     An object containing information about the genetics descriptor.
   type: object
   properties:
     Database:
-      $ref: Genetics.Database
+      name: Database
+      description: |
+        [URI](SPEC_ROOT/02-common-principles.md#uniform-resource-indicator)
+        of database where the dataset is hosted.
+      type: string
+      format: uri
     Dataset:
-      $ref: Genetics.Dataset
+      name: Dataset
+      description: |
+        [URI](SPEC_ROOT/02-common-principles.md#uniform-resource-indicator)
+        where data can be retrieved.
+      type: string
+      format: uri
     Descriptors:
-      $ref: Genetics.Descriptors
+      name: Descriptors
+      description: |
+        List of relevant descriptors (for example, journal articles) for dataset
+        using a valid
+        [URI](SPEC_ROOT/02-common-principles.md#uniform-resource-indicator)
+        when possible.
+      anyOf:
+      - type: string
+      - type: array
+        items:
+          type: string
 GradientSetType:
   name: GradientSetType
+  display_name: Gradient Set Type
   description: |
     It should be possible to infer the gradient coil from the scanner model.
     If not, for example because of a custom upgrade or use of a gradient
@@ -1004,9 +1112,10 @@ GradientSetType:
   type: string
 HED:
   name: HED
+  display_name: HED
   description: |
     Hierarchical Event Descriptor (HED) information,
-    see: [Appendix III](/99-appendices/03-hed.html) for details.
+    see: [Appendix III](SPEC_ROOT/99-appendices/03-hed.md) for details.
   anyOf:
   - type: string
   - type: object
@@ -1014,18 +1123,21 @@ HED:
       type: string
 HEDVersion:
   name: HEDVersion
+  display_name: HED Version
   description: |
     If HED tags are used:
     The version of the HED schema used to validate HED tags for study.
   type: string
 Haematocrit:
   name: Haematocrit
+  display_name: Haematocrit
   description: |
     Measured haematocrit, meaning the volume of erythrocytes divided by the
     volume of whole blood.
   type: number
 HardcopyDeviceSoftwareVersion:
   name: HardcopyDeviceSoftwareVersion
+  display_name: Hardcopy Device Software Version
   description: |
     Manufacturer's designation of the software of the device that created this
     Hardcopy Image (the printer).
@@ -1033,10 +1145,11 @@ HardcopyDeviceSoftwareVersion:
   type: string
 HardwareFilters:
   name: HardwareFilters
+  display_name: Hardware Filters
   description: |
     Object of temporal hardware filters applied, or `"n/a"` if the data is not
-    available. Each key:value pair in the JSON object is a name of the filter and
-    an object in which its parameters are defined as key:value pairs.
+    available. Each key-value pair in the JSON object is a name of the filter and
+    an object in which its parameters are defined as key-value pairs.
     For example, `{"Highpass RC filter": {"Half amplitude cutoff (Hz)":
     0.0159, "Roll-off": "6dB/Octave"}}`.
   anyOf:
@@ -1048,6 +1161,7 @@ HardwareFilters:
     - n/a
 HeadCircumference:
   name: HeadCircumference
+  display_name: Head Circumference
   description: |
     Circumference of the participant's head, expressed in cm (for example, `58`).
   type: number
@@ -1055,10 +1169,11 @@ HeadCircumference:
   unit: cm
 HeadCoilCoordinateSystem:
   name: HeadCoilCoordinateSystem
+  display_name: Head Coil Coordinate System
   description: |
     Defines the coordinate system for the head coils.
     See
-    [Appendix VIII](/99-appendices/08-coordinate-systems.html)
+    [Appendix VIII](SPEC_ROOT/99-appendices/08-coordinate-systems.md)
     for a list of restricted keywords for coordinate systems.
     If `"Other"`, provide definition of the coordinate system in
     `HeadCoilCoordinateSystemDescription`.
@@ -1069,12 +1184,14 @@ HeadCoilCoordinateSystem:
   - $ref: _StandardTemplateDeprecatedCoordSys
 HeadCoilCoordinateSystemDescription:
   name: HeadCoilCoordinateSystemDescription
+  display_name: Head Coil Coordinate System Description
   description: |
     Free-form text description of the coordinate system.
     May also include a link to a documentation page or paper describing the system in greater detail.
   type: string
 HeadCoilCoordinateUnits:
   name: HeadCoilCoordinateUnits
+  display_name: Head Coil Coordinate Units
   description: |
     Units of the coordinates of `HeadCoilCoordinateSystem`.
   type: string
@@ -1085,8 +1202,9 @@ HeadCoilCoordinateUnits:
   - n/a
 HeadCoilCoordinates:
   name: HeadCoilCoordinates
+  display_name: Head Coil Coordinates
   description: |
-    Key:value pairs describing head localization coil labels and their
+    Key-value pairs describing head localization coil labels and their
     coordinates, interpreted following the `HeadCoilCoordinateSystem`
     (for example, `{"NAS": [12.7,21.3,13.9], "LPA": [5.2,11.3,9.6],
     "RPA": [20.2,11.3,9.1]}`).
@@ -1106,6 +1224,7 @@ HeadCoilCoordinates:
     maxItems: 3
 HeadCoilFrequency:
   name: HeadCoilFrequency
+  display_name: Head Coil Frequency
   description: |
     List of frequencies (in Hz) used by the head localisation coils
     ('HLC' in CTF systems, 'HPI' in Elekta, 'COH' in BTi/4D)
@@ -1120,6 +1239,7 @@ HeadCoilFrequency:
       unit: Hz
 HowToAcknowledge:
   name: HowToAcknowledge
+  display_name: How To Acknowledge
   description: |
     Text containing instructions on how researchers using this dataset should
     acknowledge the original authors.
@@ -1128,18 +1248,21 @@ HowToAcknowledge:
   type: string
 ImageAcquisitionProtocol:
   name: ImageAcquisitionProtocol
+  display_name: Image Acquisition Protocol
   description: |
     Description of the image acquisition protocol or
-    [URI](/02-common-principles.html#uniform-resource-indicator)
+    [URI](SPEC_ROOT/02-common-principles.md#uniform-resource-indicator)
     (for example from [protocols.io](https://www.protocols.io/)).
   type: string
 ImageDecayCorrected:
   name: ImageDecayCorrected
+  display_name: Image Decay Corrected
   description: |
     Boolean flag specifying whether the image data have been decay-corrected.
   type: boolean
 ImageDecayCorrectionTime:
   name: ImageDecayCorrectionTime
+  display_name: Image Decay Correction Time
   description: |
     Point in time from which the decay correction was applied with respect to
     `"TimeZero"` in the default unit seconds.
@@ -1147,12 +1270,14 @@ ImageDecayCorrectionTime:
   unit: s
 Immersion:
   name: Immersion
+  display_name: Immersion
   description: |
     Lens immersion medium. If the file format is OME-TIFF, the value MUST be consistent
     with the `Immersion` OME metadata field.
   type: string
 InfusionRadioactivity:
   name: InfusionRadioactivity
+  display_name: Infusion Radioactivity
   description: |
     Amount of radioactivity infused into the patient.
     This value must be less than or equal to the total injected radioactivity
@@ -1161,17 +1286,20 @@ InfusionRadioactivity:
   type: number
 InfusionSpeed:
   name: InfusionSpeed
+  display_name: Infusion Speed
   description: |
     If given, infusion speed.
   type: number
 InfusionSpeedUnits:
   name: InfusionSpeedUnits
+  display_name: Infusion Speed Units
   description: |
     Unit of infusion speed (for example, `"mL/s"`).
   type: string
   format: unit
 InfusionStart:
   name: InfusionStart
+  display_name: Infusion Start
   description: |
     Time of start of infusion with respect to `"TimeZero"` in the default unit
     seconds.
@@ -1179,6 +1307,7 @@ InfusionStart:
   unit: s
 InjectedMass:
   name: InjectedMass
+  display_name: Injected Mass
   description: |
     Total mass of radiolabeled compound injected into subject (for example, `10`).
     This can be derived as the ratio of the `"InjectedRadioactivity"` and
@@ -1192,11 +1321,13 @@ InjectedMass:
     - n/a
 InjectedMassPerWeight:
   name: InjectedMassPerWeight
+  display_name: Injected Mass Per Weight
   description: |
     Injected mass per kilogram bodyweight.
   type: number
 InjectedMassPerWeightUnits:
   name: InjectedMassPerWeightUnits
+  display_name: Injected Mass Per Weight Units
   description: |
     Unit format of the injected mass per kilogram bodyweight
     (for example, `"ug/kg"`).
@@ -1204,6 +1335,7 @@ InjectedMassPerWeightUnits:
   format: unit
 InjectedMassUnits:
   name: InjectedMassUnits
+  display_name: Injected Mass Units
   description: |
     Unit format of the mass of compound injected (for example, `"ug"` or
     `"umol"`).
@@ -1217,6 +1349,7 @@ InjectedMassUnits:
     - n/a
 InjectedRadioactivity:
   name: InjectedRadioactivity
+  display_name: Injected Radioactivity
   description: |
     Total amount of radioactivity injected into the patient (for example, `400`).
     For bolus-infusion experiments, this value should be the sum of all injected
@@ -1225,18 +1358,21 @@ InjectedRadioactivity:
   type: number
 InjectedRadioactivityUnits:
   name: InjectedRadioactivityUnits
+  display_name: Injected Radioactivity Units
   description: |
     Unit format of the specified injected radioactivity (for example, `"MBq"`).
   type: string
   format: unit
 InjectedVolume:
   name: InjectedVolume
+  display_name: Injected Volume
   description: |
     Injected volume of the radiotracer in the unit `"mL"`.
   type: number
   unit: mL
 InjectionEnd:
   name: InjectionEnd
+  display_name: Injection End
   description: |
     Time of end of injection with respect to `"TimeZero"` in the default unit
     seconds.
@@ -1244,42 +1380,48 @@ InjectionEnd:
   unit: s
 InjectionStart:
   name: InjectionStart
+  display_name: Injection Start
   description: |
     Time of start of injection with respect to `"TimeZero"` in the default unit
     seconds.
-    This corresponds to DICOM Tag 0018, 1042 `Contrast/Bolus Start Time`
+    This corresponds to DICOM Tag 0018, 1072 `Contrast/Bolus Start Time`
     converted to seconds relative to `"TimeZero"`.
   type: number
   unit: s
 InstitutionAddress:
   name: InstitutionAddress
+  display_name: Institution Address
   description: |
     The address of the institution in charge of the equipment that produced the
     measurements.
   type: string
 InstitutionName:
   name: InstitutionName
+  display_name: Institution Name
   description: |
     The name of the institution in charge of the equipment that produced the
     measurements.
   type: string
 InstitutionalDepartmentName:
   name: InstitutionalDepartmentName
+  display_name: Institutional Department Name
   description: |
     The department in the institution in charge of the equipment that produced
     the measurements.
   type: string
 Instructions:
   name: Instructions
+  display_name: Instructions
   description: |
     Text of the instructions given to participants before the recording.
   type: string
 IntendedFor:
   name: IntendedFor
+  display_name: Intended For
   description: |
     The paths to files for which the associated file is intended to be used.
     Contains one or more filenames with paths relative to the participant
-    subfolder.
+    subdirectory.
     Paths need to use forward slashes instead of backward slashes,
     regardless of operating system.
   anyOf:
@@ -1289,8 +1431,25 @@ IntendedFor:
     items:
       type: string
       format: participant_relative
+IntendedFor__ds_relative:
+  name: IntendedFor
+  display_name: Intended For
+  description: |
+    The paths to files for which the associated file is intended to be used.
+    Contains one or more filenames with paths relative to the dataset
+    root.
+    Paths need to use forward slashes instead of backward slashes,
+    regardless of operating system.
+  anyOf:
+  - type: string
+    format: dataset_relative
+  - type: array
+    items:
+      type: string
+      format: dataset_relative
 InversionTime:
   name: InversionTime
+  display_name: Inversion Time
   description: |
     The inversion time (TI) for the acquisition, specified in seconds.
     Inversion time is the time after the middle of inverting RF pulse to middle
@@ -1302,6 +1461,7 @@ InversionTime:
   exclusiveMinimum: 0
 LabelingDistance:
   name: LabelingDistance
+  display_name: Labeling Distance
   description: |
     Distance from the center of the imaging slab to the center of the labeling
     plane (`(P)CASL`) or the leading edge of the labeling slab (`PASL`),
@@ -1313,6 +1473,7 @@ LabelingDistance:
   unit: mm
 LabelingDuration:
   name: LabelingDuration
+  display_name: Labeling Duration
   description: |
     Total duration of the labeling pulse train, in seconds,
     corresponding to the temporal width of the labeling bolus for
@@ -1337,6 +1498,7 @@ LabelingDuration:
       minimum: 0
 LabelingEfficiency:
   name: LabelingEfficiency
+  display_name: Labeling Efficiency
   description: |
     Labeling efficiency, specified as a number between zero and one,
     only if obtained externally (for example phase-contrast based).
@@ -1344,6 +1506,7 @@ LabelingEfficiency:
   exclusiveMinimum: 0
 LabelingLocationDescription:
   name: LabelingLocationDescription
+  display_name: Labeling Location Description
   description: |
     Description of the location of the labeling plane (`"CASL"` or `"PCASL"`) or
     the labeling slab (`"PASL"`) that cannot be captured by fields
@@ -1355,6 +1518,7 @@ LabelingLocationDescription:
   type: string
 LabelingOrientation:
   name: LabelingOrientation
+  display_name: Labeling Orientation
   description: |
     Orientation of the labeling plane (`(P)CASL`) or slab (`PASL`).
     The direction cosines of a normal vector perpendicular to the ASL labeling
@@ -1365,6 +1529,7 @@ LabelingOrientation:
     type: number
 LabelingPulseAverageB1:
   name: LabelingPulseAverageB1
+  display_name: Labeling Pulse Average B1
   description: |
     The average B1-field strength of the RF labeling pulses, in microteslas.
     As an alternative, `"LabelingPulseFlipAngle"` can be provided.
@@ -1373,6 +1538,7 @@ LabelingPulseAverageB1:
   unit: uT
 LabelingPulseAverageGradient:
   name: LabelingPulseAverageGradient
+  display_name: Labeling Pulse Average Gradient
   description: |
     The average labeling gradient, in milliteslas per meter.
   type: number
@@ -1380,6 +1546,7 @@ LabelingPulseAverageGradient:
   unit: mT/m
 LabelingPulseDuration:
   name: LabelingPulseDuration
+  display_name: Labeling Pulse Duration
   description: |
     Duration of the individual labeling pulses, in milliseconds.
   type: number
@@ -1387,6 +1554,7 @@ LabelingPulseDuration:
   unit: ms
 LabelingPulseFlipAngle:
   name: LabelingPulseFlipAngle
+  display_name: Labeling Pulse Flip Angle
   description: |
     The flip angle of a single labeling pulse, in degrees,
     which can be given as an alternative to `"LabelingPulseAverageB1"`.
@@ -1396,6 +1564,7 @@ LabelingPulseFlipAngle:
   unit: degree
 LabelingPulseInterval:
   name: LabelingPulseInterval
+  display_name: Labeling Pulse Interval
   description: |
     Delay between the peaks of the individual labeling pulses, in milliseconds.
   type: number
@@ -1403,6 +1572,7 @@ LabelingPulseInterval:
   unit: ms
 LabelingPulseMaximumGradient:
   name: LabelingPulseMaximumGradient
+  display_name: Labeling Pulse Maximum Gradient
   description: |
     The maximum amplitude of the gradient switched on during the application of
     the labeling RF pulse(s), in milliteslas per meter.
@@ -1411,6 +1581,7 @@ LabelingPulseMaximumGradient:
   unit: mT/m
 LabelingSlabThickness:
   name: LabelingSlabThickness
+  display_name: Labeling Slab Thickness
   description: |
     Thickness of the labeling slab in millimeters.
     For non-selective FAIR a zero is entered.
@@ -1420,6 +1591,7 @@ LabelingSlabThickness:
   unit: mm
 Levels:
   name: Levels
+  display_name: Levels
   description: |
     For categorical variables: An object of possible values (keys) and their
     descriptions (values).
@@ -1428,25 +1600,29 @@ Levels:
     type: string
 License:
   name: License
+  display_name: License
   description: |
     The license for the dataset.
     The use of license name abbreviations is RECOMMENDED for specifying a license
-    (see [Appendix II](/99-appendices/02-licenses.html)).
+    (see [Appendix II](SPEC_ROOT/99-appendices/02-licenses.md)).
     The corresponding full license text MAY be specified in an additional
     `LICENSE` file.
   type: string
 LongName:
   name: LongName
+  display_name: Long Name
   description: |
     Long (unabbreviated) name of the column.
   type: string
 LookLocker:
   name: LookLocker
+  display_name: Look Locker
   description: |
     Boolean indicating if a Look-Locker readout is used.
   type: boolean
 M0Estimate:
   name: M0Estimate
+  display_name: M0Estimate
   description: |
     A single numerical whole-brain M0 value (referring to the M0 of blood),
     only if obtained externally
@@ -1455,6 +1631,7 @@ M0Estimate:
   exclusiveMinimum: 0
 M0Type:
   name: M0Type
+  display_name: M0Type
   description: |
     Describes the presence of M0 information.
     `"Separate"` means that a separate `*_m0scan.nii[.gz]` is present.
@@ -1470,15 +1647,17 @@ M0Type:
   - Absent
 MEGChannelCount:
   name: MEGChannelCount
+  display_name: MEG Channel Count
   description: |
     Number of MEG channels (for example, `275`).
   type: integer
   minimum: 0
 MEGCoordinateSystem:
   name: MEGCoordinateSystem
+  display_name: MEG Coordinate System
   description: |
     Defines the coordinate system for the MEG sensors.
-    See [Appendix VIII](/99-appendices/08-coordinate-systems.html)
+    See [Appendix VIII](SPEC_ROOT/99-appendices/08-coordinate-systems.md)
     for a list of restricted keywords for coordinate systems.
     If `"Other"`, provide definition of the coordinate system in
     `"MEGCoordinateSystemDescription"`.
@@ -1489,6 +1668,7 @@ MEGCoordinateSystem:
   - $ref: _StandardTemplateDeprecatedCoordSys
 MEGCoordinateSystemDescription:
   name: MEGCoordinateSystemDescription
+  display_name: MEG Coordinate System Description
   description: |
     Free-form text description of the coordinate system.
     May also include a link to a documentation page or paper describing the
@@ -1496,6 +1676,7 @@ MEGCoordinateSystemDescription:
   type: string
 MEGCoordinateUnits:
   name: MEGCoordinateUnits
+  display_name: MEG Coordinate Units
   description: |
     Units of the coordinates of `"MEGCoordinateSystem"`.
   type: string
@@ -1506,6 +1687,7 @@ MEGCoordinateUnits:
   - n/a
 MEGREFChannelCount:
   name: MEGREFChannelCount
+  display_name: MEGREF Channel Count
   description: |
     Number of MEG reference channels (for example, `23`).
     For systems without such channels (for example, Neuromag Vectorview),
@@ -1514,6 +1696,7 @@ MEGREFChannelCount:
   minimum: 0
 MRAcquisitionType:
   name: MRAcquisitionType
+  display_name: MR Acquisition Type
   description: |
     Type of sequence readout.
     Corresponds to DICOM Tag 0018, 0023 `MR Acquisition Type`.
@@ -1523,17 +1706,20 @@ MRAcquisitionType:
   - 3D
 MRTransmitCoilSequence:
   name: MRTransmitCoilSequence
+  display_name: MR Transmit Coil Sequence
   description: |
     This is a relevant field if a non-standard transmit coil is used.
     Corresponds to DICOM Tag 0018, 9049 `MR Transmit Coil Sequence`.
   type: string
 MTNumberOfPulses:
   name: MTNumberOfPulses
+  display_name: MT Number Of Pulses
   description: |
     The number of magnetization transfer RF pulses applied before the readout.
   type: number
 MTOffsetFrequency:
   name: MTOffsetFrequency
+  display_name: MT Offset Frequency
   description: |
     The frequency offset of the magnetization transfer pulse with respect to the
     central H1 Larmor frequency in Hertz (Hz).
@@ -1541,18 +1727,21 @@ MTOffsetFrequency:
   unit: Hz
 MTPulseBandwidth:
   name: MTPulseBandwidth
+  display_name: MT Pulse Bandwidth
   description: |
     The excitation bandwidth of the magnetization transfer pulse in Hertz (Hz).
   type: number
   unit: Hz
 MTPulseDuration:
   name: MTPulseDuration
+  display_name: MT Pulse Duration
   description: |
     Duration of the magnetization transfer RF pulse in seconds.
   type: number
   unit: s
 MTPulseShape:
   name: MTPulseShape
+  display_name: MT Pulse Shape
   description: |
     Shape of the magnetization transfer RF pulse waveform.
     The value `"GAUSSHANN"` refers to a Gaussian pulse with a Hanning window.
@@ -1569,18 +1758,21 @@ MTPulseShape:
   - FERMI
 MTState:
   name: MTState
+  display_name: MT State
   description: |
     Boolean stating whether the magnetization transfer pulse is applied.
     Corresponds to DICOM Tag 0018, 9020 `Magnetization Transfer`.
   type: boolean
 MagneticFieldStrength:
   name: MagneticFieldStrength
+  display_name: Magnetic Field Strength
   description: |
     Nominal field strength of MR magnet in Tesla.
     Corresponds to DICOM Tag 0018, 0087 `Magnetic Field Strength`.
   type: number
 Magnification:
   name: Magnification
+  display_name: Magnification
   description: |
     Lens magnification (for example: `40`). If the file format is OME-TIFF,
     the value MUST be consistent with the `"NominalMagnification"` OME metadata field.
@@ -1588,22 +1780,26 @@ Magnification:
   exclusiveMinimum: 0
 Manual:
   name: Manual
+  display_name: Manual
   description: |
     Indicates if the segmentation was performed manually or via an automated
     process.
   type: boolean
 Manufacturer:
   name: Manufacturer
+  display_name: Manufacturer
   description: |
     Manufacturer of the equipment that produced the measurements.
   type: string
 ManufacturersModelName:
   name: ManufacturersModelName
+  display_name: Manufacturers Model Name
   description: |
     Manufacturer's model name of the equipment that produced the measurements.
   type: string
 MatrixCoilMode:
   name: MatrixCoilMode
+  display_name: Matrix Coil Mode
   description: |
     (If used)
     A method for reducing the number of independent channels by combining in
@@ -1613,6 +1809,7 @@ MatrixCoilMode:
   type: string
 MaxMovement:
   name: MaxMovement
+  display_name: Max Movement
   description: |
     Maximum head movement (in mm) detected during the recording,
     as measured by the head localisation coils (for example, `4.8`).
@@ -1620,6 +1817,7 @@ MaxMovement:
   unit: mm
 MeasurementToolMetadata:
   name: MeasurementToolMetadata
+  display_name: Measurement Tool Metadata
   description: |
     A description of the measurement tool as a whole.
     Contains two fields: `"Description"` and `"TermURL"`.
@@ -1634,6 +1832,7 @@ MeasurementToolMetadata:
       type: string
 MetaboliteAvail:
   name: MetaboliteAvail
+  display_name: Metabolite Available
   description: |
     Boolean that specifies if metabolite measurements are available.
     If `true`, the `metabolite_parent_fraction` column MUST be present in the
@@ -1641,11 +1840,13 @@ MetaboliteAvail:
   type: boolean
 MetaboliteMethod:
   name: MetaboliteMethod
+  display_name: Metabolite Method
   description: |
     Method used to measure metabolites.
   type: string
 MetaboliteRecoveryCorrectionApplied:
   name: MetaboliteRecoveryCorrectionApplied
+  display_name: Metabolite Recovery Correction Applied
   description: |
     Metabolite recovery correction from the HPLC, for tracers where it changes
     with time postinjection.
@@ -1654,12 +1855,14 @@ MetaboliteRecoveryCorrectionApplied:
   type: boolean
 MiscChannelCount:
   name: MiscChannelCount
+  display_name: Misc Channel Count
   description: |
     Number of miscellaneous analog channels for auxiliary signals.
   type: integer
   minimum: 0
 MixingTime:
   name: MixingTime
+  display_name: Mixing Time
   description: |
     In the context of a stimulated- and spin-echo 3D EPI sequence for B1+ mapping,
     corresponds to the interval between spin- and stimulated-echo pulses.
@@ -1670,47 +1873,55 @@ MixingTime:
   unit: s
 ModeOfAdministration:
   name: ModeOfAdministration
+  display_name: Mode Of Administration
   description: |
     Mode of administration of the injection
     (for example, `"bolus"`, `"infusion"`, or `"bolus-infusion"`).
   type: string
 MolarActivity:
   name: MolarActivity
+  display_name: Molar Activity
   description: |
     Molar activity of compound injected.
     Corresponds to DICOM Tag 0018, 1077 `Radiopharmaceutical Specific Activity`.
   type: number
 MolarActivityMeasTime:
   name: MolarActivityMeasTime
+  display_name: Molar Activity Measurement Time
   description: |
     Time to which molar radioactivity measurement above applies in the default
     unit `"hh:mm:ss"`.
   type: string
-  pattern: ^(?:2[0-3]|[01][0-9]):[0-5][0-9]:[0-5][0-9]$
+  format: time
 MolarActivityUnits:
   name: MolarActivityUnits
+  display_name: Molar Activity Units
   description: |
     Unit of the specified molar radioactivity (for example, `"GBq/umol"`).
   type: string
   format: unit
 MultibandAccelerationFactor:
   name: MultibandAccelerationFactor
+  display_name: Multiband Acceleration Factor
   description: |
     The multiband factor, for multiband acquisitions.
   type: number
 MultipartID:
   name: MultipartID
+  display_name: MultipartID
   description: |
     A unique (per participant) label tagging DWI runs that are part of a
     multipart scan.
   type: string
 Name:
   name: Name
+  display_name: Name
   description: |
     Name of the dataset.
   type: string
 NegativeContrast:
   name: NegativeContrast
+  display_name: Negative Contrast
   description: |
     `true` or `false` value specifying whether increasing voxel intensity
     (within sample voxels) denotes a decreased value with respect to the
@@ -1721,12 +1932,14 @@ NegativeContrast:
   type: boolean
 NonlinearGradientCorrection:
   name: NonlinearGradientCorrection
+  display_name: Nonlinear Gradient Correction
   description: |
     Boolean stating if the image saved has been corrected for gradient
     nonlinearities by the scanner sequence.
   type: boolean
 NumberOfVolumesDiscardedByScanner:
   name: NumberOfVolumesDiscardedByScanner
+  display_name: Number Of Volumes Discarded By Scanner
   description: |
     Number of volumes ("dummy scans") discarded by the scanner
     (as opposed to those discarded by the user post hoc)
@@ -1742,6 +1955,7 @@ NumberOfVolumesDiscardedByScanner:
   minimum: 0
 NumberOfVolumesDiscardedByUser:
   name: NumberOfVolumesDiscardedByUser
+  display_name: Number Of Volumes Discarded By User
   description: |
     Number of volumes ("dummy scans") discarded by the user before including the
     file in the dataset.
@@ -1754,6 +1968,7 @@ NumberOfVolumesDiscardedByUser:
   minimum: 0
 NumberShots:
   name: NumberShots
+  display_name: Number Shots
   description: |
     The number of RF excitations needed to reconstruct a slice or volume
     (may be referred to as partition).
@@ -1772,6 +1987,7 @@ NumberShots:
       type: number
 NumericalAperture:
   name: NumericalAperture
+  display_name: Numerical Aperture
   description: |
     Lens numerical aperture (for example: `1.4`). If the file format is OME-TIFF,
     the value MUST be consistent with the `LensNA` OME metadata field.
@@ -1779,23 +1995,27 @@ NumericalAperture:
   exclusiveMinimum: 0
 OperatingSystem:
   name: OperatingSystem
+  display_name: Operating System
   description: |
     Operating system used to run the stimuli presentation software
     (for formatting recommendations, see examples below this table).
   type: string
 OtherAcquisitionParameters:
   name: OtherAcquisitionParameters
+  display_name: Other Acquisition Parameters
   description: |
     Description of other relevant image acquisition parameters.
   type: string
 PASLType:
   name: PASLType
+  display_name: PASL Type
   description: |
     Type of the labeling pulse of the `PASL` labeling,
     for example `"FAIR"`, `"EPISTAR"`, or `"PICORE"`.
   type: string
 PCASLType:
   name: PCASLType
+  display_name: PCASL Type
   description: |
     The type of gradient pulses used in the `control` condition.
   type: string
@@ -1804,12 +2024,14 @@ PCASLType:
   - unbalanced
 ParallelAcquisitionTechnique:
   name: ParallelAcquisitionTechnique
+  display_name: Parallel Acquisition Technique
   description: |
     The type of parallel imaging used (for example `"GRAPPA"`, `"SENSE"`).
     Corresponds to DICOM Tag 0018, 9078 `Parallel Acquisition Technique`.
   type: string
 ParallelReductionFactorInPlane:
   name: ParallelReductionFactorInPlane
+  display_name: Parallel Reduction Factor In Plane
   description: |
     The parallel imaging (for instance, GRAPPA) factor.
     Use the denominator of the fraction of k-space encoded for each slice.
@@ -1818,18 +2040,21 @@ ParallelReductionFactorInPlane:
   type: number
 PartialFourier:
   name: PartialFourier
+  display_name: Partial Fourier
   description: |
     The fraction of partial Fourier information collected.
     Corresponds to DICOM Tag 0018, 9081 `Partial Fourier`.
   type: number
 PartialFourierDirection:
   name: PartialFourierDirection
+  display_name: Partial Fourier Direction
   description: |
     The direction where only partial Fourier information was collected.
     Corresponds to DICOM Tag 0018, 9036 `Partial Fourier Direction`.
   type: string
 PharmaceuticalDoseAmount:
   name: PharmaceuticalDoseAmount
+  display_name: Pharmaceutical Dose Amount
   description: |
     Dose amount of pharmaceutical coadministered with tracer.
   anyOf:
@@ -1839,6 +2064,7 @@ PharmaceuticalDoseAmount:
       type: number
 PharmaceuticalDoseRegimen:
   name: PharmaceuticalDoseRegimen
+  display_name: Pharmaceutical Dose Regimen
   description: |
     Details of the pharmaceutical dose regimen.
     Either adequate description or short-code relating to regimen documented
@@ -1846,6 +2072,7 @@ PharmaceuticalDoseRegimen:
   type: string
 PharmaceuticalDoseTime:
   name: PharmaceuticalDoseTime
+  display_name: Pharmaceutical Dose Time
   description: |
     Time of administration of pharmaceutical dose, relative to time zero.
     For an infusion, this should be a vector with two elements specifying the
@@ -1862,6 +2089,7 @@ PharmaceuticalDoseTime:
       unit: s
 PharmaceuticalDoseUnits:
   name: PharmaceuticalDoseUnits
+  display_name: Pharmaceutical Dose Units
   description: |
     Unit format relating to pharmaceutical dose
     (for example, `"mg"` or `"mg/kg"`).
@@ -1869,11 +2097,13 @@ PharmaceuticalDoseUnits:
   format: unit
 PharmaceuticalName:
   name: PharmaceuticalName
+  display_name: Pharmaceutical Name
   description: |
     Name of pharmaceutical coadministered with tracer.
   type: string
 PhaseEncodingDirection:
   name: PhaseEncodingDirection
+  display_name: Phase Encoding Direction
   description: |
     The letters `i`, `j`, `k` correspond to the first, second and third axis of
     the data in the NIFTI file.
@@ -1895,6 +2125,7 @@ PhaseEncodingDirection:
   - k-
 PixelSize:
   name: PixelSize
+  display_name: Pixel Size
   description: |
     A 2- or 3-number array of the physical size of a pixel, either `[PixelSizeX, PixelSizeY]`
     or `[PixelSizeX, PixelSizeY, PixelSizeZ]`, where X is the width, Y the height and Z the
@@ -1911,6 +2142,7 @@ PixelSize:
     minimum: 0
 PixelSizeUnits:
   name: PixelSizeUnits
+  display_name: Pixel Size Units
   description: |
     Unit format of the specified `"PixelSize"`. MUST be one of: `"mm"` (millimeter), `"um"`
     (micrometer) or `"nm"` (nanometer).
@@ -1921,11 +2153,13 @@ PixelSizeUnits:
   - nm
 PlasmaAvail:
   name: PlasmaAvail
+  display_name: Plasma Avail
   description: |
     Boolean that specifies if plasma measurements are available.
   type: boolean
 PlasmaFreeFraction:
   name: PlasmaFreeFraction
+  display_name: Plasma Free Fraction
   description: |
     Measured free fraction in plasma, meaning the concentration of free compound
     in plasma divided by total concentration of compound in plasma
@@ -1935,11 +2169,13 @@ PlasmaFreeFraction:
   maximum: 100
 PlasmaFreeFractionMethod:
   name: PlasmaFreeFractionMethod
+  display_name: Plasma Free Fraction Method
   description: |
     Method used to estimate free fraction.
   type: string
 PostLabelingDelay:
   name: PostLabelingDelay
+  display_name: Post Labeling Delay
   description: |
     This is the postlabeling delay (PLD) time, in seconds, after the end of the
     labeling (for `"CASL"` or `"PCASL"`) or middle of the labeling pulse
@@ -1964,6 +2200,7 @@ PostLabelingDelay:
       unit: s
 PowerLineFrequency:
   name: PowerLineFrequency
+  display_name: Power Line Frequency
   description: |
     Frequency (in Hz) of the power grid at the geographical location of the
     instrument (for example, `50` or `60`).
@@ -1976,6 +2213,7 @@ PowerLineFrequency:
     - n/a
 PromptRate:
   name: PromptRate
+  display_name: Prompt Rate
   description: |
     Prompt rate for each frame (same units as `Units`, for example, `"Bq/mL"`).
   type: array
@@ -1983,6 +2221,7 @@ PromptRate:
     type: number
 PulseSequenceDetails:
   name: PulseSequenceDetails
+  display_name: Pulse Sequence Details
   description: |
     Information beyond pulse sequence type that identifies the specific pulse
     sequence used (for example,
@@ -1992,6 +2231,7 @@ PulseSequenceDetails:
   type: string
 PulseSequenceType:
   name: PulseSequenceType
+  display_name: Pulse Sequence Type
   description: |
     A general description of the pulse sequence used for the scan
     (for example, `"MPRAGE"`, `"Gradient Echo EPI"`, `"Spin Echo EPI"`,
@@ -1999,6 +2239,7 @@ PulseSequenceType:
   type: string
 Purity:
   name: Purity
+  display_name: Purity
   description: |
     Purity of the radiolabeled compound (between 0 and 100%).
   type: number
@@ -2006,6 +2247,7 @@ Purity:
   maximum: 100
 RandomRate:
   name: RandomRate
+  display_name: Random Rate
   description: |
     Random rate for each frame (same units as `"Units"`, for example, `"Bq/mL"`).
   type: array
@@ -2013,6 +2255,7 @@ RandomRate:
     type: number
 RawSources:
   name: RawSources
+  display_name: Raw Sources
   description: |
     A list of paths relative to dataset root pointing to the BIDS-Raw file(s)
     that were used in the creation of this derivative.
@@ -2022,6 +2265,7 @@ RawSources:
     format: dataset_relative
 ReceiveCoilActiveElements:
   name: ReceiveCoilActiveElements
+  display_name: Receive Coil Active Elements
   description: |
     Information describing the active/selected elements of the receiver coil.
     This does not correspond to a tag in the DICOM ontology.
@@ -2029,6 +2273,7 @@ ReceiveCoilActiveElements:
   type: string
 ReceiveCoilName:
   name: ReceiveCoilName
+  display_name: Receive Coil Name
   description: |
     Information describing the receiver coil.
     Corresponds to DICOM Tag 0018, 1250 `Receive Coil Name`,
@@ -2038,6 +2283,7 @@ ReceiveCoilName:
   type: string
 ReconFilterSize:
   name: ReconFilterSize
+  display_name: Recon Filter Size
   description: |
     Kernel size of post-recon filter (FWHM) in default units `"mm"`.
   anyOf:
@@ -2049,6 +2295,7 @@ ReconFilterSize:
       unit: mm
 ReconFilterType:
   name: ReconFilterType
+  display_name: Recon Filter Type
   description: |
     Type of post-recon smoothing (for example, `["Shepp"]`).
   anyOf:
@@ -2058,16 +2305,19 @@ ReconFilterType:
       type: string
 ReconMethodImplementationVersion:
   name: ReconMethodImplementationVersion
+  display_name: Recon Method Implementation Version
   description: |
     Identification for the software used, such as name and version.
   type: string
 ReconMethodName:
   name: ReconMethodName
+  display_name: Recon Method Name
   description: |
     Reconstruction method or algorithm (for example, `"3d-op-osem"`).
   type: string
 ReconMethodParameterLabels:
   name: ReconMethodParameterLabels
+  display_name: Recon Method Parameter Labels
   description: |
     Names of reconstruction parameters (for example, `["subsets", "iterations"]`).
   type: array
@@ -2075,6 +2325,7 @@ ReconMethodParameterLabels:
     type: string
 ReconMethodParameterUnits:
   name: ReconMethodParameterUnits
+  display_name: Recon Method Parameter Units
   description: |
     Unit of reconstruction parameters (for example, `["none", "none"]`).
   type: array
@@ -2083,6 +2334,7 @@ ReconMethodParameterUnits:
     format: unit
 ReconMethodParameterValues:
   name: ReconMethodParameterValues
+  display_name: Recon Method Parameter Values
   description: |
     Values of reconstruction parameters (for example, `[21, 3]`).
   type: array
@@ -2090,12 +2342,14 @@ ReconMethodParameterValues:
     type: number
 RecordingDuration:
   name: RecordingDuration
+  display_name: Recording Duration
   description: |
     Length of the recording in seconds (for example, `3600`).
   type: number
   unit: s
 RecordingType:
   name: RecordingType
+  display_name: Recording Type
   description: |
     Defines whether the recording is `"continuous"`, `"discontinuous"`, or
     `"epoched"`, where `"epoched"` is limited to time windows about events of
@@ -2107,15 +2361,17 @@ RecordingType:
   - discontinuous
 ReferencesAndLinks:
   name: ReferencesAndLinks
+  display_name: References And Links
   description: |
     List of references to publications that contain information on the dataset.
     A reference may be textual or a
-    [URI](/02-common-principles.html#uniform-resource-indicator).
+    [URI](SPEC_ROOT/02-common-principles.md#uniform-resource-indicator).
   items:
     type: string
   type: array
 RepetitionTime:
   name: RepetitionTime
+  display_name: Repetition Time
   description: |
     The time in seconds between the beginning of an acquisition of one volume
     and the beginning of acquisition of the volume following it (TR).
@@ -2138,6 +2394,7 @@ RepetitionTime:
   unit: s
 RepetitionTimeExcitation:
   name: RepetitionTimeExcitation
+  display_name: Repetition Time Excitation
   description: |
     The interval, in seconds, between two successive excitations.
     [DICOM Tag 0018, 0080](http://dicomlookup.com/lookup.asp?sw=Tnumber&q=(0018,0080)
@@ -2157,6 +2414,7 @@ RepetitionTimeExcitation:
   unit: s
 RepetitionTimePreparation:
   name: RepetitionTimePreparation
+  display_name: Repetition Time Preparation
   description: |
     The interval, in seconds, that it takes a preparation pulse block to
     re-appear at the beginning of the succeeding (essentially identical) pulse
@@ -2166,7 +2424,7 @@ RepetitionTimePreparation:
     The data type array provides a value for each volume in a 4D dataset and
     should only be used when the volume timing is critical for interpretation of
     the data, such as in
-    [ASL](/04-modality-specific-files/01-magnetic-resonance-imaging-data.html\
+    [ASL](SPEC_ROOT/04-modality-specific-files/01-magnetic-resonance-imaging-data.md\
     #arterial-spin-labeling-perfusion-data).
   anyOf:
   - type: number
@@ -2179,10 +2437,11 @@ RepetitionTimePreparation:
       unit: s
 Resolution:
   name: Resolution
+  display_name: Resolution
   description: |
     Specifies the interpretation of the resolution keyword.
-    If an object is used, then the keys should be values for the ``res`` entity
-    and values should be descriptions of those ``res`` values.
+    If an object is used, then the keys should be values for the `res` entity
+    and values should be descriptions of those `res` values.
   anyOf:
   - type: string
   - type: object
@@ -2190,17 +2449,20 @@ Resolution:
       type: string
 SEEGChannelCount:
   name: SEEGChannelCount
+  display_name: SEEG Channel Count
   description: |
     Number of SEEG channels.
   type: integer
   minimum: 0
 SampleEmbedding:
   name: SampleEmbedding
+  display_name: Sample Embedding
   description: |
     Description of the tissue sample embedding (for example: `"Epoxy resin"`).
   type: string
 SampleEnvironment:
   name: SampleEnvironment
+  display_name: Sample Environment
   description: |
     Environment in which the sample was imaged. MUST be one of: `"in vivo"`, `"ex vivo"`
     or `"in vitro"`.
@@ -2211,25 +2473,29 @@ SampleEnvironment:
   - in vitro
 SampleExtractionInstitution:
   name: SampleExtractionInstitution
+  display_name: Sample Extraction Institution
   description: |
     The name of the institution in charge of the extraction of the sample,
     if different from the institution in charge of the equipment that produced the image.
   type: string
 SampleExtractionProtocol:
   name: SampleExtractionProtocol
+  display_name: Sample Extraction Protocol
   description: |
     Description of the sample extraction protocol or
-    [URI](/02-common-principles.html#uniform-resource-indicator)
+    [URI](SPEC_ROOT/02-common-principles.md#uniform-resource-indicator)
     (for example from [protocols.io](https://www.protocols.io/)).
   type: string
 SampleFixation:
   name: SampleFixation
+  display_name: Sample Fixation
   description: |
     Description of the tissue sample fixation
     (for example: `"4% paraformaldehyde, 2% glutaraldehyde"`).
   type: string
 SampleOrigin:
   name: SampleOrigin
+  display_name: Sample Origin
   description: |
     Describes from which tissue the genetic information was extracted.
   type: string
@@ -2244,6 +2510,7 @@ SampleOrigin:
   - other biospecimen
 SamplePrimaryAntibody:
   name: SamplePrimaryAntibody
+  display_name: Sample Primary Antibody
   description: |
     Description(s) of the primary antibody used for immunostaining.
     Either an [RRID](https://scicrunch.org/resources) or the name, supplier and catalogue
@@ -2259,6 +2526,7 @@ SamplePrimaryAntibody:
       type: string
 SampleSecondaryAntibody:
   name: SampleSecondaryAntibody
+  display_name: Sample Secondary Antibody
   description: |
     Description(s) of the secondary antibody used for immunostaining.
     Either an [RRID](https://scicrunch.org/resources) or the name, supplier and catalogue
@@ -2274,6 +2542,7 @@ SampleSecondaryAntibody:
       type: string
 SampleStaining:
   name: SampleStaining
+  display_name: Sample Staining
   description: |
     Description(s) of the tissue sample staining (for example: `"Osmium"`).
     MAY be an array of strings if different stains are used in each channel of the file
@@ -2285,6 +2554,7 @@ SampleStaining:
       type: string
 SamplingFrequency:
   name: SamplingFrequency
+  display_name: Sampling Frequency
   description: |
     Sampling frequency (in Hz) of all the data in the recording,
     regardless of their type (for example, `2400`).
@@ -2292,21 +2562,26 @@ SamplingFrequency:
   unit: Hz
 ScaleFactor:
   name: ScaleFactor
+  display_name: Scale Factor
   description: |
-    Scale factor for each frame.
+    Scale factor for each frame. This field MUST be defined if the imaging data (`.nii[.gz]`) are scaled.
+    If this field is not defined, then it is assumed that the scaling factor is 1. Defining this field
+    when the scaling factor is 1 is RECOMMENDED, for the sake of clarity.
   type: array
   items:
     type: number
 ScanDate:
   name: ScanDate
+  display_name: Scan Date
   description: |
     Date of scan in the format `"YYYY-MM-DD[Z]"`.
     This field is DEPRECATED, and this metadata SHOULD be recorded in the `acq_time` column of the
-    corresponding [Scans file](/03-modality-agnostic-files.html#scans-file).
+    corresponding [Scans file](SPEC_ROOT/03-modality-agnostic-files.md#scans-file).
   type: string
   format: date
 ScanOptions:
   name: ScanOptions
+  display_name: Scan Options
   description: |
     Parameters of ScanningSequence.
     Corresponds to DICOM Tag 0018, 0022 `Scan Options`.
@@ -2317,12 +2592,14 @@ ScanOptions:
       type: string
 ScanStart:
   name: ScanStart
+  display_name: Scan Start
   description: |
     Time of start of scan with respect to `TimeZero` in the default unit seconds.
   type: number
   unit: s
 ScanningSequence:
   name: ScanningSequence
+  display_name: Scanning Sequence
   description: |
     Description of the type of data acquired.
     Corresponds to DICOM Tag 0018, 0020 `Scanning Sequence`.
@@ -2333,6 +2610,7 @@ ScanningSequence:
       type: string
 ScatterFraction:
   name: ScatterFraction
+  display_name: Scatter Fraction
   description: |
     Scatter fraction for each frame (Units: 0-100%).
   type: array
@@ -2342,12 +2620,14 @@ ScatterFraction:
     maximum: 100
 SequenceName:
   name: SequenceName
+  display_name: Sequence Name
   description: |
     Manufacturer's designation of the sequence name.
     Corresponds to DICOM Tag 0018, 0024 `Sequence Name`.
   type: string
 SequenceVariant:
   name: SequenceVariant
+  display_name: Sequence Variant
   description: |
     Variant of the ScanningSequence.
     Corresponds to DICOM Tag 0018, 0021 `Sequence Variant`.
@@ -2358,6 +2638,7 @@ SequenceVariant:
       type: string
 SinglesRate:
   name: SinglesRate
+  display_name: Singles Rate
   description: |
     Singles rate for each frame (same units as `Units`, for example, `"Bq/mL"`).
   type: array
@@ -2365,11 +2646,13 @@ SinglesRate:
     type: number
 SkullStripped:
   name: SkullStripped
+  display_name: Skull Stripped
   description: |
     Whether the volume was skull stripped (non-brain voxels set to zero) or not.
   type: boolean
 SliceEncodingDirection:
   name: SliceEncodingDirection
+  display_name: Slice Encoding Direction
   description: |
     The axis of the NIfTI data along which slices were acquired,
     and the direction in which `"SliceTiming"` is defined with respect to.
@@ -2392,6 +2675,7 @@ SliceEncodingDirection:
   - k-
 SliceThickness:
   name: SliceThickness
+  display_name: Slice Thickness
   description: |
     Slice thickness of the tissue sample in the unit micrometers (`"um"`) (for example: `5`).
   type: number
@@ -2399,6 +2683,7 @@ SliceThickness:
   exclusiveMinimum: 0
 SliceTiming:
   name: SliceTiming
+  display_name: Slice Timing
   description: |
     The time at which each slice was acquired within each volume (frame) of the
     acquisition.
@@ -2421,12 +2706,13 @@ SliceTiming:
     unit: s
 SoftwareFilters:
   name: SoftwareFilters
+  display_name: Software Filters
   description: |
     [Object](https://www.json.org/json-en.html)
     of temporal software filters applied, or `"n/a"` if the data is
     not available.
-    Each key:value pair in the JSON object is a name of the filter and an object
-    in which its parameters are defined as key:value pairs
+    Each key-value pair in the JSON object is a name of the filter and an object
+    in which its parameters are defined as key-value pairs
     (for example, `{"Anti-aliasing filter":
     {"half-amplitude cutoff (Hz)": 500, "Roll-off": "6dB/Octave"}}`).
   anyOf:
@@ -2438,35 +2724,40 @@ SoftwareFilters:
     - n/a
 SoftwareName:
   name: SoftwareName
+  display_name: Software Name
   description: |
     Name of the software that was used to present the stimuli.
   type: string
 SoftwareRRID:
   name: SoftwareRRID
+  display_name: SoftwareRRID
   description: |
     [Research Resource Identifier](https://scicrunch.org/resources) of the
     software that was used to present the stimuli.
     Examples: The RRID for Psychtoolbox is 'SCR_002881',
     and that of PsychoPy is 'SCR_006571'.
   type: string
-  pattern: .+_.+
+  format: rrid
 SoftwareVersion:
   name: SoftwareVersion
+  display_name: Software Version
   description: |
     Version of the software that was used to present the stimuli.
   type: string
 SoftwareVersions:
   name: SoftwareVersions
+  display_name: Software Versions
   description: |
     Manufacturer's designation of software version of the equipment that produced
     the measurements.
   type: string
 SourceDatasets:
   name: SourceDatasets
+  display_name: Source Datasets
   description: |
     Used to specify the locations and relevant attributes of all source datasets.
     Valid keys in each object include `"URL"`, `"DOI"` (see
-    [URI](/02-common-principles.html#uniform-resource-indicator)), and
+    [URI](SPEC_ROOT/02-common-principles.md#uniform-resource-indicator)), and
     `"Version"` with
     [string](https://www.w3schools.com/js/js_json_datatypes.asp)
     values.
@@ -2483,6 +2774,7 @@ SourceDatasets:
         type: string
 Sources:
   name: Sources
+  display_name: Sources
   description: |
     A list of files with the paths specified relative to dataset root;
     these files were directly used in the creation of this derivative data file.
@@ -2498,6 +2790,7 @@ Sources:
     format: dataset_relative
 SpatialReference:
   name: SpatialReference
+  display_name: Spatial Reference
   description: |
     For images with a single reference, the value MUST be a single string.
     For images with multiple references, such as surface and volume references,
@@ -2522,6 +2815,7 @@ SpatialReference:
         format: dataset_relative
 SpecificRadioactivity:
   name: SpecificRadioactivity
+  display_name: Specific Radioactivity
   description: |
     Specific activity of compound injected.
     **Note this is not required for an FDG acquisition, since it is not available,
@@ -2533,13 +2827,15 @@ SpecificRadioactivity:
     - n/a
 SpecificRadioactivityMeasTime:
   name: SpecificRadioactivityMeasTime
+  display_name: Specific Radioactivity Measurement Time
   description: |
     Time to which specific radioactivity measurement above applies in the default
     unit `"hh:mm:ss"`.
   type: string
-  pattern: ^(?:2[0-3]|[01][0-9]):[0-5][0-9]:[0-5][0-9]$
+  format: time
 SpecificRadioactivityUnits:
   name: SpecificRadioactivityUnits
+  display_name: Specific Radioactivity Units
   description: |
     Unit format of specified specific radioactivity (for example, `"Bq/g"`).
     **Note this is not required for an FDG acquisition, since it is not available,
@@ -2552,6 +2848,7 @@ SpecificRadioactivityUnits:
     - n/a
 SpoilingGradientDuration:
   name: SpoilingGradientDuration
+  display_name: Spoiling Gradient Duration
   description: |
     The duration of the spoiler gradient lobe in seconds.
     The duration of a trapezoidal lobe is defined as the summation of ramp-up
@@ -2560,6 +2857,7 @@ SpoilingGradientDuration:
   unit: s
 SpoilingGradientMoment:
   name: SpoilingGradientMoment
+  display_name: Spoiling Gradient Moment
   description: |
     Zeroth moment of the spoiler gradient lobe in
     millitesla times second per meter (mT.s/m).
@@ -2567,6 +2865,7 @@ SpoilingGradientMoment:
   unit: mT.s/m
 SpoilingRFPhaseIncrement:
   name: SpoilingRFPhaseIncrement
+  display_name: Spoiling RF Phase Increment
   description: |
     The amount of incrementation described in degrees,
     which is applied to the phase of the excitation pulse at each TR period for
@@ -2575,12 +2874,14 @@ SpoilingRFPhaseIncrement:
   unit: degrees
 SpoilingState:
   name: SpoilingState
+  display_name: Spoiling State
   description: |
     Boolean stating whether the pulse sequence uses any type of spoiling
     strategy to suppress residual transverse magnetization.
   type: boolean
 SpoilingType:
   name: SpoilingType
+  display_name: Spoiling Type
   description: |
     Specifies which spoiling method(s) are used by a spoiled sequence.
   type: string
@@ -2590,6 +2891,7 @@ SpoilingType:
   - COMBINED
 StartTime:
   name: StartTime
+  display_name: Start Time
   description: |
     Start time in seconds in relation to the start of acquisition of the first
     data sample in the corresponding neural dataset (negative values are allowed).
@@ -2597,13 +2899,15 @@ StartTime:
   unit: s
 StationName:
   name: StationName
+  display_name: Station Name
   description: |
     Institution defined name of the machine that produced the measurements.
   type: string
 StimulusPresentation:
   name: StimulusPresentation
+  display_name: Stimulus Presentation
   description: |
-    Object containing key value pairs related to the software used to present
+    Object containing key-value pairs related to the software used to present
     the stimuli during the experiment, specifically:
     `"OperatingSystem"`, `"SoftwareName"`, `"SoftwareRRID"`, `"SoftwareVersion"` and
     `"Code"`.
@@ -2622,6 +2926,7 @@ StimulusPresentation:
       $ref: Code
 SubjectArtefactDescription:
   name: SubjectArtefactDescription
+  display_name: Subject Artefact Description
   description: |
     Freeform description of the observed subject artefact and its possible cause
     (for example, `"Vagus Nerve Stimulator"`, `"non-removable implant"`).
@@ -2630,11 +2935,13 @@ SubjectArtefactDescription:
   type: string
 TaskDescription:
   name: TaskDescription
+  display_name: Task Description
   description: |
     Longer description of the task.
   type: string
 TaskName:
   name: TaskName
+  display_name: Task Name
   description: |
     Name of the task.
     No two tasks should have the same name.
@@ -2645,20 +2952,23 @@ TaskName:
   type: string
 TermURL:
   name: TermURL
+  display_name: TermURL
   description: |
     URL pointing to a formal definition of this type of data in an ontology
     available on the web.
   type: string
 TimeZero:
   name: TimeZero
+  display_name: Time Zero
   description: |
     Time zero to which all scan and/or blood measurements have been adjusted to,
     in the unit "hh:mm:ss".
     This should be equal to `"InjectionStart"` or `"ScanStart"`.
   type: string
-  pattern: ^(?:2[0-3]|[01][0-9]):[0-5][0-9]:[0-5][0-9]$
+  format: time
 TissueDeformationScaling:
   name: TissueDeformationScaling
+  display_name: Tissue Deformation Scaling
   description: |
     Estimated deformation of the tissue, given as a percentage of the original
     tissue size (for examples: for a shrinkage of 3%, the value is `97`;
@@ -2667,6 +2977,7 @@ TissueDeformationScaling:
   exclusiveMinimum: 0
 TissueOrigin:
   name: TissueOrigin
+  display_name: Tissue Origin
   description: |
     Describes the type of tissue analyzed for `"SampleOrigin"` `brain`.
   type: string
@@ -2679,6 +2990,7 @@ TissueOrigin:
   - microvascular
 TotalAcquiredPairs:
   name: TotalAcquiredPairs
+  display_name: Total Acquired Pairs
   description: |
     The total number of acquired `control`-`label` pairs.
     A single pair consists of a single `control` and a single `label` image.
@@ -2686,6 +2998,7 @@ TotalAcquiredPairs:
   exclusiveMinimum: 0
 TotalReadoutTime:
   name: TotalReadoutTime
+  display_name: Total Readout Time
   description: |
     This is actually the "effective" total readout time,
     defined as the readout duration, specified in seconds,
@@ -2697,56 +3010,66 @@ TotalReadoutTime:
   unit: s
 TracerMolecularWeight:
   name: TracerMolecularWeight
+  display_name: Tracer Molecular Weight
   description: |
     Accurate molecular weight of the tracer used.
   type: number
 TracerMolecularWeightUnits:
   name: TracerMolecularWeightUnits
+  display_name: Tracer Molecular Weight Units
   description: |
     Unit of the molecular weights measurement (for example, `"g/mol"`).
   type: string
   format: unit
 TracerName:
   name: TracerName
+  display_name: Tracer Name
   description: |
     Name of the tracer compound used (for example, `"CIMBI-36"`)
   type: string
 TracerRadLex:
   name: TracerRadLex
+  display_name: Tracer Rad Lex
   description: |
     ID of the tracer compound from the RadLex Ontology.
   type: string
 TracerRadionuclide:
   name: TracerRadionuclide
+  display_name: Tracer Radionuclide
   description: |
     Radioisotope labelling tracer (for example, `"C11"`).
   type: string
 TracerSNOMED:
   name: TracerSNOMED
+  display_name: TracerSNOMED
   description: |
     ID of the tracer compound from the SNOMED Ontology
     (subclass of Radioactive isotope).
   type: string
 TriggerChannelCount:
   name: TriggerChannelCount
+  display_name: Trigger Channel Count
   description: |
     Number of channels for digital (TTL bit level) triggers.
   type: integer
   minimum: 0
 TubingLength:
   name: TubingLength
+  display_name: Tubing Length
   description: |
     The length of the blood tubing, from the subject to the detector in meters.
   type: number
   unit: m
 TubingType:
   name: TubingType
+  display_name: Tubing Type
   description: |
     Description of the type of tubing used, ideally including the material and
     (internal) diameter.
   type: string
 Type:
   name: Type
+  display_name: Type
   description: |
     Short identifier of the mask.
     The value `"Brain"` refers to a brain mask.
@@ -2761,20 +3084,23 @@ Type:
   - ROI
 Units:
   name: Units
+  display_name: Units
   description: |
     Measurement units for the associated file.
     SI units in CMIXF formatting are RECOMMENDED
-    (see [Units](/02-common-principles.html#units)).
+    (see [Units](SPEC_ROOT/02-common-principles.md#units)).
   type: string
   format: unit
 VascularCrushing:
   name: VascularCrushing
+  display_name: Vascular Crushing
   description: |
     Boolean indicating if Vascular Crushing is used.
     Corresponds to DICOM Tag 0018, 9259 `ASL Crusher Flag`.
   type: boolean
 VascularCrushingVENC:
   name: VascularCrushingVENC
+  display_name: Vascular Crushing VENC
   description: |
     The crusher gradient strength, in centimeters per second.
     Specify either one number for the total time-series, or provide an array of
@@ -2790,6 +3116,7 @@ VascularCrushingVENC:
       unit: cm/s
 VolumeTiming:
   name: VolumeTiming
+  display_name: Volume Timing
   description: |
     The time at which each volume was acquired during the acquisition.
     It is described using a list of times referring to the onset of each volume
@@ -2806,6 +3133,7 @@ VolumeTiming:
     unit: s
 WholeBloodAvail:
   name: WholeBloodAvail
+  display_name: Whole Blood Avail
   description: |
     Boolean that specifies if whole blood measurements are available.
     If `true`, the `whole_blood_radioactivity` column MUST be present in the
@@ -2813,6 +3141,7 @@ WholeBloodAvail:
   type: boolean
 WithdrawalRate:
   name: WithdrawalRate
+  display_name: Withdrawal Rate
   description: |
     The rate at which the blood was withdrawn from the subject.
     The unit of the specified withdrawal rate should be in `"mL/s"`.
@@ -2908,22 +3237,25 @@ _iEEGCoordSys:
   - Other
 iEEGCoordinateProcessingDescription:
   name: iEEGCoordinateProcessingDescription
+  display_name: iEEG Coordinate Processing Description
   description: |
     Has any post-processing (such as projection) been done on the electrode
     positions (for example, `"surface_projection"`, `"none"`).
   type: string
 iEEGCoordinateProcessingReference:
   name: iEEGCoordinateProcessingReference
+  display_name: iEEG Coordinate Processing Reference
   description: |
     A reference to a paper that defines in more detail the method used to
     localize the electrodes and to post-process the electrode positions.
   type: string
 iEEGCoordinateSystem:
   name: iEEGCoordinateSystem
+  display_name: iEEG Coordinate System
   description: |
     Defines the coordinate system for the iEEG sensors.
     See
-    [Appendix VIII](/99-appendices/08-coordinate-systems.html)
+    [Appendix VIII](SPEC_ROOT/99-appendices/08-coordinate-systems.md)
     for a list of restricted keywords for coordinate systems.
     If `"Other"`, provide definition of the coordinate system in
     `iEEGCoordinateSystemDescription`.
@@ -2939,6 +3271,7 @@ iEEGCoordinateSystem:
   - $ref: _StandardTemplateDeprecatedCoordSys
 iEEGCoordinateSystemDescription:
   name: iEEGCoordinateSystemDescription
+  display_name: iEEG Coordinate System Description
   description: |
     Free-form text description of the coordinate system.
     May also include a link to a documentation page or paper describing the
@@ -2946,6 +3279,7 @@ iEEGCoordinateSystemDescription:
   type: string
 iEEGCoordinateUnits:
   name: iEEGCoordinateUnits
+  display_name: iEEG Coordinate Units
   description: |
     Units of the `*_electrodes.tsv`.
     MUST be `"pixels"` if `iEEGCoordinateSystem` is `Pixels`.
@@ -2958,6 +3292,7 @@ iEEGCoordinateUnits:
   - n/a
 iEEGElectrodeGroups:
   name: iEEGElectrodeGroups
+  display_name: iEEG Electrode Groups
   description: |
     Field to describe the way electrodes are grouped into strips, grids or depth
     probes.
@@ -2966,12 +3301,14 @@ iEEGElectrodeGroups:
   type: string
 iEEGGround:
   name: iEEGGround
+  display_name: iEEG Ground
   description: |
     Description of the location of the ground electrode
     (`"placed on right mastoid (M2)"`).
   type: string
 iEEGPlacementScheme:
   name: iEEGPlacementScheme
+  display_name: iEEG Placement Scheme
   description: |
     Freeform description of the placement of the iEEG electrodes.
     Left/right/bilateral/depth/surface
@@ -2981,6 +3318,7 @@ iEEGPlacementScheme:
   type: string
 iEEGReference:
   name: iEEGReference
+  display_name: iEEG Reference
   description: |
     General description of the reference scheme used and (when applicable) of
     location of the reference electrode in the raw recordings
diff --git a/dandi/support/bids/schemadata/1.7.0+012/objects/modalities.yaml b/dandi/support/bids/schemadata/1.7.0+369/objects/modalities.yaml
similarity index 62%
rename from dandi/support/bids/schemadata/1.7.0+012/objects/modalities.yaml
rename to dandi/support/bids/schemadata/1.7.0+369/objects/modalities.yaml
index be32d324a..862577d21 100644
--- a/dandi/support/bids/schemadata/1.7.0+012/objects/modalities.yaml
+++ b/dandi/support/bids/schemadata/1.7.0+369/objects/modalities.yaml
@@ -1,30 +1,30 @@
 ---
 # This file describes modalities supported by BIDS.
 mri:
-  name: Magnetic Resonance Imaging
+  display_name: Magnetic Resonance Imaging
   description: |
     Data acquired with an MRI scanner.
 eeg:
-  name: Electroencephalography
+  display_name: Electroencephalography
   description: |
     Data acquired with EEG.
 ieeg:
-  name: Intracranial Electroencephalography
+  display_name: Intracranial Electroencephalography
   description: |
     Data acquired with iEEG.
 meg:
-  name: Magnetoencephalography
+  display_name: Magnetoencephalography
   description: |
     Data acquired with an MEG scanner.
 beh:
-  name: Behavioral experiments
+  display_name: Behavioral experiments
   description: |
     Behavioral data acquired without accompanying neuroimaging data.
 pet:
-  name: Positron Emission Tomography
+  display_name: Positron Emission Tomography
   description: |
     Data acquired with PET.
 micr:
-  name: Microscopy
+  display_name: Microscopy
   description: |
     Data acquired with a microscope.
diff --git a/dandi/support/bids/schemadata/1.7.0+012/objects/suffixes.yaml b/dandi/support/bids/schemadata/1.7.0+369/objects/suffixes.yaml
similarity index 79%
rename from dandi/support/bids/schemadata/1.7.0+012/objects/suffixes.yaml
rename to dandi/support/bids/schemadata/1.7.0+369/objects/suffixes.yaml
index 10efeaedb..1ea222113 100644
--- a/dandi/support/bids/schemadata/1.7.0+012/objects/suffixes.yaml
+++ b/dandi/support/bids/schemadata/1.7.0+369/objects/suffixes.yaml
@@ -1,42 +1,50 @@
 ---
 # This file defines valid BIDS file suffixes.
 # For rules regarding how suffixes relate to datatypes, see files in `rules/datatypes/`.
-2PE:
-  name: 2-photon excitation microscopy
+TwoPE:
+  value: 2PE
+  display_name: 2-photon excitation microscopy
   description: |
     2-photon excitation microscopy imaging data
 BF:
-  name: Bright-field microscopy
+  value: BF
+  display_name: Bright-field microscopy
   description: |
     Bright-field microscopy imaging data
 Chimap:
-  name: Quantitative susceptibility map (QSM)
+  value: Chimap
+  display_name: Quantitative susceptibility map (QSM)
   description: |
     In parts per million (ppm).
     QSM allows for determining the underlying magnetic susceptibility of tissue
     (Chi)
-    ([Wang & Liu, 2014](https://onlinelibrary.wiley.com/doi/10.1002/mrm.25358)).
+    ([Wang & Liu, 2014](https://doi.org/10.1002/mrm.25358)).
     Chi maps are REQUIRED to use this suffix regardless of the method used to
     generate them.
   unit: ppm
 CARS:
-  name: Coherent anti-Stokes Raman spectroscopy
+  value: CARS
+  display_name: Coherent anti-Stokes Raman spectroscopy
   description: |
     Coherent anti-Stokes Raman spectroscopy imaging data
 CONF:
-  name: Confocal microscopy
+  value: CONF
+  display_name: Confocal microscopy
   description: |
     Confocal microscopy imaging data
 DIC:
-  name: Differential interference contrast microscopy
+  value: DIC
+  display_name: Differential interference contrast microscopy
   description: |
     Differential interference contrast microscopy imaging data
 DF:
-  name: Dark-field microscopy
+  value: DF
+  display_name: Dark-field microscopy
   description: |
     Dark-field microscopy imaging data
 FLAIR:
-  name: Fluid attenuated inversion recovery image
+  value: FLAIR
+  display_name: Fluid attenuated inversion recovery image
   description: |
     In arbitrary units (arbitrary).
     Structural images with predominant T2 contribution (also known as T2-FLAIR),
@@ -44,7 +52,8 @@ FLAIR:
     inversion time, coupled with notably long repetition and echo times.
   unit: arbitrary
 FLASH:
-  name: Fast-Low-Angle-Shot image
+  value: FLASH
+  display_name: Fast-Low-Angle-Shot image
   description: |
     FLASH (Fast-Low-Angle-Shot) is a vendor-specific implementation for spoiled
     gradient echo acquisition.
@@ -56,17 +65,20 @@ FLASH:
     different applications.
     **Change:** Removed from suffixes.
 FLUO:
-  name: Fluorescence microscopy
+  value: FLUO
+  display_name: Fluorescence microscopy
   description: |
     Fluorescence microscopy imaging data
 IRT1:
-  name: Inversion recovery T1 mapping
+  value: IRT1
+  display_name: Inversion recovery T1 mapping
   description: |
     The IRT1 method involves multiple inversion recovery spin-echo images
     acquired at different inversion times
     ([Barral et al. 2010](https://doi.org/10.1002/mrm.22497)).
 M0map:
-  name: Equilibrium magnetization (M0) map
+  value: M0map
+  display_name: Equilibrium magnetization (M0) map
   description: |
     In arbitrary units (arbitrary).
     A common quantitative MRI (qMRI) fitting variable that represents the amount
@@ -75,31 +87,36 @@ M0map:
     (for example, variable flip angle T1 mapping).
   unit: arbitrary
 MEGRE:
-  name: Multi-echo Gradient Recalled Echo
+  value: MEGRE
+  display_name: Multi-echo Gradient Recalled Echo
   description: |
     Anatomical gradient echo images acquired at different echo times.
     Please note that this suffix is not intended for the logical grouping of
     images acquired using an Echo Planar Imaging (EPI) readout.
 MESE:
-  name: Multi-echo Spin Echo
+  value: MESE
+  display_name: Multi-echo Spin Echo
   description: |
     The MESE method involves multiple spin echo images acquired at different echo
     times and is primarily used for T2 mapping.
     Please note that this suffix is not intended for the logical grouping of
     images acquired using an Echo Planar Imaging (EPI) readout.
 MP2RAGE:
-  name: Magnetization Prepared Two Gradient Echoes
+  value: MP2RAGE
+  display_name: Magnetization Prepared Two Gradient Echoes
   description: |
     The MP2RAGE method is a special protocol that collects several images at
     different flip angles and inversion times to create a parametric T1map by
     combining the magnitude and phase images
     ([Marques et al. 2010](https://doi.org/10.1016/j.neuroimage.2009.10.002)).
 MPE:
-  name: Multi-photon excitation microscopy
+  value: MPE
+  display_name: Multi-photon excitation microscopy
   description: |
     Multi-photon excitation microscopy imaging data
 MPM:
-  name: Multi-parametric Mapping
+  value: MPM
+  display_name: Multi-parametric Mapping
   description: |
     The MPM approaches (a.k.a hMRI) involves the acquisition of highly-similar
     anatomical images that differ in terms of application of a magnetization
@@ -109,12 +126,14 @@ MPM:
     See [here](https://owncloud.gwdg.de/index.php/s/iv2TOQwGy4FGDDZ) for
     suggested MPM acquisition protocols.
 MTR:
-  name: Magnetization Transfer Ratio
+  value: MTR
+  display_name: Magnetization Transfer Ratio
   description: |
     This method is to calculate a semi-quantitative magnetization transfer ratio
     map.
 MTRmap:
-  name: Magnetization transfer ratio image
+  value: MTRmap
+  display_name: Magnetization transfer ratio image
   description: |
     In arbitrary units (arbitrary).
     MTR maps are REQUIRED to use this suffix regardless of the method used to
@@ -125,7 +144,8 @@ MTRmap:
   minValue: 0
   maxValue: 100
 MTS:
-  name: Magnetization transfer saturation
+  value: MTS
+  display_name: Magnetization transfer saturation
   description: |
     This method is to calculate a semi-quantitative magnetization transfer
     saturation index map.
@@ -133,21 +153,24 @@ MTS:
     of application of a magnetization transfer RF pulse (MTon or MToff) and flip
     angle ([Helms et al. 2008](https://doi.org/10.1002/mrm.21732)).
 MTVmap:
-  name: Macromolecular tissue volume (MTV) image
+  value: MTVmap
+  display_name: Macromolecular tissue volume (MTV) image
   description: |
     In arbitrary units (arbitrary).
     MTV maps are REQUIRED to use this suffix regardless of the method used to
     generate them.
   unit: arbitrary
 MTsat:
-  name: Magnetization transfer saturation image
+  value: MTsat
+  display_name: Magnetization transfer saturation image
   description: |
     In arbitrary units (arbitrary).
     MTsat maps are REQUIRED to use this suffix regardless of the method used to
     generate them.
   unit: arbitrary
 MWFmap:
-  name: Myelin water fraction image
+  value: MWFmap
+  display_name: Myelin water fraction image
   description: |
     In arbitrary units (arbitrary).
     MWF maps are REQUIRED to use this suffix regardless of the method used to
@@ -158,25 +181,30 @@ MWFmap:
   minValue: 0
   maxValue: 100
 NLO:
-  name: Nonlinear optical microscopy
+  value: NLO
+  display_name: Nonlinear optical microscopy
   description: |
     Nonlinear optical microscopy imaging data
 OCT:
-  name: Optical coherence tomography
+  value: OCT
+  display_name: Optical coherence tomography
   description: |
     Optical coherence tomography imaging data
 PC:
-  name: Phase-contrast microscopy
+  value: PC
+  display_name: Phase-contrast microscopy
   description: |
     Phase-contrast microscopy imaging data
 PD:
-  name: Proton density image
+  value: PD
+  display_name: Proton density image
   description: |
     Ambiguous, may refer to a parametric image or to a conventional image.
     **Change:** Replaced by `PDw` or `PDmap`.
   unit: arbitrary
 PDT2:
-  name: PD and T2 weighted image
+  value: PDT2
+  display_name: PD and T2 weighted image
   description: |
     In arbitrary units (arbitrary).
     PDw and T2w images acquired using a dual echo FSE sequence through view
@@ -184,21 +212,24 @@ PDT2:
     ([Johnson et al. 1994](https://pubmed.ncbi.nlm.nih.gov/8010268/)).
   unit: arbitrary
 PDT2map:
-  name: Combined PD/T2 image
+  value: PDT2map
+  display_name: Combined PD/T2 image
   description: |
     In arbitrary units (arbitrary).
     Combined PD/T2 maps are REQUIRED to use this suffix regardless of the method
     used to generate them.
   unit: arbitrary
 PDmap:
-  name: Proton density image
+  value: PDmap
+  display_name: Proton density image
   description: |
     In arbitrary units (arbitrary).
     PD maps are REQUIRED to use this suffix regardless of the method used to
     generate them.
   unit: arbitrary
 PDw:
-  name: Proton density (PD) weighted image
+  value: PDw
+  display_name: Proton density (PD) weighted image
   description: |
     In arbitrary units (arbitrary).
     The contrast of these images is mainly determined by spatial variations in
@@ -209,39 +240,45 @@ PDw:
     repetition and short echo times, and at small flip angles.
   unit: arbitrary
 PLI:
-  name: Polarized-light microscopy
+  value: PLI
+  display_name: Polarized-light microscopy
   description: |
     Polarized-light microscopy imaging data
 R1map:
-  name: Longitudinal relaxation rate image
+  value: R1map
+  display_name: Longitudinal relaxation rate image
   description: |
     In seconds<sup>-1</sup> (1/s).
     R1 maps (R1 = 1/T1) are REQUIRED to use this suffix regardless of the method
     used to generate them.
   unit: 1/s
 R2map:
-  name: True transverse relaxation rate image
+  value: R2map
+  display_name: True transverse relaxation rate image
   description: |
     In seconds<sup>-1</sup> (1/s).
     R2 maps (R2 = 1/T2) are REQUIRED to use this suffix regardless of the method
     used to generate them.
   unit: 1/s
 R2starmap:
-  name: Observed transverse relaxation rate image
+  value: R2starmap
+  display_name: Observed transverse relaxation rate image
   description: |
     In seconds<sup>-1</sup> (1/s).
     R2-star maps (R2star = 1/T2star) are REQUIRED to use this suffix regardless
     of the method used to generate them.
   unit: 1/s
 RB1COR:
-  name: RB1COR
+  value: RB1COR
+  display_name: RB1COR
   description: |
     Low resolution images acquired by the body coil
     (in the gantry of the scanner) and the head coil using identical acquisition
     parameters to generate a combined sensitivity map as described in
     [Papp et al. (2016)](https://doi.org/10.1002/mrm.26058).
 RB1map:
-  name: RF receive sensitivity map
+  value: RB1map
+  display_name: RF receive sensitivity map
   description: |
     In arbitrary units (arbitrary).
     Radio frequency (RF) receive (B1-) sensitivity maps are REQUIRED to use this
@@ -251,7 +288,8 @@ RB1map:
     B1-<sub>intensity</sub>\*Amplitude<sub>ideal</sub>.
   unit: arbitrary
 S0map:
-  name: Observed signal amplitude (S0) image
+  value: S0map
+  display_name: Observed signal amplitude (S0) image
   description: |
     In arbitrary units (arbitrary).
     For a multi-echo (typically fMRI) sequence, S0 maps index the baseline signal
@@ -262,19 +300,23 @@ S0map:
     approach.html#monoexponential-decay-model-fit).
     S0 maps are RECOMMENDED to use this suffix if derived from an ME-FMRI dataset.
 SEM:
-  name: Scanning electron microscopy
+  value: SEM
+  display_name: Scanning electron microscopy
   description: |
     Scanning electron microscopy imaging data
 SPIM:
-  name: Selective plane illumination microscopy
+  value: SPIM
+  display_name: Selective plane illumination microscopy
   description: |
     Selective plane illumination microscopy imaging data
 SR:
-  name: Super-resolution microscopy
+  value: SR
+  display_name: Super-resolution microscopy
   description: |
     Super-resolution microscopy imaging data
 T1map:
-  name: Longitudinal relaxation time image
+  value: T1map
+  display_name: Longitudinal relaxation time image
   description: |
     In seconds (s).
     T1 maps are REQUIRED to use this suffix regardless of the method used to
@@ -283,14 +325,16 @@ T1map:
     for further reading on T1-mapping.
   unit: s
 T1rho:
-  name: T1 in rotating frame (T1 rho) image
+  value: T1rho
+  display_name: T1 in rotating frame (T1 rho) image
   description: |
     In seconds (s).
     T1-rho maps are REQUIRED to use this suffix regardless of the method used to
     generate them.
   unit: s
 T1w:
-  name: T1-weighted image
+  value: T1w
+  display_name: T1-weighted image
   description: |
     In arbitrary units (arbitrary).
     The contrast of these images is mainly determined by spatial variations in
@@ -304,14 +348,16 @@ T1w:
     sequence (for example, `TurboFLASH` or `MP-RAGE`).
   unit: arbitrary
 T2map:
-  name: True transverse relaxation time image
+  value: T2map
+  display_name: True transverse relaxation time image
   description: |
     In seconds (s).
     T2 maps are REQUIRED to use this suffix regardless of the method used to
     generate them.
   unit: s
 T2star:
-  name: T2\* image
+  value: T2star
+  display_name: T2\* image
   description: |
     Ambiguous, may refer to a parametric image or to a conventional image.
     **Change:** Replaced by `T2starw` or `T2starmap`.
@@ -319,14 +365,16 @@ T2star:
   - unit: arbitrary
   - unit: s
 T2starmap:
-  name: Observed transverse relaxation time image
+  value: T2starmap
+  display_name: Observed transverse relaxation time image
   description: |
     In seconds (s).
     T2-star maps are REQUIRED to use this suffix regardless of the method used to
     generate them.
   unit: s
 T2starw:
-  name: T2star weighted image
+  value: T2starw
+  display_name: T2star weighted image
   description: |
     In arbitrary units (arbitrary).
     The contrast of these images is mainly determined by spatial variations in
@@ -339,7 +387,8 @@ T2starw:
     and at small flip angles.
   unit: arbitrary
 T2w:
-  name: T2-weighted image
+  value: T2w
+  display_name: T2-weighted image
   description: |
     In arbitrary units (arbitrary).
     The contrast of these images is mainly determined by spatial variations in
@@ -351,13 +400,15 @@ T2w:
     than on T2.
   unit: arbitrary
 TB1AFI:
-  name: TB1AFI
+  value: TB1AFI
+  display_name: TB1AFI
   description: |
     This method ([Yarnykh 2007](https://doi.org/10.1002/mrm.21120))
     calculates a B1<sup>+</sup> map from two images acquired at interleaved (two)
     TRs with identical RF pulses using a steady-state sequence.
 TB1DAM:
-  name: TB1DAM
+  value: TB1DAM
+  display_name: TB1DAM
   description: |
     The double-angle B1<sup>+</sup> method
     ([Insko and Bolinger 1993](https://doi.org/10.1006/jmra.1993.1133)) is based
@@ -366,7 +417,8 @@ TB1DAM:
     Common sequence types for this application include spin echo and echo planar
     imaging.
 TB1EPI:
-  name: TB1EPI
+  value: TB1EPI
+  display_name: TB1EPI
   description: |
     This B1<sup>+</sup> mapping method
     ([Jiru and Klose 2006](https://doi.org/10.1002/mrm.21083)) is based on two
@@ -374,14 +426,16 @@ TB1EPI:
     multiple flip angles in one sequence, used in the calculation of deviations
     from the nominal flip angle.
 TB1RFM:
-  name: TB1RFM
+  value: TB1RFM
+  display_name: TB1RFM
   description: |
     The result of a Siemens `rf_map` product sequence.
     This sequence produces two images.
     The first image appears like an anatomical image and the second output is a
     scaled flip angle map.
 TB1SRGE:
-  name: TB1SRGE
+  value: TB1SRGE
+  display_name: TB1SRGE
   description: |
     Saturation-prepared with 2 rapid gradient echoes (SA2RAGE) uses a ratio of
     two saturation recovery images with different time delays,
@@ -391,14 +445,16 @@ TB1SRGE:
     iteratively improve B1+ and T1 map estimation
     ([Marques & Gruetter 2013](https://doi.org/10.1371/journal.pone.0069294)).
 TB1TFL:
-  name: TB1TFL
+  value: TB1TFL
+  display_name: TB1TFL
   description: |
     The result of a Siemens `tfl_b1_map` product sequence.
     This sequence produces two images.
     The first image appears like an anatomical image and the second output is a
     scaled flip angle map.
 TB1map:
-  name: RF transmit field image
+  value: TB1map
+  display_name: RF transmit field image
   description: |
     In arbitrary units (arbitrary).
     Radio frequency (RF) transmit (B1+) field maps are REQUIRED to use this
@@ -408,11 +464,13 @@ TB1map:
     B1+<sub>intensity</sub>\*FlipAngle<sub>nominal</sub> .
   unit: arbitrary
 TEM:
-  name: Transmission electron microscopy
+  value: TEM
+  display_name: Transmission electron microscopy
   description: |
     Transmission electron microscopy imaging data
 UNIT1:
-  name: Homogeneous (flat) T1-weighted MP2RAGE image
+  value: UNIT1
+  display_name: Homogeneous (flat) T1-weighted MP2RAGE image
   description: |
     In arbitrary units (arbitrary).
     UNIT1 images are REQUIRED to use this suffix regardless of the method used to
@@ -424,7 +482,8 @@ UNIT1:
     Please see [`MP2RAGE` specific notes](/99-appendices/11-qmri.html#unit1-images)
     in the qMRI appendix for further information.
 VFA:
-  name: Variable flip angle
+  value: VFA
+  display_name: Variable flip angle
   description: |
     The VFA method involves at least two spoiled gradient echo (SPGR) of
     steady-state free precession (SSFP) images acquired at different flip angles.
@@ -432,132 +491,158 @@ VFA:
     data may be eligible for DESPOT1, DESPOT2 and their variants
     ([Deoni et al. 2005](https://doi.org/10.1002/mrm.20314)).
 angio:
-  name: Angiogram
+  value: angio
+  display_name: Angiogram
   description: |
     Magnetic resonance angiography sequences focus on enhancing the contrast of
     blood vessels (generally arteries, but sometimes veins) against other tissue
     types.
 asl:
-  name: Arterial Spin Labeling
+  value: asl
+  display_name: Arterial Spin Labeling
   description: |
     The complete ASL time series stored as a 4D NIfTI file in the original
     acquisition order, with possible volume types including: control, label,
     m0scan, deltam, cbf.
 aslcontext:
-  name: Arterial Spin Labeling Context
+  value: aslcontext
+  display_name: Arterial Spin Labeling Context
   description: |
     A TSV file defining the image types for volumes in an associated ASL file.
 asllabeling:
-  name: ASL Labeling Screenshot
+  value: asllabeling
+  display_name: ASL Labeling Screenshot
   description: |
     An anonymized screenshot of the planning of the labeling slab/plane with
     respect to the imaging slab or slices `*_asllabeling.jpg`.
     Based on DICOM macro C.8.13.5.14.
 beh:
-  name: Behavioral recording
+  value: beh
+  display_name: Behavioral recording
   description: |
     Behavioral recordings from tasks.
     These files are similar to events files, but do not include the `"onset"` and
     `"duration"` columns that are mandatory for events files.
 blood:
-  name: Blood recording data
+  value: blood
+  display_name: Blood recording data
   description: |
     Blood measurements of radioactivity stored in
-    [tabular files](/02-common-principles.html#tabular-files)
+    [tabular files](SPEC_ROOT/02-common-principles.md#tabular-files)
     and located in the `pet/` directory along with the corresponding PET data.
 bold:
-  name: Blood-Oxygen-Level Dependent image
+  value: bold
+  display_name: Blood-Oxygen-Level Dependent image
   description: |
     Blood-Oxygen-Level Dependent contrast (specialized T2\* weighting)
 cbv:
-  name: Cerebral blood volume image
+  value: cbv
+  display_name: Cerebral blood volume image
   description: |
     Cerebral Blood Volume contrast (specialized T2\* weighting or difference between T1 weighted images)
 channels:
-  name: Channels File
+  value: channels
+  display_name: Channels File
   description: |
     Channel information.
 coordsystem:
-  name: Coordinate System File
+  value: coordsystem
+  display_name: Coordinate System File
   description: |
     A JSON document specifying the coordinate system(s) used for the MEG, EEG,
     head localization coils, and anatomical landmarks.
 defacemask:
-  name: Defacing Mask
+  value: defacemask
+  display_name: Defacing Mask
   description: |
     A binary mask that was used to remove facial features from an anatomical MRI
     image.
 dwi:
-  name: Diffusion-weighted image
+  value: dwi
+  display_name: Diffusion-weighted image
   description: |
     Diffusion-weighted imaging contrast (specialized T2 weighting).
 eeg:
-  name: Electroencephalography
+  value: eeg
+  display_name: Electroencephalography
   description: |
     Electroencephalography recording data.
 electrodes:
-  name: Electrodes
+  value: electrodes
+  display_name: Electrodes
   description: |
     File that gives the location of (i)EEG electrodes.
 epi:
-  name: EPI
+  value: epi
+  display_name: EPI
   description: |
     The phase-encoding polarity (PEpolar) technique combines two or more Spin Echo
     EPI scans with different phase encoding directions to estimate the underlying
     inhomogeneity/deformation map.
 events:
-  name: Events
+  value: events
+  display_name: Events
   description: |
     Event timing information from a behavioral task.
 fieldmap:
-  name: Fieldmap
+  value: fieldmap
+  display_name: Fieldmap
   description: |
     Some MR schemes such as spiral-echo imaging (SEI) sequences are able to
     directly provide maps of the *B<sub>0</sub>* field inhomogeneity.
 headshape:
-  name: Headshape File
+  value: headshape
+  display_name: Headshape File
   description: |
     The 3-D locations of points that describe the head shape and/or electrode
     locations can be digitized and stored in separate files.
 ieeg:
-  name: Intracranial Electroencephalography
+  value: ieeg
+  display_name: Intracranial Electroencephalography
   description: |
     Intracranial electroencephalography recording data.
 inplaneT1:
-  name: Inplane T1
+  value: inplaneT1
+  display_name: Inplane T1
   description: |
     In arbitrary units (arbitrary).
     T1 weighted structural image matched to a functional (task) image.
   unit: arbitrary
 inplaneT2:
-  name: Inplane T2
+  value: inplaneT2
+  display_name: Inplane T2
   description: |
     In arbitrary units (arbitrary).
     T2 weighted structural image matched to a functional (task) image.
   unit: arbitrary
 m0scan:
-  name: M0 image
+  value: m0scan
+  display_name: M0 image
   description: |
     The M0 image is a calibration image, used to estimate the equilibrium
     magnetization of blood.
 magnitude:
-  name: Magnitude
+  value: magnitude
+  display_name: Magnitude
   description: |
     Field-mapping MR schemes such as gradient-recalled echo (GRE) generate a
     Magnitude image to be used for anatomical reference.
     Requires the existence of Phase, Phase-difference or Fieldmap maps.
 magnitude1:
-  name: Magnitude
+  value: magnitude1
+  display_name: Magnitude
   description: |
     Magnitude map generated by GRE or similar schemes, associated with the first
     echo in the sequence.
 magnitude2:
-  name: Magnitude
+  value: magnitude2
+  display_name: Magnitude
   description: |
     Magnitude map generated by GRE or similar schemes, associated with the second
     echo in the sequence.
 markers:
-  name: MEG Sensor Coil Positions
+  value: markers
+  display_name: MEG Sensor Coil Positions
   description: |
     Another manufacturer-specific detail pertains to the KIT/Yokogawa/Ricoh
     system, which saves the MEG sensor coil positions in a separate file with two
@@ -565,60 +650,70 @@ markers:
     For these files, the `markers` suffix MUST be used.
     For example: `sub-01_task-nback_markers.sqd`
 meg:
-  name: Magnetoencephalography
+  value: meg
+  display_name: Magnetoencephalography
   description: |
     Unprocessed MEG data stored in the native file format of the MEG instrument
     with which the data was collected.
 pet:
-  name: Positron Emission Tomography
+  value: pet
+  display_name: Positron Emission Tomography
   description: |
     PET imaging data SHOULD be stored in 4D
     (or 3D, if only one volume was acquired) NIfTI files with the `_pet` suffix.
     Volumes MUST be stored in chronological order
     (the order they were acquired in).
 phase:
-  name: Phase image
+  value: phase
+  display_name: Phase image
   description: |
-    [DEPRECATED](/02-common-principles.html#definitions).
+    [DEPRECATED](SPEC_ROOT/02-common-principles.md#definitions).
     Phase information associated with magnitude information stored in BOLD
     contrast.
     This suffix should be replaced by the
-    [`part-phase`](/99-appendices/09-entities.html#part)
+    [`part-phase`](SPEC_ROOT/99-appendices/09-entities.md#part)
     in conjunction with the `bold` suffix.
   anyOf:
   - unit: arbitrary
   - unit: rad
 phase1:
-  name: Phase
+  value: phase1
+  display_name: Phase
   description: |
     Phase map generated by GRE or similar schemes, associated with the first
     echo in the sequence.
 phase2:
-  name: Phase
+  value: phase2
+  display_name: Phase
   description: |
     Phase map generated by GRE or similar schemes, associated with the second
     echo in the sequence.
 phasediff:
-  name: Phase-difference
+  value: phasediff
+  display_name: Phase-difference
   description: |
     Some scanners subtract the `phase1` from the `phase2` map and generate a
     unique `phasediff` file.
     For instance, this is a common output for the built-in fieldmap sequence of
     Siemens scanners.
 photo:
-  name: Photo File
+  value: photo
+  display_name: Photo File
   description: |
     Photos of the anatomical landmarks, head localization coils or tissue sample.
 physio:
-  name: Physiological recording
+  value: physio
+  display_name: Physiological recording
   description: |
     Physiological recordings such as cardiac and respiratory signals.
 sbref:
-  name: Single-band reference image
+  value: sbref
+  display_name: Single-band reference image
   description: |
     Single-band reference for one or more multi-band `dwi` images.
 scans:
-  name: Scans file
+  value: scans
+  display_name: Scans file
   description: |
     The purpose of this file is to describe timing and other properties of each imaging acquisition
     sequence (each run file) within one session.
@@ -636,7 +731,8 @@ scans:
     All such included additional fields SHOULD be documented in an accompanying _scans.json file
     that describes these fields in detail (see Tabular files).
 sessions:
-  name: Sessions file
+  value: sessions
+  display_name: Sessions file
   description: |
     In case of multiple sessions there is an option of adding additional sessions.tsv files
     describing variables changing between sessions.
@@ -645,10 +741,12 @@ sessions:
     Column names in sessions.tsv files MUST be different from group level participant key column
     names in the participants.tsv file.
 stim:
-  name: Continuous recording
+  value: stim
+  display_name: Continuous recording
   description: |
     Continuous measures, such as parameters of a film or audio stimulus.
 uCT:
-  name: Micro-CT
+  value: uCT
+  display_name: Micro-CT
   description: |
     Micro-CT imaging data
diff --git a/dandi/support/bids/schemadata/1.7.0+012/objects/top_level_files.yaml b/dandi/support/bids/schemadata/1.7.0+369/objects/top_level_files.yaml
similarity index 80%
rename from dandi/support/bids/schemadata/1.7.0+012/objects/top_level_files.yaml
rename to dandi/support/bids/schemadata/1.7.0+369/objects/top_level_files.yaml
index 79eab838c..5583ddae4 100644
--- a/dandi/support/bids/schemadata/1.7.0+012/objects/top_level_files.yaml
+++ b/dandi/support/bids/schemadata/1.7.0+369/objects/top_level_files.yaml
@@ -4,6 +4,7 @@
 # For that information, see `rules/top_level_files.yaml`.
 CHANGES:
   name: CHANGES
+  display_name: Change log
   description: |
     Version history of the dataset (describing changes, updates and corrections) MAY be provided in
     the form of a `CHANGES` text file.
@@ -13,6 +14,7 @@ CHANGES:
     The `CHANGES` file MUST be either in ASCII or UTF-8 encoding.
 LICENSE:
   name: LICENSE
+  display_name: License
   description: |
     A `LICENSE` file MAY be provided in addition to the short specification of the
     used license in the `dataset_description.json` `"License"` field.
@@ -20,16 +22,30 @@ LICENSE:
     The `LICENSE` file MUST be either in ASCII or UTF-8 encoding.
 README:
   name: README
+  display_name: Readme
   description: |
-    In addition a free form text file (`README`) describing the dataset in more details SHOULD be
-    provided.
-    The `README` file MUST be either in ASCII or UTF-8 encoding.
+    A REQUIRED text file, `README`, SHOULD describe the dataset in more detail.
+    The `README` file MUST be either in ASCII or UTF-8 encoding and MAY have one of the extensions:
+    `.md` ([Markdown](https://www.markdownguide.org/)),
+    `.rst` ([reStructuredText](https://docutils.sourceforge.io/rst.html)),
+    or `.txt`.
+    A BIDS dataset MUST NOT contain more than one `README` file (with or without extension)
+    at its root directory.
+    BIDS does not make any recommendations with regards to the
+    [Markdown flavor](https://www.markdownguide.org/extended-syntax/#lightweight-markup-languages)
+    and does not validate the syntax of Markdown and reStructuredText.
+    The `README` file SHOULD be structured such that its contents can be easily understood
+    even if the used format is not rendered.
+    A guideline for creating a good `README` file can be found in the
+    [bids-starter-kit](https://github.com/bids-standard/bids-starter-kit/blob/master/templates/README).
 dataset_description:
   name: Dataset Description
+  display_name: Dataset Description
   description: |
     The file `dataset_description.json` is a JSON file describing the dataset.
 genetic_info:
   name: Genetic Information
+  display_name: Genetic Information
   description: |
     The `genetic_info.json` file describes the genetic information available in the
     `participants.tsv` file and/or the genetic database described in
@@ -38,6 +54,7 @@ genetic_info:
     `genetic_id` column in `participants.tsv` MUST include this file.
 participants:
   name: Participant Information
+  display_name: Participant Information
   description: |
     The purpose of this RECOMMENDED file is to describe properties of participants
     such as age, sex, handedness.
@@ -80,6 +97,7 @@ participants:
 
 samples:
   name: Sample Information
+  display_name: Sample Information
   description: |
     The purpose of this file is to describe properties of samples, indicated by the `sample` entity.
     This file is REQUIRED if `sample-<label>` is present in any file name within the dataset.
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/associated_data.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/associated_data.yaml
new file mode 100644
index 000000000..b855bf9a2
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/associated_data.yaml
@@ -0,0 +1,11 @@
+---
+# This file describes the requirement levels of directories which may appear
+# within a dataset directory without following BIDS format.
+code:
+  required: false
+derivatives:
+  required: false
+sourcedata:
+  required: false
+stimuli:
+  required: false
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/checks/asl.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/checks/asl.yaml
new file mode 100644
index 000000000..090f1a2a6
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/checks/asl.yaml
@@ -0,0 +1,279 @@
+# Rules for ASL data that are not defined in tables.
+---
+
+# 157
+ASLLabelingDurationNiftiLength:
+  issue:
+    code: LABELING_DURATION_LENGTH_NOT_MATCHING_NIFTI
+    message: |
+      The number of values for 'LabelingDuration' for this file does not match the 4th dimension
+      of the NIfTI header.
+      'LabelingDuration' is the total duration of the labeling pulse train, in seconds,
+      corresponding to the temporal width of the labeling bolus for `(P)CASL`.
+      In case all control-label volumes (or deltam or CBF) have the same `LabelingDuration`, a scalar must be
+      specified.
+      In case the control-label volumes (or deltam or cbf) have a different `LabelingDuration`,
+      an array of numbers must be specified, for which any `m0scan` in the timeseries has a `LabelingDuration` of
+      zero.
+      In case an array of numbers is provided, its length should be equal to the number of volumes specified in
+      `*_aslcontext.tsv`. Corresponds to DICOM Tag 0018,9258 `ASL Pulse Train Duration`.
+    level: error
+  selectors:
+  - suffix == "asl"
+  - '"LabelingDuration" in sidecar'
+  - type(sidecar.LabelingDuration) == 'array'
+  checks:
+  - nifti_header.dim[4] == sidecar.LabelingDuration.length
+
+# 165
+ASLContextConsistent:
+  issue:
+    code: ASLCONTEXT_TSV_NOT_CONSISTENT
+    message: |
+      The number of volumes in the '*_aslcontext.tsv' for this file does not match the number of
+      values in the NIfTI header.
+    level: error
+  selectors:
+  - suffix == "asl"
+  - '"aslcontext" in associations'
+  checks:
+  - nifti_header.dim[4] == associations.aslcontext.n_rows
+
+# 168
+ASLFlipAngleNiftiLength:
+  issue:
+    code: FLIP_ANGLE_NOT_MATCHING_NIFTI
+    message: |
+      The number of values for 'FlipAngle' for this file does not match the 4th dimension of the NIfTI header.
+      'FlipAngle' is the flip angle (FA) for the acquisition, specified in degrees.
+      Corresponds to: DICOM Tag 0018, 1314 `Flip Angle`.
+      The data type number may apply to files from any MRI modality concerned with a single value for this field,
+      or to the files in a file collection where the value of this field is iterated using the flip entity.
+      The data type array provides a value for each volume in a 4D dataset and should only be used when the
+      volume timing is critical for interpretation of the data, such as in ASL or variable flip
+      angle fMRI sequences.
+    level: error
+  selectors:
+  - suffix == "asl"
+  - '"FlipAngle" in sidecar'
+  - type(sidecar.FlipAngle) == 'array'
+  checks:
+  - nifti_header.dim[4] == sidecar.FlipAngle.length
+
+# 172
+ASLFlipAngleASLContextLength:
+  issue:
+    code: FLIP_ANGLE_NOT_MATCHING_ASLCONTEXT_TSV
+    message: |
+      The number of values for 'FlipAngle' for this file does not match the number of volumes in the
+      'sub-<label>[_ses-<label>][_acq-<label>][_rec-<label>][_run-<index>]_aslcontext.tsv'.
+      'FlipAngle' is the flip angle (FA) for the acquisition, specified in degrees.
+      Corresponds to: DICOM Tag 0018, 1314 `Flip Angle`.
+      The data type number may apply to files from any MRI modality concerned with a single value for this field,
+      or to the files in a file collection where the value of this field is iterated using the flip entity.
+      The data type array provides a value for each volume in a 4D dataset and should only be used when the volume
+      timing is critical for interpretation of the data, such as in ASL or variable flip angle fMRI sequences.
+    level: error
+  selectors:
+  - suffix == "asl"
+  - '"aslcontext" in associations'
+  - '"FlipAngle" in sidecar'
+  - type(sidecar.FlipAngle) == 'array'
+  checks:
+  - aslcontext.n_rows == sidecar.FlipAngle.length
+
+# 173
+ASLPostLabelingDelayNiftiLength:
+  issue:
+    code: POST_LABELING_DELAY_NOT_MATCHING_NIFTI
+    message: |
+      The number of values for 'PostLabelingDelay' for this file does not match the 4th dimension of the NIfTI
+      header.
+      'PostLabelingDelay' is the time, in seconds, after the end of the labeling (for (P)CASL) or middle of the
+      labeling pulse (for PASL) until the middle of the excitation pulse applied to the imaging slab
+      (for 3D acquisition) or first slice (for 2D acquisition).
+      Can be a number (for a single-PLD time series) or an array of numbers (for multi-PLD and Look-Locker).
+      In the latter case, the array of numbers contains the PLD of each volume
+      (that is, each 'control' and 'label')
+      in the acquisition order. Any image within the time-series without a PLD (for example, an 'm0scan') is
+      indicated by a zero.
+      Based on DICOM Tags 0018,9079 Inversion Times and 0018,0082 InversionTime.
+    level: error
+  selectors:
+  - suffix == "asl"
+  - '"aslcontext" in associations'
+  - type(sidecar.PostLabelingDelay) == 'array'
+  checks:
+  - nifti_header.pixdim[4] == sidecar.PostLabelingDelay.length
+
+# 174
+ASLPostLabelingDelayASLContextLength:
+  issue:
+    code: POST_LABELING_DELAY_NOT_MATCHING_ASLCONTEXT_TSV
+    message: |
+      The number of values for 'PostLabelingDelay' for this file does not match the number of volumes
+      in the 'sub-<label>[_ses-<label>][_acq-<label>][_rec-<label>][_run-<index>]_aslcontext.tsv'.
+      'PostLabelingDelay' is the time, in seconds, after the end of the labeling (for (P)CASL) or
+      middle of the labeling pulse (for PASL) until the middle of the excitation pulse applied to
+      the imaging slab (for 3D acquisition) or first slice (for 2D acquisition).
+      Can be a number (for a single-PLD time series) or an array of numbers (for multi-PLD and Look-Locker).
+      In the latter case, the array of numbers contains the PLD of each volume
+      (that is, each 'control' and 'label')
+      in the acquisition order.
+      Any image within the time-series without a PLD (for example, an 'm0scan') is indicated by a zero.
+      Based on DICOM Tags 0018,9079 Inversion Times and 0018,0082 InversionTime.
+    level: error
+  selectors:
+  - suffix == "asl"
+  - '"aslcontext" in associations'
+  - type(sidecar.PostLabelingDelay) == 'array'
+  checks:
+  - aslcontext.n_rows == sidecar.PostLabelingDelay.length
+
+# 175
+ASLLabelingDurationASLContextLength:
+  issue:
+    code: LABELLING_DURATION_NOT_MATCHING_ASLCONTEXT_TSV
+    message: |
+      The number of values for 'LabelingDuration' for this file does not match the number of volumes
+      in the 'sub-<label>[_ses-<label>][_acq-<label>][_rec-<label>][_run-<index>]_aslcontext.tsv'.
+      'LabelingDuration' is the total duration of the labeling pulse train, in seconds,
+      corresponding to the temporal width of the labeling bolus for `(P)CASL`.
+      In case all control-label volumes (or deltam or CBF) have the same `LabelingDuration`,
+      a scalar must be specified.
+      In case the control-label volumes (or deltam or cbf) have a different `LabelingDuration`,
+      an array of numbers must be specified, for which any `m0scan` in the timeseries has a
+      `LabelingDuration` of zero.
+      In case an array of numbers is provided, its length should be equal to the number of volumes
+      specified in `*_aslcontext.tsv`.
+      Corresponds to DICOM Tag 0018,9258 `ASL Pulse Train Duration`.
+    level: error
+  selectors:
+  - suffix == "asl"
+  - '"aslcontext" in associations'
+  - '"LabelingDuration" in sidecar'
+  - type(sidecar.LabelingDuration) == 'array'
+  checks:
+  - aslcontext.n_rows == sidecar.LabelingDuration.length
+
+# 177
+ASLRepetitionTimePreparationASLContextLength:
+  issue:
+    code: REPETITIONTIMEPREPARATION_NOT_MATCHING_ASLCONTEXT_TSV
+    message: |
+      The number of values of 'RepetitionTimePreparation' for this file does not match the number of
+      volumes in the 'sub-<label>[_ses-<label>][_acq-<label>][_rec-<label>][_run-<index>]_aslcontext.tsv'.
+      'RepetitionTimePreparation' is the interval, in seconds, that it takes a preparation pulse block to
+      re-appear at the beginning of the succeeding (essentially identical) pulse sequence block.
+      The data type number may apply to files from any MRI modality concerned with a single value for this field.
+      The data type array provides a value for each volume in a 4D dataset and should only be used when the
+      volume timing is critical for interpretation of the data, such as in ASL.
+    level: error
+  selectors:
+  - suffix == "asl"
+  - '"aslcontext" in associations'
+  - '"RepetitionTimePreparation" in sidecar'
+  - type(sidecar.RepetitionTimePreparation) == 'array'
+  checks:
+  - aslcontext.n_rows == sidecar.RepetitionTimePreparation.length
+
+# 180
+ASLBackgroundSuppressionNumberPulses:
+  issue:
+    code: BACKGROUND_SUPPRESSION_PULSE_NUMBER_NOT_CONSISTENT
+    message: |
+      The 'BackgroundSuppressionNumberPulses' field is not consistent with the length of
+      'BackgroundSuppressionPulseTime'.
+      'BackgroundSuppressionNumberPulses' is the number of background suppression pulses used.
+      Note that this excludes any effect of background suppression pulses applied before the labeling.
+    level: warning
+  selectors:
+  - suffix == "asl"
+  - '"BackgroundSuppressionNumberPulses" in sidecar'
+  - '"BackgroundSuppressionPulseTime" in sidecar'
+  - type(sidecar.BackgroundSuppressionPulseTime) == 'array'
+  checks:
+  - sidecar.BackgroundSuppressionPulseTime.length == sidecar.BackgroundSuppressionNumberPulses
+
+# 181
+ASLTotalAcquiredVolumesASLContextLength:
+  issue:
+    code: TOTAL_ACQUIRED_VOLUMES_NOT_CONSISTENT
+    message: |
+      The number of values for 'TotalAcquiredVolumes' for this file does not match number of
+      volumes in the 'sub-<label>[_ses-<label>][_acq-<label>][_rec-<label>][_run-<index>]_aslcontext.tsv'.
+      'TotalAcquiredVolumes' is the original number of 3D volumes acquired for each volume defined in the
+      'sub-<label>[_ses-<label>][_acq-<label>][_rec-<label>][_run-<index>]_aslcontext.tsv'.
+    level: warning
+  selectors:
+  - suffix == "asl"
+  - '"aslcontext" in associations'
+  - '"TotalAcquiredVolumes" in sidecar'
+  checks:
+  - aslcontext.n_rows == sidecar.TotalAcquiredVolumes
+
+# 196
+ASLEchoTimeASLContextLength:
+  issue:
+    code: ECHO_TIME_NOT_CONSISTENT
+    message: |
+      The number of values for 'EchoTime' for this file does not match number of volumes in the
+      'sub-<label>[_ses-<label>][_acq-<label>][_rec-<label>][_run-<index>]_aslcontext.tsv'.
+      'EchoTime' is the echo time (TE) for the acquisition, specified in seconds.
+    level: warning
+  selectors:
+  - suffix == "asl"
+  - '"aslcontext" in associations'
+  - '"EchoTime" in sidecar'
+  - type(sidecar.EchoTime) == 'array'
+  checks:
+  - aslcontext.n_rows == sidecar.EchoTime.length
+
+# 198
+ASLM0TypeAbsentScan:
+  issue:
+    code: M0Type_SET_INCORRECTLY_TO_ABSENT
+    message: |
+      You defined M0Type as 'absent' while including a separate '*_m0scan.nii[.gz]' and
+      '*_m0scan.json', or defining the 'M0Estimate' field.
+      This is not allowed, please check that this field are filled correctly.
+    level: error
+  selectors:
+  - suffix == "asl"
+  - '"aslcontext" in associations'
+  - '"m0scan" in associations'
+  - '"M0Type" in sidecar'
+  checks:
+  - sidecar.M0Type != "absent"
+
+# 199
+ASLM0TypeAbsentASLContext:
+  issue:
+    code: M0Type_SET_INCORRECTLY_TO_ABSENT_IN_ASLCONTEXT
+    message: |
+      You defined M0Type as 'absent' while including an m0scan volume within the '*_aslcontext.tsv'.
+      This is not allowed, please check that this field are filled correctly.
+    level: error
+  selectors:
+  - suffix == "asl"
+  - '"aslcontext" in associations'
+  - aslcontext.volume_type.includes('"m0scan")
+  - '"M0Type" in sidecar'
+  checks:
+  - sidecar.M0Type != "absent"
+
+# 202
+ASLM0TypeIncorrect:
+  issue:
+    code: M0Type_SET_INCORRECTLY
+    message: |
+      M0Type was not defined correctly.
+      If 'M0Type' is equal to 'separate', the dataset should include a *_m0scan.nii[.gz] and *_m0scan.json file.
+    level: error
+  selectors:
+  - suffix == "asl"
+  - '"aslcontext" in associations'
+  - '"M0Type" in sidecar'
+  - sidecar.M0Type == "separate"
+  checks:
+  - '"m0scan" in associations'
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/checks/dwi.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/checks/dwi.yaml
new file mode 100644
index 000000000..6cc157290
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/checks/dwi.yaml
@@ -0,0 +1,61 @@
+# Rules for DWI data that are not defined in tables.
+---
+
+# 29
+DWIVolumeCount:
+  code: VOLUME_COUNT_MISMATCH
+  description: |
+    The number of volumes in this scan does not match the number of volumes in the
+    corresponding .bvec and .bval files.
+  level: error
+  selectors:
+  - suffix == "dwi"
+  - '"bval" in associations'
+  - '"bvec" in associations'
+  checks:
+  - associations.bval.n_cols == nifti_header.dim[4]
+  - associations.bvec.n_cols == nifti_header.dim[4]
+
+# 30
+DWIBvalRows:
+  code: BVAL_MULTIPLE_ROWS
+  description: |
+    '.bval' files should contain exactly one row of volumes.
+  level: error
+  selectors:
+  - extension == "bval"
+  checks:
+  - data.n_rows == 1
+
+# 31
+DWIBvecRows:
+  code: BVEC_NUMBER_ROWS
+  description: |
+    '.bvec' files should contain exactly three rows of volumes.
+  level: error
+  selectors:
+  - extension == "bvec"
+  checks:
+  - data.n_rows == 3
+
+# 32
+DWIMissingBvec:
+  code: DWI_MISSING_BVEC
+  description: |
+    DWI scans must have a corresponding .bvec file.
+  level: error
+  selectors:
+  - suffix == "dwi"
+  checks:
+  - '"bvec" in associations'
+
+# 33
+DWIMissingBval:
+  code: DWI_MISSING_BVAL
+  description: |
+    DWI scans must have a corresponding .bval file.
+  level: error
+  selectors:
+  - suffix == "dwi"
+  checks:
+  - '"bval" in associations'
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/checks/events.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/checks/events.yaml
new file mode 100644
index 000000000..f6ffd882d
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/checks/events.yaml
@@ -0,0 +1,16 @@
+# Rules for events data that are not defined in tables.
+---
+
+# 25
+EventsMissing:
+  issue:
+    code: EVENTS_TSV_MISSING
+    message: |
+      Task scans should have a corresponding events.tsv file.
+      If this is a resting state scan you can ignore this warning or rename the task to include the word "rest".
+    level: warning  # could be an error with the proper selectors, I think
+  selectors:
+  - '"task" in entities'
+  - '!(entities.task.includes("rest"))'
+  checks:
+  - '"events" in associations'
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/checks/fmap.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/checks/fmap.yaml
new file mode 100644
index 000000000..048765ac7
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/checks/fmap.yaml
@@ -0,0 +1,26 @@
+# Rules for fieldmap data that are not defined in tables.
+---
+
+# 91
+FmapFieldmapWithoutMagnitude:
+  issue:
+    code: _FIELDMAP_WITHOUT_MAGNITUDE_FILE
+    message: |
+      '_fieldmap.nii[.gz]' file does not have accompanying '_magnitude.nii[.gz]' file.
+    level: error
+  selectors:
+  - suffix == "fieldmap"
+  checks:
+  - '"magnitude" in associations'
+
+# 92
+FmapPhasediffWithoutMagnitude:
+  issue:
+    code: MISSING_MAGNITUDE1_FILE
+    message: |
+      Each '_phasediff.nii[.gz]' file should be associations with a '_magnitude1.nii[.gz]' file.
+    level: warning
+  selectors:
+  - suffix == "phasediff"
+  checks:
+  - '"magnitude1" in associations'
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/checks/func.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/checks/func.yaml
new file mode 100644
index 000000000..d46d22ff1
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/checks/func.yaml
@@ -0,0 +1,16 @@
+# Rules for functional data that are not defined in tables.
+---
+PhaseSuffixDeprecated:
+  issue:
+    code: PHASE_SUFFIX_DEPRECATED
+    message: |
+      DEPRECATED. Phase information associated with magnitude information stored in BOLD contrast.
+      This suffix should be replaced by the part-phase in conjunction with the bold suffix.
+      For backwards compatibility, _phase is considered equivalent to _part-phase_bold.
+      When the _phase suffix is not used, each file shares the same name with the exception of the
+      part-<mag|phase> or part-<real|imag> key/value.
+    level: warning
+  selectors:
+  - datatype == "func"
+  checks:
+  - '!(suffix == "phase")'
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/common_derivatives_validation.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/common_derivatives_validation.yaml
new file mode 100644
index 000000000..0c2755e3e
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/common_derivatives_validation.yaml
@@ -0,0 +1,18 @@
+---
+ResInSidecar:
+    selectors:
+    - dataset.dataset_description.DatasetType == "derivative"
+    - '["mri", "pet"].includes(modality)'
+    - '["nii", " nii.gz"].includes(extension)'
+    - type(sidecar.Resolution) == "object"
+    checks:
+    - entities.resolution in sidecar.Resolution
+
+DenInSidecar:
+    selectors:
+    - dataset.dataset_description.DatasetType == "derivative"
+    - '["mri", "pet"].includes(modality)'
+    - '[".nii", ".nii.gz"].includes(extension)'
+    - type(sidecar.Density) == "object"
+    checks:
+    - entities.density in sidecar.Density
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/dataset_metadata.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/dataset_metadata.yaml
new file mode 100644
index 000000000..c1b086527
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/dataset_metadata.yaml
@@ -0,0 +1,67 @@
+---
+dataset_description:
+  selectors:
+  - path == "/dataset_description.json"
+  fields:
+    Name: REQUIRED
+    BIDSVersion: REQUIRED
+    DatasetType: RECOMMENDED
+    License: RECOMMENDED
+    Authors:
+      level: RECOMMENDED
+      issue:
+        code: NO_AUTHORS
+        message: |
+          The Authors field of dataset_description.json should contain an array of fields -
+          with one author per field. This was triggered because there are no authors, which
+          will make DOI registration from dataset metadata impossible.
+    Acknowledgements: OPTIONAL
+    HowToAcknowledge: OPTIONAL
+    Funding: OPTIONAL
+    EthicsApprovals: OPTIONAL
+    ReferencesAndLinks: OPTIONAL
+    DatasetDOI: OPTIONAL
+    GeneratedBy: RECOMMENDED
+    GeneratedBy[].Name: REQUIRED
+    GeneratedBy[].Version: RECOMMENDED
+    GeneratedBy[].Description: OPTIONAL
+    GeneratedBy[].CodeURL: OPTIONAL
+    GeneratedBy[].Container: OPTIONAL
+    GeneratedBy[].Container{}.Type: RECOMMENDED
+    GeneratedBy[].Container{}.Tag: RECOMMENDED
+    GeneratedBy[].Container{}.URI: RECOMMENDED
+    SourceDatasets: RECOMMENDED
+
+derivative_description:
+  selectors:
+  - path == "/dataset_description.json"
+  - json.DatasetType == "derivative"
+  fields:
+    GeneratedBy: REQUIRED
+
+dataset_description_with_genetics:
+  selectors:
+  - path == "/dataset_description.json"
+  - 'dataset.files.includes("/genetic_info.json")'
+  fields:
+    Genetics: REQUIRED
+    Genetics{}.Dataset:
+      level: REQUIRED
+      issue:
+        code: NO_GENETIC_DATABASE
+        message: |
+          A genetic_info.json file is present but no Database field present in Genetics
+          object in dataset_description.json.
+    Genetics{}.Database: OPTIONAL
+    Genetics{}.Descriptors: OPTIONAL
+
+genetic_info:
+  selectors:
+  - path == "/genetic_info.json"
+  fields:
+    GeneticLevel: REQUIRED
+    SampleOrigin: REQUIRED
+    AnalyticalApproach: OPTIONAL
+    TissueOrigin: OPTIONAL
+    BrainLocation: OPTIONAL
+    CellType: OPTIONAL
diff --git a/dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/anat.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/anat.yaml
similarity index 86%
rename from dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/anat.yaml
rename to dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/anat.yaml
index b1a470c2e..7e0f04d6c 100644
--- a/dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/anat.yaml
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/anat.yaml
@@ -1,6 +1,6 @@
 ---
-# Nonparametric
-- suffixes:
+nonparametric:
+  suffixes:
   - T1w
   - T2w
   - PDw
@@ -17,6 +17,8 @@
   - .nii.gz
   - .nii
   - .json
+  datatypes:
+  - anat
   entities:
     subject: required
     session: optional
@@ -26,8 +28,8 @@
     reconstruction: optional
     part: optional
 
-# Parametric
-- suffixes:
+parametric:
+  suffixes:
   - T1map
   - T2map
   - T2starmap
@@ -49,6 +51,8 @@
   - .nii.gz
   - .nii
   - .json
+  datatypes:
+  - anat
   entities:
     subject: required
     session: optional
@@ -57,13 +61,15 @@
     ceagent: optional
     reconstruction: optional
 
-# Defacemask
-- suffixes:
+defacemask:
+  suffixes:
   - defacemask
   extensions:
   - .nii.gz
   - .nii
   - .json
+  datatypes:
+  - anat
   entities:
     subject: required
     session: optional
@@ -73,14 +79,16 @@
     reconstruction: optional
     modality: optional
 
-# Multi-echo
-- suffixes:
+multiecho:
+  suffixes:
   - MESE
   - MEGRE
   extensions:
   - .nii.gz
   - .nii
   - .json
+  datatypes:
+  - anat
   entities:
     subject: required
     session: optional
@@ -91,13 +99,15 @@
     echo: required
     part: optional
 
-# Multi-flip
-- suffixes:
+multiflip:
+  suffixes:
   - VFA
   extensions:
   - .nii.gz
   - .nii
   - .json
+  datatypes:
+  - anat
   entities:
     subject: required
     session: optional
@@ -109,13 +119,15 @@
     flip: required
     part: optional
 
-# Multi-inv
-- suffixes:
+multiinversion:
+  suffixes:
   - IRT1
   extensions:
   - .nii.gz
   - .nii
   - .json
+  datatypes:
+  - anat
   entities:
     subject: required
     session: optional
@@ -126,13 +138,15 @@
     inversion: required
     part: optional
 
-# MP2RAGE
-- suffixes:
+mp2rage:
+  suffixes:
   - MP2RAGE
   extensions:
   - .nii.gz
   - .nii
   - .json
+  datatypes:
+  - anat
   entities:
     subject: required
     session: optional
@@ -145,14 +159,16 @@
     inversion: required
     part: optional
 
-# VFA+MT
-- suffixes:
+vfamt:
+  suffixes:
   - MPM
   - MTS
   extensions:
   - .nii.gz
   - .nii
   - .json
+  datatypes:
+  - anat
   entities:
     subject: required
     session: optional
@@ -165,13 +181,15 @@
     mtransfer: required
     part: optional
 
-# MTR
-- suffixes:
+mtr:
+  suffixes:
   - MTR
   extensions:
   - .nii.gz
   - .nii
   - .json
+  datatypes:
+  - anat
   entities:
     subject: required
     session: optional
diff --git a/dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/beh.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/beh.yaml
similarity index 81%
rename from dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/beh.yaml
rename to dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/beh.yaml
index 59358b59b..1f3111799 100644
--- a/dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/beh.yaml
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/beh.yaml
@@ -1,11 +1,13 @@
 ---
-# Continuous data
-- suffixes:
+timeseries:
+  suffixes:
   - stim
   - physio
   extensions:
   - .tsv.gz
   - .json
+  datatypes:
+  - beh
   entities:
     subject: required
     session: optional
@@ -15,12 +17,15 @@
     recording: optional
 
 # Non-continuous data
-- suffixes:
+noncontinuous:
+  suffixes:
   - events
   - beh
   extensions:
   - .tsv
   - .json
+  datatypes:
+  - beh
   entities:
     subject: required
     session: optional
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/derivatives/common_derivatives.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/derivatives/common_derivatives.yaml
new file mode 100644
index 000000000..adddf62f3
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/derivatives/common_derivatives.yaml
@@ -0,0 +1,413 @@
+---
+anat_nonparametric_common:
+  $ref: rules.datatypes.anat.nonparametric
+  entities:
+    $ref: rules.datatypes.anat.nonparametric.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+anat_parametric_common:
+  $ref: rules.datatypes.anat.parametric
+  entities:
+    $ref: rules.datatypes.anat.parametric.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+anat_defacemask_common:
+  $ref: rules.datatypes.anat.defacemask
+  entities:
+    $ref: rules.datatypes.anat.defacemask.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+anat_multiecho_common:
+  $ref: rules.datatypes.anat.multiecho
+  entities:
+    $ref: rules.datatypes.anat.multiecho.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+anat_multiflip_common:
+  $ref: rules.datatypes.anat.multiflip
+  entities:
+    $ref: rules.datatypes.anat.multiflip.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+anat_multiinversion_common:
+  $ref: rules.datatypes.anat.multiinversion
+  entities:
+    $ref: rules.datatypes.anat.multiinversion.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+anat_mp2rage_common:
+  $ref: rules.datatypes.anat.mp2rage
+  entities:
+    $ref: rules.datatypes.anat.mp2rage.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+anat_vfamt_common:
+  $ref: rules.datatypes.anat.vfamt
+  entities:
+    $ref: rules.datatypes.anat.vfamt.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+anat_mtr_common:
+  $ref: rules.datatypes.anat.mtr
+  entities:
+    $ref: rules.datatypes.anat.mtr.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+beh_timeseries_common:
+  $ref: rules.datatypes.beh.timeseries
+  entities:
+    $ref: rules.datatypes.beh.timeseries.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+beh_noncontinuous_common:
+  $ref: rules.datatypes.beh.noncontinuous
+  entities:
+    $ref: rules.datatypes.beh.noncontinuous.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+dwi_dwi_common:
+  $ref: rules.datatypes.dwi.dwi
+  entities:
+    $ref: rules.datatypes.dwi.dwi.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+dwi_sbref_common:
+  $ref: rules.datatypes.dwi.sbref
+  entities:
+    $ref: rules.datatypes.dwi.sbref.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+dwi_timeseries_common:
+  $ref: rules.datatypes.dwi.timeseries
+  entities:
+    $ref: rules.datatypes.dwi.timeseries.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+eeg_eeg_common:
+  $ref: rules.datatypes.eeg.eeg
+  entities:
+    $ref: rules.datatypes.eeg.eeg.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+eeg_channels_common:
+  $ref: rules.datatypes.eeg.channels
+  entities:
+    $ref: rules.datatypes.eeg.channels.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+eeg_coordsystem_common:
+  $ref: rules.datatypes.eeg.coordsystem
+  entities:
+    $ref: rules.datatypes.eeg.coordsystem.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+eeg_electrodes_common:
+  $ref: rules.datatypes.eeg.electrodes
+  entities:
+    $ref: rules.datatypes.eeg.electrodes.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+eeg_events_common:
+  $ref: rules.datatypes.eeg.events
+  entities:
+    $ref: rules.datatypes.eeg.events.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+eeg_photo_common:
+  $ref: rules.datatypes.eeg.photo
+  entities:
+    $ref: rules.datatypes.eeg.photo.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+eeg_timeseries_common:
+  $ref: rules.datatypes.eeg.timeseries
+  entities:
+    $ref: rules.datatypes.eeg.timeseries.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+fmap_fieldmaps_common:
+  $ref: rules.datatypes.fmap.fieldmaps
+  entities:
+    $ref: rules.datatypes.fmap.fieldmaps.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+fmap_pepolar_common:
+  $ref: rules.datatypes.fmap.pepolar
+  entities:
+    $ref: rules.datatypes.fmap.pepolar.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+fmap_TB1DAM_common:
+  $ref: rules.datatypes.fmap.TB1DAM
+  entities:
+    $ref: rules.datatypes.fmap.TB1DAM.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+fmap_TB1EPI_common:
+  $ref: rules.datatypes.fmap.TB1EPI
+  entities:
+    $ref: rules.datatypes.fmap.TB1EPI.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+fmap_RFFieldMaps_common:
+  $ref: rules.datatypes.fmap.RFFieldMaps
+  entities:
+    $ref: rules.datatypes.fmap.RFFieldMaps.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+fmap_TB1SRGE_common:
+  $ref: rules.datatypes.fmap.TB1SRGE
+  entities:
+    $ref: rules.datatypes.fmap.TB1SRGE.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+fmap_parametric_common:
+  $ref: rules.datatypes.fmap.parametric
+  entities:
+    $ref: rules.datatypes.fmap.parametric.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+func_func_common:
+  $ref: rules.datatypes.func.func
+  entities:
+    $ref: rules.datatypes.func.func.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+func_phase_common:
+  $ref: rules.datatypes.func.phase
+  entities:
+    $ref: rules.datatypes.func.phase.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+func_events_common:
+  $ref: rules.datatypes.func.events
+  entities:
+    $ref: rules.datatypes.func.events.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+func_timeseries_common:
+  $ref: rules.datatypes.func.timeseries
+  entities:
+    $ref: rules.datatypes.func.timeseries.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+ieeg_ieeg_common:
+  $ref: rules.datatypes.ieeg.ieeg
+  entities:
+    $ref: rules.datatypes.ieeg.ieeg.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+ieeg_channels_common:
+  $ref: rules.datatypes.ieeg.channels
+  entities:
+    $ref: rules.datatypes.ieeg.channels.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+ieeg_coordsystem_common:
+  $ref: rules.datatypes.ieeg.coordsystem
+  entities:
+    $ref: rules.datatypes.ieeg.coordsystem.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+ieeg_electrodes_common:
+  $ref: rules.datatypes.ieeg.electrodes
+  entities:
+    $ref: rules.datatypes.ieeg.electrodes.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+ieeg_events_common:
+  $ref: rules.datatypes.ieeg.events
+  entities:
+    $ref: rules.datatypes.ieeg.events.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+ieeg_photo_common:
+  $ref: rules.datatypes.ieeg.photo
+  entities:
+    $ref: rules.datatypes.ieeg.photo.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+ieeg_timeseries_common:
+  $ref: rules.datatypes.ieeg.timeseries
+  entities:
+    $ref: rules.datatypes.ieeg.timeseries.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+meg_meg_common:
+  $ref: rules.datatypes.meg.meg
+  entities:
+    $ref: rules.datatypes.meg.meg.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+meg_calibration_common:
+  $ref: rules.datatypes.meg.calibration
+  entities:
+    $ref: rules.datatypes.meg.calibration.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+meg_crosstalk_common:
+  $ref: rules.datatypes.meg.crosstalk
+  entities:
+    $ref: rules.datatypes.meg.crosstalk.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+meg_headshape_common:
+  $ref: rules.datatypes.meg.headshape
+  entities:
+    $ref: rules.datatypes.meg.headshape.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+meg_markers_common:
+  $ref: rules.datatypes.meg.markers
+  entities:
+    $ref: rules.datatypes.meg.markers.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+meg_coordsystem_common:
+  $ref: rules.datatypes.meg.coordsystem
+  entities:
+    $ref: rules.datatypes.meg.coordsystem.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+meg_channels_common:
+  $ref: rules.datatypes.meg.channels
+  entities:
+    $ref: rules.datatypes.meg.channels.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+meg_events_common:
+  $ref: rules.datatypes.meg.events
+  entities:
+    $ref: rules.datatypes.meg.events.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+meg_photo_common:
+  $ref: rules.datatypes.meg.photo
+  entities:
+    $ref: rules.datatypes.meg.photo.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+meg_timeseries_common:
+  $ref: rules.datatypes.meg.timeseries
+  entities:
+    $ref: rules.datatypes.meg.timeseries.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+micr_microscopy_common:
+  $ref: rules.datatypes.micr.microscopy
+  entities:
+    $ref: rules.datatypes.micr.microscopy.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+micr_photo_common:
+  $ref: rules.datatypes.micr.photo
+  entities:
+    $ref: rules.datatypes.micr.photo.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+perf_asl_common:
+  $ref: rules.datatypes.perf.asl
+  entities:
+    $ref: rules.datatypes.perf.asl.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+perf_aslcontext_common:
+  $ref: rules.datatypes.perf.aslcontext
+  entities:
+    $ref: rules.datatypes.perf.aslcontext.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+perf_asllabeling_common:
+  $ref: rules.datatypes.perf.asllabeling
+  entities:
+    $ref: rules.datatypes.perf.asllabeling.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+perf_timeseries_common:
+  $ref: rules.datatypes.perf.timeseries
+  entities:
+    $ref: rules.datatypes.perf.timeseries.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+pet_pet_common:
+  $ref: rules.datatypes.pet.pet
+  entities:
+    $ref: rules.datatypes.pet.pet.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+pet_blood_common:
+  $ref: rules.datatypes.pet.blood
+  entities:
+    $ref: rules.datatypes.pet.blood.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+pet_events_common:
+  $ref: rules.datatypes.pet.events
+  entities:
+    $ref: rules.datatypes.pet.events.entities
+    space: OPTIONAL
+    desc: OPTIONAL
+
+pet_timeseries_common:
+  $ref: rules.datatypes.pet.timeseries
+  entities:
+    $ref: rules.datatypes.pet.timeseries.entities
+    space: OPTIONAL
+    desc: OPTIONAL
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/derivatives/common_imaging_derivatives.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/derivatives/common_imaging_derivatives.yaml
new file mode 100644
index 000000000..b41a43808
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/derivatives/common_imaging_derivatives.yaml
@@ -0,0 +1,220 @@
+---
+anat_parametric_volumetric:
+  $ref: rules.datatypes.anat.parametric
+  entities:
+    $ref: rules.datatypes.anat.parametric.entities
+    space: OPTIONAL
+    resolution: OPTIONAL
+    density: OPTIONAL
+    desc: OPTIONAL
+
+anat_nonparametric_volumetric:
+  $ref: rules.datatypes.anat.nonparametric
+  entities:
+    $ref: rules.datatypes.anat.nonparametric.entities
+    space: OPTIONAL
+    resolution: OPTIONAL
+    density: OPTIONAL
+    desc: OPTIONAL
+
+dwi_volumetric:
+  $ref: rules.datatypes.dwi.dwi
+  entities:
+    $ref: rules.datatypes.dwi.dwi.entities
+    space: OPTIONAL
+    resolution: OPTIONAL
+    density: OPTIONAL
+    desc: OPTIONAL
+
+func_volumetric:
+  $ref: rules.datatypes.func.func
+  entities:
+    $ref: rules.datatypes.func.func.entities
+    space: OPTIONAL
+    resolution: OPTIONAL
+    density: OPTIONAL
+    desc: OPTIONAL
+
+anat_parametric_mask:
+  $ref: rules.datatypes.anat.parametric
+  suffixes:
+  - mask
+  extensions:
+  - .nii.gz
+  entities:
+    $ref: rules.datatypes.anat.parametric.entities
+    space: OPTIONAL
+    resolution: OPTIONAL
+    density: OPTIONAL
+    label: OPTIONAL
+    desc: OPTIONAL
+
+anat_nonparametric_mask:
+  $ref: rules.datatypes.anat.nonparametric
+  suffixes:
+  - mask
+  extensions:
+  - .nii.gz
+  entities:
+    $ref: rules.datatypes.anat.nonparametric.entities
+    space: OPTIONAL
+    resolution: OPTIONAL
+    density: OPTIONAL
+    label: OPTIONAL
+    desc: OPTIONAL
+
+dwi_mask:
+  $ref: rules.datatypes.dwi.dwi
+  suffixes:
+  - mask
+  extensions:
+  - .nii.gz
+  entities:
+    $ref: rules.datatypes.dwi.dwi.entities
+    space: OPTIONAL
+    resolution: OPTIONAL
+    density: OPTIONAL
+    label: OPTIONAL
+    desc: OPTIONAL
+
+func_mask:
+  $ref: rules.datatypes.func.func
+  suffixes:
+  - mask
+  extensions:
+  - .nii.gz
+  entities:
+    $ref: rules.datatypes.func.func.entities
+    space: OPTIONAL
+    resolution: OPTIONAL
+    density: OPTIONAL
+    label: OPTIONAL
+    desc: OPTIONAL
+
+anat_parametric_discrete_segmentation:
+  $ref: rules.datatypes.anat.parametric
+  suffixes:
+  - dseg
+  extensions:
+  - .nii.gz
+  entities:
+    $ref: rules.datatypes.anat.parametric.entities
+    space: OPTIONAL
+    resolution: OPTIONAL
+    density: OPTIONAL
+
+anat_nonparametric_discrete_segmentation:
+  $ref: rules.datatypes.anat.nonparametric
+  suffixes:
+  - dseg
+  extensions:
+  - .nii.gz
+  entities:
+    $ref: rules.datatypes.anat.nonparametric.entities
+    space: OPTIONAL
+    resolution: OPTIONAL
+    density: OPTIONAL
+
+func_discrete_segmentation:
+  $ref: rules.datatypes.func.func
+  suffixes:
+  - dseg
+  extensions:
+  - .nii.gz
+  entities:
+    $ref: rules.datatypes.func.func.entities
+    space: OPTIONAL
+    resolution: OPTIONAL
+    density: OPTIONAL
+
+dwi_discrete_segmentation:
+  $ref: rules.datatypes.dwi.dwi
+  suffixes:
+  - dseg
+  extensions:
+  - .nii.gz
+  entities:
+    $ref: rules.datatypes.dwi.dwi.entities
+    space: OPTIONAL
+    resolution: OPTIONAL
+    density: OPTIONAL
+
+anat_parametric_probabilistic_segmentation:
+  $ref: rules.datatypes.anat.parametric
+  suffixes:
+  - probseg
+  extensions:
+  - .nii.gz
+  entities:
+    $ref: rules.datatypes.anat.parametric.entities
+    space: OPTIONAL
+    resolution: OPTIONAL
+    density: OPTIONAL
+    label: OPTIONAL
+
+anat_nonparametric_probabilistic_segmentation:
+  $ref: rules.datatypes.anat.nonparametric
+  suffixes:
+  - probseg
+  extensions:
+  - .nii.gz
+  entities:
+    $ref: rules.datatypes.anat.nonparametric.entities
+    space: OPTIONAL
+    resolution: OPTIONAL
+    density: OPTIONAL
+    label: OPTIONAL
+
+func_probabilistic_segmentation:
+  $ref: rules.datatypes.func.func
+  suffixes:
+  - probseg
+  extensions:
+  - .nii.gz
+  entities:
+    $ref: rules.datatypes.func.func.entities
+    space: OPTIONAL
+    resolution: OPTIONAL
+    density: OPTIONAL
+    label: OPTIONAL
+
+dwi_probabilistic_segmentation:
+  $ref: rules.datatypes.dwi.dwi
+  suffixes:
+  - probseg
+  extensions:
+  - .nii.gz
+  entities:
+    $ref: rules.datatypes.dwi.dwi.entities
+    space: OPTIONAL
+    resolution: OPTIONAL
+    density: OPTIONAL
+    label: OPTIONAL
+
+anat_parametic_discrete_surface:
+  $ref: rules.datatypes.anat.parametric
+  suffixes:
+  - dseg
+  extensions:
+  - .label.gii
+  - .dlabel.nii
+  entities:
+    $ref: rules.datatypes.anat.parametric.entities
+    hemisphere:: OPTIONAL
+    space: OPTIONAL
+    resolution: OPTIONAL
+    density: OPTIONAL
+
+anat_nonparametic_discrete_surface:
+  $ref: rules.datatypes.anat.nonparametric
+  suffixes:
+  - dseg
+  extensions:
+  - .label.gii
+  - .dlabel.nii
+  entities:
+    $ref: rules.datatypes.anat.nonparametric.entities
+    hemisphere:: OPTIONAL
+    space: OPTIONAL
+    resolution: OPTIONAL
+    density: OPTIONAL
diff --git a/dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/dwi.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/dwi.yaml
similarity index 75%
rename from dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/dwi.yaml
rename to dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/dwi.yaml
index dfb178760..48c0caf29 100644
--- a/dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/dwi.yaml
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/dwi.yaml
@@ -1,6 +1,6 @@
 ---
-# DWI
-- suffixes:
+dwi:
+  suffixes:
   - dwi
   extensions:
   - .nii.gz
@@ -8,40 +8,49 @@
   - .json
   - .bvec
   - .bval
+  datatypes:
+  - dwi
   entities:
     subject: required
     session: optional
     acquisition: optional
+    reconstruction: optional
     direction: optional
     run: optional
     part: optional
 
-# Single-band reference images
-- suffixes:
+sbref:
+  suffixes:
   - sbref
   extensions:
   - .nii.gz
   - .nii
   - .json
+  datatypes:
+  - dwi
   entities:
     subject: required
     session: optional
     acquisition: optional
+    reconstruction: optional
     direction: optional
     run: optional
     part: optional
 
-# Timeseries
-- suffixes:
+timeseries:
+  suffixes:
   - physio
   - stim
   extensions:
   - .tsv.gz
   - .json
+  datatypes:
+  - dwi
   entities:
     subject: required
     session: optional
     acquisition: optional
+    reconstruction: optional
     direction: optional
     run: optional
     part: optional
diff --git a/dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/eeg.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/eeg.yaml
similarity index 78%
rename from dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/eeg.yaml
rename to dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/eeg.yaml
index 6b112e343..96a57783b 100644
--- a/dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/eeg.yaml
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/eeg.yaml
@@ -1,5 +1,6 @@
 ---
-- suffixes:
+eeg:
+  suffixes:
   - eeg
   extensions:
   - .json
@@ -10,6 +11,8 @@
   - .set
   - .fdt
   - .bdf
+  datatypes:
+  - eeg
   entities:
     subject: required
     session: optional
@@ -17,11 +20,14 @@
     acquisition: optional
     run: optional
 
-- suffixes:
+channels:
+  suffixes:
   - channels
   extensions:
   - .json
   - .tsv
+  datatypes:
+  - eeg
   entities:
     subject: required
     session: optional
@@ -29,32 +35,41 @@
     acquisition: optional
     run: optional
 
-- suffixes:
+coordsystem:
+  suffixes:
   - coordsystem
   extensions:
   - .json
+  datatypes:
+  - eeg
   entities:
     subject: required
     session: optional
     acquisition: optional
     space: optional
 
-- suffixes:
+electrodes:
+  suffixes:
   - electrodes
   extensions:
   - .json
   - .tsv
+  datatypes:
+  - eeg
   entities:
     subject: required
     session: optional
     acquisition: optional
     space: optional
 
-- suffixes:
+events:
+  suffixes:
   - events
   extensions:
   - .json
   - .tsv
+  datatypes:
+  - eeg
   entities:
     subject: required
     session: optional
@@ -62,22 +77,29 @@
     acquisition: optional
     run: optional
 
-- suffixes:
+photo:
+  suffixes:
   - photo
   extensions:
   - .jpg
+  - .png
+  - .tif
+  datatypes:
+  - eeg
   entities:
     subject: required
     session: optional
     acquisition: optional
 
-# Timeseries
-- suffixes:
+timeseries:
+  suffixes:
   - physio
   - stim
   extensions:
   - .tsv.gz
   - .json
+  datatypes:
+  - eeg
   entities:
     subject: required
     session: optional
diff --git a/dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/fmap.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/fmap.yaml
similarity index 85%
rename from dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/fmap.yaml
rename to dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/fmap.yaml
index 2c445196d..cda02c410 100644
--- a/dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/fmap.yaml
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/fmap.yaml
@@ -1,6 +1,6 @@
 ---
-# Fieldmaps
-- suffixes:
+fieldmaps:
+  suffixes:
   - phasediff
   - phase1
   - phase2
@@ -12,20 +12,24 @@
   - .nii.gz
   - .nii
   - .json
+  datatypes:
+  - fmap
   entities:
     subject: required
     session: optional
     acquisition: optional
     run: optional
 
-# PEPolar
-- suffixes:
+pepolar:
+  suffixes:
   - epi
   - m0scan
   extensions:
   - .nii.gz
   - .nii
   - .json
+  datatypes:
+  - fmap
   entities:
     subject: required
     session: optional
@@ -34,13 +38,15 @@
     direction: required
     run: optional
 
-# TB1DAM
-- suffixes:
+TB1DAM:
+  suffixes:
   - TB1DAM
   extensions:
   - .nii.gz
   - .nii
   - .json
+  datatypes:
+  - fmap
   entities:
     subject: required
     session: optional
@@ -52,13 +58,15 @@
     inversion: optional
     part: optional
 
-# TB1EPI
-- suffixes:
+TB1EPI:
+  suffixes:
   - TB1EPI
   extensions:
   - .nii.gz
   - .nii
   - .json
+  datatypes:
+  - fmap
   entities:
     subject: required
     session: optional
@@ -71,8 +79,8 @@
     inversion: optional
     part: optional
 
-# RFFieldMaps
-- suffixes:
+RFFieldMaps:
+  suffixes:
   - TB1AFI
   - TB1TFL
   - TB1RFM
@@ -81,6 +89,8 @@
   - .nii.gz
   - .nii
   - .json
+  datatypes:
+  - fmap
   entities:
     subject: required
     session: optional
@@ -93,13 +103,15 @@
     inversion: optional
     part: optional
 
-# TB1SRGE
-- suffixes:
+TB1SRGE:
+  suffixes:
   - TB1SRGE
   extensions:
   - .nii.gz
   - .nii
   - .json
+  datatypes:
+  - fmap
   entities:
     subject: required
     session: optional
@@ -112,14 +124,16 @@
     inversion: required
     part: optional
 
-# Parametric
-- suffixes:
+parametric:
+  suffixes:
   - TB1map
   - RB1map
   extensions:
   - .nii.gz
   - .nii
   - .json
+  datatypes:
+  - fmap
   entities:
     subject: required
     session: optional
diff --git a/dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/func.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/func.yaml
similarity index 86%
rename from dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/func.yaml
rename to dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/func.yaml
index 1fbdca7b5..77c3b3acc 100644
--- a/dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/func.yaml
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/func.yaml
@@ -1,6 +1,6 @@
 ---
-# Func
-- suffixes:
+func:
+  suffixes:
   - bold
   - cbv
   - sbref
@@ -8,6 +8,8 @@
   - .nii.gz
   - .nii
   - .json
+  datatypes:
+  - func
   entities:
     subject: required
     session: optional
@@ -20,13 +22,15 @@
     echo: optional
     part: optional
 
-# Phase (deprecated)
-- suffixes:
+phase:
+  suffixes:
   - phase  # deprecated
   extensions:
   - .nii.gz
   - .nii
   - .json
+  datatypes:
+  - func
   entities:
     subject: required
     session: optional
@@ -38,12 +42,14 @@
     run: optional
     echo: optional
 
-# Events
-- suffixes:
+events:
+  suffixes:
   - events
   extensions:
   - .tsv
   - .json
+  datatypes:
+  - func
   entities:
     subject: required
     session: optional
@@ -54,13 +60,15 @@
     direction: optional
     run: optional
 
-# Timeseries
-- suffixes:
+timeseries:
+  suffixes:
   - physio
   - stim
   extensions:
   - .tsv.gz
   - .json
+  datatypes:
+  - func
   entities:
     subject: required
     session: optional
diff --git a/dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/ieeg.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/ieeg.yaml
similarity index 79%
rename from dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/ieeg.yaml
rename to dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/ieeg.yaml
index 37c02963f..6b14df288 100644
--- a/dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/ieeg.yaml
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/ieeg.yaml
@@ -1,5 +1,6 @@
 ---
-- suffixes:
+ieeg:
+  suffixes:
   - ieeg
   extensions:
   - .mefd/
@@ -11,6 +12,8 @@
   - .set
   - .fdt
   - .nwb
+  datatypes:
+  - ieeg
   entities:
     subject: required
     session: optional
@@ -18,11 +21,14 @@
     acquisition: optional
     run: optional
 
-- suffixes:
+channels:
+  suffixes:
   - channels
   extensions:
   - .json
   - .tsv
+  datatypes:
+  - ieeg
   entities:
     subject: required
     session: optional
@@ -30,32 +36,41 @@
     acquisition: optional
     run: optional
 
-- suffixes:
+coordsystem:
+  suffixes:
   - coordsystem
   extensions:
   - .json
+  datatypes:
+  - ieeg
   entities:
     subject: required
     session: optional
     acquisition: optional
     space: optional
 
-- suffixes:
+electrodes:
+  suffixes:
   - electrodes
   extensions:
   - .json
   - .tsv
+  datatypes:
+  - ieeg
   entities:
     subject: required
     session: optional
     acquisition: optional
     space: optional
 
-- suffixes:
+events:
+  suffixes:
   - events
   extensions:
   - .json
   - .tsv
+  datatypes:
+  - ieeg
   entities:
     subject: required
     session: optional
@@ -63,22 +78,27 @@
     acquisition: optional
     run: optional
 
-- suffixes:
+photo:
+  suffixes:
   - photo
   extensions:
   - .jpg
+  - .png
+  - .tif
   entities:
     subject: required
     session: optional
     acquisition: optional
 
-# Timeseries
-- suffixes:
+timeseries:
+  suffixes:
   - physio
   - stim
   extensions:
   - .tsv.gz
   - .json
+  datatypes:
+  - ieeg
   entities:
     subject: required
     session: optional
diff --git a/dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/meg.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/meg.yaml
similarity index 78%
rename from dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/meg.yaml
rename to dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/meg.yaml
index 104689b7f..133f4aa7d 100644
--- a/dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/meg.yaml
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/meg.yaml
@@ -1,7 +1,6 @@
 ---
-# MEG data files
-# First group
-- suffixes:
+meg:
+  suffixes:
   - meg
   extensions:
   - /  # corresponds to BTi/4D data
@@ -15,6 +14,10 @@
   - .mrk
   - .kdf
   - .mhd
+  - .trg
+  - .chn
+  datatypes:
+  - meg
   entities:
     subject: required
     session: optional
@@ -24,12 +27,13 @@
     processing: optional
     split: optional
 
-# Second group
-# Specifically, it's dat files with "acq-calibration"
-- suffixes:
+calibration:
+  suffixes:
   - meg
   extensions:
   - .dat
+  datatypes:
+  - meg
   entities:
     subject: required
     session: optional
@@ -39,12 +43,13 @@
       enum:
       - calibration
 
-# Third group
-# fif files with "acq-crosstalk"
-- suffixes:
+crosstalk:
+  suffixes:
   - meg
   extensions:
   - .fif
+  datatypes:
+  - meg
   entities:
     subject: required
     session: optional
@@ -54,22 +59,27 @@
       enum:
       - crosstalk
 
-# Headshape files
-- suffixes:
+headshape:
+  suffixes:
   - headshape
   extensions:
-  - "*"
+  - .*
+  - .pos
+  datatypes:
+  - meg
   entities:
     subject: required
     session: optional
     acquisition: optional
 
-# Marker files
-- suffixes:
+markers:
+  suffixes:
   - markers
   extensions:
   - .sqd
   - .mrk
+  datatypes:
+  - meg
   entities:
     subject: required
     session: optional
@@ -77,22 +87,26 @@
     acquisition: optional
     space: optional
 
-# Coordinate systems
-- suffixes:
+coordsystem:
+  suffixes:
   - coordsystem
   extensions:
   - .json
+  datatypes:
+  - meg
   entities:
     subject: required
     session: optional
     acquisition: optional
 
-# Channel files
-- suffixes:
+channels:
+  suffixes:
   - channels
   extensions:
   - .json
   - .tsv
+  datatypes:
+  - meg
   entities:
     subject: required
     session: optional
@@ -101,12 +115,14 @@
     run: optional
     processing: optional
 
-# Events files
-- suffixes:
+events:
+  suffixes:
   - events
   extensions:
   - .json
   - .tsv
+  datatypes:
+  - meg
   entities:
     subject: required
     session: optional
@@ -114,23 +130,29 @@
     acquisition: optional
     run: optional
 
-# Head photos
-- suffixes:
+photo:
+  suffixes:
   - photo
   extensions:
   - .jpg
+  - .png
+  - .tif
+  datatypes:
+  - meg
   entities:
     subject: required
     session: optional
     acquisition: optional
 
-# Timeseries
-- suffixes:
+timeseries:
+  suffixes:
   - physio
   - stim
   extensions:
   - .tsv.gz
   - .json
+  datatypes:
+  - meg
   entities:
     subject: required
     session: optional
diff --git a/dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/micr.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/micr.yaml
similarity index 83%
rename from dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/micr.yaml
rename to dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/micr.yaml
index 3af2fb86d..c08072a74 100644
--- a/dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/micr.yaml
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/micr.yaml
@@ -1,6 +1,6 @@
 ---
-# Microscopy
-- suffixes:
+microscopy:
+  suffixes:
   - TEM
   - SEM
   - uCT
@@ -21,9 +21,12 @@
   extensions:
   - .ome.tif
   - .ome.btf
+  - .ome.zarr/
   - .png
   - .tif
   - .json
+  datatypes:
+  - micr
   entities:
     subject: required
     session: optional
@@ -33,12 +36,15 @@
     run: optional
     chunk: optional
 
-- suffixes:
+photo:
+  suffixes:
   - photo
   extensions:
   - .jpg
   - .png
   - .tif
+  datatypes:
+  - micr
   entities:
     subject: required
     session: optional
diff --git a/dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/perf.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/perf.yaml
similarity index 82%
rename from dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/perf.yaml
rename to dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/perf.yaml
index 14b4ffe40..ef97ffb54 100644
--- a/dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/perf.yaml
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/perf.yaml
@@ -1,12 +1,14 @@
 ---
-# First group
-- suffixes:
+asl:
+  suffixes:
   - asl
   - m0scan
   extensions:
   - .nii.gz
   - .nii
   - .json
+  datatypes:
+  - perf
   entities:
     subject: required
     session: optional
@@ -15,12 +17,14 @@
     direction: optional
     run: optional
 
-# Second group
-- suffixes:
+aslcontext:
+  suffixes:
   - aslcontext
   extensions:
   - .tsv
   - .json
+  datatypes:
+  - perf
   entities:
     subject: required
     session: optional
@@ -29,11 +33,13 @@
     direction: optional
     run: optional
 
-# Third group
-- suffixes:
+asllabeling:
+  suffixes:
   - asllabeling
   extensions:
   - .jpg
+  datatypes:
+  - perf
   entities:
     subject: required
     session: optional
@@ -41,13 +47,15 @@
     reconstruction: optional
     run: optional
 
-# Timeseries
-- suffixes:
+timeseries:
+  suffixes:
   - physio
   - stim
   extensions:
   - .tsv.gz
   - .json
+  datatypes:
+  - perf
   entities:
     subject: required
     session: optional
diff --git a/dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/pet.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/pet.yaml
similarity index 83%
rename from dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/pet.yaml
rename to dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/pet.yaml
index 33f1a9f3e..36d8cd3ce 100644
--- a/dandi/support/bids/schemadata/1.7.0+012/rules/datatypes/pet.yaml
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/datatypes/pet.yaml
@@ -1,11 +1,13 @@
 ---
-# PET recordings
-- suffixes:
+pet:
+  suffixes:
   - pet
   extensions:
   - .nii.gz
   - .nii
   - .json
+  datatypes:
+  - pet
   entities:
     subject: required
     session: optional
@@ -14,12 +16,14 @@
     reconstruction: optional
     run: optional
 
-# Blood recordings
-- suffixes:
+blood:
+  suffixes:
   - blood
   extensions:
   - .tsv
   - .json
+  datatypes:
+  - pet
   entities:
     subject: required
     session: optional
@@ -29,12 +33,14 @@
     run: optional
     recording: required
 
-# Events
-- suffixes:
+events:
+  suffixes:
   - events
   extensions:
   - .tsv
   - .json
+  datatypes:
+  - pet
   entities:
     subject: required
     session: optional
@@ -43,13 +49,15 @@
     reconstruction: optional
     run: optional
 
-# Timeseries
-- suffixes:
+timeseries:
+  suffixes:
   - physio
   - stim
   extensions:
   - .tsv.gz
   - .json
+  datatypes:
+  - pet
   entities:
     subject: required
     session: optional
diff --git a/dandi/support/bids/schemadata/1.7.0+012/rules/entities.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/entities.yaml
similarity index 100%
rename from dandi/support/bids/schemadata/1.7.0+012/rules/entities.yaml
rename to dandi/support/bids/schemadata/1.7.0+369/rules/entities.yaml
diff --git a/dandi/support/bids/schemadata/1.7.0+012/rules/modalities.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/modalities.yaml
similarity index 100%
rename from dandi/support/bids/schemadata/1.7.0+012/rules/modalities.yaml
rename to dandi/support/bids/schemadata/1.7.0+369/rules/modalities.yaml
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/anat.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/anat.yaml
new file mode 100644
index 000000000..4df92f0bb
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/anat.yaml
@@ -0,0 +1,34 @@
+#
+# Groups of related metadata fields
+#
+# Assumptions: never need disjunction of selectors
+# Assumptions: top-to-bottom overrides is sufficient logic
+
+
+---
+# Anatomy imaging data
+
+MRIAnatomyCommonMetadataFields:
+    selectors:
+    - modality == "MRI"
+    - datatype == "anat"
+    fields:
+        ContrastBolusIngredient: OPTIONAL
+        RepetitionTimeExcitation: OPTIONAL
+        RepetitionTimePreparation: OPTIONAL
+
+PhaseEntityUnits:
+    selectors:
+    - modality == "MRI"
+    - datatype == "anat"
+    - entities.part == "phase"
+    fields:
+        Unit: REQUIRED
+
+PhaseSuffixUnits:
+    selectors:
+    - modality == "MRI"
+    - datatype == "anat"
+    - suffix == "phase"
+    fields:
+        Unit: REQUIRED
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/asl.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/asl.yaml
new file mode 100644
index 000000000..d711f9fc7
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/asl.yaml
@@ -0,0 +1,285 @@
+#
+# Groups of related metadata fields
+#
+# Assumptions: never need disjunction of selectors
+# Assumptions: top-to-bottom overrides is sufficient logic
+
+
+---
+# Fields described in text, but not in tables
+MRIASLTextOnly:
+    selectors:
+    - modality == "MRI"
+    - datatype == "perf"
+    - suffix == "asl"
+    fields:
+        MagneticFieldStrength: required
+        MRAcquisitionType: required
+        EchoTime: required
+        SliceTiming:
+            level: recommended
+            level_addendum: required if `MRAcquisitionType` is defined as `2D`
+        RepetitionTimePreparation: required
+        FlipAngle:
+            level: recommended
+            level_addendum: required if `LookLocker` is `true`
+
+MRIASLTextOnlySliceTiming:
+    selectors:
+    - modality == "MRI"
+    - datatype == "perf"
+    - suffix == "asl"
+    - '"MRAcquisitionType" in sidecar'
+    - sidecar.MRAcquisitionType == "2D"
+    fields:
+        SliceTiming:
+            level: required
+            issue:
+                code: SLICE_TIMING_NOT_DEFINED_2D_ASL
+                message: |
+                    You should define `SliceTiming` for this file, because `SequenceType` is sets
+                    to a 2D sequence. `SliceTiming` is the time at which each slice was
+                    acquired within each volume (frame) of the acquisition. Slice timing
+                    is not slice order -- rather, it is a list of times containing the
+                    time (in seconds) of each slice acquisition in relation to the beginning
+                    of volume acquisition. The list goes through the slices along the slice
+                    axis in the slice encoding dimension (see below). Note that to ensure the
+                    proper interpretation of the `SliceTiming` field, it is important to check
+                    if the optional `SliceEncodingDirection` exists. In particular, if
+                    `SliceEncodingDirection` is negative, the entries in `SliceTiming` are
+                    defined in reverse order with respect to the slice axis, such that the
+                    final entry in the `SliceTiming` list is the time of acquisition of slice 0.
+                    Without this parameter slice time correction will not be possible.
+
+MRIASLTextOnlyFlipAngle:
+    selectors:
+    - modality == "MRI"
+    - datatype == "perf"
+    - suffix == "asl"
+    - '"LookLocker in sidecar'
+    - sidecar.LookLocker == true
+    fields:
+        FlipAngle:
+            level: required
+            issue:
+                code: LOOK_LOCKER_FLIP_ANGLE_MISSING
+                message: |
+                    You should define `FlipAngle` for this file, in case of a
+                    LookLocker acquisition. `FlipAngle` is the flip angle (FA)
+                    for the acquisition, specified in degrees. Corresponds to
+                    DICOM Tag 0018, 1314 `Flip Angle`. The data type number may
+                    apply to files from any MRI modality concerned with a single
+                    value for this field, or to the files in a file collection
+                    where the value of this field is iterated using the flip entity.
+                    The data type array provides a value for each volume in a 4D
+                    dataset and should only be used when the volume timing is critical
+                    for interpretation of the data, such as in ASL or variable flip
+                    angle fMRI sequences.
+
+# Common metadata fields applicable to both (P)CASL and PASL
+MRIASLCommonMetadataFields:
+    selectors:
+    - modality == "MRI"
+    - datatype == "perf"
+    - suffix == "asl"
+    fields:
+        ArterialSpinLabelingType: required
+        PostLabelingDelay: required
+        BackgroundSuppression: required
+        M0Type: required
+        TotalAcquiredPairs: required
+        VascularCrushing: recommended
+        AcquisitionVoxelSize: recommended
+        M0Estimate:
+            level: optional
+            level_addendum: required if `M0Type` is `Estimate`
+        BackgroundSuppressionNumberPulses:
+            level: optional
+            level_addendum: recommended if `BackgroundSuppression` is `true`
+        BackgroundSuppressionPulseTime:
+            level: optional
+            level_addendum: recommended if `BackgroundSuppression` is `true`
+        VascularCrushingVENC:
+            level: optional
+            level_addendum: recommended if `VascularCrushing` is `true`
+        LabelingOrientation: recommended
+        LabelingDistance: recommended
+        LabelingLocationDescription: recommended
+        LookLocker: optional
+        LabelingEfficiency: optional
+
+MRIASLCommonMetadataFieldsM0Type:
+    selectors:
+    - modality == "MRI"
+    - datatype == "perf"
+    - suffix == "asl"
+    - '"M0Type" in sidecar'
+    - sidecar.M0Type == "Estimate"
+    fields:
+        M0Estimate:
+            level: required
+            issue:
+                code: M0ESTIMATE_NOT_DEFINED
+                message: |
+                    You must define `M0Estimate` for this file, because `M0Type` is set to
+                    'Estimate'. `M0Estimate` is a single numerical whole-brain M0 value
+                    (referring to the M0 of blood), only if obtained externally (for example
+                    retrieved from CSF in a separate measurement).
+
+MRIASLCommonMetadataFieldsBackgroundSuppression:
+    selectors:
+    - modality == "MRI"
+    - datatype == "perf"
+    - suffix == "asl"
+    - '"BackgroundSuppression" in sidecar'
+    - sidecar.BackgroundSuppression == true
+    fields:
+        BackgroundSuppressionNumberPulses: recommended
+        BackgroundSuppressionPulseTime: recommended
+
+MRIASLCommonMetadataFieldsVascularCrushing:
+    selectors:
+    - modality == "MRI"
+    - datatype == "perf"
+    - suffix == "asl"
+    - '"VascularCrushing" in sidecar'
+    - sidecar.VascularCrushing == true
+    fields:
+        VascularCrushingVENC: recommended
+
+MRIASLPCASLSpecific:
+    selectors:
+    - modality == "MRI"
+    - datatype == "perf"
+    - suffix == "asl"
+    - '"ArterialSpinLabelingType" in sidecar'
+    - '["CASL", "PCASL"].includes(sidecar.ArterialSpinLabelingType)'
+    fields:
+        LabelingDuration: required
+        LabelingPulseAverageGradient: recommended
+        LabelingPulseMaximumGradient: recommended
+        LabelingPulseAverageB1: recommended
+        LabelingPulseDuration: recommended
+        LabelingPulseFlipAngle: recommended
+        LabelingPulseInterval: recommended
+
+MRIASLPCASLSpecific2:
+    selectors:
+    - modality == "MRI"
+    - datatype == "perf"
+    - suffix == "asl"
+    - '"ArterialSpinLabelingType" in sidecar'
+    - sidecar.ArterialSpinLabelingType == "PCASL"
+    fields:
+        PCASLType: recommended
+
+MRIASLCASLSpecific:
+    selectors:
+    - modality == "MRI"
+    - datatype == "perf"
+    - suffix == "asl"
+    - '"ArterialSpinLabelingType" in sidecar'
+    - sidecar.ArterialSpinLabelingType == "CASL"
+    fields:
+        CASLType: recommended
+
+MRIASLPASLSpecific:
+    selectors:
+    - modality == "MRI"
+    - datatype == "perf"
+    - suffix == "asl"
+    - '"ArterialSpinLabelingType" in sidecar'
+    - sidecar.ArterialSpinLabelingType == "PASL"
+    fields:
+        BolusCutOffFlag: required
+        PASLType: recommended
+        LabelingSlabThickness: recommended
+        BolusCutOffDelayTime:
+            level: optional
+            level_addendum: required if `BolusCutOffFlag` is `true`
+        BolusCutOffTechnique:
+            level: optional
+            level_addendum: required if `BolusCutOffFlag` is `true`
+
+MRIASLPASLSpecificBolusCutOffFlag:
+    selectors:
+    - modality == "MRI"
+    - datatype == "perf"
+    - suffix == "asl"
+    - '"ArterialSpinLabelingType" in sidecar'
+    - sidecar.ArterialSpinLabelingType == "PASL"
+    - '"BolusCutOffFlag" in sidecar'
+    - sidecar.BolusCutOffFlag == true
+    fields:
+        BolusCutOffDelayTime:
+            level: required
+            issue:
+                code: PASL_BOLUS_CUT_OFF_DELAY_TIME
+                message: |
+                    It is required to define 'BolusCutOffDelayTime' for this file,
+                    when 'BolusCutOffFlag' is set to true. 'BolusCutOffDelayTime' is
+                    the duration between the end of the labeling and the start of the
+                    bolus cut-off saturation pulse(s), in seconds. This can be a number
+                    or array of numbers, of which the values must be non-negative and
+                    monotonically increasing, depending on the number of bolus cut-off
+                    saturation pulses. For Q2TIPS, only the values for the first and last
+                    bolus cut-off saturation pulses are provided. Based on DICOM Tag
+                    0018,925F ASL Bolus Cut-off Delay Time.
+        BolusCutOffTechnique:
+            level: required
+            issue:
+                code: PASL_BOLUS_CUT_OFF_TECHINIQUE
+                message: |
+                    It is required to define `BolusCutOffTechnique` for this file,
+                    when `BolusCutOffFlag` is set to `true`. `BolusCutOffTechnique`,
+                    is the name of the technique used
+                    (for example, Q2TIPS, QUIPSS or QUIPSSII).
+                    Corresponds to DICOM Tag 0018,925E `ASL Bolus Cut-off Technique`.
+
+# m0scan metadata fields
+MRIASLM0ScanTextOnly:
+    selectors:
+    - modality == "MRI"
+    - datatype == "perf"
+    - suffix == "m0scan"
+    fields:
+        EchoTime: required
+        RepetitionTimePreparation: required
+        FlipAngle:
+            level: recommended
+            level_addendum: required if `LookLocker` is `true`
+
+MRIASLM0ScanTextOnlyFlipAngle:
+    selectors:
+    - modality == "MRI"
+    - datatype == "perf"
+    - suffix == "m0scan"
+    - '"LookLocker" in sidecar'
+    - sidecar.LookLocker == true
+    fields:
+        FlipAngle:
+            level: required
+            issue:
+                code: LOOK_LOCKER_FLIP_ANGLE_MISSING
+                message: |
+                    You should define `FlipAngle` for this file, in case of a LookLocker
+                    acquisition. `FlipAngle` is the flip angle (FA) for the acquisition,
+                    specified in degrees. Corresponds to DICOM Tag 0018, 1314 `Flip Angle`.
+                    The data type number may apply to files from any MRI modality concerned
+                    with a single value for this field, or to the files in a file collection
+                    where the value of this field is iterated using the flip entity. The
+                    data type array provides a value for each volume in a 4D dataset and
+                    should only be used when the volume timing is critical for interpretation
+                    of the data, such as in ASL or variable flip angle fMRI sequences.
+
+MRIASLM0Scan:
+    selectors:
+    - modality == "MRI"
+    - datatype == "perf"
+    - suffix == "m0scan"
+    fields:
+        IntendedFor:
+            level: required
+            description_addendum: |
+                This is used to refer to the ASL time series for which the `*_m0scan.nii[.gz]` is intended.
+        AcquisitionVoxelSize: recommended
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/beh.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/beh.yaml
new file mode 100644
index 000000000..d0760eda5
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/beh.yaml
@@ -0,0 +1,21 @@
+#
+# Groups of related metadata fields
+#
+# Assumptions: never need disjunction of selectors
+# Assumptions: top-to-bottom overrides is sufficient logic
+
+
+---
+# Metadata for either beh or events files
+BEHTabularData:
+    selectors:
+    - '["beh", "events"].includes(suffix)'
+    fields:
+        TaskName: recommended
+        Instructions: recommended
+        TaskDescription: recommended
+        CogAtlasID: recommended
+        CogPOID: recommended
+        InstitutionName: recommended
+        InstitutionAddress: recommended
+        InstitutionalDepartmentName: recommended
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/continuous.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/continuous.yaml
new file mode 100644
index 000000000..2607ce1df
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/continuous.yaml
@@ -0,0 +1,26 @@
+#
+# Groups of related metadata fields
+#
+# Assumptions: never need disjunction of selectors
+# Assumptions: top-to-bottom overrides is sufficient logic
+
+
+---
+# Metadata for either physio or stim files
+Continuous:
+    selectors:
+    - '["physio", "stim"].includes(suffix)'
+    fields:
+        SamplingFrequency: required
+        StartTime: required
+        Columns: required
+
+# Other recommended metadata for physiological data
+Physio:
+    selectors:
+    - suffix == "physio"
+    fields:
+        Manufacturer: recommended
+        ManufacturersModelName: recommended
+        SoftwareVersions: recommended
+        DeviceSerialNumber: recommended
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/derivatives/common_derivatives.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/derivatives/common_derivatives.yaml
new file mode 100644
index 000000000..5d01d3683
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/derivatives/common_derivatives.yaml
@@ -0,0 +1,85 @@
+---
+CommonDerivativeFields:
+  selectors:
+  - dataset.DatasetType == "derivative"
+  fields:
+    Description: RECOMMENDED
+    Sources: OPTIONAL
+    RawSources: OPTIONAL
+
+SpatialReferenceEntity:
+  selectors:
+  - dataset.DatasetType == "derivative"
+  - '"space" in entities'
+  fields:
+    SpatialReference: RECOMMENDED
+
+SpatialReferenceNonStandard:
+  selectors:
+  - dataset.DatasetType == "derivative"
+  - 'schema.objects.metadata._StandardTemplateCoordSys).includes(not(entities.space)'
+  fields:
+    SpatialReference: REQUIRED
+
+SpatialReferenceNoEntity:
+  selectors:
+  - dataset.DatasetType == "derivative"
+  - '!("space" in entities)'
+  fields:
+    SpatialReference: REQUIRED
+
+# this needs to come before density and resolution overrides selected in a
+# different way
+MaskDerivatives:
+  selectors:
+  - dataset.DatasetType == "derivative"
+  - suffix == "mask"
+  fields:
+    RawSources: REQUIRED
+    Type: RECOMMENDED
+    Atlas: OPTIONAL
+    Resolution: OPTIONAL
+    Density: OPTIONAL
+
+MaskDerivativesAtlas:
+  selectors:
+  - dataset.DatasetType == "derivative"
+  - suffix == "mask"
+  - '"label" in entities'
+  fields:
+    atlas: RECOMMENDED
+
+SegmentationCommon:
+  selectors:
+  - dataset.DatasetType == "derivative"
+  - '["dseg", "probseg"].includes(suffix)'
+  fields:
+    Type: RECOMMENDED
+    Atlas: OPTIONAL
+    Resolution: OPTIONAL
+    Density: OPTIONAL
+
+# Derivatives -> Imaging data types
+ImageDerivatives:
+  selectors:
+  - dataset.DatasetType == "derivative"
+  - '["mri", "pet"].includes(modality)'
+  - '[".nii", ".nii.gz"].includes(extension)'
+  fields:
+    SkullStripped: REQUIRED
+
+ImageDerivativeResEntity:
+  selectors:
+  - dataset.DatasetType == "derivative"
+  - '["mri", "pet"].includes(modality)'
+  - '"res" in entities'
+  fields:
+    Resolution: REQUIRED
+
+ImageDerivativeDenEntity:
+  selectors:
+  - dataset.DatasetType == "derivative"
+  - '["mri", "pet"].includes(modality)'
+  - '"den" in entities'
+  fields:
+    Density: REQUIRED
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/dwi.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/dwi.yaml
new file mode 100644
index 000000000..0f25d3ee1
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/dwi.yaml
@@ -0,0 +1,25 @@
+#
+# Groups of related metadata fields
+#
+# Assumptions: never need disjunction of selectors
+# Assumptions: top-to-bottom overrides is sufficient logic
+
+
+---
+# Multipart (split) DWI schemes
+# NOTE: I don't think this can be schemafied, since it depends on owner intent.
+MRIDiffusionMultipart:
+    selectors:
+    - modality == "mri"
+    - datatype == "dwi"
+    fields:
+        MultipartID: required
+
+# Other recommended metadata
+MRIDiffusionOtherMetadata:
+    selectors:
+    - modality == "mri"
+    - datatype == "dwi"
+    fields:
+        PhaseEncodingDirection: recommended
+        TotalReadoutTime: recommended
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/eeg.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/eeg.yaml
new file mode 100644
index 000000000..d82715d85
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/eeg.yaml
@@ -0,0 +1,166 @@
+#
+# Groups of related metadata fields
+#
+# Assumptions: never need disjunction of selectors
+# Assumptions: top-to-bottom overrides is sufficient logic
+
+
+---
+
+EEGGeneric:
+    selectors:
+    - modality == "eeg"
+    - datatype == "eeg"
+    - suffix == "eeg"
+    fields:
+        TaskName:
+            level: required
+            description_addendum: |
+                A recommended convention is to name resting state task using labels
+                beginning with `rest`.
+
+EEGRecommended:
+    selectors:
+    - modality == "eeg"
+    - datatype == "eeg"
+    - suffix == "eeg"
+    fields:
+        InstitutionName: recommended
+        InstitutionAddress: recommended
+        InstitutionalDepartmentName: recommended
+        Manufacturer: recommended
+        ManufacturersModelName: recommended
+        SoftwareVersions: recommended
+        TaskDescription: recommended
+        Instructions:
+            level: recommended
+            description_addendum: |
+                This is especially important in context of resting state recordings and
+                distinguishing between eyes open and eyes closed paradigms.
+        CogAtlasID: recommended
+        CogPOID: recommended
+        DeviceSerialNumber: recommended
+
+EEGRequired:
+    selectors:
+    - modality == "eeg"
+    - datatype == "eeg"
+    - suffix == "eeg"
+    fields:
+        EEGReference: required
+        SamplingFrequency:
+            level: required
+            description_addendum: |
+                The sampling frequency of data channels that deviate from the main sampling
+                frequency SHOULD be specified in the `channels.tsv` file.
+        PowerLineFrequency: required
+        SoftwareFilters: required
+
+EEGMoreRecommended:
+    selectors:
+    - modality == "eeg"
+    - datatype == "eeg"
+    - suffix == "eeg"
+    fields:
+        CapManufacturer: recommended
+        CapManufacturersModelName: recommended
+        EEGChannelCount: recommended
+        ECGChannelCount: recommended
+        EMGChannelCount: recommended
+        EOGChannelCount: recommended
+        MiscChannelCount: recommended
+        TriggerChannelCount: recommended
+        RecordingDuration: recommended
+        RecordingType: recommended
+        EpochLength: recommended
+        EEGGround: recommended
+        HeadCircumference: recommended
+        EEGPlacementScheme: recommended
+        HardwareFilters: recommended
+        SubjectArtefactDescription: recommended
+
+# General fields
+EEGCoordsystemGeneral:
+    selectors:
+    - modality == "eeg"
+    - datatype == "eeg"
+    - suffix == "coordsystem"
+    fields:
+        IntendedFor:
+            level: optional
+            description_addendum: |
+                This identifies the MRI or CT scan associated with the electrodes,
+                landmarks, and fiducials.
+
+# Fields relating to the EEG electrode positions
+EEGCoordsystemPositions:
+    selectors:
+    - modality == "eeg"
+    - datatype == "eeg"
+    - suffix == "coordsystem"
+    fields:
+        EEGCoordinateSystem: required
+        EEGCoordinateUnits: required
+        EEGCoordinateSystemDescription:
+            level: recommended
+            level_addendum: required if `EEGCoordinateSystem` is `"Other"`
+
+EEGCoordsystemOther:
+    selectors:
+    - modality == "eeg"
+    - datatype == "eeg"
+    - suffix == "coordsystem"
+    - '"EEGCoordinateSystem" in sidecar'
+    - sidecar.EEGCoordinateSystem == "Other"
+    fields:
+        EEGCoordinateSystemDescription: required
+
+# Fields relating to the position of fiducials measured during an EEG session/run
+EEGCoordsystemFiducials:
+    selectors:
+    - modality == "eeg"
+    - datatype == "eeg"
+    - suffix == "coordsystem"
+    fields:
+        FiducialsDescription: optional
+        FiducialsCoordinates: recommended
+        FiducialsCoordinateSystem: recommended
+        FiducialsCoordinateUnits: recommended
+        FiducialsCoordinateSystemDescription:
+            level: recommended
+            level_addendum: required if `FiducialsCoordinateSystem` is `"Other"`
+
+EEGCoordsystemOtherFiducialCoordinateSystem:
+    selectors:
+    - modality == "eeg"
+    - datatype == "eeg"
+    - suffix == "coordsystem"
+    - FiducialsCoordinateSystem == "Other"
+    fields:
+        FiducialsCoordinateSystemDescription: required
+
+# Fields relating to the position of anatomical landmark measured during an EEG session/run
+EEGCoordsystemLandmark:
+    selectors:
+    - modality == "eeg"
+    - datatype == "eeg"
+    - suffix == "coordsystem"
+    fields:
+        AnatomicalLandmarkCoordinates: recommended
+        AnatomicalLandmarkCoordinateSystem:
+            level: recommended
+            description_addendum: Preferably the same as the `EEGCoordinateSystem`.
+        AnatomicalLandmarkCoordinateUnits: recommended
+        AnatomicalLandmarkCoordinateSystemDescription:
+            level: recommended
+            level_addendum: required if `AnatomicalLandmarkCoordinateSystem` is `"Other"`
+
+EEGCoordsystemAnatomicalLandmarkCoordinateSystemDescription:
+    selectors:
+    - modality == "eeg"
+    - datatype == "eeg"
+    - suffix == "coordsystem"
+    - '"AnatomicalLandmarkCoordinateSystem" in sidecar'
+    - sidecar.AnatomicalLandmarkCoordinateSystem == "Other"
+    fields:
+        AnatomicalLandmarkCoordinateSystemDescription: required
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/entities.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/entities.yaml
new file mode 100644
index 000000000..e6249cfd0
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/entities.yaml
@@ -0,0 +1,81 @@
+#
+# Groups of related metadata fields
+#
+# Assumptions: never need disjunction of selectors
+# Assumptions: top-to-bottom overrides is sufficient logic
+
+
+---
+
+# Entities
+
+EntitiesTaskMetadata:
+    selectors:
+    - '"task" in entities'
+    fields:
+        TaskName: recommended
+
+EntitiesCeMetadata:
+    selectors:
+    - '"ce" in entities'
+    fields:
+        ContrastBolusIngredient: optional
+
+EntitiesTrcMetadata:
+    selectors:
+    - '"trc" in entities'
+    fields:
+        TracerName: required
+
+EntitiesStainMetadata:
+    selectors:
+    - '"stain" in entities'
+    fields:
+        SampleStaining: recommended
+        SamplePrimaryAntibodies: recommended
+        SampleSecondaryAntibodies: recommended
+
+EntitiesEchoMetadata:
+    selectors:
+    - '"echo" in entities'
+    fields:
+        EchoTime: required
+
+EntitiesFlipMetadata:
+    selectors:
+    - '"flip" in entities'
+    fields:
+        FlipAngle: required
+
+EntitiesInvMetadata:
+    selectors:
+    - '"inv" in entities'
+    fields:
+        InversionTime: required
+
+EntitiesMTMetadata:
+    selectors:
+    - '"mt" in entities'
+    fields:
+        MTState: required
+
+EntitiesPartMetadata:
+    selectors:
+    - entities.part == "phase"
+    fields:
+        Units:
+            level: required
+            rules:
+            - '["rad", "arbitrary"].includes(value)'
+
+EntitiesResMetadata:
+    selectors:
+    - '"res" in entities'
+    fields:
+        Resolution: required
+
+EntitiesDenMetadata:
+    selectors:
+    - '"den" in entities'
+    fields:
+        Density: required
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/fmap.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/fmap.yaml
new file mode 100644
index 000000000..bd628a5c1
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/fmap.yaml
@@ -0,0 +1,87 @@
+#
+# Groups of related metadata fields
+#
+# Assumptions: never need disjunction of selectors
+# Assumptions: top-to-bottom overrides is sufficient logic
+
+
+---
+# Fieldmap data
+MRIFieldmapB0FieldIdentifier:
+    selectors:
+    - modality == "MRI"
+    - datatype == "fmap"
+    fields:
+        B0FieldIdentifier: recommended
+
+MRIFieldmapIntendedFor:
+    selectors:
+    - modality == "MRI"
+    - datatype == "fmap"
+    fields:
+        IntendedFor:
+            level: optional
+            description_addendum: |
+                This field is optional, and in case the fieldmaps do not correspond
+                to any particular scans, it does not have to be filled.
+
+# Case 1: Phase-difference map and at least one magnitude image
+MRIFieldmapPhaseDifferencePhasediff:
+    selectors:
+    - modality == "MRI"
+    - datatype == "fmap"
+    - suffix == "phasediff"
+    fields:
+        EchoTime1: required
+        EchoTime2: required
+
+MRIFieldmapPhaseDifferenceMagnitude1:
+    selectors:
+    - modality == "MRI"
+    - datatype == "fmap"
+    - suffix == "magnitude1"
+    fields:
+        EchoTime1: required
+
+MRIFieldmapPhaseDifferenceMagnitude2:
+    selectors:
+    - modality == "MRI"
+    - datatype == "fmap"
+    - suffix == "magnitude2"
+    fields:
+        EchoTime2: required
+
+# Case 2: Two phase maps and two magnitude images
+# NOTE: Need to check for presence of related files.
+# For example, magnitude1 needs EchoTime__fmap only if phase1 file exists,
+# but EchoTime1 if phasediff exists.
+MRIFieldmapTwoPhase:
+    selectors:
+    - modality == "MRI"
+    - datatype == "fmap"
+    - '["phase1", "phase2", "magnitude1", "magnitude2"].includes(suffix)'
+    fields:
+        EchoTime__fmap: required
+
+# Case 3: Direct field mapping
+MRIFieldmapDirectFieldMapping:
+    selectors:
+    - modality == "MRI"
+    - datatype == "fmap"
+    - '["phase", "fieldmap"].includes(suffix)'
+    fields:
+        Units:
+            level: required
+            description_addendum: |
+                Fieldmaps must be in units of Hertz (`"Hz"`),
+                radians per second (`"rad/s"`), or Tesla (`"T"`).
+
+# Case 4: Multiple phase encoded directions ("pepolar")
+MRIFieldmapPepolar:
+    selectors:
+    - modality == "MRI"
+    - datatype == "fmap"
+    - suffix == "epi"
+    fields:
+        PhaseEncodingDirection: required
+        TotalReadoutTime: required
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/func.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/func.yaml
new file mode 100644
index 000000000..9d7cdd012
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/func.yaml
@@ -0,0 +1,110 @@
+#
+# Groups of related metadata fields
+#
+# Assumptions: never need disjunction of selectors
+# Assumptions: top-to-bottom overrides is sufficient logic
+
+
+---
+# Task imaging data
+
+# Required fields
+MRIFuncRequired:
+    selectors:
+    - modality == "mri"
+    - datatype == "func"
+    fields:
+        RepetitionTime: required
+        VolumeTiming: required
+        TaskName:
+            level: required
+            description_addendum: |
+                A recommended convention is to name resting state task using labels
+                beginning with `rest`.
+
+# Timing Parameters
+MRIFuncTimingParameters:
+    selectors:
+    - modality == "mri"
+    - datatype == "func"
+    fields:
+        NumberOfVolumesDiscardedByScanner: recommended
+        NumberOfVolumesDiscardedByUser: recommended
+        DelayTime: recommended
+        AcquisitionDuration:
+            level: recommended
+            level_addendum: |
+                required for sequences that are described with the `VolumeTiming`
+                field and that do not have the `SliceTiming` field set to allow for
+                accurate calculation of "acquisition time"
+            issue:
+                name: VOLUME_TIMING_MISSING_ACQUISITION_DURATION
+                message: |
+                    The field 'VolumeTiming' requires 'AcquisitionDuration' or 'SliceTiming' to be defined.
+        DelayAfterTrigger: recommended
+
+# The mutual exclusion table, spread across 5 definitions
+# NOTE: This introduces a prohibited level
+MRIFuncTimingParametersMutualExclusion1:
+    selectors:
+    - modality == "mri"
+    - datatype == "func"
+    - '"RepetitionTime" in sidecar'
+    fields:
+        AcquisitionDuration: prohibited
+        VolumeTiming: prohibited
+
+MRIFuncTimingParametersMutualExclusion2:
+    selectors:
+    - modality == "mri"
+    - datatype == "func"
+    - '"SliceTiming" in sidecar'
+    - '"VolumeTiming" in sidecar'
+    fields:
+        RepetitionTime: prohibited
+        DelayTime: prohibited
+
+MRIFuncTimingParametersMutualExclusion3:
+    selectors:
+    - modality == "mri"
+    - datatype == "func"
+    - '"AcquisitionDuration" in sidecar'
+    - '"VolumeTiming" in sidecar'
+    fields:
+        RepetitionTime: prohibited
+        DelayTime: prohibited
+
+MRIFuncTimingParametersMutualExclusion4:
+    selectors:
+    - modality == "mri"
+    - datatype == "func"
+    - '"RepetitionTime" in sidecar'
+    - '"SliceTiming" in sidecar'
+    fields:
+        AcquisitionDuration: prohibited
+        VolumeTiming: prohibited
+
+MRIFuncTimingParametersMutualExclusion5:
+    selectors:
+    - modality == "mri"
+    - datatype == "func"
+    - '"RepetitionTime" in sidecar'
+    - '"DelayTime" in sidecar'
+    fields:
+        AcquisitionDuration: prohibited
+        VolumeTiming: prohibited
+
+# fMRI task information
+MRIFuncTaskInformation:
+    selectors:
+    - modality == "mri"
+    - datatype == "func"
+    fields:
+        Instructions:
+            level: recommended
+            description_addendum: |
+                This is especially important in context of resting state recordings and
+                distinguishing between eyes open and eyes closed paradigms.
+        TaskDescription: recommended
+        CogAtlasID: recommended
+        CogPOID: recommended
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/ieeg.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/ieeg.yaml
new file mode 100644
index 000000000..39c4fa907
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/ieeg.yaml
@@ -0,0 +1,144 @@
+#
+# Groups of related metadata fields
+#
+# Assumptions: never need disjunction of selectors
+# Assumptions: top-to-bottom overrides is sufficient logic
+
+
+---
+
+iEEGGeneric:
+    selectors:
+    - modality == "ieeg"
+    - datatype == "ieeg"
+    - suffix == "ieeg"
+    fields:
+        TaskName:
+            level: required
+            description_addendum: |
+                A recommended convention is to name resting state task using labels
+                beginning with `rest`.
+
+iEEGRecommended:
+    selectors:
+    - modality == "ieeg"
+    - datatype == "ieeg"
+    - suffix == "ieeg"
+    fields:
+        InstitutionName: recommended
+        InstitutionAddress: recommended
+        InstitutionalDepartmentName: recommended
+        Manufacturer:
+            level: recommended
+            description_addendum: For example, `"TDT"`, `"Blackrock"`.
+        ManufacturersModelName: recommended
+        SoftwareVersions: recommended
+        TaskDescription: recommended
+        Instructions:
+            level: recommended
+            description_addendum: |
+                This is especially important in context of resting state recordings and
+                distinguishing between eyes open and eyes closed paradigms.
+        CogAtlasID: recommended
+        CogPOID: recommended
+        DeviceSerialNumber: recommended
+
+# Specific iEEG fields MUST be present
+iEEGRequired:
+    selectors:
+    - modality == "ieeg"
+    - datatype == "ieeg"
+    - suffix == "ieeg"
+    fields:
+        iEEGReference: required
+        SamplingFrequency:
+            level: required
+            description_addendum: |
+                The sampling frequency of data channels that deviate from the main sampling
+                frequency SHOULD be specified in the `channels.tsv` file.
+        PowerLineFrequency: required
+        SoftwareFilters": required
+
+# Specific iEEG fields SHOULD be present
+iEEGMoreRecommended:
+    selectors:
+    - modality == "ieeg"
+    - datatype == "ieeg"
+    - suffix == "ieeg"
+    fields:
+        DCOffsetCorrection: deprecated
+        HardwareFilters: recommended
+        ElectrodeManufacturer: recommended
+        ElectrodeManufacturersModelName: recommended
+        ECOGChannelCount: recommended
+        SEEGChannelCount: recommended
+        EEGChannelCount: recommended
+        EOGChannelCount: recommended
+        ECGChannelCount: recommended
+        EMGChannelCount: recommended
+        MiscChannelCount: recommended
+        TriggerChannelCount: recommended
+        RecordingDuration: recommended
+        RecordingType: recommended
+        EpochLength: recommended
+        iEEGGround: recommended
+        iEEGPlacementScheme: recommended
+        iEEGElectrodeGroups: recommended
+        SubjectArtefactDescription: recommended
+
+# Specific iEEG fields MAY be present
+iEEGOptional:
+    selectors:
+    - modality == "ieeg"
+    - datatype == "ieeg"
+    - suffix == "ieeg"
+    fields:
+        ElectricalStimulation: optional
+        ElectricalStimulationParameters: optional
+
+# General fields
+iEEGCoordsystemGeneral:
+    selectors:
+    - modality == "ieeg"
+    - datatype == "ieeg"
+    - suffix == "coordsystem"
+    fields:
+        IntendedFor:
+            level: optional
+            description_addendum: |
+                If only a surface reconstruction is available, this should point to
+                the surface reconstruction file.
+                Note that this file should have the same coordinate system
+                specified in `iEEGCoordinateSystem`.
+                For example, **T1**: `'sub-<label>/ses-<label>/anat/sub-01_T1w.nii.gz'`
+                **Surface**: `'/derivatives/surfaces/sub-<label>/ses-<label>/anat/
+                sub-01_hemi-R_desc-T1w_pial.surf.gii'`
+                **Operative photo**: `'/sub-<label>/ses-<label>/ieeg/
+                sub-0001_ses-01_acq-photo1_photo.jpg'`
+                **Talairach**: `'/derivatives/surfaces/sub-Talairach/ses-01/anat/
+                sub-Talairach_hemi-R_pial.surf.gii'`
+
+# Fields relating to the iEEG electrode positions
+iEEGCoordsystemPositions:
+    selectors:
+    - modality == "ieeg"
+    - datatype == "ieeg"
+    - suffix == "coordsystem"
+    fields:
+        iEEGCoordinateSystem: required
+        iEEGCoordinateUnits: required
+        iEEGCoordinateSystemDescription:
+            level: recommended
+            level_addendum: required if `iEEGCoordinateSystem` is `"Other"`
+        iEEGCoordinateProcessingDescription: recommended
+        iEEGCoordinateProcessingReference: recommended
+
+iEEGCoordsystemOther:
+    selectors:
+    - modality == "ieeg"
+    - datatype == "ieeg"
+    - suffix == "coordsystem"
+    - '"iEEGCoordinateSystem" in sidecar'
+    - sidecar.iEEGCoordinateSystem == "Other"
+    fields:
+        iEEGCoordinateSystemDescription: required
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/meg.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/meg.yaml
new file mode 100644
index 000000000..71de0f30a
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/meg.yaml
@@ -0,0 +1,261 @@
+#
+# Groups of related metadata fields
+#
+# Assumptions: never need disjunction of selectors
+# Assumptions: top-to-bottom overrides is sufficient logic
+
+
+---
+# Magnetoencephalography
+
+# Sidecar JSON (*_meg.json)
+MEGGeneric:
+    selectors:
+    - modality == "meg"
+    - datatype == "meg"
+    - suffix == "meg"
+    fields:
+        TaskName:
+            level: required
+            description_addendum: |
+                A recommended convention is to name resting state task using labels
+                beginning with `rest`.
+
+MEGRecommended:
+    selectors:
+    - modality == "meg"
+    - datatype == "meg"
+    - suffix == "meg"
+    fields:
+        InstitutionName: recommended
+        InstitutionAddress: recommended
+        InstitutionalDepartmentName: recommended
+        Manufacturer:
+            level: recommended
+            description_addendum: |
+                For MEG scanners, this must be one of:
+                `"CTF"`, `"Elekta/Neuromag"`, `"BTi/4D"`, `"KIT/Yokogawa"`,
+                `"ITAB"`, `"KRISS"`, `"Other"`.
+                See [Appendix VII](/99-appendices/07-meg-systems.html) for
+                preferred names.
+        ManufacturersModelName:
+            level: recommended
+            description_addendum: |
+                See [Appendix VII](/99-appendices/07-meg-systems.html) for
+                preferred names.
+        SoftwareVersions: recommended
+        TaskDescription: recommended
+        Instructions:
+            level: recommended
+            description_addendum: |
+                This is especially important in context of resting state recordings and
+                distinguishing between eyes open and eyes closed paradigms.
+        CogAtlasID: recommended
+        CogPOID: recommended
+        DeviceSerialNumber: recommended
+
+# Specific MEG fields MUST be present
+MEGRequired:
+    selectors:
+    - modality == "meg"
+    - datatype == "meg"
+    - suffix == "meg"
+    fields:
+        SamplingFrequency:
+            level: required
+            description_addendum: |
+                The sampling frequency of data channels that deviate from the main sampling
+                frequency SHOULD be specified in the `channels.tsv` file.
+        PowerLineFrequency: required
+        DewarPosition: required
+        SoftwareFilters: required
+        DigitizedLandmarks: required
+        DigitizedHeadPoints: required
+
+# Specific MEG fields SHOULD be present
+MEGMoreRecommended:
+    selectors:
+    - modality == "meg"
+    - datatype == "meg"
+    - suffix == "meg"
+    fields:
+        MEGChannelCount: recommended
+        MEGREFChannelCount: recommended
+        EEGChannelCount: recommended
+        ECOGChannelCount: recommended
+        SEEGChannelCount: recommended
+        EOGChannelCount: recommended
+        ECGChannelCount: recommended
+        EMGChannelCount: recommended
+        MiscChannelCount: recommended
+        TriggerChannelCount: recommended
+        RecordingDuration: recommended
+        RecordingType: recommended
+        EpochLength: recommended
+        ContinuousHeadLocalization: recommended
+        HeadCoilFrequency: recommended
+        MaxMovement: recommended
+        SubjectArtefactDescription: recommended
+        AssociatedEmptyRoom: recommended
+        HardwareFilters: recommended
+
+# Specific EEG fields
+# NOTE: I'm not sure if "EEG is present" is enough to indicate simultaneous EEG/MEG.
+MEGwithEEG:
+    selectors:
+    - modality == "meg"
+    - datatype == "meg"
+    - suffix == "meg"
+    - dataset.modalities.includes('"EEG")
+    fields:
+        EEGPlacementScheme: optional
+        CapManufacturer: optional
+        CapManufacturersModelName: optional
+        EEGReference: optional
+
+# MEG and EEG sensors
+MEGCoordsystemWithEEG:
+    selectors:
+    - modality == "meg"
+    - datatype == "meg"
+    - suffix == "coordsystem"
+    fields:
+        MEGCoordinateSystem: required
+        MEGCoordinateUnits: required
+        MEGCoordinateSystemDescription:
+            level: optional
+            level_addendum: required if `MEGCoordinateSystem` is `Other`
+        EEGCoordinateSystem:
+            level: optional
+            description_addendum: |
+                See [Recording EEG simultaneously with MEG]
+                (/04-modality-specific-files/02-magnetoencephalography.html#recording-eeg-simultaneously-with-meg).
+                Preferably the same as the `MEGCoordinateSystem`.
+        EEGCoordinateUnits: optional
+        EEGCoordinateSystemDescription:
+            level: optional
+            level_addendum: required if `EEGCoordinateSystem` is `Other`
+            description_addendum: |
+                See [Recording EEG simultaneously with MEG]
+                (/04-modality-specific-files/02-magnetoencephalography.html#recording-eeg-simultaneously-with-meg).
+
+# NOTE: The JSON isn't really a sidecar, so "sidecar.MEGCoordinateSystem" is misleading.
+MEGCoordsystemWithEEGMEGCoordinateSystem:
+    selectors:
+    - modality == "meg"
+    - datatype == "meg"
+    - suffix == "coordsystem"
+    - '"MEGCoordinateSystem" in sidecar'
+    - sidecar.MEGCoordinateSystem == "Other"
+    fields:
+        MEGCoordinateSystemDescription: required
+
+# NOTE: Not sure if this requires simult. EEG
+MEGCoordsystemWithEEGEEGCoordinateSystem:
+    selectors:
+    - modality == "meg"
+    - datatype == "meg"
+    - suffix == "coordsystem"
+    - '"EEGCoordinateSystem" in sidecar'
+    - sidecar.EEGCoordinateSystem == "Other"
+    fields:
+        EEGCoordinateSystemDescription: required
+
+# Head localization coils
+MEGCoordsystemHeadLocalizationCoils:
+    selectors:
+    - modality == "meg"
+    - datatype == "meg"
+    - suffix == "coordsystem"
+    fields:
+        HeadCoilCoordinates: optional
+        HeadCoilCoordinateSystem: optional
+        HeadCoilCoordinateUnits: optional
+        HeadCoilCoordinateSystemDescription:
+            level: optional
+            level_addendum: required if `HeadCoilCoordinateSystem` is `Other`
+
+MEGCoordsystemHeadLocalizationCoilsHeadCoilCoordinateSystem:
+    selectors:
+    - modality == "meg"
+    - datatype == "meg"
+    - suffix == "coordsystem"
+    - '"HeadCoilCoordinateSystem" in sidecar'
+    - sidecar.HeadCoilCoordinateSystem == "Other"
+    fields:
+        HeadCoilCoordinateSystemDescription: required
+
+# Digitized head points
+MEGCoordsystemDigitizedHeadPoints:
+    selectors:
+    - modality == "meg"
+    - datatype == "meg"
+    - suffix == "coordsystem"
+    fields:
+        DigitizedHeadPoints: optional
+        DigitizedHeadPointsCoordinateSystem: optional
+        DigitizedHeadPointsCoordinateUnits: optional
+        DigitizedHeadPointsCoordinateSystemDescription:
+            level: optional
+            level_addendum: required if `DigitizedHeadPointsCoordinateSystem` is `Other`
+
+MEGCoordsystemDigitizedHeadPointsDigitizedHeadPointsCoordinateSystem:
+    selectors:
+    - modality == "meg"
+    - datatype == "meg"
+    - suffix == "coordsystem"
+    - '"DigitizedHeadPointsCoordinateSystem" in sidecar'
+    - sidecar.DigitizedHeadPointsCoordinateSystem == "Other"
+    fields:
+        DigitizedHeadPointsCoordinateSystemDescription: required
+
+# Anatomical MRI
+MEGCoordsystemAnatomicalMRI:
+    selectors:
+    - modality == "meg"
+    - datatype == "meg"
+    - suffix == "coordsystem"
+    - dataset.modalities.includes("anat")
+    fields:
+        IntendedFor:
+            level: optional
+            description_addendum: |
+                This is used to identify the structural MRI(s),
+                possibly of different types if a list is specified,
+                to be used with the MEG recording.
+
+# Anatomical landmarks
+MEGCoordsystemAnatomicalLandmarks:
+    selectors:
+    - modality == "meg"
+    - datatype == "meg"
+    - suffix == "coordsystem"
+    fields:
+        AnatomicalLandmarkCoordinates: optional
+        AnatomicalLandmarkCoordinateSystem:
+            level: optional
+            description_addendum: |
+                Preferably the same as the `MEGCoordinateSystem`.
+        AnatomicalLandmarkCoordinateUnits: optional
+        AnatomicalLandmarkCoordinateSystemDescription:
+            level: optional
+            level_addendum: required if `AnatomicalLandmarkCoordinateSystem` is `Other`
+
+MEGCoordsystemAnatomicalLandmarksAnatomicalLandmarkCoordinateSystem:
+    selectors:
+    - modality == "meg"
+    - datatype == "meg"
+    - suffix == "coordsystem"
+    - '"AnatomicalLandmarkCoordinateSystem" in sidecar'
+    - sidecar.AnatomicalLandmarkCoordinateSystem == "Other"
+    fields:
+        AnatomicalLandmarkCoordinateSystemDescription: required
+
+# Fiducials information
+MEGCoordsystemFiducialsInformation:
+    selectors:
+    - modality == "meg"
+    - datatype == "meg"
+    - suffix == "coordsystem"
+    fields:
+        FiducialsDescription: optional
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/micr.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/micr.yaml
new file mode 100644
index 000000000..077dbbba6
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/micr.yaml
@@ -0,0 +1,79 @@
+#
+# Groups of related metadata fields
+#
+# Assumptions: never need disjunction of selectors
+# Assumptions: top-to-bottom overrides is sufficient logic
+
+
+---
+# Device Hardware
+MicroscopyDeviceHardware:
+    selectors:
+    - modality == "micr"
+    - datatype == "micr"
+    fields:
+        Manufacturer: recommended
+        ManufacturersModelName: recommended
+        DeviceSerialNumber: recommended
+        StationName: recommended
+        SoftwareVersions: recommended
+        InstitutionName: recommended
+        InstitutionAddress: recommended
+        InstitutionalDepartmentName: recommended
+
+# Image Acquisition
+MicroscopyImageAcquisition:
+    selectors:
+    - modality == "micr"
+    - datatype == "micr"
+    fields:
+        PixelSize: required
+        PixelSizeUnits: required
+        Immersion: optional
+        NumericalAperture: optional
+        Magnification: optional
+        ImageAcquisitionProtocol: optional
+        OtherAcquisitionParameters: optional
+
+# Sample
+MicroscopySample:
+    selectors:
+    - modality == "micr"
+    - datatype == "micr"
+    fields:
+        BodyPart:
+            level: recommended
+            description_addendum: |
+                From [DICOM Body Part Examined](http://dicom.nema.org/medical/dicom/current/
+                output/chtml/part16/chapter_L.html#chapter_L)
+                (for example `"BRAIN"`).
+        BodyPartDetails: recommended
+        BodyPartDetailsOntology: optional
+        SampleEnvironment: recommended
+        SampleEmbedding: optional
+        SampleFixation: optional
+        SampleStaining: recommended
+        SamplePrimaryAntibody: recommended
+        SampleSecondaryAntibody: recommended
+        SliceThickness: optional
+        TissueDeformationScaling: optional
+        SampleExtractionProtocol: optional
+        SampleExtractionInstitution: optional
+
+# Chunk Transformations
+MicroscopyChunkTransformations:
+    selectors:
+    - modality == "micr"
+    - datatype == "micr"
+    - '"chunk" in entities'
+    fields:
+        ChunkTransformationMatrix: recommended
+
+MicroscopyChunkTransformationsMatrixAxis:
+    selectors:
+    - modality == "micr"
+    - datatype == "micr"
+    - '"chunk" in entities'
+    - '"ChunkTransformationMatrix" in sidecar'
+    fields:
+        ChunkTransformationMatrixAxis: required
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/mri.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/mri.yaml
new file mode 100644
index 000000000..058e2dab0
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/mri.yaml
@@ -0,0 +1,263 @@
+#
+# Groups of related metadata fields
+#
+# Assumptions: never need disjunction of selectors
+# Assumptions: top-to-bottom overrides is sufficient logic
+
+
+---
+# MRI Common metadata fields
+MRIScannerHardware:
+    selectors:
+    - modality == "mri"
+    fields:
+        Manufacturer:
+            level: recommended
+            description_addendum: Corresponds to DICOM Tag 0008, 0070 `Manufacturer`.
+        ManufacturersModelName:
+            level: recommended
+            description_addendum: Corresponds to DICOM Tag 0008, 1090 `Manufacturers Model Name`.
+        DeviceSerialNumber:
+            level: recommended
+            description_addendum: Corresponds to DICOM Tag 0018, 1000 `DeviceSerialNumber`.
+        StationName:
+            level: recommended
+            description_addendum: Corresponds to DICOM Tag 0008, 1010 `Station Name`.
+        SoftwareVersions:
+            level: recommended
+            description_addendum: Corresponds to DICOM Tag 0018, 1020 `Software Versions`.
+        HardcopyDeviceSoftwareVersion: DEPRECATED
+        MagneticFieldStrength:
+            level: recommended, but required for Arterial Spin Labeling
+        ReceiveCoilName: recommended
+        ReceiveCoilActiveElements: recommended
+        GradientSetType: recommended
+        MRTransmitCoilSequence: recommended
+        MatrixCoilMode: recommended
+        CoilCombinationMethod: recommended
+
+MRISequenceSpecifics:
+    selectors:
+    - modality == "mri"
+    fields:
+        PulseSequenceType: recommended
+        ScanningSequence: recommended
+        SequenceVariant: recommended
+        ScanOptions: recommended
+        SequenceName: recommended
+        PulseSequenceDetails: recommended
+        NonlinearGradientCorrection: |
+            recommended, but required if [PET](./09-positron-emission-tomography.md) data are present
+        MRAcquisitionType: recommended, but required for Arterial Spin Labeling
+        MTState: recommended
+        MTOffsetFrequency: optional
+        MTPulseBandwidth: optional
+        MTNumberOfPulses: optional
+        MTPulseShape: optional
+        MTPulseDuration: optional
+        SpoilingState: recommended
+        SpoilingType: optional
+        SpoilingRFPhaseIncrement: optional
+        SpoilingGradientMoment: optional
+        SpoilingGradientDuration: optional
+
+PETMRISequenceSpecifics:
+    selectors:
+    - modality == "mri"
+    - dataset.modalities.includes("PET")
+    fields:
+        NonLinearGradientCorrection: required
+
+ASLMRISequenceSpecifics:
+    selectors:
+    - modality == "mri"
+    - datatype == "perf"
+    fields:
+        MRAcquisitionType: required
+
+MTParameters:
+    selectors:
+    - '"MTState" in sidecar'
+    - sidecar.MTState == "True"
+    fields:
+        MTOffsetFrequency: recommended
+        MTPulseBandwidth: recommended
+        MTNumberOfPulses: recommended
+        MTPulseShape: recommended
+        MTPulseDuration: recommended
+
+SpoilingType:
+    selectors:
+    - '"SpoilingState" in sidecar'
+    - sidecar.SpoilingState == true
+    fields:
+        SpoilingType: recommended
+
+SpoilingRF:
+    selectors:
+    - '"SpoilingType" in sidecar'
+    - '["RF", "COMBINED"].includes(sidecar.SpoilingType)'
+    fields:
+        SpoilingRFPhaseIncrement: recommended
+
+SpoilingGradient:
+    selectors:
+    - '"SpoilingType" in sidecar'
+    - '["GRADIENT", "COMBINED"].includes(sidecar.SpoilingType)'
+    fields:
+        SpoilingGradientMoment: recommended
+        SpoilingGradientDuration: recommended
+
+MRISpatialEncoding:
+    selectors:
+    - modality == "mri"
+    fields:
+        NumberShots: recommended
+        ParallelReductionFactorInPlane: recommended
+        ParallelAcquisitionTechnique: recommended
+        PartialFourier: recommended
+        PartialFourierDirection: recommended
+        PhaseEncodingDirection:
+            level: recommended
+            level_addendum: |
+                This parameter is required if corresponding fieldmap data is present
+                or when using multiple runs with different phase encoding directions
+                (which can be later used for field inhomogeneity correction).
+            issue:
+                name: PHASE_ENCODING_DIRECTION_MUST_DEFINE
+                issue: |
+                    You have to define 'PhaseEncodingDirection' for this file.
+        EffectiveEchoSpacing:
+            level: recommended
+            level_addendum: |
+                <sup>2</sup> This parameter is required if corresponding fieldmap data
+                is present.
+            issue:
+                name: EFFECTIVE_ECHO_SPACING_NOT_DEFINED
+                message: |
+                    You should define 'EffectiveEchoSpacing' for this file. If you don't
+                    provide this information field map correction will not be possible.
+        TotalReadoutTime:
+            level: recommended
+            level_addendum: |
+                <sup>3</sup> This parameter is required if corresponding 'field/distortion' maps
+                acquired with opposing phase encoding directions are present
+                (see [Case 4: Multiple phase encoded
+                directions](#case-4-multiple-phase-encoded-directions-pepolar)).
+            issue:
+                name: TOTAL_READOUT_TIME_MUST_DEFINE
+                message: |
+                    You have to define 'TotalReadoutTime' for this file.
+        MixingTime: recommended
+
+MRITimingParameters:
+    selectors:
+    - modality == "mri"
+    fields:
+        EchoTime:
+            level: recommended
+            level_addendum: |
+                required if corresponding fieldmap data is present,
+                or the data comes from a multi-echo sequence or Arterial Spin Labeling.
+            issue:
+                name: ECHO_TIME_NOT_DEFINED
+                message: |
+                    You must define 'EchoTime' for this file. 'EchoTime' is the echo time (TE)
+                    for the acquisition, specified in seconds. Corresponds to DICOM Tag
+                    0018, 0081 Echo Time (please note that the DICOM term is in milliseconds
+                    not seconds). The data type number may apply to files from any MRI modality
+                    concerned with a single value for this field, or to the files in a file
+                    collection where the value of this field is iterated using the echo entity.
+                    The data type array provides a value for each volume in a 4D dataset and
+                    should only be used when the volume timing is critical for interpretation
+                    of the data, such as in ASL or variable echo time fMRI sequences.
+        InversionTime: recommended
+        SliceTiming:
+            level: recommended
+            level_addendum: |
+                required for sparse sequences that do not have the `DelayTime` field set,
+                and Arterial Spin Labeling with `MRAcquisitionType` set on `2D`.
+        SliceEncodingDirection: recommended
+        DwellTime: recommended
+
+SliceTimingASL:
+    selectors:
+    - modality == "mri"
+    - datatype == "perf"
+    - '["asl", "m0scan"].includes(suffix)'
+    - '"MRAcquisitionType" in sidecar'
+    - sidecar.MRAcquisitionType == "2D"
+    fields:
+        SliceTiming: required
+
+# This is technically for sparse sequences only, but I don't know how to encode that.
+SliceTimingSparse:
+    selectors:
+    - modality == "mri"
+    - '"DelayTime" in sidecar'
+    fields:
+        SliceTiming: required
+
+MRIRFandContrast:
+    selectors:
+    - modality == "mri"
+    fields:
+        FlipAngle:
+            level: recommended
+            level_addendum: required if LookLocker is set to `true`.
+            issue:
+                name: LOOK_LOCKER_FLIP_ANGLE_MISSING
+                message: |
+                    You should define 'FlipAngle' for this file, in
+                    case of a LookLocker acquisition. 'FlipAngle' is the
+                    flip angle (FA) for the acquisition, specified in degrees.
+                    Corresponds to: DICOM Tag 0018, 1314 `Flip Angle`. The data
+                    type number may apply to files from any MRI modality concerned
+                    with a single value for this field, or to the files in a file
+                    collection where the value of this field is iterated using the
+                    flip entity. The data type array provides a value for each volume
+                    in a 4D dataset and should only be used when the volume timing is
+                    critical for interpretation of the data, such as in ASL or
+                    variable flip angle fMRI sequences.
+        NegativeContrast: optional
+
+MRIFlipAngleLookLocker:
+    selectors:
+    - modality == "mri"
+    - '"LookLocker" in sidecar'
+    - sidecar.LookLocker == True
+    fields:
+        FlipAngle: required
+
+MRISliceAcceleration:
+    selectors:
+    - modality == "mri"
+    fields:
+        MultibandAccelerationFactor: recommended
+
+MRIAnatomicalLandmarks:
+    selectors:
+    - modality == "mri"
+    fields:
+        AnatomicalLandmarkCoordinates__mri: recommended
+
+MRIEchoPlanarImagingAndB0Mapping:
+    selectors:
+    - modality == "mri"
+    fields:
+        B0FieldIdentifier: recommended
+        B0FieldSource: recommended
+
+MRIInstitutionInformation:
+    selectors:
+    - modality == "mri"
+    fields:
+        InstitutionName:
+            level: recommended
+            description_addendum: Corresponds to DICOM Tag 0008, 0080 `InstitutionName`.
+        InstitutionAddress:
+            level: recommended
+            description_addendum: Corresponds to DICOM Tag 0008, 0081 `InstitutionAddress`.
+        InstitutionalDepartmentName:
+            level: recommended
+            description_addendum: Corresponds to DICOM Tag 0008, 1040 `Institutional Department Name`.
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/pet.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/pet.yaml
new file mode 100644
index 000000000..6399eb5e6
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/sidecars/pet.yaml
@@ -0,0 +1,183 @@
+---
+# PET common metadata fields
+PETScannerHardware:
+    selectors:
+    - modality == "pet"
+    fields:
+        Manufacturer:
+            level: required
+            description_addendum: Corresponds to DICOM Tag 0008, 0070 `Manufacturer`.
+        ManufacturersModelName:
+            level: required
+            description_addendum: Corresponds to DICOM Tag 0008, 1090 `Manufacturers Model Name`.
+        Units:
+            level: required
+            description_addendum: |
+                SI unit for radioactivity (Becquerel) should be used (for example, "Bq/mL").
+                Corresponds to DICOM Tag 0054, 1001 `Units`.
+        InstitutionName:
+            level: recommended
+            description_addendum: Corresponds to DICOM Tag 0008, 0080 `InstitutionName`.
+        InstitutionAddress:
+            level: recommended
+            description_addendum: Corresponds to DICOM Tag 0008, 0081 `InstitutionAddress`.
+        InstitutionalDepartmentName:
+            level: recommended
+            description_addendum: Corresponds to DICOM Tag 0008, 1040 `Institutional Department Name`.
+        BodyPart:
+            level: recommended
+            description_addendum: Corresponds to DICOM Tag 0018, 0015 `Body Part Examined`.
+
+PETRadioChemistry:
+    selectors:
+    - modality == "pet"
+    fields:
+        TracerName:
+            level: required
+        TracerRadionuclide:
+            level: required
+        InjectedRadioactivity:
+            level: required
+        InjectedRadioactivityUnits:
+            level: required
+        InjectedMass:
+            level: required
+        InjectedMassUnits:
+            level: required
+        SpecificRadioactivity:
+            level: required
+        SpecificRadioactivityUnits:
+            level: required
+        ModeOfAdministration:
+            level: required
+        TracerRadLex:
+            level: recommended
+        TracerSNOMED:
+            level: recommended
+        TracerMolecularWeight:
+            level: recommended
+        TracerMolecularWeightUnits:
+            level: recommended
+        InjectedMassPerWeight:
+            level: recommended
+        InjectedMassPerWeightUnits:
+            level: recommended
+        SpecificRadioactivityMeasTime:
+            level: recommended
+        MolarActivity:
+            level: recommended
+        MolarActivityUnits:
+            level: recommended
+        MolarActivityMeasTime:
+            level: recommended
+        InfusionRadioactivity:
+            level: recommended
+            level_addendum: required if PETRadioChemistry.fields.ModeOfAdministration == 'bolus-infusion'
+        InfusionStart:
+            level: recommended
+            level_addendum: required if PETRadioChemistry.fields.ModeOfAdministration == 'bolus-infusion'
+        InfusionSpeed:
+            level: recommended
+            level_addendum: required if PETRadioChemistry.fields.ModeOfAdministration == 'bolus-infusion'
+        InfusionSpeedUnits:
+            level: recommended
+            level_addendum: required if PETRadioChemistry.fields.ModeOfAdministration == 'bolus-infusion'
+        InjectedVolume:
+            level: recommended
+            level_addendum: required if PETRadioChemistry.fields.ModeOfAdministration == 'bolus-infusion'
+        Purity:
+            level: recommended
+
+# PET Infusion conditionally required entities
+EntitiesBolusMetadata:
+    selectors:
+    - modality == "pet"
+    - sidecar.ModeOfAdministration == 'bolus-infusion'
+    fields:
+        InfusionRadioactivity:
+            level: required
+        InfusionStart:
+            level: required
+        InfusionSpeed:
+            level: required
+        InfusionSpeedUnits:
+            level: required
+        InjectedVolume:
+            level: required
+
+PETPharmaceuticals:
+    selectors:
+    - modality == "pet"
+    fields:
+        PharmaceuticalName:
+            level: recommended
+        PharmaceuticalDoseAmount:
+            level: recommended
+        PharmaCeuticalDoseUnits:
+            level: recommended
+        PharmaCeuticalDoseRegimen:
+            level: recommended
+        PharmaCeuticalDoseTime:
+            level: recommended
+        Anaesthesia:
+            level: optional
+
+PETTime:
+    selectors:
+    - modality == "pet"
+    fields:
+        TimeZero:
+            level: required
+        ScanStart:
+            level: required
+        InjectionStart:
+            level: required
+        FramesTimesStart:
+            level: required
+        FrameDuration:
+            level: required
+        InjectionEnd:
+            level: recommended
+        ScanDate:
+            level: deprecated
+
+PETReconstruction:
+    selectors:
+    - modality == "pet"
+    fields:
+        AcquisitionMode:
+            level: required
+        ImageDecayCorrected:
+            level: required
+        ImageDecayCorrectionTime:
+            level: required
+        ReconMethodName:
+            level: required
+        ReconMethodParameterLabels:
+            level: required
+        ReconMethodParameterUnits:
+            level: required
+        ReconMethodParameterValues:
+            level: required
+        ReconFilterType:
+            level: required
+        ReconFilterSize:
+            level: required
+        AttenuationCorrection:
+            level: required
+        ReconMethodImplementationVersion:
+            level: recommended
+        AttenuationCorrectionMethodReference:
+            level: recommended
+        ScaleFactor:
+            level: recommended
+        ScatterFraction:
+            level: recommended
+        DecayCorrectionFactor:
+            level: recommended
+        DoseCalibrationFactor:
+            level: recommended
+        PromptRate:
+            level: recommended
+        SinglesRate:
+            level: recommended
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/derivatives/common_derivatives.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/derivatives/common_derivatives.yaml
new file mode 100644
index 000000000..73df02e2d
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/derivatives/common_derivatives.yaml
@@ -0,0 +1,11 @@
+---
+SegmentationLookup:
+  selectors:
+  - dataset.DatasetType == "derivative"
+  - '["dseg", "probseg"].includes(suffix)'
+  columns:
+    index: REQUIRED
+    name: REQUIRED
+    abbreviation: OPTIONAL
+    color: OPTIONAL
+    mapping: OPTIONAL
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/eeg.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/eeg.yaml
new file mode 100644
index 000000000..742a6856e
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/eeg.yaml
@@ -0,0 +1,43 @@
+---
+EEGChannels:
+    selectors:
+    - datatype == "eeg"
+    - suffix == "channels"
+    - extension == ".tsv"
+    initial_columns:
+    - name__channels
+    - type__eeg_channels
+    - units
+    columns:
+        name__channels: required
+        type__eeg_channels: required
+        units: required
+        description: optional
+        sampling_frequency: optional
+        reference: optional
+        low_cutoff: optional
+        high_cutoff: optional
+        notch: optional
+        status: optional
+        status_descriptions: optional
+    additional_columns: allowed_if_defined
+
+EEGElectrodes:
+    selectors:
+    - datatype == "eeg"
+    - suffix == "electrodes"
+    - extension == ".tsv"
+    initial_columns:
+    - name__electrodes
+    - x
+    - y
+    - z
+    columns:
+        name__electrodes: required
+        x: required
+        y: required
+        z: required
+        type__electrodes: recommended
+        material: recommended
+        impedance: recommended
+    additional_columns: allowed_if_defined
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/ieeg.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/ieeg.yaml
new file mode 100644
index 000000000..36bde71c5
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/ieeg.yaml
@@ -0,0 +1,49 @@
+---
+iEEGChannels:
+    selectors:
+    - datatype == "ieeg"
+    - suffix == "channels"
+    - extension == ".tsv"
+    initial_columns:
+    - name__channels
+    - type__ieeg_channels
+    - units
+    columns:
+        name__channels: required
+        type__ieeg_channels: required
+        units: required
+        low_cutoff: required
+        high_cutoff: required
+        reference: optional
+        group: optional
+        sampling_frequency: optional
+        description: optional
+        notch: optional
+        status: optional
+        status_descriptions: optional
+    additional_columns: allowed_if_defined
+
+iEEGElectrodes:
+    selectors:
+    - datatype == "ieeg"
+    - suffix == "electrodes"
+    - extension == ".tsv"
+    initial_columns:
+    - name__electrodes
+    - x
+    - y
+    - z
+    columns:
+        name__electrodes: required
+        x: required
+        y: required
+        z: required
+        size: required
+        material: recommended
+        manufacturer: recommended
+        group: recommended
+        hemisphere: recommended
+        type__electrodes: optional
+        impedance: optional
+        dimension: optional
+    additional_columns: allowed_if_defined
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/meg.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/meg.yaml
new file mode 100644
index 000000000..ed6aeda5c
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/meg.yaml
@@ -0,0 +1,23 @@
+---
+MEGChannels:
+    selectors:
+    - datatype == "meg"
+    - suffix == "channels"
+    - extension == ".tsv"
+    initial_columns:
+    - name__channels
+    - type__meg_channels
+    - units
+    columns:
+        name__channels: required
+        type__meg_channels: required
+        units: required
+        description: optional
+        sampling_frequency: optional
+        low_cutoff: optional
+        high_cutoff: optional
+        notch: optional
+        software_filters: optional
+        status: optional
+        status_descriptions: optional
+    additional_columns: allowed_if_defined
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/perf.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/perf.yaml
new file mode 100644
index 000000000..4ced4b5e7
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/perf.yaml
@@ -0,0 +1,8 @@
+---
+ASLContext:
+    selectors:
+    - datatype == "perf"
+    - suffix == "aslcontext"
+    columns:
+        volume_type: REQUIRED
+    additional_columns: not_allowed
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/pet.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/pet.yaml
new file mode 100644
index 000000000..7dfb2c051
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/pet.yaml
@@ -0,0 +1,52 @@
+---
+Blood:
+    selectors:
+    - modality == "pet"
+    - suffix == "blood"
+    - extension == ".tsv"
+    columns:
+        time: required
+        plasma_radioactivity: optional
+        metabolite_parent_fraction: optional
+        metabolite_polar_fraction: optional
+        hplc_recovery_fractions: optional
+        whole_blood_radioactivity: optional
+
+BloodPlasma:
+    selectors:
+    - modality == "pet"
+    - suffix == "blood"
+    - extension == ".tsv"
+    - '"PlasmaAvail" in sidecar'
+    columns:
+        plasma_radioactivity: required
+
+BloodMetabolite:
+    selectors:
+    - modality == "pet"
+    - suffix == "blood"
+    - extension == ".tsv"
+    - '"MetaboliteAvail" in sidecar'
+    columns:
+        metabolite_parent_fraction: required
+        metabolite_polar_fraction: recommended
+
+BloodMetaboliteCorrection:
+    selectors:
+    - modality == "pet"
+    - suffix == "blood"
+    - extension == ".tsv"
+    - '"MetaboliteRecoveryCorrectionApplied" in sidecar'
+    - sidecar.MetaboliteRecoveryCorrectionApplied == true
+    columns:
+        hplc_recovery_fractions: required
+
+BloodWholeBlood:
+    selectors:
+    - modality == "pet"
+    - suffix == "blood"
+    - extension == ".tsv"
+    - '"WholeBloodAvail" in sidecar'
+    - sidecar.WholeBloodAvail == true
+    columns:
+        whole_blood_radioactivity: required
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/physio.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/physio.yaml
new file mode 100644
index 000000000..e8d122f6e
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/physio.yaml
@@ -0,0 +1,9 @@
+---
+PhysioColumns:
+    selectors:
+    - suffix == "physio"
+    columns:
+        cardiac: OPTIONAL
+        respiratory: OPTIONAL
+        trigger: OPTIONAL
+    additional_columns: allowed
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/task.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/task.yaml
new file mode 100644
index 000000000..a714e7161
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_data/task.yaml
@@ -0,0 +1,15 @@
+---
+TaskEvents:
+    selectors:
+    - '"task" in entities'
+    - suffix == "events"
+    columns:
+        onset: REQUIRED
+        duration: REQUIRED
+        sample: OPTIONAL
+        trial_type: OPTIONAL
+        response_time: OPTIONAL
+        value: OPTIONAL
+        HED: OPTIONAL
+        stim_file: OPTIONAL
+    additional_columns: allowed
diff --git a/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_metadata.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_metadata.yaml
new file mode 100644
index 000000000..6b1ec9baa
--- /dev/null
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/tabular_metadata.yaml
@@ -0,0 +1,18 @@
+---
+scans:
+  suffixes:
+  - scans
+  extensions:
+  - .tsv
+  - .json
+  entities:
+    subject: required
+    session: optional  # session is required if session is present in the dataset.
+sessions:  # This file may only exist if session is present in the dataset.
+  suffixes:
+  - sessions
+  extensions:
+  - .tsv
+  - .json
+  entities:
+    subject: required
diff --git a/dandi/support/bids/schemadata/1.7.0+012/rules/top_level_files.yaml b/dandi/support/bids/schemadata/1.7.0+369/rules/top_level_files.yaml
similarity index 93%
rename from dandi/support/bids/schemadata/1.7.0+012/rules/top_level_files.yaml
rename to dandi/support/bids/schemadata/1.7.0+369/rules/top_level_files.yaml
index f24133deb..cc776648c 100644
--- a/dandi/support/bids/schemadata/1.7.0+012/rules/top_level_files.yaml
+++ b/dandi/support/bids/schemadata/1.7.0+369/rules/top_level_files.yaml
@@ -3,6 +3,9 @@ README:
   required: true
   extensions:
   - None
+  - .md
+  - .rst
+  - .txt
 CHANGES:
   required: true
   extensions:

From 8405a990e78214484b21f9db4d83c3f804b40bc3 Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Fri, 8 Jul 2022 00:50:19 -0400
Subject: [PATCH 03/28] Reverting to DANDI fork of bids-examples

---
 dandi/tests/fixtures.py               |  2 +-
 dandi/tests/test_bids_validator_xs.py | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/dandi/tests/fixtures.py b/dandi/tests/fixtures.py
index 5120a7d0d..7a8b21998 100644
--- a/dandi/tests/fixtures.py
+++ b/dandi/tests/fixtures.py
@@ -226,7 +226,7 @@ def fixture() -> Iterator[str]:
 
 
 nwb_test_data = get_gitrepo_fixture("http://github.com/dandi-datasets/nwb_test_data")
-bids_examples = get_gitrepo_fixture("https://github.com/bids-standard/bids-examples")
+bids_examples = get_gitrepo_fixture("https://github.com/dandi/bids-examples")
 
 LOCAL_DOCKER_DIR = Path(__file__).with_name("data") / "dandiarchive-docker"
 LOCAL_DOCKER_ENV = LOCAL_DOCKER_DIR.name
diff --git a/dandi/tests/test_bids_validator_xs.py b/dandi/tests/test_bids_validator_xs.py
index 56c9d1d70..fb91ff225 100644
--- a/dandi/tests/test_bids_validator_xs.py
+++ b/dandi/tests/test_bids_validator_xs.py
@@ -12,6 +12,9 @@
     "qmri_tb1tfl",
     "qmri_vfa/derivatives/qMRLab",
 ]
+BIDS_EXAMPLES_BLACKLIST = [
+    "invalid_pet001",
+]
 
 TEST_SCHEMA_PATH = "{module_path}/support/bids/schemadata/1.7.0+369"
 
@@ -348,3 +351,16 @@ def test_bids_datasets(bids_examples, tmp_path):
     )
     # Have all files been validated?
     assert len(result["path_tracking"]) == 0
+
+
+def test_error_datasets(bids_examples):
+    from dandi.bids_validator_xs import validate_bids
+
+    # Validate per dataset, with automatic schema selection:
+    for i in os.listdir(bids_examples):
+        if i in BIDS_EXAMPLES_BLACKLIST:
+            result = validate_bids(
+                os.path.join(bids_examples, i),
+            )
+            # Are there non-validated files?
+            assert len(result["path_tracking"]) != 0

From fc5a72045c173992e01fc5c1a812dd17975bf3d8 Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Fri, 8 Jul 2022 01:08:14 -0400
Subject: [PATCH 04/28] Docstring fix

---
 dandi/validate.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dandi/validate.py b/dandi/validate.py
index b0d857537..30b1599a2 100644
--- a/dandi/validate.py
+++ b/dandi/validate.py
@@ -36,7 +36,7 @@ def validate_bids(
     Notes
     -----
     Can be used from bash, as:
-        DANDI_DEVEL=1 dandi validate-bids --schema="1.7.0+012+dandi001" --report="my.log" /my/path
+        DANDI_DEVEL=1 dandi validate-bids --report="my.log" /my/path
     """
     from .bids_validator_xs import validate_bids as validate_bids_
 

From 4baf68974d361ae00dc9eba455290768f89a1a1a Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Fri, 8 Jul 2022 01:30:45 -0400
Subject: [PATCH 05/28] Record BIDS schema version, analogous to:

https://github.com/bids-standard/bids-specification/pull/1138/commits/e1eaea38b58d80f08dce474b207bda93dcd228fe
---
 dandi/bids_validator_xs.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/dandi/bids_validator_xs.py b/dandi/bids_validator_xs.py
index 3e0cd95cf..958eb6d71 100644
--- a/dandi/bids_validator_xs.py
+++ b/dandi/bids_validator_xs.py
@@ -799,6 +799,20 @@ def validate_bids(
         pseudofile_suffixes=pseudofile_suffixes,
     )
 
+    # Record schema version.
+    # Not sure whether to incorporate in validation_result.
+    if bids_schema_dir == os.path.join(
+        os.path.abspath(os.path.dirname(__file__)),
+        "data",
+        "schema",
+    ):
+        # Declare we are using live version,
+        # string will evaluate as larger than numbered versions.
+        schema_version = "99999.0.0"
+    else:
+        _, schema_version = os.path.split(bids_schema_dir)
+    validation_result["bids_schema_version"] = schema_version
+
     log_errors(validation_result)
 
     if report_path:

From 34a2af2e8e7633072fc1e2b635d3a1018aec95e9 Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Fri, 8 Jul 2022 20:39:59 -0400
Subject: [PATCH 06/28] Logging to appdirs when BIDS validation is called via
 DANDI wrapper

---
 dandi/bids_validator_xs.py |  5 ++---
 dandi/cli/cmd_validate.py  |  9 ++-------
 dandi/metadata.py          |  2 +-
 dandi/validate.py          | 19 ++++++++++++++++---
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/dandi/bids_validator_xs.py b/dandi/bids_validator_xs.py
index 958eb6d71..384594c32 100644
--- a/dandi/bids_validator_xs.py
+++ b/dandi/bids_validator_xs.py
@@ -467,7 +467,7 @@ def validate_all(
 
 def write_report(
     validation_result,
-    report_path="/var/tmp/bids-validator/report_{datetime}-{pid}.log",
+    report_path="/var/tmp/bids-validator-report_{datetime}-{pid}.log",
     datetime_format="%Y%m%d%H%M%SZ",
 ):
     """Write a human-readable report based on the validation result.
@@ -482,8 +482,7 @@ def write_report(
     report_path : str, optional
         A path under which the report is to be saved, `datetime`, and `pid`
         are available as variables for string formatting, and will be expanded to the
-        current datetime (as per the `datetime_format` parameter)
-        and process ID, respectively.
+        current datetime (as per the `datetime_format` parameter) and process ID, respectively.
     datetime_format : str, optional
         A datetime format, optionally used for the report path.
 
diff --git a/dandi/cli/cmd_validate.py b/dandi/cli/cmd_validate.py
index 553e40a69..39e1c344e 100644
--- a/dandi/cli/cmd_validate.py
+++ b/dandi/cli/cmd_validate.py
@@ -10,13 +10,11 @@
 @devel_option(
     "--schema", help="Validate against new BIDS schema version", metavar="VERSION"
 )
-@click.option("--report", help="Specify path to write a report under.")
 @click.option(
-    "--report-flag",
+    "--report",
     "-r",
     is_flag=True,
-    help="Whether to write a report under a unique path in the current directory. "
-    "Only usable if `--report` is not already used.",
+    help="Whether to write a report under a unique path in the current directory. ",
 )
 @click.argument("paths", nargs=-1, type=click.Path(exists=True, dir_okay=True))
 @devel_debug_option()
@@ -28,9 +26,6 @@ def validate_bids(
     from ..bids_utils import is_valid, report_errors
     from ..validate import validate_bids as validate_bids_
 
-    if report_flag and not report:
-        report = report_flag
-
     validator_result = validate_bids_(
         *paths,
         report=report,
diff --git a/dandi/metadata.py b/dandi/metadata.py
index 1225a9697..0d9b645cc 100644
--- a/dandi/metadata.py
+++ b/dandi/metadata.py
@@ -119,7 +119,7 @@ def get_metadata(path: Union[str, Path]) -> Optional[dict]:
     # could still be augmented with `_is_nwb` to disambiguate both cases
     # at the detection level.
     if _path_in_bids(path):
-        from .bids_validator_xs import validate_bids
+        from .validate import validate_bids
 
         _meta = validate_bids(path)
         meta = _meta["match_listing"][0]
diff --git a/dandi/validate.py b/dandi/validate.py
index 30b1599a2..9ad9cea57 100644
--- a/dandi/validate.py
+++ b/dandi/validate.py
@@ -1,6 +1,8 @@
 from pathlib import Path
 from typing import Iterator, List, Optional, Tuple, Union
 
+import appdirs
+
 from .files import find_dandi_files
 
 # TODO: provide our own "errors" records, which would also include warnings etc
@@ -10,7 +12,7 @@ def validate_bids(
     *paths: Union[str, Path],
     schema_version: Optional[str] = None,
     devel_debug: bool = False,
-    report: Optional[str] = None,
+    report: bool = False,
 ) -> dict:
     """Validate BIDS paths.
 
@@ -22,7 +24,7 @@ def validate_bids(
         BIDS schema version to use, this setting will override the version specified in the dataset.
     devel_debug : bool, optional
         Whether to trigger debugging in the BIDS validator.
-    report_path : bool or str, optional
+    report : bool or str, optional
         If `True` a log will be written using the standard output path of `.write_report()`.
         If string, the string will be used as the output path.
         If the variable evaluates as False, no log will be written.
@@ -40,8 +42,19 @@ def validate_bids(
     """
     from .bids_validator_xs import validate_bids as validate_bids_
 
+    if report:
+        log_dir = appdirs.user_log_dir("dandi-cli", "dandi")
+        report_path = "{log_dir}/bids-validator-report_{{datetime}}-{{pid}}.log"
+        report_path = report_path.format(
+            log_dir=log_dir,
+        )
+    else:
+        report_path = ""
     validation_result = validate_bids_(
-        paths, schema_version=schema_version, debug=devel_debug, report_path=report
+        paths,
+        schema_version=schema_version,
+        debug=devel_debug,
+        report_path=report_path,
     )
     return dict(validation_result)
 

From a67c91ee559d8f443e2b3deb02da75ebb74b26cc Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Tue, 12 Jul 2022 13:48:38 -0400
Subject: [PATCH 07/28] Moved external modules to dandi/support/*/

---
 dandi/bids_utils.py                           |  2 +-
 .../bids/validator.py}                        |  5 ++--
 dandi/tests/test_bids_validator_xs.py         | 25 +++++++++++--------
 dandi/validate.py                             |  3 ++-
 4 files changed, 20 insertions(+), 15 deletions(-)
 rename dandi/{bids_validator_xs.py => support/bids/validator.py} (99%)

diff --git a/dandi/bids_utils.py b/dandi/bids_utils.py
index 3e4cdbe09..489599df0 100644
--- a/dandi/bids_utils.py
+++ b/dandi/bids_utils.py
@@ -11,7 +11,7 @@ def is_valid(
     Parameters
     ----------
     validation_result: dict
-        Dictionary as returned by `dandi.bids_validator_xs.validate_bids()`.
+        Dictionary as returned by `dandi.support.bids.validator.validate_bids()`.
     allow_missing_files: bool, optional
         Whether to consider the dataset invalid if any mandatory files are not present.
     allow_invalid_filenames: bool, optional
diff --git a/dandi/bids_validator_xs.py b/dandi/support/bids/validator.py
similarity index 99%
rename from dandi/bids_validator_xs.py
rename to dandi/support/bids/validator.py
index 384594c32..873e29b84 100644
--- a/dandi/bids_validator_xs.py
+++ b/dandi/support/bids/validator.py
@@ -9,8 +9,7 @@
 import os
 import re
 
-from . import utils
-from .support.bids import schema
+from . import schema, utils
 
 lgr = utils.get_logger()
 
@@ -731,7 +730,7 @@ def _get_directory_suffixes(my_schema):
 
 def validate_bids(
     bids_paths,
-    schema_reference_root="{module_path}/support/bids/schemadata/",
+    schema_reference_root="/usr/share/bids-schema/",
     schema_version=None,
     debug=False,
     report_path=False,
diff --git a/dandi/tests/test_bids_validator_xs.py b/dandi/tests/test_bids_validator_xs.py
index fb91ff225..19b19fba3 100644
--- a/dandi/tests/test_bids_validator_xs.py
+++ b/dandi/tests/test_bids_validator_xs.py
@@ -16,11 +16,11 @@
     "invalid_pet001",
 ]
 
-TEST_SCHEMA_PATH = "{module_path}/support/bids/schemadata/1.7.0+369"
+TEST_SCHEMA_PATH = "{module_path}/schemadata/1.7.0+369"
 
 
 def test__add_entity():
-    from dandi.bids_validator_xs import _add_entity
+    from ..support.bids.validator import _add_entity
 
     # Test empty input and directory creation and required entity
     regex_entities = ""
@@ -69,7 +69,7 @@ def test__add_entity():
 
 
 def test__add_extensions():
-    from dandi.bids_validator_xs import _add_extensions
+    from ..support.bids.validator import _add_extensions
 
     # Test single extension
     regex_string = (
@@ -122,7 +122,7 @@ def test__add_extensions():
 
 
 def test__add_subdirs():
-    from dandi.bids_validator_xs import _add_subdirs
+    from ..support.bids.validator import _add_subdirs
 
     regex_string = "sub-(?P=subject)_sessions\\.(tsv|json)"
     variant = {
@@ -180,7 +180,7 @@ def test__add_subdirs():
 
 
 def test__add_suffixes():
-    from dandi.bids_validator_xs import _add_suffixes
+    from ..support.bids.validator import _add_suffixes
 
     # Test single expansion
     regex_entities = "sub-(?P=subject)"
@@ -240,7 +240,7 @@ def test__add_suffixes():
 
 
 def test_load_all():
-    from dandi.bids_validator_xs import load_all
+    from ..support.bids.validator import load_all
 
     schema_path = os.path.join(
         os.path.abspath(os.path.dirname(__file__)),
@@ -256,7 +256,7 @@ def test_load_all():
 
 
 def test_write_report(tmp_path):
-    from dandi.bids_validator_xs import write_report
+    from ..support.bids.validator import write_report
 
     validation_result = {}
 
@@ -314,7 +314,7 @@ def test_write_report(tmp_path):
 
 
 def test_bids_datasets(bids_examples, tmp_path):
-    from dandi.bids_validator_xs import validate_bids
+    from ..support.bids.validator import validate_bids
 
     # Validate per dataset with explicit schema specification:
     for i in os.listdir(bids_examples):
@@ -336,7 +336,11 @@ def test_bids_datasets(bids_examples, tmp_path):
             selected_path = os.path.join(root, f)
             selected_paths.append(selected_path)
     # Does terminal debug output and schema auto-fallback work?
-    result = validate_bids(selected_paths, debug=True)
+    result = validate_bids(
+        selected_paths,
+        schema_reference_root="{module_path}/schemadata",
+        debug=True,
+    )
     # Does default log path specification work?
     result = validate_bids(
         selected_paths, schema_version=TEST_SCHEMA_PATH, report_path=True
@@ -354,13 +358,14 @@ def test_bids_datasets(bids_examples, tmp_path):
 
 
 def test_error_datasets(bids_examples):
-    from dandi.bids_validator_xs import validate_bids
+    from ..support.bids.validator import validate_bids
 
     # Validate per dataset, with automatic schema selection:
     for i in os.listdir(bids_examples):
         if i in BIDS_EXAMPLES_BLACKLIST:
             result = validate_bids(
                 os.path.join(bids_examples, i),
+                schema_reference_root="{module_path}/schemadata",
             )
             # Are there non-validated files?
             assert len(result["path_tracking"]) != 0
diff --git a/dandi/validate.py b/dandi/validate.py
index 9ad9cea57..ba111020f 100644
--- a/dandi/validate.py
+++ b/dandi/validate.py
@@ -40,7 +40,7 @@ def validate_bids(
     Can be used from bash, as:
         DANDI_DEVEL=1 dandi validate-bids --report="my.log" /my/path
     """
-    from .bids_validator_xs import validate_bids as validate_bids_
+    from .support.bids.validator import validate_bids as validate_bids_
 
     if report:
         log_dir = appdirs.user_log_dir("dandi-cli", "dandi")
@@ -53,6 +53,7 @@ def validate_bids(
     validation_result = validate_bids_(
         paths,
         schema_version=schema_version,
+        schema_reference_root="{module_path}/schemadata",
         debug=devel_debug,
         report_path=report_path,
     )

From cff8c894aaec0ddb78474f08af57309937cdc670 Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Tue, 12 Jul 2022 14:35:52 -0400
Subject: [PATCH 08/28] formatting changes to stay in sync with upstream BIDS

---
 dandi/support/bids/validator.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/dandi/support/bids/validator.py b/dandi/support/bids/validator.py
index 873e29b84..45f9e78c4 100644
--- a/dandi/support/bids/validator.py
+++ b/dandi/support/bids/validator.py
@@ -1,7 +1,3 @@
-"""
-THIS FILE IS BUNDLED FROM THE bids-specification PACKAGE.
-Schema loading- and processing-related functions.
-"""
 from copy import deepcopy
 import datetime
 from functools import lru_cache
@@ -163,7 +159,12 @@ def _add_extensions(regex_string, variant):
 
 
 def _add_subdirs(
-    regex_string, variant, datatype, entity_definitions, formats, modality_datatypes
+    regex_string,
+    variant,
+    datatype,
+    entity_definitions,
+    formats,
+    modality_datatypes,
 ):
     """Add appropriate subdirectories as required by entities present."""
 
@@ -466,7 +467,7 @@ def validate_all(
 
 def write_report(
     validation_result,
-    report_path="/var/tmp/bids-validator-report_{datetime}-{pid}.log",
+    report_path="/var/tmp/bids-validator/report_{datetime}-{pid}.log",
     datetime_format="%Y%m%d%H%M%SZ",
 ):
     """Write a human-readable report based on the validation result.

From 2ed89294f52101f2d7ac5de41939d1278ea51115 Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Thu, 14 Jul 2022 11:47:05 -0400
Subject: [PATCH 09/28] Corrected help text

---
 dandi/cli/cmd_validate.py | 2 +-
 dandi/validate.py         | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dandi/cli/cmd_validate.py b/dandi/cli/cmd_validate.py
index 39e1c344e..2b08f5aa5 100644
--- a/dandi/cli/cmd_validate.py
+++ b/dandi/cli/cmd_validate.py
@@ -14,7 +14,7 @@
     "--report",
     "-r",
     is_flag=True,
-    help="Whether to write a report under a unique path in the current directory. ",
+    help="Whether to write a report under a unique path in the DANDI log directory.",
 )
 @click.argument("paths", nargs=-1, type=click.Path(exists=True, dir_okay=True))
 @devel_debug_option()
diff --git a/dandi/validate.py b/dandi/validate.py
index ba111020f..645c1ccd7 100644
--- a/dandi/validate.py
+++ b/dandi/validate.py
@@ -25,9 +25,7 @@ def validate_bids(
     devel_debug : bool, optional
         Whether to trigger debugging in the BIDS validator.
     report : bool or str, optional
-        If `True` a log will be written using the standard output path of `.write_report()`.
-        If string, the string will be used as the output path.
-        If the variable evaluates as False, no log will be written.
+        If `True` a log will be written inside the DANDI log directory.
 
     Returns
     -------

From 73a206163ee14136d4377ea48de8f03f30079162 Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Tue, 19 Jul 2022 17:05:06 -0400
Subject: [PATCH 10/28] Updated report docstring in wrapper

---
 dandi/validate.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dandi/validate.py b/dandi/validate.py
index 645c1ccd7..310fecb96 100644
--- a/dandi/validate.py
+++ b/dandi/validate.py
@@ -24,8 +24,8 @@ def validate_bids(
         BIDS schema version to use, this setting will override the version specified in the dataset.
     devel_debug : bool, optional
         Whether to trigger debugging in the BIDS validator.
-    report : bool or str, optional
-        If `True` a log will be written inside the DANDI log directory.
+    report : bool, optional
+        Whether to write a BIDS validator report inside the DANDI log directory.
 
     Returns
     -------

From c367e052a05ef5ff935b9b334a4e282420cf3e91 Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Tue, 19 Jul 2022 18:57:28 -0400
Subject: [PATCH 11/28] verify report file creation

---
 dandi/tests/test_validate.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 dandi/tests/test_validate.py

diff --git a/dandi/tests/test_validate.py b/dandi/tests/test_validate.py
new file mode 100644
index 000000000..84b82a90e
--- /dev/null
+++ b/dandi/tests/test_validate.py
@@ -0,0 +1,15 @@
+from glob import glob
+import os
+
+import appdirs
+
+
+def test_validate_bids(bids_examples):
+    from ..validate import validate_bids
+
+    selected_dataset = os.path.join(bids_examples, os.listdir(bids_examples)[0])
+    _ = validate_bids(selected_dataset, report=True)
+    # Check if a report is being produced.
+    pid = os.getpid()
+    log_dir = appdirs.user_log_dir("dandi-cli", "dandi")
+    assert len(glob(f"{log_dir}/bids-validator-report_*-{pid}.log")) == 1

From b514d8a5b0c74a4100bd58420ce0fac792f0d9d7 Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Tue, 19 Jul 2022 19:01:46 -0400
Subject: [PATCH 12/28] Moved bash usage example to CLI function

---
 dandi/cli/cmd_validate.py | 9 ++++++++-
 dandi/validate.py         | 5 -----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dandi/cli/cmd_validate.py b/dandi/cli/cmd_validate.py
index 2b08f5aa5..a31062a02 100644
--- a/dandi/cli/cmd_validate.py
+++ b/dandi/cli/cmd_validate.py
@@ -22,7 +22,14 @@
 def validate_bids(
     paths, schema=None, devel_debug=False, report=False, report_flag=False
 ):
-    """Validate BIDS paths."""
+    """Validate BIDS paths.
+
+    Notes
+    -----
+    Used from bash, eg:
+        dandi validate-bids /my/path
+    """
+
     from ..bids_utils import is_valid, report_errors
     from ..validate import validate_bids as validate_bids_
 
diff --git a/dandi/validate.py b/dandi/validate.py
index 310fecb96..76820d325 100644
--- a/dandi/validate.py
+++ b/dandi/validate.py
@@ -32,11 +32,6 @@ def validate_bids(
     dict
         Dictionary reporting required patterns not found and existing filenames not matching any
         patterns.
-
-    Notes
-    -----
-    Can be used from bash, as:
-        DANDI_DEVEL=1 dandi validate-bids --report="my.log" /my/path
     """
     from .support.bids.validator import validate_bids as validate_bids_
 

From 24038e885c068b059823b20227bfb0f0a9dd454d Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Tue, 19 Jul 2022 19:18:49 -0400
Subject: [PATCH 13/28] Formatting

---
 dandi/tests/test_validate.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dandi/tests/test_validate.py b/dandi/tests/test_validate.py
index 84b82a90e..d1b46a94d 100644
--- a/dandi/tests/test_validate.py
+++ b/dandi/tests/test_validate.py
@@ -9,6 +9,7 @@ def test_validate_bids(bids_examples):
 
     selected_dataset = os.path.join(bids_examples, os.listdir(bids_examples)[0])
     _ = validate_bids(selected_dataset, report=True)
+
     # Check if a report is being produced.
     pid = os.getpid()
     log_dir = appdirs.user_log_dir("dandi-cli", "dandi")

From 2e5344964538b84323998ff4faa9afd57e65d9b8 Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Tue, 19 Jul 2022 19:18:57 -0400
Subject: [PATCH 14/28] Better windows support

---
 dandi/support/bids/validator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dandi/support/bids/validator.py b/dandi/support/bids/validator.py
index 45f9e78c4..9902dd24b 100644
--- a/dandi/support/bids/validator.py
+++ b/dandi/support/bids/validator.py
@@ -550,7 +550,7 @@ def _find_dataset_description(my_path):
     if os.path.isfile(candidate):
         return candidate
     else:
-        level_up = os.path.dirname(my_path.rstrip("/"))
+        level_up = os.path.dirname(my_path.rstrip("/").rstrip("\\"))
         return _find_dataset_description(level_up)
 
 

From d4640bf401c131acb658bcd8380cad11bde4f62e Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Tue, 19 Jul 2022 22:42:27 -0400
Subject: [PATCH 15/28] Improved windows support

---
 dandi/support/bids/validator.py | 4 +++-
 dandi/tests/test_validate.py    | 8 ++++++--
 dandi/validate.py               | 1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dandi/support/bids/validator.py b/dandi/support/bids/validator.py
index 9902dd24b..8ba4c0a36 100644
--- a/dandi/support/bids/validator.py
+++ b/dandi/support/bids/validator.py
@@ -545,12 +545,14 @@ def write_report(
 
 def _find_dataset_description(my_path):
     candidate = os.path.join(my_path, "dataset_description.json")
-    if my_path == "/":
+    # Windows support... otherwise we could do `if my_path == "/"`.
+    if my_path == "/" or "\\" and "/" not in my_path:
         return None
     if os.path.isfile(candidate):
         return candidate
     else:
         level_up = os.path.dirname(my_path.rstrip("/").rstrip("\\"))
+        print(level_up)
         return _find_dataset_description(level_up)
 
 
diff --git a/dandi/tests/test_validate.py b/dandi/tests/test_validate.py
index d1b46a94d..1906e347b 100644
--- a/dandi/tests/test_validate.py
+++ b/dandi/tests/test_validate.py
@@ -7,10 +7,14 @@
 def test_validate_bids(bids_examples):
     from ..validate import validate_bids
 
-    selected_dataset = os.path.join(bids_examples, os.listdir(bids_examples)[0])
+    # Replace explicit dataset with `os.listdir(bids_examples)[1]` whenever we
+    # implement light data cloning analogous to (`[1]` because `[0]` is .git):
+    # https://github.com/bids-standard/bids-specification/pull/1143
+    selected_dataset = os.path.join(bids_examples, "asl003")
     _ = validate_bids(selected_dataset, report=True)
 
     # Check if a report is being produced.
     pid = os.getpid()
     log_dir = appdirs.user_log_dir("dandi-cli", "dandi")
-    assert len(glob(f"{log_dir}/bids-validator-report_*-{pid}.log")) == 1
+    report_expression = os.path.join(log_dir, f"bids-validator-report_*-{pid}.log")
+    assert len(glob(report_expression)) == 1
diff --git a/dandi/validate.py b/dandi/validate.py
index 76820d325..0dcefdeea 100644
--- a/dandi/validate.py
+++ b/dandi/validate.py
@@ -33,6 +33,7 @@ def validate_bids(
         Dictionary reporting required patterns not found and existing filenames not matching any
         patterns.
     """
+
     from .support.bids.validator import validate_bids as validate_bids_
 
     if report:

From d35e5f2b14b0c002e8586a6b1c43693ddb5c65fb Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Wed, 20 Jul 2022 11:46:27 -0400
Subject: [PATCH 16/28] Dropped debugging print line

---
 dandi/support/bids/validator.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dandi/support/bids/validator.py b/dandi/support/bids/validator.py
index 8ba4c0a36..2c30458af 100644
--- a/dandi/support/bids/validator.py
+++ b/dandi/support/bids/validator.py
@@ -552,7 +552,6 @@ def _find_dataset_description(my_path):
         return candidate
     else:
         level_up = os.path.dirname(my_path.rstrip("/").rstrip("\\"))
-        print(level_up)
         return _find_dataset_description(level_up)
 
 

From cd0b36ca5c6ebc752c57b7fb7f1fceae6dd54911 Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Wed, 20 Jul 2022 12:07:45 -0400
Subject: [PATCH 17/28] Nicer conditional for recursion

---
 dandi/support/bids/validator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dandi/support/bids/validator.py b/dandi/support/bids/validator.py
index 2c30458af..a7cc5e40c 100644
--- a/dandi/support/bids/validator.py
+++ b/dandi/support/bids/validator.py
@@ -546,7 +546,7 @@ def write_report(
 def _find_dataset_description(my_path):
     candidate = os.path.join(my_path, "dataset_description.json")
     # Windows support... otherwise we could do `if my_path == "/"`.
-    if my_path == "/" or "\\" and "/" not in my_path:
+    if my_path == "/" or not any(i in my_path for i in ["/", "\\"]):
         return None
     if os.path.isfile(candidate):
         return candidate

From a444368dd9fca6eafd0585d0d94bbef0b1f6dd0e Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Wed, 20 Jul 2022 12:22:43 -0400
Subject: [PATCH 18/28] Removed deprecated parameter

---
 dandi/cli/cmd_validate.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dandi/cli/cmd_validate.py b/dandi/cli/cmd_validate.py
index a31062a02..809bb7495 100644
--- a/dandi/cli/cmd_validate.py
+++ b/dandi/cli/cmd_validate.py
@@ -20,7 +20,10 @@
 @devel_debug_option()
 @map_to_click_exceptions
 def validate_bids(
-    paths, schema=None, devel_debug=False, report=False, report_flag=False
+    paths,
+    schema=None,
+    devel_debug=False,
+    report=False,
 ):
     """Validate BIDS paths.
 

From 4d4a7cfc09cee3f5a5edbf5d78121f1625a21e1d Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Wed, 20 Jul 2022 17:28:12 -0400
Subject: [PATCH 19/28] Reinstated option for report path specification

---
 dandi/cli/cmd_validate.py    |  6 ++++++
 dandi/tests/test_validate.py | 13 +++++++++++++
 dandi/validate.py            |  7 ++++---
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/dandi/cli/cmd_validate.py b/dandi/cli/cmd_validate.py
index 809bb7495..63ba84ced 100644
--- a/dandi/cli/cmd_validate.py
+++ b/dandi/cli/cmd_validate.py
@@ -10,6 +10,10 @@
 @devel_option(
     "--schema", help="Validate against new BIDS schema version", metavar="VERSION"
 )
+@click.option(
+    "--report-path",
+    help="Write report under path, this option implies `--report/-r`.",
+)
 @click.option(
     "--report",
     "-r",
@@ -24,6 +28,7 @@ def validate_bids(
     schema=None,
     devel_debug=False,
     report=False,
+    report_path="",
 ):
     """Validate BIDS paths.
 
@@ -39,6 +44,7 @@ def validate_bids(
     validator_result = validate_bids_(
         *paths,
         report=report,
+        report_path=report_path,
         schema_version=schema,
         devel_debug=devel_debug,
     )
diff --git a/dandi/tests/test_validate.py b/dandi/tests/test_validate.py
index 1906e347b..a6b495f6d 100644
--- a/dandi/tests/test_validate.py
+++ b/dandi/tests/test_validate.py
@@ -7,6 +7,7 @@
 def test_validate_bids(bids_examples):
     from ..validate import validate_bids
 
+    # TEST DEFAULT REPORT PATH:
     # Replace explicit dataset with `os.listdir(bids_examples)[1]` whenever we
     # implement light data cloning analogous to (`[1]` because `[0]` is .git):
     # https://github.com/bids-standard/bids-specification/pull/1143
@@ -18,3 +19,15 @@ def test_validate_bids(bids_examples):
     log_dir = appdirs.user_log_dir("dandi-cli", "dandi")
     report_expression = os.path.join(log_dir, f"bids-validator-report_*-{pid}.log")
     assert len(glob(report_expression)) == 1
+
+    # TEST CISTOM REPORT PATH:
+    # Replace explicit dataset with `os.listdir(bids_examples)[1]` whenever we
+    # implement light data cloning analogous to (`[1]` because `[0]` is .git):
+    # https://github.com/bids-standard/bids-specification/pull/1143
+    selected_dataset = os.path.join(bids_examples, "asl003")
+    _ = validate_bids(
+        selected_dataset, report_path="/tmp/inplace_bids-validator-report.log"
+    )
+
+    # Check if a report is being produced.
+    assert len(glob("/tmp/inplace_bids-validator-report.log")) == 1
diff --git a/dandi/validate.py b/dandi/validate.py
index 0dcefdeea..3c3636eee 100644
--- a/dandi/validate.py
+++ b/dandi/validate.py
@@ -13,6 +13,7 @@ def validate_bids(
     schema_version: Optional[str] = None,
     devel_debug: bool = False,
     report: bool = False,
+    report_path: str = "",
 ) -> dict:
     """Validate BIDS paths.
 
@@ -26,6 +27,8 @@ def validate_bids(
         Whether to trigger debugging in the BIDS validator.
     report : bool, optional
         Whether to write a BIDS validator report inside the DANDI log directory.
+    report_path : str, optional
+        Path underneath which to write a validation report, this option implies `report`.
 
     Returns
     -------
@@ -36,14 +39,12 @@ def validate_bids(
 
     from .support.bids.validator import validate_bids as validate_bids_
 
-    if report:
+    if report and not report_path:
         log_dir = appdirs.user_log_dir("dandi-cli", "dandi")
         report_path = "{log_dir}/bids-validator-report_{{datetime}}-{{pid}}.log"
         report_path = report_path.format(
             log_dir=log_dir,
         )
-    else:
-        report_path = ""
     validation_result = validate_bids_(
         paths,
         schema_version=schema_version,

From 3bcc542081627ffe4fb73e638aa62046f404ce7b Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Fri, 22 Jul 2022 03:29:36 -0400
Subject: [PATCH 20/28] code style improvement

Co-authored-by: John T. Wodder II <jwodder@users.noreply.github.com>
---
 dandi/support/bids/validator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dandi/support/bids/validator.py b/dandi/support/bids/validator.py
index a7cc5e40c..14ab7e8ab 100644
--- a/dandi/support/bids/validator.py
+++ b/dandi/support/bids/validator.py
@@ -551,7 +551,7 @@ def _find_dataset_description(my_path):
     if os.path.isfile(candidate):
         return candidate
     else:
-        level_up = os.path.dirname(my_path.rstrip("/").rstrip("\\"))
+        level_up = os.path.dirname(my_path.rstrip("/\\"))
         return _find_dataset_description(level_up)
 
 

From 140a7cfaba948c8668da59be6698406626f0d5f6 Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Fri, 22 Jul 2022 03:49:26 -0400
Subject: [PATCH 21/28] style improvements

---
 dandi/support/bids/validator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dandi/support/bids/validator.py b/dandi/support/bids/validator.py
index a7cc5e40c..931f6c095 100644
--- a/dandi/support/bids/validator.py
+++ b/dandi/support/bids/validator.py
@@ -61,7 +61,7 @@ def _get_paths(
             path_list.append(bids_path)
             continue
         for root, dirs, file_names in os.walk(bids_path, topdown=True):
-            if any(root.endswith(i) for i in pseudofile_suffixes):
+            if root.endswith(tuple(pseudofile_suffixes)):
                 # Add the directory name to the validation paths list.
                 path_list.append(f"{root}/")
                 # Do not index the contents of the directory.

From b582485b283af10df23cac1590b122a11f262b40 Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Fri, 22 Jul 2022 03:55:33 -0400
Subject: [PATCH 22/28] Improved windows support

---
 dandi/support/bids/validator.py | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/dandi/support/bids/validator.py b/dandi/support/bids/validator.py
index 003b89833..45e695c65 100644
--- a/dandi/support/bids/validator.py
+++ b/dandi/support/bids/validator.py
@@ -3,6 +3,7 @@
 from functools import lru_cache
 import json
 import os
+from pathlib import Path
 import re
 
 from . import schema, utils
@@ -58,12 +59,12 @@ def _get_paths(
     for bids_path in bids_paths:
         bids_path = os.path.abspath(os.path.expanduser(bids_path))
         if os.path.isfile(bids_path):
-            path_list.append(bids_path)
+            path_list.append(Path(bids_path).as_posix())
             continue
         for root, dirs, file_names in os.walk(bids_path, topdown=True):
             if root.endswith(tuple(pseudofile_suffixes)):
                 # Add the directory name to the validation paths list.
-                path_list.append(f"{root}/")
+                path_list.append(Path(root).as_posix() + "/")
                 # Do not index the contents of the directory.
                 dirs[:] = []
             # will break if BIDS ever puts meaningful data under `/.{dandi,datalad,git}*/`
@@ -74,12 +75,7 @@ def _get_paths(
                     continue
                 file_path = os.path.join(root, file_name)
                 # This will need to be replaced with bids root finding.
-                path_list.append(file_path)
-
-    # Standardize Windows paths
-    if "\\" in path_list[0]:
-        for ix, i in enumerate(path_list):
-            path_list[ix] = i.replace("\\", "/")
+                path_list.append(Path(file_path).as_posix())
 
     return path_list
 
@@ -724,9 +720,8 @@ def _get_directory_suffixes(my_schema):
     pseudofile_suffixes = []
     for i in my_schema["objects"]["extensions"].values():
         i_value = i["value"]
-        if i_value.endswith("/"):
-            if i_value != "/":
-                pseudofile_suffixes.append(i_value[:-1])
+        if i_value.endswith("/") and i_value != "/":
+            pseudofile_suffixes.append(i_value[:-1])
     return pseudofile_suffixes
 
 

From 02a6e95d8ebb34b369aab19c525d16508d269d34 Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Fri, 22 Jul 2022 04:32:22 -0400
Subject: [PATCH 23/28] Using pytest's tmp_path

---
 dandi/tests/test_validate.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dandi/tests/test_validate.py b/dandi/tests/test_validate.py
index a6b495f6d..6d854aec2 100644
--- a/dandi/tests/test_validate.py
+++ b/dandi/tests/test_validate.py
@@ -4,7 +4,7 @@
 import appdirs
 
 
-def test_validate_bids(bids_examples):
+def test_validate_bids(bids_examples, tmp_path):
     from ..validate import validate_bids
 
     # TEST DEFAULT REPORT PATH:
@@ -24,10 +24,12 @@ def test_validate_bids(bids_examples):
     # Replace explicit dataset with `os.listdir(bids_examples)[1]` whenever we
     # implement light data cloning analogous to (`[1]` because `[0]` is .git):
     # https://github.com/bids-standard/bids-specification/pull/1143
+    report_path = os.path.join(tmp_path, "inplace_bids-validator-report.log")
     selected_dataset = os.path.join(bids_examples, "asl003")
     _ = validate_bids(
-        selected_dataset, report_path="/tmp/inplace_bids-validator-report.log"
+        selected_dataset,
+        report_path=report_path,
     )
 
     # Check if a report is being produced.
-    assert len(glob("/tmp/inplace_bids-validator-report.log")) == 1
+    assert len(glob(report_path)) == 1

From 8c1dbcccf58b0b7f679db316932bac02a2b84ed1 Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Fri, 22 Jul 2022 04:32:42 -0400
Subject: [PATCH 24/28] Updated library name

---
 dandi/support/bids/validator.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dandi/support/bids/validator.py b/dandi/support/bids/validator.py
index 45e695c65..c48cfbeb3 100644
--- a/dandi/support/bids/validator.py
+++ b/dandi/support/bids/validator.py
@@ -204,7 +204,7 @@ def load_top_level(
     Parameters
     ----------
     my_schema : dict
-        A nested dictionary, as returned by `schemacode.schema.load_schema()`.
+        A nested dictionary, as returned by `bidsschematools.schema.load_schema()`.
 
     Returns
     -------
@@ -241,7 +241,7 @@ def load_entities(
     Parameters
     ----------
     my_schema : dict
-        A nested dictionary, as returned by `schemacode.schema.load_schema()`.
+        A nested dictionary, as returned by `bidsschematools.schema.load_schema()`.
 
     Notes
     -----
@@ -667,7 +667,7 @@ def select_schema_dir(
         raise ValueError(
             f"The expected schema directory {schema_dir} does not exist on the system. "
             "Please ensure the file exists or manually specify a schema version for "
-            "which the schemacode files are available on your system."
+            "which the bidsschematools files are available on your system."
         )
 
 
@@ -703,7 +703,7 @@ def _get_directory_suffixes(my_schema):
     Parameters
     ----------
     my_schema : dict
-        Nested directory as produced by `schemacode.schema.load_schema()`.
+        Nested directory as produced by `bidsschematools.schema.load_schema()`.
 
     Returns
     -------
@@ -767,7 +767,7 @@ def validate_bids(
 
     Examples
     --------
-    >>> from schemacode import validator
+    >>> from bidsschematools import validator
     >>> bids_paths = '~/.data2/datalad/000026/rawdata'
     >>> schema_version='{module_path}/data/schema/'
     >>> validator.validate_bids(bids_paths, schema_version=schema_version, debug=False)"

From 41fa4ac0bb28886b2afe3f429b71f8b5bc2e8703 Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Fri, 22 Jul 2022 14:04:01 -0400
Subject: [PATCH 25/28] removed unused default values from function wrapped
 with click

---
 dandi/cli/cmd_validate.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dandi/cli/cmd_validate.py b/dandi/cli/cmd_validate.py
index 63ba84ced..9e02aa62b 100644
--- a/dandi/cli/cmd_validate.py
+++ b/dandi/cli/cmd_validate.py
@@ -7,7 +7,7 @@
 
 
 @click.command()
-@devel_option(
+@click.option(
     "--schema", help="Validate against new BIDS schema version", metavar="VERSION"
 )
 @click.option(
@@ -25,10 +25,10 @@
 @map_to_click_exceptions
 def validate_bids(
     paths,
-    schema=None,
+    schema,
+    report,
+    report_path,
     devel_debug=False,
-    report=False,
-    report_path="",
 ):
     """Validate BIDS paths.
 

From 75e8fc303561f16d3f397ec9ed4e13951dec7c49 Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Tue, 26 Jul 2022 18:09:32 -0400
Subject: [PATCH 26/28] Simplified directory exclusion logic

Co-authored-by: John T. Wodder II <jwodder@users.noreply.github.com>
---
 dandi/support/bids/validator.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dandi/support/bids/validator.py b/dandi/support/bids/validator.py
index 45f9e78c4..10cf25839 100644
--- a/dandi/support/bids/validator.py
+++ b/dandi/support/bids/validator.py
@@ -41,9 +41,9 @@ def _get_paths(
         input.
     """
     exclude_subdirs = [
-        rf"{os.sep}.dandi",
-        rf"{os.sep}.datalad",
-        rf"{os.sep}.git",
+        ".dandi",
+        ".datalad",
+        ".git",
     ]
     # `.bidsignore` is not, in fact, a BIDS file, as per:
     # https://github.com/bids-standard/bids-specification/issues/980
@@ -67,7 +67,7 @@ def _get_paths(
                 # Do not index the contents of the directory.
                 dirs[:] = []
             # will break if BIDS ever puts meaningful data under `/.{dandi,datalad,git}*/`
-            if any(exclude_subdir in root for exclude_subdir in exclude_subdirs):
+            if os.path.basename(root) in exclude_subdirs::
                 continue
             for file_name in file_names:
                 if file_name in exclude_files:

From 3f43905500d0de26b9876f95dd8c46884c39c90b Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Tue, 26 Jul 2022 18:14:20 -0400
Subject: [PATCH 27/28] Typo

---
 dandi/support/bids/validator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dandi/support/bids/validator.py b/dandi/support/bids/validator.py
index 8ce50e191..f1981f7e6 100644
--- a/dandi/support/bids/validator.py
+++ b/dandi/support/bids/validator.py
@@ -68,7 +68,7 @@ def _get_paths(
                 # Do not index the contents of the directory.
                 dirs[:] = []
             # will break if BIDS ever puts meaningful data under `/.{dandi,datalad,git}*/`
-            if os.path.basename(root) in exclude_subdirs::
+            if os.path.basename(root) in exclude_subdirs:
                 continue
             for file_name in file_names:
                 if file_name in exclude_files:

From 468e39c9c3f7962e5078e9bdc4b6ad1f16fa4ee8 Mon Sep 17 00:00:00 2001
From: Horea Christian <chr@chymera.eu>
Date: Tue, 26 Jul 2022 20:19:44 -0400
Subject: [PATCH 28/28] Do not index top-level files from pseudofile
 directories

---
 dandi/support/bids/validator.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dandi/support/bids/validator.py b/dandi/support/bids/validator.py
index f1981f7e6..8c1768d47 100644
--- a/dandi/support/bids/validator.py
+++ b/dandi/support/bids/validator.py
@@ -67,6 +67,7 @@ def _get_paths(
                 path_list.append(Path(root).as_posix() + "/")
                 # Do not index the contents of the directory.
                 dirs[:] = []
+                file_names[:] = []
             # will break if BIDS ever puts meaningful data under `/.{dandi,datalad,git}*/`
             if os.path.basename(root) in exclude_subdirs:
                 continue