diff --git a/src/02-common-principles.md b/src/02-common-principles.md
index a2f29a667c..da6c1bb2ed 100644
--- a/src/02-common-principles.md
+++ b/src/02-common-principles.md
@@ -33,15 +33,16 @@ misunderstanding we clarify them here.
     scanning sequence/protocol.
 
 1.  Data type - a functional group of different types of data. In BIDS we define
-    six data types: func (task based and resting state functional MRI), dwi
+    eight data types: func (task based and resting state functional MRI), dwi
     (diffusion weighted imaging), fmap (field inhomogeneity mapping data such as
     field maps), anat (structural imaging such as T1, T2, etc.), meg
-    (magnetoencephalography), beh (behavioral).
+    (magnetoencephalography), eeg (electroencephalography), ieeg (intracranial
+    electroencephalography), beh (behavioral).
 
 1.  Task - a set of structured activities performed by the participant. Tasks
     are usually accompanied by stimuli and responses, and can greatly vary in
     complexity. For the purpose of this specification we consider the so-called
-    “resting state” a task. In the context of brain scanning, a task is always
+    "resting state" a task. In the context of brain scanning, a task is always
     tied to one data acquisition. Therefore, even if during one acquisition the
     subject performed multiple conceptually different behaviors (with different
     sets of instructions) they will be considered one (combined) task.
@@ -71,7 +72,33 @@ not covered by this standard. The most sensible place to put it is next to the
 continuous recording file with the same naming scheme but different extensions.
 The solutions will change from case to case and publicly available datasets will
 be reviewed to include common data types in the future releases of the BIDS
-spec.
+specification.
+
+## File name structure
+
+A file name consists of a chain of *entities*, or key-value pairs, a *suffix* and an
+*extension*.
+Two prominent examples of entities are `subject` and `session`.
+
+For a data file that was collected in a given `session` from a given
+`subject`, the file name will begin with the string `sub-<label>_ses-<label>`.
+
+Note that `sub-<label>` corresponds to the `subject` entity because it has
+the `sub-` "key" and`<label>` "value", where `<label>` would in a real data file
+correspond to a unique identifier of that subject, such as `01`.
+The same holds for the `session` entity with its `ses-` key and its `<label>`
+value.
+
+A chain of entities, followed by a suffix, connected by underscores (`_`)
+produces a human readable file name, such as `sub-01_task-rest_eeg.edf`.
+It is evident from the file name alone that the file contains resting state
+data from subject `01`.
+The suffix `eeg` and the extension `.edf` depend on the imaging modality and
+the data format and indicate further details of the file's contents.
+
+A summary of all entities in BIDS and the order in which they MUST be
+specified is available in the [entity table](./99-appendices/04-entity-table.md)
+in the appendix.
 
 ## Source vs. raw vs. derived data
 
@@ -151,7 +178,7 @@ participant can exist only at participant level directory, i.e
 specific to a participant is to be declared only at top level of dataset for eg:
 `task-sist_bold.json` must be placed under `/dataset/task-sist_bold.json`
 
-Example 1: Two JSON files that are erroneously at the same level.
+Example 1: Two JSON files that are erroneously at the same level
 
 ```Text
 sub-01/
@@ -172,7 +199,7 @@ constraint that no more than one file may be defined at a given level of the
 directory structure. Instead `sub-01_ses-test_task-overtverbgeneration_run-2_bold.json`
 should have been under `sub-01/ses-test/func/`.
 
-Example 2: Multiple run and rec with same acquisition (acq) parameters acq-test1
+Example 2: Multiple `run`s and `rec`s with same acquisition (`acq`) parameters
 
 ```Text
 sub-01/
@@ -191,8 +218,7 @@ apply to different runs and rec files. Also if the JSON file
 (`task-xyz_acq-test1_bold.json`) is defined at dataset top level directory, it
 will be applicable to all task runs with `test1` acquisition parameter.
 
-Example 3: Multiple json files at different levels for same task and
-acquisition parameters
+Example 3: Multiple json files at different levels for same task and acquisition parameters
 
 ```Text
 task-xyz_acq-test1_bold.json
@@ -327,11 +353,14 @@ BIDS uses custom user-defined labels in several situations (naming of
 participants, sessions, acquisition schemes, etc.) Labels are strings and MUST
 only consist of letters (lower or upper case) and/or numbers. If numbers are
 used we RECOMMEND zero padding (e.g., `01` instead of `1` if you have more than
-nine subjects) to make alphabetical sorting more intuitive. Please note that the
-sub- prefix is not part of the subject label, but must be included in file names
-(similarly to other key names). In contrast to other labels, run and echo labels
-MUST be integers. Those labels MAY include zero padding, but this is NOT
-RECOMMENDED to maintain their uniqueness.
+nine subjects) to make alphabetical sorting more intuitive.
+
+Please note that a given label is distinct from the "prefix" it refers to. For
+example `sub-01` refers to the `sub` entity (a subject) with the label `01`.
+The `sub-` prefix is not part of the subject label, but must be included in file
+names (similarly to other key names). In contrast to other labels, `run` and
+`echo` labels MUST be integers. Those labels MAY include zero padding, but this
+is NOT RECOMMENDED to maintain their uniqueness.
 
 ## Units
 
diff --git a/src/04-modality-specific-files/01-magnetic-resonance-imaging-data.md b/src/04-modality-specific-files/01-magnetic-resonance-imaging-data.md
index 0723cbc5f5..5b8eb95277 100644
--- a/src/04-modality-specific-files/01-magnetic-resonance-imaging-data.md
+++ b/src/04-modality-specific-files/01-magnetic-resonance-imaging-data.md
@@ -136,12 +136,16 @@ modalities include:
 | Inplane T2         | inplaneT2        | T2-weighted anatomical image matched to functional acquisition                                                                                                                                                                          |
 | Angiography        | angio            |                                                                                                                                                                                                                                         |
 
+#### The `run` entity
+
 If several scans of the same modality are acquired they MUST be indexed with a
 key-value pair: `_run-1`, `_run-2`, `_run-3` etc. (only integers are allowed as
 run labels). When there is only one scan of a given type the run key MAY be
 omitted. Please note that diffusion imaging data is stored elsewhere (see
 below).
 
+#### The `acq` entity
+
 The OPTIONAL `acq-<label>` key/value pair 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 -
@@ -155,11 +159,15 @@ can also be used to make that distinction. At what level of detail to make the
 distinction (e.g. just between RARE and FLASH, or between RARE, FLASH, and
 FLASHsubsampled) remains at the discretion of the researcher.
 
+#### The `ce` entity
+
 Similarly the OPTIONAL `ce-<label>` key/value can be used to distinguish
 sequences using different contrast enhanced images. The label is the name of the
 contrast agent. The key `ContrastBolusIngredient` MAY be also be added in the
 JSON file, with the same label.
 
+#### The `rec` entity
+
 Similarly the OPTIONAL `rec-<label>` key/value can be used to distinguish
 different reconstruction algorithms (for example ones using motion correction).
 
@@ -372,20 +380,18 @@ however the user is free to choose any other label than `singleband` and
 `multiband` as long as they are consistent across subjects and sessions. For
 multiband acquisitions, one can also save the single-band reference image as
 type `sbref` (e.g. `dwi/sub-control01_sbref.nii[.gz]`) The bvec and bval files
-are in the FSL format<sup>4</sup>: The bvec files contain 3 rows with n
-space-delimited floating-point numbers (corresponding to the n volumes in the
-relevant NIfTI file). The first row contains the x elements, the second row
-contains the y elements and 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 volumes. Inherent to the FSL format for bvec
-specification is the fact that the coordinate system of the bvecs is with
-respect to the participant (i.e., defined by the axes of the corresponding
-dwi.nii file) and not the magnet’s coordinate system, which means that any
-rotations applied to dwi.nii also need to be applied to the corresponding bvec
-file.
-
-<sup>4</sup>[https://fsl.fmrib.ox.ac.uk/fsl/fslwiki/FDT/UserGuide#DTIFIT](https://fsl.fmrib.ox.ac.uk/fsl/fslwiki/FDT/UserGuide#DTIFIT)
+are in the [FSL format](https://fsl.fmrib.ox.ac.uk/fsl/fslwiki/FDT/UserGuide#DTIFIT):
+The bvec files contain 3 rows with n space-delimited floating-point numbers
+(corresponding to the n volumes in the relevant NIfTI file). The first row
+contains the x elements, the second row contains the y elements and 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 volumes. Inherent to
+the FSL format for bvec specification is the fact that the coordinate system of
+the bvecs is with respect to the participant (i.e., defined by the axes of the
+corresponding dwi.nii file) and not the magnet’s coordinate system, which means
+that any rotations applied to dwi.nii also need to be applied to the
+corresponding bvec file.
 
 bvec example:
 
diff --git a/src/99-appendices/04-entity-table.md b/src/99-appendices/04-entity-table.md
index cb8d96539b..863f9aad5f 100644
--- a/src/99-appendices/04-entity-table.md
+++ b/src/99-appendices/04-entity-table.md
@@ -7,18 +7,26 @@ precede the reconstruction entity. REQUIRED and OPTIONAL entities for a given
 file type are denoted. Entity formats indicate whether the value is alphanumeric
 (`<label>`) or numeric (`<index>`).
 
-| Entity                   | Format              | anat<br>(T1w T2w T1rho T1map T2map T2star FLAIR FLASH PD PDmap PDT2 inplaneT1 inplaneT2 angio) | anat<br>(defacemask) | func<br>(bold sbref events) | func<br>(physio stim) | dwi<br>(dwi bvec bval) | fmap<br>(phasediff phase1 phase2 magnitude1 magnitude2 magnitude fieldmap) | fmap<br>(epi) | beh<br>(events stim physio) | meg<br>  | eeg<br>  | ieeg<br> | channels<br>(meg/eeg/ieeg) | headshape<br>(meg) | markers<br>(meg) | photo<br>(meg/eeg/ieeg) | electrodes<br>(eeg/ieeg) | events<br>(meg/eeg/ieeg) |
-| :----------------------- | :------------------ | :--------------------------------------------------------------------------------------------- | :------------------- | :-------------------------- | :-------------------- | :--------------------- | :------------------------------------------------------------------------- | :------------ | :-------------------------- | :------- | :------- | :------- | :------------------------- | :----------------- | :--------------- | :---------------------- | :----------------------- | :----------------------- |
-| Subject                  | `sub-<label>`       | REQUIRED                                                                                       | REQUIRED             | REQUIRED                    | REQUIRED              | REQUIRED               | REQUIRED                                                                   | REQUIRED      | REQUIRED                    | REQUIRED | REQUIRED | REQUIRED | REQUIRED                   | REQUIRED           | REQUIRED         | REQUIRED                | REQUIRED                 | REQUIRED                 |
-| Session                  | `ses-<label>`       | OPTIONAL                                                                                       | OPTIONAL             | OPTIONAL                    | OPTIONAL              | OPTIONAL               | OPTIONAL                                                                   | OPTIONAL      | OPTIONAL                    | OPTIONAL | OPTIONAL | OPTIONAL | OPTIONAL                   | OPTIONAL           | OPTIONAL         | OPTIONAL                | OPTIONAL                 | OPTIONAL                 |
-| Task                     | `task-<label>`      |                                                                                                |                      | REQUIRED                    | REQUIRED              |                        |                                                                            |               | REQUIRED                    | REQUIRED | REQUIRED | REQUIRED | REQUIRED                   |                    | OPTIONAL         |                         |                          | REQUIRED                 |
-| Acquisition              | `acq-<label>`       | OPTIONAL                                                                                       | OPTIONAL             | OPTIONAL                    | OPTIONAL              | OPTIONAL               | OPTIONAL                                                                   | OPTIONAL      |                             | OPTIONAL | OPTIONAL | OPTIONAL |                            | OPTIONAL           | OPTIONAL         | OPTIONAL                | OPTIONAL                 |                          |
-| Contrast Enhancing Agent | `ce-<label>`        | OPTIONAL                                                                                       | OPTIONAL             | OPTIONAL                    |                       |                        |                                                                            | OPTIONAL      |                             |          |          |          |                            |                    |                  |                         |                          |                          |
-| Reconstruction           | `rec-<label>`       | OPTIONAL                                                                                       | OPTIONAL             | OPTIONAL                    | OPTIONAL              |                        |                                                                            |               |                             |          |          |          |                            |                    |                  |                         |                          |                          |
-| Phase-Encoding Direction | `dir-<label>`       |                                                                                                |                      | OPTIONAL                    |                       | OPTIONAL               |                                                                            | REQUIRED      |                             |          |          |          |                            |                    |                  |                         |                          |                          |
-| Run                      | `run-<index>`       |                                                                                                |                      | OPTIONAL                    | OPTIONAL              | OPTIONAL               | OPTIONAL                                                                   | OPTIONAL      |                             | OPTIONAL | OPTIONAL | OPTIONAL | OPTIONAL                   |                    |                  |                         |                          | OPTIONAL                 |
-| Corresponding modality   | `mod-<label>`       |                                                                                                | OPTIONAL             |                             |                       |                        |                                                                            |               |                             |          |          |          |                            |                    |                  |                         |                          |                          |
-| Echo                     | `echo-<index>`      |                                                                                                |                      | OPTIONAL                    |                       |                        |                                                                            |               |                             |          |          |          |                            |                    |                  |                         |                          |                          |
-| Recording                | `recording-<label>` |                                                                                                |                      |                             | OPTIONAL              |                        |                                                                            |               |                             |          |          |          |                            |                    |                  |                         |                          |                          |
-| Processed (on device)    | `proc-<label>`      |                                                                                                |                      |                             | OPTIONAL              |                        |                                                                            |               |                             | OPTIONAL |          |          |                            |                    |                  |                         |                          |                          |
-| Space                    | `space-<label>`     |                                                                                                |                      |                             |                       |                        |                                                                            |               |                             |          |          |          |                            | OPTIONAL           | OPTIONAL         |                         | OPTIONAL                 |                          |
+A general introduction to entities is given in the section on
+[file name structure](../02-common-principles.md#file-name-structure)
+
+| Entity                                                                                         | Subject       | Session       | Task           | Acquisition   | Contrast Enhancing Agent | Reconstruction | Phase-Encoding Direction | Run           | Corresponding modality | Echo           | Recording           | Processed (on device) | Space           |
+| :--------------------------------------------------------------------------------------------- | :------------ | :------------ | :------------- | :------------ | :----------------------- | :------------- | :----------------------- | :------------ | :--------------------- | :------------- | :------------------ | :-------------------- | :---------------|
+| Format                                                                                         | `sub-<label>` | `ses-<label>` | `task-<label>` | `acq-<label>` | `ce-<label>`             | `rec-<label>`  | `dir-<label>`            | `run-<index>` | `mod-<label>`          | `echo-<index>` | `recording-<label>` | `proc-<label>`        | `space-<label>` |
+| anat<br>(T1w T2w T1rho T1map T2map T2star FLAIR FLASH PD PDmap PDT2 inplaneT1 inplaneT2 angio) | REQUIRED      | OPTIONAL      |                | OPTIONAL      | OPTIONAL                 | OPTIONAL       |                          |               |                        |                |                     |                       |                 |
+| anat<br>(defacemask)                                                                           | REQUIRED      | OPTIONAL      |                | OPTIONAL      | OPTIONAL                 | OPTIONAL       |                          |               | OPTIONAL               |                |                     |                       |                 |
+| func<br>(bold sbref events)                                                                    | REQUIRED      | OPTIONAL      | REQUIRED       | OPTIONAL      | OPTIONAL                 | OPTIONAL       | OPTIONAL                 | OPTIONAL      |                        | OPTIONAL       |                     |                       |                 |
+| func<br>(physio stim)                                                                          | REQUIRED      | OPTIONAL      | REQUIRED       | OPTIONAL      |                          | OPTIONAL       |                          | OPTIONAL      |                        |                | OPTIONAL            | OPTIONAL              |                 |
+| dwi<br>(dwi bvec bval)                                                                         | REQUIRED      | 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      |                        |                |                     |                       |                 |
+| beh<br>(events stim physio)                                                                    | REQUIRED      | OPTIONAL      | REQUIRED       |               |                          |                |                          |               |                        |                |                     |                       |                 |
+| meg<br>                                                                                        | REQUIRED      | OPTIONAL      | REQUIRED       | OPTIONAL      |                          |                |                          | OPTIONAL      |                        |                |                     | OPTIONAL              |                 |
+| eeg<br>                                                                                        | REQUIRED      | OPTIONAL      | REQUIRED       | OPTIONAL      |                          |                |                          | OPTIONAL      |                        |                |                     |                       |                 |
+| ieeg<br>                                                                                       | REQUIRED      | OPTIONAL      | REQUIRED       | OPTIONAL      |                          |                |                          | OPTIONAL      |                        |                |                     |                       |                 |
+| channels<br>(meg/eeg/ieeg)                                                                     | REQUIRED      | OPTIONAL      | REQUIRED       |               |                          |                |                          | OPTIONAL      |                        |                |                     |                       |                 |
+| headshape<br>(meg)                                                                             | REQUIRED      | OPTIONAL      |                | OPTIONAL      |                          |                |                          |               |                        |                |                     |                       | OPTIONAL        |
+| markers<br>(meg)                                                                               | REQUIRED      | OPTIONAL      | OPTIONAL       | OPTIONAL      |                          |                |                          |               |                        |                |                     |                       | OPTIONAL        |
+| photo<br>(meg/eeg/ieeg)                                                                        | REQUIRED      | OPTIONAL      |                | OPTIONAL      |                          |                |                          |               |                        |                |                     |                       |                 |        
+| electrodes<br>(eeg/ieeg)                                                                       | REQUIRED      | OPTIONAL      |                | OPTIONAL      |                          |                |                          |               |                        |                |                     |                       | OPTIONAL        |
+| events<br>(meg/eeg/ieeg)                                                                       | REQUIRED      | OPTIONAL      | REQUIRED       |               |                          |                |                          | OPTIONAL      |                        |                |                     |                       |                 |        
diff --git a/src/CHANGES.md b/src/CHANGES.md
index b25e59c55f..3b7efd7596 100644
--- a/src/CHANGES.md
+++ b/src/CHANGES.md
@@ -6,6 +6,7 @@ Changelog
 -   \[ENH] Update contributing guide and README to make discussion forums easy to find [#279](https://github.com/bids-standard/bids-specification/pull/279) ([emdupre](https://github.com/emdupre))
 -   \[ENH] Starter Kit dropdown menu [#278](https://github.com/bids-standard/bids-specification/pull/278) ([franklin-feingold](https://github.com/franklin-feingold))
 -   \[INFRA] Update pipenv [#274](https://github.com/bids-standard/bids-specification/pull/274) ([sappelhoff](https://github.com/sappelhoff))
+-   \[INFRA] Transpose the entity table and link to text anchors describing each entity [#272](https://github.com/bids-standard/bids-specification/pull/272) ([sappelhoff](https://github.com/sappelhoff))
 -   \[ENH] Add Twitter badge to README and link to website to landing page [#268](https://github.com/bids-standard/bids-specification/pull/268) ([franklin-feingold](https://github.com/franklin-feingold))
 -   \[ENH] adding release guidelines [#267](https://github.com/bids-standard/bids-specification/pull/267) ([franklin-feingold](https://github.com/franklin-feingold))
 -   \[FIX] Common principles: Fix filename in inheritance principle [#261](https://github.com/bids-standard/bids-specification/pull/261) ([Lestropie](https://github.com/Lestropie))