diff --git a/src/99-appendices/04-entity-table.md b/src/99-appendices/04-entity-table.md
index b2f7b5ad1b..b7d5dd3c65 100644
--- a/src/99-appendices/04-entity-table.md
+++ b/src/99-appendices/04-entity-table.md
@@ -18,17 +18,17 @@ while entity definitions are in [Appendix IX](09-entities.md).
 
 ## Magnetic Resonance Imaging
 
-| Entity                                                                                         | Subject                             | Session                             | Task                                  | Acquisition                         | Contrast Enhancing Agent          | Reconstruction                      | Phase-Encoding Direction            | Run                                 | Corresponding Modality              | Echo                                  | Recording                                       | Part                                  |
-|------------------------------------------------------------------------------------------------|-------------------------------------|-------------------------------------|---------------------------------------|-------------------------------------|-----------------------------------|-------------------------------------|-------------------------------------|-------------------------------------|-------------------------------------|---------------------------------------|-------------------------------------------------|---------------------------------------|
-| Format                                                                                         | [`sub-<label>`](09-entities.md#sub) | [`ses-<label>`](09-entities.md#ses) | [`task-<label>`](09-entities.md#task) | [`acq-<label>`](09-entities.md#acq) | [`ce-<label>`](09-entities.md#ce) | [`rec-<label>`](09-entities.md#rec) | [`dir-<label>`](09-entities.md#dir) | [`run-<index>`](09-entities.md#run) | [`mod-<label>`](09-entities.md#mod) | [`echo-<index>`](09-entities.md#echo) | [`recording-<label>`](09-entities.md#recording) | [`part-<label>`](09-entities.md#part) |
-| anat<br>(T1w T2w T1rho T1map T2map T2star FLAIR FLASH PD PDmap PDT2 inplaneT1 inplaneT2 angio) | REQUIRED                            | OPTIONAL                            |                                       | OPTIONAL                            | OPTIONAL                          | OPTIONAL                            |                                     | OPTIONAL                            |                                     |                                       |                                                 | OPTIONAL                              |
-| anat<br>(defacemask)                                                                           | REQUIRED                            | OPTIONAL                            |                                       | OPTIONAL                            | OPTIONAL                          | OPTIONAL                            |                                     | OPTIONAL                            | OPTIONAL                            |                                       |                                                 |                                       |
-| dwi<br>(dwi sbref)                                                                             | REQUIRED                            | OPTIONAL                            |                                       | OPTIONAL                            |                                   |                                     | OPTIONAL                            | OPTIONAL                            |                                     |                                       |                                                 | OPTIONAL                              |
-| fmap<br>(phasediff phase1 phase2 magnitude1 magnitude2 magnitude fieldmap)                     | REQUIRED                            | OPTIONAL                            |                                       | OPTIONAL                            |                                   |                                     |                                     | OPTIONAL                            |                                     |                                       |                                                 |                                       |
-| fmap<br>(epi)                                                                                  | REQUIRED                            | OPTIONAL                            |                                       | OPTIONAL                            | OPTIONAL                          |                                     | REQUIRED                            | OPTIONAL                            |                                     |                                       |                                                 |                                       |
-| func<br>(bold cbv sbref)                                                                       | REQUIRED                            | OPTIONAL                            | REQUIRED                              | OPTIONAL                            | OPTIONAL                          | OPTIONAL                            | OPTIONAL                            | OPTIONAL                            |                                     | OPTIONAL                              |                                                 | OPTIONAL                              |
-| func<br>(phase events)                                                                         | REQUIRED                            | OPTIONAL                            | REQUIRED                              | OPTIONAL                            | OPTIONAL                          | OPTIONAL                            | OPTIONAL                            | OPTIONAL                            |                                     | OPTIONAL                              |                                                 |                                       |
-| func<br>(physio stim)                                                                          | REQUIRED                            | OPTIONAL                            | REQUIRED                              | OPTIONAL                            |                                   | OPTIONAL                            |                                     | OPTIONAL                            |                                     |                                       | OPTIONAL                                        |                                       |
+| Entity                                                                                         | Subject                             | Session                             | Task                                  | Acquisition                         | Contrast Enhancing Agent          | Reconstruction                      | Phase-Encoding Direction            | Run                                 | Corresponding Modality              | Echo                                  | Part                                  | Recording                                       |
+|------------------------------------------------------------------------------------------------|-------------------------------------|-------------------------------------|---------------------------------------|-------------------------------------|-----------------------------------|-------------------------------------|-------------------------------------|-------------------------------------|-------------------------------------|---------------------------------------|---------------------------------------|-------------------------------------------------|
+| Format                                                                                         | [`sub-<label>`](09-entities.md#sub) | [`ses-<label>`](09-entities.md#ses) | [`task-<label>`](09-entities.md#task) | [`acq-<label>`](09-entities.md#acq) | [`ce-<label>`](09-entities.md#ce) | [`rec-<label>`](09-entities.md#rec) | [`dir-<label>`](09-entities.md#dir) | [`run-<index>`](09-entities.md#run) | [`mod-<label>`](09-entities.md#mod) | [`echo-<index>`](09-entities.md#echo) | [`part-<label>`](09-entities.md#part) | [`recording-<label>`](09-entities.md#recording) |
+| anat<br>(T1w T2w T1rho T1map T2map T2star FLAIR FLASH PD PDmap PDT2 inplaneT1 inplaneT2 angio) | REQUIRED                            | OPTIONAL                            |                                       | OPTIONAL                            | OPTIONAL                          | OPTIONAL                            |                                     | OPTIONAL                            |                                     |                                       | OPTIONAL                              |                                                 |
+| anat<br>(defacemask)                                                                           | REQUIRED                            | OPTIONAL                            |                                       | OPTIONAL                            | OPTIONAL                          | OPTIONAL                            |                                     | OPTIONAL                            | OPTIONAL                            |                                       |                                       |                                                 |
+| dwi<br>(dwi sbref)                                                                             | REQUIRED                            | OPTIONAL                            |                                       | OPTIONAL                            |                                   |                                     | OPTIONAL                            | OPTIONAL                            |                                     |                                       | OPTIONAL                              |                                                 |
+| fmap<br>(phasediff phase1 phase2 magnitude1 magnitude2 magnitude fieldmap)                     | REQUIRED                            | OPTIONAL                            |                                       | OPTIONAL                            |                                   |                                     |                                     | OPTIONAL                            |                                     |                                       |                                       |                                                 |
+| fmap<br>(epi)                                                                                  | REQUIRED                            | OPTIONAL                            |                                       | OPTIONAL                            | OPTIONAL                          |                                     | REQUIRED                            | OPTIONAL                            |                                     |                                       |                                       |                                                 |
+| func<br>(bold cbv sbref)                                                                       | REQUIRED                            | OPTIONAL                            | REQUIRED                              | OPTIONAL                            | OPTIONAL                          | OPTIONAL                            | OPTIONAL                            | OPTIONAL                            |                                     | OPTIONAL                              | OPTIONAL                              |                                                 |
+| func<br>(phase events)                                                                         | REQUIRED                            | OPTIONAL                            | REQUIRED                              | OPTIONAL                            | OPTIONAL                          | OPTIONAL                            | OPTIONAL                            | OPTIONAL                            |                                     | OPTIONAL                              |                                       |                                                 |
+| func<br>(physio stim)                                                                          | REQUIRED                            | OPTIONAL                            | REQUIRED                              | OPTIONAL                            |                                   | OPTIONAL                            |                                     | OPTIONAL                            |                                     |                                       |                                       | OPTIONAL                                        |
 
 ## Encephalography (EEG, iEEG, and MEG)
 
diff --git a/src/99-appendices/09-entities.md b/src/99-appendices/09-entities.md
index eb51e93ed1..2bbd081438 100644
--- a/src/99-appendices/09-entities.md
+++ b/src/99-appendices/09-entities.md
@@ -177,23 +177,12 @@ Full name: Magnetization Transfer
 Format: `mt-<label>`
 
 Definition: 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>` key/value pair MUST be used to
 distinguish individual files.
-This entity represents the `MTState` metadata field. Allowed label values for this 
+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,
 respectively.
 
-## recording
-
-Full name: Recording
-
-Format: `recording-<label>`
-
-Definition: More than one continuous recording file can be included (with different
-sampling frequencies).
-In such case use different labels.
-For example: `_recording-contrast`, `_recording-saturation`.
-
 ## part
 
 Full name: Part
@@ -215,6 +204,17 @@ The possible options are `rad` or `arbitrary`.
 When there is only a magnitude image of a given type, the `part` key MAY be
 omitted.
 
+## recording
+
+Full name: Recording
+
+Format: `recording-<label>`
+
+Definition: More than one continuous recording file can be included (with different
+sampling frequencies).
+In such case use different labels.
+For example: `_recording-contrast`, `_recording-saturation`.
+
 ## proc
 
 Full name: Processed (on device)
diff --git a/src/schema/entities.yaml b/src/schema/entities.yaml
index af29b466a9..f1b32de0e0 100644
--- a/src/schema/entities.yaml
+++ b/src/schema/entities.yaml
@@ -143,15 +143,6 @@ mt:
     entity are `on` and `off`, for images acquired in presence and absence of an MT pulse,
     respectively.
   format: label
-recording:
-  name: Recording
-  entity: recording
-  description: |
-    More than one continuous recording file can be included (with different
-    sampling frequencies).
-    In such case use different labels.
-    For example: `_recording-contrast`, `_recording-saturation`.
-  format: label
 part:
   name: Part
   entity: part
@@ -171,6 +162,15 @@ part:
     When there is only a magnitude image of a given type, the `part` key MAY be
     omitted.
   format: label
+recording:
+  name: Recording
+  entity: recording
+  description: |
+    More than one continuous recording file can be included (with different
+    sampling frequencies).
+    In such case use different labels.
+    For example: `_recording-contrast`, `_recording-saturation`.
+  format: label
 processing:
   name: Processed (on device)
   entity: proc