From acd6d354dce7428ba54290cd4d4db5e54b11260b Mon Sep 17 00:00:00 2001
From: "victor.petukhov" <victor.petukhov@jetbrains.com>
Date: Fri, 28 Dec 2018 15:19:20 +0300
Subject: [PATCH] Support several spec places to which tests are linked and
 require specify spec version for each test

---
 .../boolean-literals/p-1/pos/2.1.kt           |  5 ++-
 .../boolean-literals/p-1/pos/2.10.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.11.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.12.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.13.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.14.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.15.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.16.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.17.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.18.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.19.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.2.kt           |  5 ++-
 .../boolean-literals/p-1/pos/2.20.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.21.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.22.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.23.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.24.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.25.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.26.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.3.kt           |  5 ++-
 .../boolean-literals/p-1/pos/2.4.kt           |  5 ++-
 .../boolean-literals/p-1/pos/2.5.kt           |  5 ++-
 .../boolean-literals/p-1/pos/2.6.kt           |  5 ++-
 .../boolean-literals/p-1/pos/2.7.kt           |  5 ++-
 .../boolean-literals/p-1/pos/2.8.kt           |  5 ++-
 .../boolean-literals/p-1/pos/2.9.kt           |  5 ++-
 .../binary-integer-literals/p-1/pos/1.1.kt    |  5 ++-
 .../binary-integer-literals/p-1/pos/2.1.kt    |  5 ++-
 .../decimal-integer-literals/p-1/pos/1.1.kt   |  5 ++-
 .../decimal-integer-literals/p-1/pos/2.1.kt   |  5 ++-
 .../p-1/pos/1.1.kt                            |  5 ++-
 .../p-1/pos/2.1.kt                            |  5 ++-
 .../long-integer-literals/p-1/pos/1.1.kt      |  5 ++-
 .../long-integer-literals/p-1/pos/1.2.kt      |  5 ++-
 .../long-integer-literals/p-1/pos/1.3.kt      |  5 ++-
 .../real-literals/p-1/pos/1.1.kt              |  5 ++-
 .../real-literals/p-1/pos/3.1.kt              |  5 ++-
 .../real-literals/p-2/pos/1.1.kt              |  5 ++-
 .../real-literals/p-2/pos/1.2.kt              |  5 ++-
 .../real-literals/p-3/pos/1.1.kt              |  5 ++-
 .../real-literals/p-3/pos/1.2.kt              |  5 ++-
 .../real-literals/p-3/pos/1.3.kt              |  5 ++-
 .../real-literals/p-3/pos/1.4.kt              |  5 ++-
 .../real-literals/p-3/pos/2.1.kt              |  5 ++-
 .../real-literals/p-3/pos/2.2.kt              |  5 ++-
 .../real-literals/p-3/pos/2.3.kt              |  5 ++-
 .../real-literals/p-4/pos/1.1.kt              |  5 ++-
 .../real-literals/p-4/pos/1.2.kt              |  5 ++-
 .../real-literals/p-4/pos/1.3.kt              |  5 ++-
 .../real-literals/p-4/pos/1.4.kt              |  5 ++-
 .../real-literals/p-4/pos/1.5.kt              |  5 ++-
 .../templates/_layout/linkedTestsLayout.kt    |  5 ++-
 .../boolean-literals/p-1/neg/3.1.kt           |  5 ++-
 .../boolean-literals/p-1/pos/3.1.kt           |  5 ++-
 .../boolean-literals/p-1/pos/3.2.kt           |  5 ++-
 .../binary-integer-literals/p-1/neg/1.1.kt    |  5 ++-
 .../binary-integer-literals/p-1/neg/2.1.kt    |  5 ++-
 .../binary-integer-literals/p-1/neg/2.2.kt    |  5 ++-
 .../binary-integer-literals/p-1/neg/2.3.kt    |  5 ++-
 .../decimal-integer-literals/p-1/neg/2.1.kt   |  5 ++-
 .../decimal-integer-literals/p-1/neg/2.2.kt   |  5 ++-
 .../p-1/neg/1.1.kt                            |  5 ++-
 .../p-1/neg/2.1.kt                            |  5 ++-
 .../p-1/neg/2.2.kt                            |  5 ++-
 .../p-1/neg/2.3.kt                            |  5 ++-
 .../long-integer-literals/p-1/neg/1.1.kt      |  5 ++-
 .../long-integer-literals/p-1/neg/1.2.kt      |  5 ++-
 .../long-integer-literals/p-1/neg/1.3.kt      |  5 ++-
 .../long-integer-literals/p-1/neg/2.1.kt      |  5 ++-
 .../long-integer-literals/p-1/neg/2.2.kt      |  5 ++-
 .../long-integer-literals/p-1/neg/2.3.kt      |  5 ++-
 .../long-integer-literals/p-1/neg/2.4.kt      |  5 ++-
 .../long-integer-literals/p-1/neg/2.5.kt      |  5 ++-
 .../long-integer-literals/p-1/pos/2.1.kt      |  5 ++-
 .../long-integer-literals/p-1/pos/2.2.kt      |  5 ++-
 .../long-integer-literals/p-1/pos/2.3.kt      |  5 ++-
 .../long-integer-literals/p-1/pos/2.4.kt      |  5 ++-
 .../long-integer-literals/p-1/pos/2.5.kt      |  5 ++-
 .../real-literals/p-1/neg/1.1.kt              |  5 ++-
 .../real-literals/p-1/neg/3.1.kt              |  5 ++-
 .../real-literals/p-1/pos/1.1.kt              |  5 ++-
 .../real-literals/p-1/pos/1.2.kt              |  5 ++-
 .../real-literals/p-1/pos/3.1.kt              |  5 ++-
 .../real-literals/p-1/pos/3.2.kt              |  5 ++-
 .../real-literals/p-2/neg/1.1.kt              |  5 ++-
 .../real-literals/p-2/neg/1.2.kt              |  5 ++-
 .../real-literals/p-2/neg/1.3.kt              |  5 ++-
 .../real-literals/p-2/neg/1.4.kt              |  5 ++-
 .../real-literals/p-2/pos/1.1.kt              |  5 ++-
 .../real-literals/p-2/pos/1.2.kt              |  5 ++-
 .../real-literals/p-3/neg/1.1.kt              |  5 ++-
 .../real-literals/p-3/neg/1.2.kt              |  5 ++-
 .../real-literals/p-3/neg/2.1.kt              |  5 ++-
 .../real-literals/p-3/pos/1.1.kt              |  5 ++-
 .../real-literals/p-3/pos/1.2.kt              |  5 ++-
 .../real-literals/p-3/pos/1.3.kt              |  5 ++-
 .../real-literals/p-3/pos/1.4.kt              |  5 ++-
 .../real-literals/p-3/pos/1.5.kt              |  5 ++-
 .../real-literals/p-3/pos/2.1.kt              |  5 ++-
 .../real-literals/p-3/pos/2.2.kt              |  5 ++-
 .../real-literals/p-3/pos/2.3.kt              |  5 ++-
 .../real-literals/p-4/neg/1.1.kt              |  5 ++-
 .../real-literals/p-4/neg/1.2.kt              |  5 ++-
 .../real-literals/p-4/neg/2.1.kt              |  5 ++-
 .../real-literals/p-4/neg/2.2.kt              |  5 ++-
 .../real-literals/p-4/neg/2.3.kt              |  5 ++-
 .../real-literals/p-4/pos/1.1.kt              |  5 ++-
 .../real-literals/p-4/pos/1.2.kt              |  5 ++-
 .../real-literals/p-4/pos/1.3.kt              |  5 ++-
 .../real-literals/p-4/pos/1.4.kt              |  5 ++-
 .../real-literals/p-4/pos/1.5.kt              |  5 ++-
 .../real-literals/p-5/pos/1.1.kt              |  5 ++-
 .../real-literals/p-5/pos/1.2.kt              |  5 ++-
 .../real-literals/p-5/pos/1.3.kt              |  5 ++-
 .../real-literals/p-5/pos/1.4.kt              |  5 ++-
 .../real-literals/p-5/pos/1.5.kt              |  5 ++-
 .../linked/when-expression/p-11/neg/1.1.kt    |  5 ++-
 .../linked/when-expression/p-11/neg/1.2.kt    |  5 ++-
 .../linked/when-expression/p-11/neg/3.1.kt    |  5 ++-
 .../linked/when-expression/p-11/neg/6.1.kt    |  5 ++-
 .../linked/when-expression/p-11/neg/7.1.kt    |  5 ++-
 .../linked/when-expression/p-11/neg/8.1.kt    |  5 ++-
 .../linked/when-expression/p-11/neg/8.2.kt    |  5 ++-
 .../linked/when-expression/p-11/neg/8.3.kt    |  5 ++-
 .../linked/when-expression/p-11/pos/1.1.kt    |  5 ++-
 .../linked/when-expression/p-11/pos/1.2.kt    |  5 ++-
 .../linked/when-expression/p-11/pos/1.3.kt    |  5 ++-
 .../linked/when-expression/p-11/pos/3.1.kt    |  5 ++-
 .../linked/when-expression/p-11/pos/6.1.kt    |  5 ++-
 .../linked/when-expression/p-11/pos/7.1.kt    |  5 ++-
 .../linked/when-expression/p-11/pos/8.1.kt    |  5 ++-
 .../linked/when-expression/p-11/pos/8.2.kt    |  5 ++-
 .../linked/when-expression/p-11/pos/8.3.kt    |  5 ++-
 .../linked/when-expression/p-2/pos/3.1.kt     |  5 ++-
 .../linked/when-expression/p-2/pos/3.2.kt     |  5 ++-
 .../linked/when-expression/p-3/neg/1.1.kt     |  5 ++-
 .../linked/when-expression/p-3/neg/2.1.kt     |  5 ++-
 .../linked/when-expression/p-3/neg/2.2.kt     |  5 ++-
 .../linked/when-expression/p-3/pos/1.1.kt     |  5 ++-
 .../linked/when-expression/p-3/pos/2.1.kt     |  5 ++-
 .../linked/when-expression/p-3/pos/2.2.kt     |  5 ++-
 .../linked/when-expression/p-3/pos/2.3.kt     |  5 ++-
 .../linked/when-expression/p-5/neg/1.1.kt     |  5 ++-
 .../linked/when-expression/p-5/pos/1.1.kt     |  5 ++-
 .../linked/when-expression/p-6/neg/1.1.kt     |  5 ++-
 .../linked/when-expression/p-6/pos/1.1.kt     |  5 ++-
 .../linked/when-expression/p-7/neg/1.1.kt     |  5 ++-
 .../linked/when-expression/p-7/neg/1.2.kt     |  5 ++-
 .../linked/when-expression/p-7/neg/3.1.kt     |  5 ++-
 .../linked/when-expression/p-7/neg/3.2.kt     |  5 ++-
 .../linked/when-expression/p-7/neg/5.1.kt     |  5 ++-
 .../linked/when-expression/p-7/neg/5.2.kt     |  5 ++-
 .../linked/when-expression/p-7/neg/7.1.kt     |  5 ++-
 .../linked/when-expression/p-7/pos/1.1.kt     |  5 ++-
 .../linked/when-expression/p-7/pos/1.2.kt     |  5 ++-
 .../linked/when-expression/p-7/pos/1.3.kt     |  5 ++-
 .../linked/when-expression/p-7/pos/1.4.kt     |  5 ++-
 .../linked/when-expression/p-7/pos/3.1.kt     |  5 ++-
 .../linked/when-expression/p-7/pos/3.2.kt     |  5 ++-
 .../linked/when-expression/p-7/pos/5.1.kt     |  5 ++-
 .../linked/when-expression/p-7/pos/5.2.kt     |  5 ++-
 .../linked/when-expression/p-7/pos/7.1.kt     |  5 ++-
 .../linked/when-expression/p-9/neg/1.1.kt     |  5 ++-
 .../linked/when-expression/p-9/neg/1.2.kt     |  5 ++-
 .../linked/when-expression/p-9/neg/1.3.kt     |  5 ++-
 .../linked/when-expression/p-9/neg/1.4.kt     |  5 ++-
 .../linked/when-expression/p-9/pos/1.1.kt     |  5 ++-
 .../linked/when-expression/p-9/pos/1.2.kt     |  5 ++-
 .../linked/when-expression/p-9/pos/1.3.kt     |  5 ++-
 .../linked/when-expression/p-9/pos/1.4.kt     |  5 ++-
 .../boolean-literals/p-1/neg/2.1.kt           |  5 ++-
 .../boolean-literals/p-1/neg/2.10.kt          |  5 ++-
 .../boolean-literals/p-1/neg/2.11.kt          |  5 ++-
 .../boolean-literals/p-1/neg/2.12.kt          |  5 ++-
 .../boolean-literals/p-1/neg/2.13.kt          |  5 ++-
 .../boolean-literals/p-1/neg/2.14.kt          |  5 ++-
 .../boolean-literals/p-1/neg/2.15.kt          |  5 ++-
 .../boolean-literals/p-1/neg/2.16.kt          |  5 ++-
 .../boolean-literals/p-1/neg/2.17.kt          |  5 ++-
 .../boolean-literals/p-1/neg/2.18.kt          |  5 ++-
 .../boolean-literals/p-1/neg/2.19.kt          |  5 ++-
 .../boolean-literals/p-1/neg/2.2.kt           |  5 ++-
 .../boolean-literals/p-1/neg/2.20.kt          |  5 ++-
 .../boolean-literals/p-1/neg/2.21.kt          |  5 ++-
 .../boolean-literals/p-1/neg/2.22.kt          |  5 ++-
 .../boolean-literals/p-1/neg/2.23.kt          |  5 ++-
 .../boolean-literals/p-1/neg/2.24.kt          |  5 ++-
 .../boolean-literals/p-1/neg/2.25.kt          |  5 ++-
 .../boolean-literals/p-1/neg/2.26.kt          |  5 ++-
 .../boolean-literals/p-1/neg/2.3.kt           |  5 ++-
 .../boolean-literals/p-1/neg/2.4.kt           |  5 ++-
 .../boolean-literals/p-1/neg/2.5.kt           |  5 ++-
 .../boolean-literals/p-1/neg/2.6.kt           |  5 ++-
 .../boolean-literals/p-1/neg/2.7.kt           |  5 ++-
 .../boolean-literals/p-1/neg/2.8.kt           |  5 ++-
 .../boolean-literals/p-1/neg/2.9.kt           |  5 ++-
 .../boolean-literals/p-1/pos/2.1.kt           |  5 ++-
 .../boolean-literals/p-1/pos/2.10.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.11.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.12.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.13.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.14.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.15.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.16.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.17.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.18.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.19.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.2.kt           |  5 ++-
 .../boolean-literals/p-1/pos/2.20.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.21.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.22.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.23.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.24.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.25.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.26.kt          |  5 ++-
 .../boolean-literals/p-1/pos/2.3.kt           |  5 ++-
 .../boolean-literals/p-1/pos/2.4.kt           |  5 ++-
 .../boolean-literals/p-1/pos/2.5.kt           |  5 ++-
 .../boolean-literals/p-1/pos/2.6.kt           |  5 ++-
 .../boolean-literals/p-1/pos/2.7.kt           |  5 ++-
 .../boolean-literals/p-1/pos/2.8.kt           |  5 ++-
 .../boolean-literals/p-1/pos/2.9.kt           |  5 ++-
 .../binary-integer-literals/p-1/neg/1.1.kt    |  5 ++-
 .../binary-integer-literals/p-1/neg/1.2.kt    |  5 ++-
 .../binary-integer-literals/p-1/neg/2.1.kt    |  5 ++-
 .../binary-integer-literals/p-1/pos/1.1.kt    |  5 ++-
 .../binary-integer-literals/p-1/pos/1.2.kt    |  5 ++-
 .../binary-integer-literals/p-1/pos/1.3.kt    |  5 ++-
 .../binary-integer-literals/p-1/pos/2.1.kt    |  5 ++-
 .../binary-integer-literals/p-1/pos/2.2.kt    |  5 ++-
 .../binary-integer-literals/p-1/pos/2.3.kt    |  5 ++-
 .../binary-integer-literals/p-1/pos/2.4.kt    |  5 ++-
 .../decimal-integer-literals/p-1/neg/1.1.kt   |  5 ++-
 .../decimal-integer-literals/p-1/pos/1.1.kt   |  5 ++-
 .../decimal-integer-literals/p-1/pos/2.1.kt   |  5 ++-
 .../decimal-integer-literals/p-1/pos/2.2.kt   |  5 ++-
 .../decimal-integer-literals/p-1/pos/2.3.kt   |  5 ++-
 .../decimal-integer-literals/p-2/neg/1.1.kt   |  5 ++-
 .../decimal-integer-literals/p-2/neg/1.2.kt   |  5 ++-
 .../p-1/neg/1.1.kt                            |  5 ++-
 .../p-1/neg/1.2.kt                            |  5 ++-
 .../p-1/neg/2.1.kt                            |  5 ++-
 .../p-1/pos/1.1.kt                            |  5 ++-
 .../p-1/pos/1.2.kt                            |  5 ++-
 .../p-1/pos/2.1.kt                            |  5 ++-
 .../p-1/pos/2.2.kt                            |  5 ++-
 .../p-1/pos/2.3.kt                            |  5 ++-
 .../p-1/pos/2.4.kt                            |  5 ++-
 .../long-integer-literals/p-1/neg/1.1.kt      |  5 ++-
 .../long-integer-literals/p-1/neg/1.2.kt      |  5 ++-
 .../long-integer-literals/p-1/neg/1.3.kt      |  5 ++-
 .../long-integer-literals/p-1/neg/1.4.kt      |  5 ++-
 .../long-integer-literals/p-1/pos/1.1.kt      |  5 ++-
 .../long-integer-literals/p-1/pos/1.10.kt     |  5 ++-
 .../long-integer-literals/p-1/pos/1.2.kt      |  5 ++-
 .../long-integer-literals/p-1/pos/1.3.kt      |  5 ++-
 .../long-integer-literals/p-1/pos/1.4.kt      |  5 ++-
 .../long-integer-literals/p-1/pos/1.5.kt      |  5 ++-
 .../long-integer-literals/p-1/pos/1.6.kt      |  5 ++-
 .../long-integer-literals/p-1/pos/1.7.kt      |  5 ++-
 .../long-integer-literals/p-1/pos/1.8.kt      |  5 ++-
 .../long-integer-literals/p-1/pos/1.9.kt      |  5 ++-
 .../real-literals/p-1/neg/1.1.kt              |  5 ++-
 .../real-literals/p-1/neg/1.2.kt              |  5 ++-
 .../real-literals/p-1/neg/1.3.kt              |  5 ++-
 .../real-literals/p-1/neg/2.1.kt              |  5 ++-
 .../real-literals/p-1/neg/2.2.kt              |  5 ++-
 .../real-literals/p-1/neg/2.3.kt              |  5 ++-
 .../real-literals/p-1/neg/3.1.kt              |  5 ++-
 .../real-literals/p-1/neg/3.2.kt              |  5 ++-
 .../real-literals/p-1/neg/3.3.kt              |  5 ++-
 .../real-literals/p-1/pos/1.1.kt              |  5 ++-
 .../real-literals/p-1/pos/1.2.kt              |  5 ++-
 .../real-literals/p-1/pos/3.1.kt              |  5 ++-
 .../real-literals/p-1/pos/3.2.kt              |  5 ++-
 .../real-literals/p-2/neg/1.1.kt              |  5 ++-
 .../real-literals/p-2/neg/1.2.kt              |  5 ++-
 .../real-literals/p-2/neg/1.3.kt              |  5 ++-
 .../real-literals/p-2/neg/1.4.kt              |  5 ++-
 .../real-literals/p-2/pos/1.1.kt              |  5 ++-
 .../real-literals/p-2/pos/1.2.kt              |  5 ++-
 .../real-literals/p-2/pos/1.3.kt              |  5 ++-
 .../real-literals/p-2/pos/1.4.kt              |  5 ++-
 .../real-literals/p-2/pos/1.5.kt              |  5 ++-
 .../real-literals/p-2/pos/1.6.kt              |  5 ++-
 .../real-literals/p-3/neg/1.1.kt              |  5 ++-
 .../real-literals/p-3/neg/1.2.kt              |  5 ++-
 .../real-literals/p-3/neg/1.3.kt              |  5 ++-
 .../real-literals/p-3/neg/1.4.kt              |  5 ++-
 .../real-literals/p-3/neg/1.5.kt              |  5 ++-
 .../real-literals/p-3/neg/2.1.kt              |  5 ++-
 .../real-literals/p-3/neg/3.1.kt              |  5 ++-
 .../real-literals/p-3/pos/1.1.kt              |  5 ++-
 .../real-literals/p-3/pos/1.2.kt              |  5 ++-
 .../real-literals/p-3/pos/1.3.kt              |  5 ++-
 .../real-literals/p-3/pos/1.4.kt              |  5 ++-
 .../real-literals/p-3/pos/1.5.kt              |  5 ++-
 .../real-literals/p-3/pos/1.6.kt              |  5 ++-
 .../real-literals/p-3/pos/2.1.kt              |  5 ++-
 .../real-literals/p-3/pos/2.2.kt              |  5 ++-
 .../real-literals/p-3/pos/2.3.kt              |  5 ++-
 .../real-literals/p-3/pos/2.4.kt              |  5 ++-
 .../real-literals/p-4/neg/1.1.kt              |  5 ++-
 .../real-literals/p-4/neg/1.2.kt              |  5 ++-
 .../real-literals/p-4/neg/1.3.kt              |  5 ++-
 .../real-literals/p-4/neg/1.4.kt              |  5 ++-
 .../real-literals/p-4/pos/1.1.kt              |  5 ++-
 .../real-literals/p-4/pos/1.2.kt              |  5 ++-
 .../real-literals/p-4/pos/1.3.kt              |  5 ++-
 .../real-literals/p-4/pos/1.4.kt              |  5 ++-
 .../real-literals/p-4/pos/1.5.kt              |  5 ++-
 .../real-literals/p-4/pos/1.6.kt              |  5 ++-
 .../real-literals/p-4/pos/1.7.kt              |  5 ++-
 .../real-literals/p-4/pos/2.1.kt              |  5 ++-
 .../real-literals/p-4/pos/2.2.kt              |  5 ++-
 .../real-literals/p-4/pos/2.3.kt              |  5 ++-
 .../real-literals/p-6/neg/1.1.kt              |  5 ++-
 .../psi/linked/when-expression/p-2/neg/3.1.kt |  5 ++-
 .../psi/linked/when-expression/p-2/neg/3.2.kt |  5 ++-
 .../psi/linked/when-expression/p-2/pos/3.1.kt |  5 ++-
 .../psi/linked/when-expression/p-2/pos/3.2.kt |  5 ++-
 .../psi/linked/when-expression/p-3/neg/1.1.kt |  5 ++-
 .../psi/linked/when-expression/p-3/neg/1.2.kt |  5 ++-
 .../psi/linked/when-expression/p-3/neg/2.1.kt |  5 ++-
 .../psi/linked/when-expression/p-3/neg/2.2.kt |  5 ++-
 .../psi/linked/when-expression/p-6/neg/1.1.kt |  5 ++-
 .../psi/linked/when-expression/p-6/neg/1.2.kt |  5 ++-
 .../psi/linked/when-expression/p-6/neg/1.3.kt |  5 ++-
 .../psi/linked/when-expression/p-7/neg/1.1.kt |  5 ++-
 .../psi/linked/when-expression/p-7/neg/1.2.kt |  5 ++-
 .../psi/linked/when-expression/p-7/neg/3.1.kt |  5 ++-
 .../psi/linked/when-expression/p-7/neg/5.1.kt |  5 ++-
 .../psi/linked/when-expression/p-7/neg/7.1.kt |  5 ++-
 .../templates/_layout/linkedTestsLayout.kt    |  5 ++-
 .../kotlin/spec/models/AbstractSpecTest.kt    |  5 +--
 .../kotlin/spec/models/LinkedSpecTest.kt      | 32 ++++++++++-------
 .../kotlin/spec/models/NotLinkedSpecTest.kt   |  5 ++-
 .../kotlin/spec/parsers/CommonParser.kt       | 35 +++++++++++++------
 .../jetbrains/kotlin/spec/parsers/Patterns.kt | 22 +++++++-----
 .../kotlin/spec/parsers/TestInfoParser.kt     |  2 --
 .../kotlin/spec/utils/TestsJsonMapBuilder.kt  |  4 +--
 341 files changed, 736 insertions(+), 1039 deletions(-)

diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.1.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.1.kt
index 67d70efc124..11b2c823f7a 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.1.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the class.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.10.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.10.kt
index 7c44d0902e7..c2e77b854e1 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.10.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.10.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 10
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the companionObject.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.11.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.11.kt
index 41b6e33afa5..91cbc301804 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.11.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.11.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 11
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the function.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.12.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.12.kt
index b6bf1bada19..d5f341a55f1 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.12.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.12.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 12
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the setter.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.13.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.13.kt
index 71dd5f7cde1..2c2a2016979 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.13.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.13.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 13
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the simpleUserType.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.14.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.14.kt
index acd4005cb9a..0693a2b10d1 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.14.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.14.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 14
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the typeParameter.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.15.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.15.kt
index 5e4c31d8bc0..75dcac9b221 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.15.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.15.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 15
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the parameter.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.16.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.16.kt
index 2fb7de9a1b3..6bdcf0acb06 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.16.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.16.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 16
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the fileAnnotationComplex.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.17.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.17.kt
index f08a540fabb..b283419826f 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.17.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.17.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 17
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the object.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.18.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.18.kt
index 37db75c02bc..b897aea94f3 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.18.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.18.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 18
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the typeAlias.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.19.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.19.kt
index 61c2653f561..2ae4730cdac 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.19.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.19.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 19
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the import.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.2.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.2.kt
index 49c7a6699a7..0e7257a86e3 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.2.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the labelReference.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.20.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.20.kt
index 1f9edde404d..31fa47d5106 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.20.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.20.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 20
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the infixFunctionCall.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.21.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.21.kt
index 5b7f1d5a5f5..e17189870d2 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.21.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.21.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 21
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the catchBlock.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.22.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.22.kt
index b5a73369c79..6a8715a50f7 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.22.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.22.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 22
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the labelDefinition.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.23.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.23.kt
index ca2a3003489..4ad980cbea8 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.23.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.23.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 23
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the atomicExpression.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.24.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.24.kt
index 8716ac9de75..c49e6e7655c 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.24.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.24.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 24
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the variableDeclarationEntry.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.25.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.25.kt
index 600035e9a6f..678a7a278fd 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.25.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.25.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 25
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the valueArgument.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.26.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.26.kt
index 84cb41c5ac9..f1e2a676459 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.26.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.26.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 26
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the callableReference.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.3.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.3.kt
index a0c1aeec218..2f20322978d 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.3.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.3.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the typeConstraint.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.4.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.4.kt
index ffe7aff8b49..ca2793aff95 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.4.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.4.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 4
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the fileAnnotationSimple.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.5.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.5.kt
index da9a2472aeb..c22a08cdae4 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.5.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.5.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 5
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the packageComplex.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.6.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.6.kt
index 20ac477d66b..50bbda438e2 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.6.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.6.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 6
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the packageSimple.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.7.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.7.kt
index 24fd300012e..bae64c26ed2 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.7.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.7.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 7
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the enumEntry.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.8.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.8.kt
index 51a85ab2aa5..7b8ec84329c 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.8.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.8.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 8
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the stringTemplateElement.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.9.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.9.kt
index 763f883073e..a5aeb9c5f20 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.9.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.9.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 9
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the unescapedAnnotation.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.kt
index d199109126f..7acf4569786 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, binary-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A sequence of decimal digit symbols (0 though 9) is a decimal integer literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Sequences with binary digit symbols.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.kt
index 2db21ebb959..761c5cfc222 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, binary-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] A sequence of decimal digit symbols (0 though 9) is a decimal integer literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Sequences with binary digit symbols separated by underscores.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.kt
index 2bda4e4b1dd..8af44753492 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, decimal-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A sequence of decimal digit symbols (0 though 9) is a decimal integer literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Sequences with decimal digit symbols.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.kt
index 4c6ce69a335..f28af57c1d8 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, decimal-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] Digits may be separated by an underscore symbol, but no underscore can be placed before the first digit or after the last one.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Sequences with decimal digit symbols separated by underscores.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.kt
index 9834817ec47..1b5818b984a 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, hexadecimal-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A sequence of decimal digit symbols (0 though 9) is a decimal integer literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Sequences with hexadecimal digit symbols.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.kt
index 4958a2d0406..b4d42895ee6 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, hexadecimal-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] A sequence of decimal digit symbols (0 though 9) is a decimal integer literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Sequences with hexadecimal digit symbols separated by underscores.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.1.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.1.kt
index a57cb0e99cb..e2edcb88d0d 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A sequence of decimal digit symbols (0 though 9) is a decimal integer literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Decimal integer literals with long literal mark.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.2.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.2.kt
index 14c5d75663b..c37f4f7c378 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.2.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A sequence of decimal digit symbols (0 though 9) is a decimal integer literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Hexadecimal integer literals with long literal mark.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.3.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.3.kt
index ad21ae04971..fc438feb66c 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.3.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A sequence of decimal digit symbols (0 though 9) is a decimal integer literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Binary integer literals with long literal mark.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-1/pos/1.1.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-1/pos/1.1.kt
index f584662d309..ef71298021d 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-1/pos/1.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-1/pos/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A real literal consists of the following parts: the whole-number part, the decimal point (ASCII period character .), the fraction part and the exponent.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Simple real literals with a different whole-number part and fraction part.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-1/pos/3.1.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-1/pos/3.1.kt
index 4e98f149ced..e9c436c698d 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-1/pos/3.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-1/pos/3.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 1
- * SENTENCE: [3] A real literal may also be followed by a type suffix (f or F).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 1 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: Simple real literals suffixed by f/F (the float suffix) with a different whole-number part and fraction part.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-2/pos/1.1.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-2/pos/1.1.kt
index bf27c6f1f9e..3dd6940e5c4 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-2/pos/1.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-2/pos/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 2
- * SENTENCE: [1] The exponent is an exponent mark (e or E) followed by an optionaly signed decimal integer (a sequence of decimal digits).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Simple real literals with an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-2/pos/1.2.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-2/pos/1.2.kt
index 83d5c2da810..5f528f6249b 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-2/pos/1.2.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-2/pos/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 2
- * SENTENCE: [1] The exponent is an exponent mark (e or E) followed by an optionaly signed decimal integer (a sequence of decimal digits).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.1.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.1.kt
index 04ee7a7cbac..e15eac64200 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [1] The whole-number part and the exponent part may be omitted.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Simple real literals with omitted a whole-number part.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.2.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.2.kt
index ca439bef686..19ebe5ff61e 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.2.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [1] The whole-number part and the exponent part may be omitted.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with omitted a whole-number part.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.3.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.3.kt
index 204bc1cf27a..38869e7b78e 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.3.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [1] The whole-number part and the exponent part may be omitted.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Real literals with omitted a whole-number part and an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.4.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.4.kt
index 554defe66fa..9de0abe44bd 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.4.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.4.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [1] The whole-number part and the exponent part may be omitted.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with omitted a whole-number part and an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/2.1.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/2.1.kt
index c3edbdddc67..afdd5b3147c 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/2.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/2.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [2] The fraction part may be omitted only together with the decimal point, if the whole-number part and either the exponent part or the type suffix are present.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 3 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Simple real literals with omitted a fraction part, suffixed by f/F (float suffix).
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/2.2.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/2.2.kt
index ab0bd926833..121e2f6b6b0 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/2.2.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/2.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [2] The fraction part may be omitted only together with the decimal point, if the whole-number part and either the exponent part or the type suffix are present.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 3 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Real literals with omitted a fraction part and an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/2.3.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/2.3.kt
index 1f7cf9d7c97..0b276b310f0 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/2.3.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/2.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [2] The fraction part may be omitted only together with the decimal point, if the whole-number part and either the exponent part or the type suffix are present.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 3 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Real literals with omitted a fraction part and an exponent mark, suffixed by f/F (float suffix).
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.1.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.1.kt
index 27dd7f89509..06aabd403d1 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [1] The digits of the whole-number part or the fraction part or the exponent may be optionally separated by underscores, but an underscore may not be placed between, before, or after these parts.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Real literals with underscores in a whole-number part and a fraction part.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.2.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.2.kt
index 21509aa4c10..446977cd926 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.2.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [1] The digits of the whole-number part or the fraction part or the exponent may be optionally separated by underscores, but an underscore may not be placed between, before, or after these parts.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with underscores in a whole-number part and a fraction part.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.3.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.3.kt
index 42a4f1730d3..454f6c339d0 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.3.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [1] The digits of the whole-number part or the fraction part or the exponent may be optionally separated by underscores, but an underscore may not be placed between, before, or after these parts.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with an exponent mark and underscores in a whole-number part, a fraction part and an exponent part.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.4.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.4.kt
index d3d94f6b001..1231f7b158e 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.4.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.4.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [1] The digits of the whole-number part or the fraction part or the exponent may be optionally separated by underscores, but an underscore may not be placed between, before, or after these parts.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: Real literals with an omitted whole-number part and underscores in a whole-number part, a fraction part and an exponent part.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.5.kt b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.5.kt
index 23630cf9965..7b52b874724 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.5.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.5.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [1] The digits of the whole-number part or the fraction part or the exponent may be optionally separated by underscores, but an underscore may not be placed between, before, or after these parts.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 5
  * DESCRIPTION: Real literals with an omitted fraction part and underscores in a whole-number part, a fraction part and an exponent part.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/templates/_layout/linkedTestsLayout.kt b/compiler/tests-spec/testData/codegen/box/templates/_layout/linkedTestsLayout.kt
index 961bdb7bb4d..7aca36f5022 100644
--- a/compiler/tests-spec/testData/codegen/box/templates/_layout/linkedTestsLayout.kt
+++ b/compiler/tests-spec/testData/codegen/box/templates/_layout/linkedTestsLayout.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (<!TEST_TYPE!>)
  *
- * SECTIONS: <!SECTIONS!>
- * PARAGRAPH: <!PARAGRAPH_NUMBER!>
- * SENTENCE: [<!SENTENCE_NUMBER!>] <!SENTENCE!>
+ * SPEC VERSION: 0.1-draft
+ * PLACES: <!SECTIONS!> -> paragraph <!PARAGRAPH_NUMBER!> -> sentence <!SENTENCE_NUMBER!>
  * NUMBER: <!TEST_NUMBER!>
  * DESCRIPTION: <!TEST_DESCRIPTION!>
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/boolean-literals/p-1/neg/3.1.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/boolean-literals/p-1/neg/3.1.kt
index 8570030f11b..5360efdd1fd 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/boolean-literals/p-1/neg/3.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/boolean-literals/p-1/neg/3.1.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [3] These are strong keywords which cannot be used as identifiers unless [escaped][Escaped identifiers].
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the class.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/boolean-literals/p-1/pos/3.1.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/boolean-literals/p-1/pos/3.1.kt
index a9f51df63d0..8276b8e8114 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/boolean-literals/p-1/pos/3.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/boolean-literals/p-1/pos/3.1.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [3] These are strong keywords which cannot be used as identifiers unless [escaped][Escaped identifiers].
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the class.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/boolean-literals/p-1/pos/3.2.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/boolean-literals/p-1/pos/3.2.kt
index 11a37a9e989..24984752d2b 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/boolean-literals/p-1/pos/3.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/boolean-literals/p-1/pos/3.2.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [3] These are strong keywords which cannot be used as identifiers unless [escaped][Escaped identifiers].
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 3
  * NUMBER: 2
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the class.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.1.kt
index 95409760f37..2e5c727bf1f 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, binary-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A sequence of binary digit symbols (0 or 1) prefixed by 0b or 0B is a binary integer literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Binary integer literals with the prefix only.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.kt
index 8246581ca71..7d4ec8210f0 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, binary-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] Digits may be separated by an underscore symbol, but no underscore can be placed before the first digit or after the last one.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Binary integer literals with an underscore after the prefix.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.2.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.2.kt
index a28d8738eff..75fd706f4f7 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, binary-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] Digits may be separated by an underscore symbol, but no underscore can be placed before the first digit or after the last one.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Binary integer literals with an underscore in the first position (it's considered as identifiers).
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.3.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.3.kt
index 8a7bf8d929f..2f595e8dbda 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, binary-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] Digits may be separated by an underscore symbol, but no underscore can be placed before the first digit or after the last one.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Binary integer literals with an underscore in the last position.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.1.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.1.kt
index 5eb840ae8da..e4f9eafad5e 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, decimal-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] Digits may be separated by an underscore symbol, but no underscore can be placed before the first digit or after the last one.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Integer literals with an underscore in the last position.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.2.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.2.kt
index 31c7063e49d..165c27b9f3e 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, decimal-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] Digits may be separated by an underscore symbol, but no underscore can be placed before the first digit or after the last one.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Integer literals with an underscore in the first position (it's considered as identifiers).
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.1.kt
index 2cef9c72419..2f16f9b97c9 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, hexadecimal-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A sequence of hexadecimal digit symbols (0 through 9, a through f, A through F) prefixed by 0x or 0X is a hexadecimal integer literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Hexadecimal integer literals with the prefix only.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.kt
index d9eda12d74a..63780bfc9c5 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, hexadecimal-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] Digits may be separated by an underscore symbol, but no underscore can be placed before the first digit or after the last one.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Hexadecimal integer literals with an underscore after the prefix.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.2.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.2.kt
index a23f82f41b1..714a223fbe4 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, hexadecimal-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] Digits may be separated by an underscore symbol, but no underscore can be placed before the first digit or after the last one.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Hexadecimal integer literals with an underscore in the first position (it's considered as identifiers).
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.3.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.3.kt
index 3a0228b050c..13df5e581b9 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, hexadecimal-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] A sequence of hexadecimal digit symbols (0 through 9, a through f, A through F) prefixed by 0x or 0X is a hexadecimal integer literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Hexadecimal integer literals with an underscore in the last position.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.1.kt
index 1fcababc2b4..18bf206501e 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] Any of the decimal, hexadecimal or binary literals may be suffixed by the long literal mark (symbol L).
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Binary and hexadecimal integer literals with a long literal mark only.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.2.kt
index 6a57659bb6b..2f1e1fb4a1f 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] Any of the decimal, hexadecimal or binary literals may be suffixed by the long literal mark (symbol L).
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Various integer literals with a not allowed underscore before the long literal mark.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.3.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.3.kt
index aabed99b671..92b612a3440 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] Any of the decimal, hexadecimal or binary literals may be suffixed by the long literal mark (symbol L).
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Various integer literals with not allowed long literal mark in lower case.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.1.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.1.kt
index 3166ed0e2ad..6291bee19cd 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.1.kt
@@ -4,9 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] An integer literal with the long literal mark has type kotlin.Long; an integer literal without it has one of the types kotlin.Int/kotlin.Short/kotlin.Byte (the selected type is dependent on the context), if its value is in range of the corresponding type, or type kotlin.Long otherwise.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Various integer literals with not allowed long literal mark in lower case (type checking).
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.2.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.2.kt
index f3f72b38fcd..a70b3bf8138 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.2.kt
@@ -4,9 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] An integer literal with the long literal mark has type kotlin.Long; an integer literal without it has one of the types kotlin.Int/kotlin.Short/kotlin.Byte (the selected type is dependent on the context), if its value is in range of the corresponding type, or type kotlin.Long otherwise.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Type checking (comparison with invalid types) of various integer literals with long literal mark.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.3.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.3.kt
index cf9b6eb3ea7..70af61846db 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.3.kt
@@ -4,9 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] An integer literal with the long literal mark has type kotlin.Long; an integer literal without it has one of the types kotlin.Int/kotlin.Short/kotlin.Byte (the selected type is dependent on the context), if its value is in range of the corresponding type, or type kotlin.Long otherwise.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Type checking (comparison with invalid types) of various integer literals.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.4.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.4.kt
index e3322c41aec..d2a5a27e527 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.4.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.4.kt
@@ -4,9 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] An integer literal with the long literal mark has type kotlin.Long; an integer literal without it has one of the types kotlin.Int/kotlin.Short/kotlin.Byte (the selected type is dependent on the context), if its value is in range of the corresponding type, or type kotlin.Long otherwise.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 4
  * DESCRIPTION: Type checking (comparison with invalid types) of too a big integers.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.5.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.5.kt
index 749c9585b33..e88584a4dda 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.5.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.5.kt
@@ -4,9 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] An integer literal with the long literal mark has type kotlin.Long; an integer literal without it has one of the types kotlin.Int/kotlin.Short/kotlin.Byte (the selected type is dependent on the context), if its value is in range of the corresponding type, or type kotlin.Long otherwise.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 5
  * DESCRIPTION: Check of integer type selection depends on the context (incopatible types).
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.1.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.1.kt
index f9479ae6cc7..f9f8e21a327 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.1.kt
@@ -4,9 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] An integer literal with the long literal mark has type kotlin.Long; an integer literal without it has one of the types kotlin.Int/kotlin.Short/kotlin.Byte (the selected type is dependent on the context), if its value is in range of the corresponding type, or type kotlin.Long otherwise.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Type checking of various integer literals with long literal mark.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.2.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.2.kt
index 3da752a3372..eca5b6d2181 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.2.kt
@@ -4,9 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] An integer literal with the long literal mark has type kotlin.Long; an integer literal without it has one of the types kotlin.Int/kotlin.Short/kotlin.Byte (the selected type is dependent on the context), if its value is in range of the corresponding type, or type kotlin.Long otherwise.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Type checking of decimal integer literals.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.3.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.3.kt
index 070c0c71984..6501290bbce 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.3.kt
@@ -4,9 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] An integer literal with the long literal mark has type kotlin.Long; an integer literal without it has one of the types kotlin.Int/kotlin.Short/kotlin.Byte (the selected type is dependent on the context), if its value is in range of the corresponding type, or type kotlin.Long otherwise.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Type checking of hexadecimal integer literals.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.4.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.4.kt
index 4ba5b2c3188..39938189b0d 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.4.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.4.kt
@@ -4,9 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] An integer literal with the long literal mark has type kotlin.Long; an integer literal without it has one of the types kotlin.Int/kotlin.Short/kotlin.Byte (the selected type is dependent on the context), if its value is in range of the corresponding type, or type kotlin.Long otherwise.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 4
  * DESCRIPTION: Type checking of binary integer literals.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.5.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.5.kt
index ee76c27ae88..2576d6a3fd8 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.5.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.5.kt
@@ -4,9 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] An integer literal with the long literal mark has type kotlin.Long; an integer literal without it has one of the types kotlin.Int/kotlin.Short/kotlin.Byte (the selected type is dependent on the context), if its value is in range of the corresponding type, or type kotlin.Long otherwise.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 5
  * DESCRIPTION: Check of integer type selection depends on the context.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-1/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-1/neg/1.1.kt
index f993dbd0118..c14785467de 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-1/neg/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-1/neg/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A real literal consists of the following parts: the whole-number part, the decimal point (ASCII period character .), the fraction part and the exponent.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Real literals separeted by comments.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-1/neg/3.1.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-1/neg/3.1.kt
index 074c4899157..f47ec7efb2d 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-1/neg/3.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-1/neg/3.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 1
- * SENTENCE: [3] A real literal may also be followed by a type suffix (f or F).
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 1 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) separeted by comments.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-1/pos/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-1/pos/1.1.kt
index c955af2dc98..cc2663f5a9d 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-1/pos/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-1/pos/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A real literal consists of the following parts: the whole-number part, the decimal point (ASCII period character .), the fraction part and the exponent.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Simple real literals with a different whole-number part and fraction part.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-1/pos/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-1/pos/1.2.kt
index 8855f660adb..46e4d960f75 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-1/pos/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-1/pos/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A real literal consists of the following parts: the whole-number part, the decimal point (ASCII period character .), the fraction part and the exponent.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 1 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals with a many digits in a whole-number part and a fraction part (including conforms).
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-1/pos/3.1.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-1/pos/3.1.kt
index 1f21727c669..c6a9efdd105 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-1/pos/3.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-1/pos/3.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 1
- * SENTENCE: [3] A real literal may also be followed by a type suffix (f or F).
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 1 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: Simple real literals suffixed by f/F (the float suffix) with a different whole-number part and fraction part.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-1/pos/3.2.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-1/pos/3.2.kt
index 6a8ffadf482..ded65a41a95 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-1/pos/3.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-1/pos/3.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 1
- * SENTENCE: [3] A real literal may also be followed by a type suffix (f or F).
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 1 -> sentence 3
  * NUMBER: 2
  * DESCRIPTION: Real literals suffixed by f/F (the float suffix) with a many digits in a whole-number part and a fraction part  (including conforms).
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-2/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-2/neg/1.1.kt
index 2bb85c29d41..a7ed2bc05ac 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-2/neg/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-2/neg/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 2
- * SENTENCE: [1] The exponent is an exponent mark (e or E) followed by an optionaly signed decimal integer (a sequence of decimal digits).
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Real literals without digits after an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-2/neg/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-2/neg/1.2.kt
index ab3402adf5e..b8fa86edad4 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-2/neg/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-2/neg/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 2
- * SENTENCE: [1] The exponent is an exponent mark (e or E) followed by an optionaly signed decimal integer (a sequence of decimal digits).
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals with a not allowed exponent mark at the beginning.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-2/neg/1.3.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-2/neg/1.3.kt
index 5eab4395a46..e7a9f77fd83 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-2/neg/1.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-2/neg/1.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 2
- * SENTENCE: [1] The exponent is an exponent mark (e or E) followed by an optionaly signed decimal integer (a sequence of decimal digits).
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with a not allowed exponent mark at the beginning.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-2/neg/1.4.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-2/neg/1.4.kt
index 4ef3fa6ca55..86a6041efff 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-2/neg/1.4.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-2/neg/1.4.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 2
- * SENTENCE: [1] The exponent is an exponent mark (e or E) followed by an optionaly signed decimal integer (a sequence of decimal digits).
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with an exponent mark without digits after it.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-2/pos/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-2/pos/1.1.kt
index cc2e92a6bbc..a0d9b1e44aa 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-2/pos/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-2/pos/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 2
- * SENTENCE: [1] The exponent is an exponent mark (e or E) followed by an optionaly signed decimal integer (a sequence of decimal digits).
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Simple real literals with an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-2/pos/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-2/pos/1.2.kt
index d6cc3d74378..d0b8eef8941 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-2/pos/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-2/pos/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 2
- * SENTENCE: [1] The exponent is an exponent mark (e or E) followed by an optionaly signed decimal integer (a sequence of decimal digits).
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/neg/1.1.kt
index e60c6d41bbc..3afb5a10640 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/neg/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/neg/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [1] The whole-number part and the exponent part may be omitted.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Real literals with omitted a whole-number part and an exponent mark without digits after it.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/neg/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/neg/1.2.kt
index 8da12183c87..15f58ebf783 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/neg/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/neg/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [1] The whole-number part and the exponent part may be omitted.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals with omitted a whole-number part, suffixed by f/F (float suffix) followed by an exponent mark without digits.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/neg/2.1.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/neg/2.1.kt
index a9c69a951ba..a1ad2d94225 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/neg/2.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/neg/2.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [2] The fraction part may be omitted only together with the decimal point, if the whole-number part and either the exponent part or the type suffix are present.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Real literals with omitted a fraction part and an exponent mark without digits after it.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/1.1.kt
index 6a3674c47d2..f243e3b9aa1 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [1] The whole-number part and the exponent part may be omitted.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Simple real literals with omitted a whole-number part.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/1.2.kt
index 33ebf2cc1bb..f238dcaf7a8 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [1] The whole-number part and the exponent part may be omitted.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals with omitted a whole-number part and an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/1.3.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/1.3.kt
index 76170b0a78f..402402ac930 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/1.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/1.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [1] The whole-number part and the exponent part may be omitted.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Real literals separeted by comments with omitted a whole-number part.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/1.4.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/1.4.kt
index df1514ffe5f..845315fb198 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/1.4.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/1.4.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [1] The whole-number part and the exponent part may be omitted.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with omitted a whole-number part.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/1.5.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/1.5.kt
index 4f8b220e852..96f1aba824c 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/1.5.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/1.5.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [1] The whole-number part and the exponent part may be omitted.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 5
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with omitted a whole-number part and an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/2.1.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/2.1.kt
index c800bebd06a..c1574ebf96b 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/2.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/2.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [2] The fraction part may be omitted only together with the decimal point, if the whole-number part and either the exponent part or the type suffix are present.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Simple real literals with omitted a fraction part, suffixed by f/F (float suffix).
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/2.2.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/2.2.kt
index 429908d7b95..bcca6bf4166 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/2.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/2.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [2] The fraction part may be omitted only together with the decimal point, if the whole-number part and either the exponent part or the type suffix are present.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Real literals with omitted a fraction part and an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/2.3.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/2.3.kt
index 839e5d64386..68e40d854ad 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/2.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-3/pos/2.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [2] The fraction part may be omitted only together with the decimal point, if the whole-number part and either the exponent part or the type suffix are present.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Real literals with omitted a fraction part and an exponent mark, suffixed by f/F (float suffix).
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/neg/1.1.kt
index 5d805129134..6d31149f3e9 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/neg/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/neg/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [1] The digits of the whole-number part or the fraction part or the exponent may be optionally separated by underscores, but an underscore may not be placed between, before, or after these parts.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Real literals without digits after an exponent mark and with undescores in the different pisitions.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/neg/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/neg/1.2.kt
index 364f7abef9f..6fb9cfea703 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/neg/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/neg/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [1] The digits of the whole-number part or the fraction part or the exponent may be optionally separated by underscores, but an underscore may not be placed between, before, or after these parts.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals with underscores at the end.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/neg/2.1.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/neg/2.1.kt
index 6b9a5e1a891..f0fe54e45b7 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/neg/2.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/neg/2.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [2] It also may not be placed before or after the exponent mark symbol.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Real literals with underscores before an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/neg/2.2.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/neg/2.2.kt
index ff6a35af7ef..0ee90cc127c 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/neg/2.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/neg/2.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [2] It also may not be placed before or after the exponent mark symbol.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Real literals with underscores after an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/neg/2.3.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/neg/2.3.kt
index 8412a5c4e73..8fbda9b897d 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/neg/2.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/neg/2.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [2] It also may not be placed before or after the exponent mark symbol.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Real literals with underscores around an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/pos/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/pos/1.1.kt
index a1f2ef005b1..a0a9b485e81 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/pos/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/pos/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [1] The digits of the whole-number part or the fraction part or the exponent may be optionally separated by underscores, but an underscore may not be placed between, before, or after these parts.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Real literals with underscores in a whole-number part and a fraction part.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/pos/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/pos/1.2.kt
index d2288a56113..81ea4110c89 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/pos/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/pos/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [1] The digits of the whole-number part or the fraction part or the exponent may be optionally separated by underscores, but an underscore may not be placed between, before, or after these parts.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with underscores in a whole-number part and a fraction part.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/pos/1.3.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/pos/1.3.kt
index 922d0937015..c09fd3162a2 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/pos/1.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/pos/1.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [1] The digits of the whole-number part or the fraction part or the exponent may be optionally separated by underscores, but an underscore may not be placed between, before, or after these parts.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with an exponent mark and underscores in a whole-number part, a fraction part and an exponent part.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/pos/1.4.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/pos/1.4.kt
index 88cbd2445fb..58f39119c6b 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/pos/1.4.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/pos/1.4.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [1] The digits of the whole-number part or the fraction part or the exponent may be optionally separated by underscores, but an underscore may not be placed between, before, or after these parts.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: Real literals with an omitted whole-number part and underscores in a whole-number part, a fraction part and an exponent part.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/pos/1.5.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/pos/1.5.kt
index 06c0f16722c..784f31887dc 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/pos/1.5.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-4/pos/1.5.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [1] The digits of the whole-number part or the fraction part or the exponent may be optionally separated by underscores, but an underscore may not be placed between, before, or after these parts.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 5
  * DESCRIPTION: Real literals with an omitted fraction part and underscores in a whole-number part, a fraction part and an exponent part.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-5/pos/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-5/pos/1.1.kt
index 0dec0e561a9..33daabc47c9 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-5/pos/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-5/pos/1.1.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 5
- * SENTENCE: [1] A real literal without the type suffix has type kotlin.Double, a real literal with the type suffix has type kotlin.Float.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 5 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: A type checking of a simple real literal (with/without underscores).
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-5/pos/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-5/pos/1.2.kt
index eacf26a1240..e9a6047638f 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-5/pos/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-5/pos/1.2.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 5
- * SENTENCE: [1] A real literal without the type suffix has type kotlin.Double, a real literal with the type suffix has type kotlin.Float.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 5 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: A type checking of a real literal with an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-5/pos/1.3.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-5/pos/1.3.kt
index bcfc54b9557..f1dd72f903d 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-5/pos/1.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-5/pos/1.3.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 5
- * SENTENCE: [1] A real literal without the type suffix has type kotlin.Double, a real literal with the type suffix has type kotlin.Float.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 5 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: A type checking of a real literal with omitted a whole-number part.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-5/pos/1.4.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-5/pos/1.4.kt
index 8a44c9c1064..531ddfdeb58 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-5/pos/1.4.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-5/pos/1.4.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 5
- * SENTENCE: [1] A real literal without the type suffix has type kotlin.Double, a real literal with the type suffix has type kotlin.Float.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 5 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: A type checking of a real literal with omitted a whole-number part and an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-5/pos/1.5.kt b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-5/pos/1.5.kt
index 8a485c9ff67..6d748ec94d7 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-5/pos/1.5.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/constant-literals/real-literals/p-5/pos/1.5.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 5
- * SENTENCE: [1] A real literal without the type suffix has type kotlin.Double, a real literal with the type suffix has type kotlin.Float.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: constant-literals, real-literals -> paragraph 5 -> sentence 1
  * NUMBER: 5
  * DESCRIPTION: A type checking of a real literal with omitted a fraction part and an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/1.1.kt
index 7971190521f..ce1605f3171 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 11
- * SENTENCE: [1] It has an else entry;
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 11 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Checking for not exhaustive when without bound value when there is no else branch.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/1.2.kt
index f67ffd0cdb7..b2969d2fff0 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/1.2.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 11
- * SENTENCE: [1] It has an else entry;
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 11 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Checking for not exhaustive when with bound value when there is no else branch.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/3.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/3.1.kt
index 22e01bfc488..bf296c86c87 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/3.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/3.1.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 11
- * SENTENCE: [3] The bound expression is of type kotlin.Boolean and the conditions contain both:
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 11 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: Checking for not exhaustive 'when' when not contains by all Boolean values or 'when' does not have bound value.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/6.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/6.1.kt
index 7b20737d592..7d6c56ec20e 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/6.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/6.1.kt
@@ -4,9 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 11
- * SENTENCE: [6] The bound expression is of a sealed class type and all its possible subtypes are covered using type test conditions of this expression;
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 11 -> sentence 6
  * NUMBER: 1
  * DESCRIPTION: Checking for not exhaustive 'when' when not covered by all possible subtypes or 'when' does not have bound value.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/7.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/7.1.kt
index 629ae4067ff..336232cb065 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/7.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/7.1.kt
@@ -4,9 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 11
- * SENTENCE: [7] The bound expression is of an Enum classes type and all enumerated values are checked for equality using constant conditions;
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 11 -> sentence 7
  * NUMBER: 1
  * DESCRIPTION: Checking for not exhaustive when when not covered by all enumerated values.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/8.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/8.1.kt
index c6677a46f6a..6305bf73707 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/8.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/8.1.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 11
- * SENTENCE: [8] The bound expression is of a nullable type and one of the areas above is met for its non-nullable counterpart and, in addition, there is a condition containing literal null.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 11 -> sentence 8
  * NUMBER: 1
  * DESCRIPTION: Checking for not exhaustive 'when' on the nullable Boolean.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/8.2.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/8.2.kt
index 0bf51f85df5..07b01db537b 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/8.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/8.2.kt
@@ -4,9 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 11
- * SENTENCE: [8] The bound expression is of a nullable type and one of the areas above is met for its non-nullable counterpart and, in addition, there is a condition containing literal null.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 11 -> sentence 8
  * NUMBER: 2
  * DESCRIPTION: Checking for not exhaustive 'when' on the nullable sealed classes (and several checks for not sealed).
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/8.3.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/8.3.kt
index c1b5526dfdd..1e5641c76c9 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/8.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/neg/8.3.kt
@@ -4,9 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 11
- * SENTENCE: [8] The bound expression is of a nullable type and one of the areas above is met for its non-nullable counterpart and, in addition, there is a condition containing literal null.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 11 -> sentence 8
  * NUMBER: 3
  * DESCRIPTION: Checking for not exhaustive 'when' on the nullable enums.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/1.1.kt
index 979a851b355..2fbf73d432c 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 11
- * SENTENCE: [1] It has an else entry;
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 11 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Check when exhaustive via else entry (when without bound value).
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/1.2.kt
index e7321369c22..898fe94d1d3 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/1.2.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 11
- * SENTENCE: [1] It has an else entry;
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 11 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Check when exhaustive via else entry (when with bound value).
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/1.3.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/1.3.kt
index 1530ab68a5f..b399773305b 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/1.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/1.3.kt
@@ -4,9 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 11
- * SENTENCE: [1] It has an else entry;
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 11 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Check when exhaustive via else entry (when with bound value, redundant else).
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/3.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/3.1.kt
index e6414bf5355..5f890a47439 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/3.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/3.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 11
- * SENTENCE: [3] The bound expression is of type kotlin.Boolean and the conditions contain both:
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 11 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: Check when exhaustive via boolean bound value and evaluating to value true and false.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/6.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/6.1.kt
index 000cee7bf41..89dd8516182 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/6.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/6.1.kt
@@ -4,9 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 11
- * SENTENCE: [6] The bound valueession is of a sealed class type and all its possible subtypes are covered using type test conditions of this valueession;
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 11 -> sentence 6
  * NUMBER: 1
  * DESCRIPTION: Check when exhaustive when possible subtypes of the sealed class are covered.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/7.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/7.1.kt
index 737af95bba0..7d6f614e819 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/7.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/7.1.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 11
- * SENTENCE: [7] The bound expression is of an Enum classes type and all enumerated values are checked for equality using constant conditions;
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 11 -> sentence 7
  * NUMBER: 1
  * DESCRIPTION: Check when exhaustive when all enumerated values are checked.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/8.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/8.1.kt
index 3ed5fcc0150..9719e1146db 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/8.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/8.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 11
- * SENTENCE: [8] The bound expression is of a nullable type and one of the areas above is met for its non-nullable counterpart and, in addition, there is a condition containing literal null.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 11 -> sentence 8
  * NUMBER: 1
  * DESCRIPTION: Check when exhaustive when boolean values are checked and contains a null check.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/8.2.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/8.2.kt
index b3ac72b6b38..4b240e881bb 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/8.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/8.2.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 11
- * SENTENCE: [8] The bound expression is of a nullable type and one of the cases above is met for its non-nullable counterpart and, in addition, there is a condition containing literal null.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 11 -> sentence 8
  * NUMBER: 2
  * DESCRIPTION: Check when exhaustive when enumerated values are checked and contains a null check.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/8.3.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/8.3.kt
index b1df4252fa0..ffece961b2b 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/8.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-11/pos/8.3.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 11
- * SENTENCE: [8] The bound expression is of a nullable type and one of the areas above is met for its non-nullable counterpart and, in addition, there is a condition containing literal null.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 11 -> sentence 8
  * NUMBER: 3
  * DESCRIPTION: Check when exhaustive when possible subtypes of the sealed class are covered and contains a null check.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-2/pos/3.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-2/pos/3.1.kt
index 22b9260cdd1..403e9eb91aa 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-2/pos/3.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-2/pos/3.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 2
- * SENTENCE: [3] When expression has two different forms: with bound value and without it.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 2 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: Empty 'when' with bound value.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-2/pos/3.2.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-2/pos/3.2.kt
index 2b95cb47378..9399f92882b 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-2/pos/3.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-2/pos/3.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 2
- * SENTENCE: [3] When expression has two different forms: with bound value and without it.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 2 -> sentence 3
  * NUMBER: 2
  * DESCRIPTION: Empty 'when' without bound value.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/neg/1.1.kt
index 73263a8dd5e..1c7f277aee6 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/neg/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/neg/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 3
- * SENTENCE: [1] When expression without bound value (the form where the expression enclosed in parantheses is absent) evaluates one of the many different expressions based on corresponding conditions present in the same when entry.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 3 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: 'When' without bound value and not allowed break and continue expression (without labels) in the control structure body.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/neg/2.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/neg/2.1.kt
index 3696a52f1c5..c7df2c9c714 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/neg/2.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/neg/2.1.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 3
- * SENTENCE: [2] Each entry consists of a boolean condition (or a special else condition), each of which is checked and evaluated in order of appearance.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 3 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: 'When' without bound value and with not boolean condition in 'when condition'.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/neg/2.2.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/neg/2.2.kt
index c52a7500865..1b7d62dc971 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/neg/2.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/neg/2.2.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 3
- * SENTENCE: [2] Each entry consists of a boolean condition (or a special else condition), each of which is checked and evaluated in order of appearance.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 3 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: 'When' without bound value and not allowed comma in when entry.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/pos/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/pos/1.1.kt
index 3e34de89fe4..03c90af8eee 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/pos/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/pos/1.1.kt
@@ -6,9 +6,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 3
- * SENTENCE: [1] When expression without bound value (the form where the expression enclosed in parantheses is absent) evaluates one of the many different expressions based on corresponding conditions present in the same when entry.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 3 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: 'When' without bound value and with different variants of expressions in the control structure body.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/pos/2.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/pos/2.1.kt
index ae391636c23..0a0845d0a18 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/pos/2.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/pos/2.1.kt
@@ -5,9 +5,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 3
- * SENTENCE: [2] Each entry consists of a boolean condition (or a special else condition), each of which is checked and evaluated in order of appearance.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 3 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: 'When' without bound value and different variants of the boolean conditions (logical, equality, comparison, type checking operator, containment operator).
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/pos/2.2.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/pos/2.2.kt
index ea4df2b7b1f..07a969ad2d9 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/pos/2.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/pos/2.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 3
- * SENTENCE: [2] Each entry consists of a boolean condition (or a special else condition), each of which is checked and evaluated in order of appearance.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 3 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: 'When' without bound value and only one 'else' branch.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/pos/2.3.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/pos/2.3.kt
index 12afa7771d0..1b7385b774f 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/pos/2.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-3/pos/2.3.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 3
- * SENTENCE: [2] Each entry consists of a boolean condition (or a special else condition), each of which is checked and evaluated in order of appearance.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 3 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: 'When' without bound value and with Nothing in condition (subtype of Boolean).
  * DISCUSSION
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-5/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-5/neg/1.1.kt
index 91fe31595ae..c6a318a99cc 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-5/neg/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-5/neg/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 5
- * SENTENCE: [1] The else entry is also special in the sense that it must be the last entry in the expression, otherwise a compiler error must be generated.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 5 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: 'When' without bound value and with 'else' branch not in the last position.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-5/pos/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-5/pos/1.1.kt
index 1b8c30d0b2c..6ac7938240d 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-5/pos/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-5/pos/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 5
- * SENTENCE: [1] The else entry is also special in the sense that it must be the last entry in the expression, otherwise a compiler error must be generated.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 5 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: 'When' without bound value and with else branch in the last position.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-6/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-6/neg/1.1.kt
index 29760b9724c..ca412c37a60 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-6/neg/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-6/neg/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 6
- * SENTENCE: [1] When expression with bound value (the form where the expression enclosed in parantheses is present) are very similar to the form without bound value, but use different syntax for conditions.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 6 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: 'When' with bound value and not allowed break and continue expression (without labels) in the control structure body.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-6/pos/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-6/pos/1.1.kt
index 5c7107d5592..2a73895fe04 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-6/pos/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-6/pos/1.1.kt
@@ -6,9 +6,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 6
- * SENTENCE: [1] When expression with bound value (the form where the expression enclosed in parantheses is present) are very similar to the form without bound value, but use different syntax for conditions.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 6 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: 'When' with bound value and with different variants of expressions in the control structure body.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/1.1.kt
index 985ddb11723..c94d610d465 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/1.1.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 7
- * SENTENCE: [1] Type test condition: type checking operator followed by type.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 7 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: 'When' with bound value and type test condition (without companion object in classes), but without type checking operator.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/1.2.kt
index 1c24cb8c109..6a3d2f68c1e 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/1.2.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 7
- * SENTENCE: [1] Type test condition: type checking operator followed by type.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 7 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: 'When' with bound value and type test condition on the non-type operand of the type checking operator.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/3.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/3.1.kt
index 5684c78192b..c43893c64ed 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/3.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/3.1.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 7
- * SENTENCE: [3] Contains test condition: containment operator followed by an expression.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 7 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: 'When' with bound value and 'when condition' with range expression, but without containment checking operator.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/3.2.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/3.2.kt
index 56b179ead2e..285f0023507 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/3.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/3.2.kt
@@ -4,9 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 7
- * SENTENCE: [3] Contains test condition: containment operator followed by an expression.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 7 -> sentence 3
  * NUMBER: 2
  * DESCRIPTION: 'When' with bound value and 'when condition' with contains operator and type without defined contains operator.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/5.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/5.1.kt
index b06541783b0..f2989636fc0 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/5.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/5.1.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 7
- * SENTENCE: [5] Any other expression.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 7 -> sentence 5
  * NUMBER: 1
  * DESCRIPTION: 'When' with bound value and non-expressions in 'when condition'.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/5.2.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/5.2.kt
index c75b2373ce7..7a419e49f13 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/5.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/5.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 7
- * SENTENCE: [5] Any other expression.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 7 -> sentence 5
  * NUMBER: 2
  * DESCRIPTION: 'When' with bound value and not allowed break and continue expression (without labels) in 'when condition'.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/7.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/7.1.kt
index 8261ef1ce4c..b8b64c1a45a 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/7.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/neg/7.1.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 7
- * SENTENCE: [7] The else condition, which works the exact same way as it would in the form without bound expression.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 7 -> sentence 7
  * NUMBER: 1
  * DESCRIPTION: 'When' with bound value and with else branch not in the last position.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/1.1.kt
index 07072bd9190..c8491de6eab 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/1.1.kt
@@ -4,9 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 7
- * SENTENCE: [1] Type test condition: type checking operator followed by type.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 7 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: 'When' with bound value and type test condition.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/1.2.kt
index 85522debcd7..00957565948 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/1.2.kt
@@ -5,9 +5,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 7
- * SENTENCE: [1] Type test condition: type checking operator followed by type.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 7 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: 'When' with bound value and type test condition (invert type checking operator).
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/1.3.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/1.3.kt
index c17198f27e2..b891ebe5c3f 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/1.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/1.3.kt
@@ -5,9 +5,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 7
- * SENTENCE: [1] Type test condition: type checking operator followed by type.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 7 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: 'When' with bound value and enumaration of type test conditions.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/1.4.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/1.4.kt
index 5decab61159..e4c0b669545 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/1.4.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/1.4.kt
@@ -3,9 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 7
- * SENTENCE: [1] Type test condition: type checking operator followed by type.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 7 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: 'When' with bound value and enumaration of type test conditions (with invert type checking operator).
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/3.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/3.1.kt
index 10dd3bc7531..d86673fe56b 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/3.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/3.1.kt
@@ -4,9 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 7
- * SENTENCE: [3] Contains test condition: containment operator followed by an expression.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 7 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: 'When' with bound value and containment operator.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/3.2.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/3.2.kt
index 2ae61d7590e..7b7079b5dd3 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/3.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/3.2.kt
@@ -4,9 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 7
- * SENTENCE: [3] Contains test condition: containment operator followed by an expression.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 7 -> sentence 3
  * NUMBER: 2
  * DESCRIPTION: 'When' with bound value and enumeration of the containment operators.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/5.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/5.1.kt
index 1105e20d40c..d16f8124a88 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/5.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/5.1.kt
@@ -5,9 +5,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 7
- * SENTENCE: [5] Any other expression.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 7 -> sentence 5
  * NUMBER: 1
  * DESCRIPTION: 'When' with enumeration of the different variants of expressions in 'when condition'.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/5.2.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/5.2.kt
index 9082720d7f9..98a62e75721 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/5.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/5.2.kt
@@ -5,9 +5,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 7
- * SENTENCE: [5] Any other expression.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 7 -> sentence 5
  * NUMBER: 2
  * DESCRIPTION: 'When' with different variants of the arithmetic expressions (additive expression and multiplicative expression) in 'when condition'.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/7.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/7.1.kt
index f9391c1b926..99c6bb4ebfa 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/7.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-7/pos/7.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 7
- * SENTENCE: [7] The else condition, which works the exact same way as it would in the form without bound expression.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 7 -> sentence 7
  * NUMBER: 1
  * DESCRIPTION: 'When' with bound value and else branch.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/neg/1.1.kt
index ebbf1064ea7..355b94af12e 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/neg/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/neg/1.1.kt
@@ -4,9 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 9
- * SENTENCE: [1] The type of the resulting expression is the least upper bound of the types of all the entries.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 9 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: 'When' least upper bound of the types check (when exhaustive via else branch).
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/neg/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/neg/1.2.kt
index 3ead264b6d6..4c921dd6565 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/neg/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/neg/1.2.kt
@@ -5,9 +5,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 9
- * SENTENCE: [1] The type of the resulting expression is the least upper bound of the types of all the entries.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 9 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: 'When' least upper bound of the types check (when exhaustive via enum).
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/neg/1.3.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/neg/1.3.kt
index 32bdad338d5..645e2b0594f 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/neg/1.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/neg/1.3.kt
@@ -4,9 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 9
- * SENTENCE: [1] The type of the resulting expression is the least upper bound of the types of all the entries.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 9 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: 'When' least upper bound of the types check (when exhaustive via boolean bound value).
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/neg/1.4.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/neg/1.4.kt
index 2c95a226234..118e69cd401 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/neg/1.4.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/neg/1.4.kt
@@ -5,9 +5,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 9
- * SENTENCE: [1] The type of the resulting expression is the least upper bound of the types of all the entries.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 9 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: 'When' least upper bound of the types check (when exhaustive via sealed class).
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/pos/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/pos/1.1.kt
index ad16139070e..341a41b5be2 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/pos/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/pos/1.1.kt
@@ -4,9 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 9
- * SENTENCE: [1] The type of the resulting expression is the least upper bound of the types of all the entries.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 9 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: 'When' least upper bound of the types check (when exhaustive via else branch).
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/pos/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/pos/1.2.kt
index 485db57ec02..caba697dd5b 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/pos/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/pos/1.2.kt
@@ -5,9 +5,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 9
- * SENTENCE: [1] The type of the resulting expression is the least upper bound of the types of all the entries.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 9 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: 'When' least upper bound of the types check (when exhaustive via enum).
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/pos/1.3.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/pos/1.3.kt
index 3706f34bb10..ccb129b9d12 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/pos/1.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/pos/1.3.kt
@@ -4,9 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 9
- * SENTENCE: [1] The type of the resulting expression is the least upper bound of the types of all the entries.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 9 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: 'When' least upper bound of the types check (when exhaustive via boolean bound value).
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/pos/1.4.kt b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/pos/1.4.kt
index 58de05e0957..6202cc8828c 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/pos/1.4.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/when-expression/p-9/pos/1.4.kt
@@ -5,9 +5,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 9
- * SENTENCE: [1] The type of the resulting expression is the least upper bound of the types of all the entries.
+ * SPEC VERSION: 0.1-draft
+ * PLACE: when-expression -> paragraph 9 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: 'When' least upper bound of the types check (when exhaustive via sealed class).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.1.kt
index c980bf094d2..1ec15ecebd5 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the class.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.10.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.10.kt
index 2d11f986c46..9a4c76e363e 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.10.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.10.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 10
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the companionObject.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.11.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.11.kt
index 8ff4d5e7eb6..1519eb189fd 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.11.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.11.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 11
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the function.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.12.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.12.kt
index 69772b6ab56..e70f9aa97d4 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.12.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.12.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 12
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the setter.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.13.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.13.kt
index 3be49f58816..2836e21d4b9 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.13.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.13.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 13
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the simpleUserType.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.14.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.14.kt
index 6dcfa36993a..6d6e05d46cb 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.14.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.14.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 14
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the typeParameter.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.15.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.15.kt
index 68087107e2a..e0c51300c50 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.15.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.15.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 15
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the parameter.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.16.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.16.kt
index 7af8e7bb377..665cd01e5f0 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.16.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.16.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 16
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the fileAnnotationComplex.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.17.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.17.kt
index 43b643532d7..066655e8616 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.17.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.17.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 17
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the object.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.18.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.18.kt
index f08d1e4b7b1..b52a4869499 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.18.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.18.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 18
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the typeAlias.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.19.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.19.kt
index 9c27d27df72..eed2ed057a9 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.19.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.19.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 19
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the import.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.2.kt
index 1a7e6a03021..858e57567e0 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the labelReference.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.20.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.20.kt
index 45711e3b84f..93c2883ccc5 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.20.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.20.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 20
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the infixFunctionCall.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.21.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.21.kt
index 69e86d3cdec..e62a72f63f4 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.21.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.21.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 21
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the catchBlock.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.22.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.22.kt
index 224507e9a91..ae940ad5327 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.22.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.22.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 22
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the labelDefinition.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.23.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.23.kt
index 16126d4a8a5..6b49b4cf93c 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.23.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.23.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 23
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the atomicExpression.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.24.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.24.kt
index 9157d323e5e..2392ae4ee24 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.24.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.24.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 24
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the variableDeclarationEntry.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.25.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.25.kt
index 21df7b99cf9..3b069434c61 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.25.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.25.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 25
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the valueArgument.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.26.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.26.kt
index 535c0dbf1a0..5e07733d6dc 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.26.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.26.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 26
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the callableReference.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.3.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.3.kt
index 264711149ab..4d293e9b029 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the typeConstraint.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.4.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.4.kt
index 148de84019a..84d30d4c5aa 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.4.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.4.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 4
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the fileAnnotationSimple.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.5.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.5.kt
index 39a550ce212..452be4f29e9 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.5.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.5.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 5
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the packageComplex.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.6.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.6.kt
index f40578a668f..a98804be078 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.6.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.6.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 6
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the packageSimple.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.7.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.7.kt
index a20e1e4212e..7cd271b2e08 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.7.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.7.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 7
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the enumEntry.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.8.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.8.kt
index 8272718e802..20fdad0aa6f 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.8.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.8.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 8
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the stringTemplateElement.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.9.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.9.kt
index 67cbaa76bc1..70129826ac3 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.9.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.9.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 9
  * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the unescapedAnnotation.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.1.kt
index 149080475be..ce6fdd163e3 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the class.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.10.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.10.kt
index 44aaa5ba2ae..73cd98ae504 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.10.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.10.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 10
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the companionObject.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.11.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.11.kt
index ebf87832a0e..0c16c8abac7 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.11.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.11.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 11
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the function.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.12.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.12.kt
index 9d5383dc6e0..aa3608193a2 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.12.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.12.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 12
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the setter.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.13.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.13.kt
index f32f92fc714..6a043f8beec 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.13.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.13.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 13
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the simpleUserType.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.14.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.14.kt
index f76e4d7a30a..d4d9756c47c 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.14.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.14.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 14
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the typeParameter.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.15.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.15.kt
index 4f8f27746a3..2234f796228 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.15.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.15.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 15
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the parameter.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.16.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.16.kt
index 50388d19749..af875418ccf 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.16.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.16.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 16
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the fileAnnotationComplex.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.17.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.17.kt
index 2930bed4176..28cff96eace 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.17.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.17.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 17
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the object.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.18.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.18.kt
index 6313834f84c..ee05884daff 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.18.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.18.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 18
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the typeAlias.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.19.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.19.kt
index 1724505804b..a434a53b10a 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.19.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.19.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 19
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the import.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.2.kt
index 3ef73946cad..b5f71dffc24 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the labelReference.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.20.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.20.kt
index 955e8c6c7fb..a6fa11acc3e 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.20.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.20.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 20
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the infixFunctionCall.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.21.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.21.kt
index 2590366cd93..947138fc497 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.21.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.21.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 21
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the catchBlock.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.22.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.22.kt
index da273490bfa..338b7442023 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.22.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.22.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 22
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the labelDefinition.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.23.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.23.kt
index 4993c12bd5c..96d579d4958 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.23.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.23.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 23
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the atomicExpression.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.24.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.24.kt
index cbf7e11bf1f..1701f0c2c24 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.24.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.24.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 24
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the variableDeclarationEntry.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.25.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.25.kt
index 98561d0e856..e1ccbceaef0 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.25.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.25.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 25
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the valueArgument.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.26.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.26.kt
index 274633cf294..a44799c9d1f 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.26.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.26.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 26
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the callableReference.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.3.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.3.kt
index 4789ecf5978..2a4e3720073 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the typeConstraint.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.4.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.4.kt
index 6c57466310e..f77b56db3c0 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.4.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.4.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 4
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the fileAnnotationSimple.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.5.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.5.kt
index 46fc6cb9600..ff1076479fa 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.5.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.5.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 5
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the packageComplex.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.6.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.6.kt
index ef51e3f7729..35b0d7a9631 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.6.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.6.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 6
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the packageSimple.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.7.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.7.kt
index 632446f757b..d8dd8c54194 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.7.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.7.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 7
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the enumEntry.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.8.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.8.kt
index b0f04ed3b58..4ab3ac81c02 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.8.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.8.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 8
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the stringTemplateElement.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.9.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.9.kt
index 8516c9344b1..dfc76d72fd6 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.9.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.9.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, boolean-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] These are strong keywords which cannot be used as identifiers unless escaped.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 9
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the unescapedAnnotation.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.1.kt
index aed367f0c01..fb8d333c0d4 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, binary-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A sequence of binary digit symbols (0 or 1) prefixed by 0b or 0B is a binary integer literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Binary integer literals with invalid or double prefixes.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.2.kt
index a2172c85c50..727125246f0 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, binary-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A sequence of binary digit symbols (0 or 1) prefixed by 0b or 0B is a binary integer literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Binary integer literals with not allowed symbols.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.kt
index e5d2d410c48..90c8016f4ae 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, binary-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] A sequence of binary digit symbols (0 or 1) prefixed by 0b or 0B is a binary integer literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Binary integer literals with underscore breaking the prefix (in it).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.kt
index 4f1b3e574d9..d4ab1b8b899 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, binary-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A sequence of binary digit symbols (0 or 1) prefixed by 0b or 0B is a binary integer literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Binary integer literals with valid digit symbols.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.2.kt
index d83f6cf56e1..51de7dceaba 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, binary-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A sequence of binary digit symbols (0 or 1) prefixed by 0b or 0B is a binary integer literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Binary integer literals with invalid [2-9] digit symbols.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.3.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.3.kt
index b514ed19bc8..517d27b5d43 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, binary-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A sequence of binary digit symbols (0 or 1) prefixed by 0b or 0B is a binary integer literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Binary integer literals with prefix only (without digit symbols).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.kt
index 9431dadac08..7ab2a46ec36 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, binary-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] Digits may be separated by an underscore symbol, but no underscore can be placed before the first digit or after the last one.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Binary integer literals with underscore symbols in valid places.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.2.kt
index 5b733ba3b86..24bbb0bdca5 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, binary-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] Digits may be separated by an underscore symbol, but no underscore can be placed before the first digit or after the last one.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Binary integer literals with underscore symbols after binary prefix.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.3.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.3.kt
index 5a8b059931d..0d0e8a94522 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, binary-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] Digits may be separated by an underscore symbol, but no underscore can be placed before the first digit or after the last one.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Binary integer literals with underscore symbol after the last digit.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.4.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.4.kt
index 951fb68c376..648e714a2be 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.4.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.4.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, binary-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] Digits may be separated by an underscore symbol, but no underscore can be placed before the first digit or after the last one.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 4
  * DESCRIPTION: Binary integer literals with underscore symbol before the first digit (it's considered as identifiers).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/1.1.kt
index f6b29060181..e6770bfa443 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, decimal-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A sequence of decimal digit symbols (0 though 9) is a decimal integer literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Sequences with not all decimal digit symbols
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.kt
index 79c63c3144a..1d3b10da5f2 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, decimal-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A sequence of decimal digit symbols (0 though 9) is a decimal integer literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Sequences with decimal digit symbols.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.kt
index 2ad4c4220d3..8d4de32cba4 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, decimal-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] Digits may be separated by an underscore symbol, but no underscore can be placed before the first digit or after the last one.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Integers with underscore symbols in the valid places.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.2.kt
index 038726e07cb..75b1a8e963b 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, decimal-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] Digits may be separated by an underscore symbol, but no underscore can be placed before the first digit or after the last one.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Integers with underscore symbol in the last position.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.3.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.3.kt
index 7270181d41d..1bb7a911f3d 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, decimal-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] Digits may be separated by an underscore symbol, but no underscore can be placed before the first digit or after the last one.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Integers with underscore symbols before the first digit (it's considered as identifiers).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.1.kt
index e423c08b5d1..6419e3fd035 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, decimal-integer-literals
- * PARAGRAPH: 2
- * SENTENCE: [1] Even more so, any decimal literal starting with digit 0 and containing more than 1 digit is not a valid decimal literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, decimal-integer-literals -> paragraph 2 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Integer literals with 0 in the first position and it contains more than 1 digit.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.2.kt
index 80719d4955f..c0dda5c1a37 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, decimal-integer-literals
- * PARAGRAPH: 2
- * SENTENCE: [1] Even more so, any decimal literal starting with digit 0 and containing more than 1 digit is not a valid decimal literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, decimal-integer-literals -> paragraph 2 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Integer literals with 0 in the first position and it contains more than 1 digit separated by underscore.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.1.kt
index 8eaba3d111e..268a3580737 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, hexadecimal-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A sequence of hexadecimal digit symbols (0 through 9, a through f, A through F) prefixed by 0x or 0X is a hexadecimal integer literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Hexadecimal integer literals with invalid or double prefixes.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.2.kt
index 5dcbad4f939..bdba1b5eb52 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, hexadecimal-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A sequence of hexadecimal digit symbols (0 through 9, a through f, A through F) prefixed by 0x or 0X is a hexadecimal integer literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Hexadecimal integer literals with not allowed symbols.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.kt
index 0a86e75cf02..370e92ac29b 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, hexadecimal-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] Digits may be separated by an underscore symbol, but no underscore can be placed before the first digit or after the last one.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Hexadecimal integer literals with underscore breaking the prefix (in it).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.kt
index 406424a9507..79af01218be 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, hexadecimal-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A sequence of hexadecimal digit symbols (0 through 9, a through f, A through F) prefixed by 0x or 0X is a hexadecimal integer literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Hexadecimal integer literals with valid symbols.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.2.kt
index 36bfa1358f9..1083fa3b785 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, hexadecimal-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A sequence of hexadecimal digit symbols (0 through 9, a through f, A through F) prefixed by 0x or 0X is a hexadecimal integer literal.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Hexadecimal integer literals with prefix only (without digit symbols).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.kt
index e98fd079b0b..0d6c3e9b99f 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, hexadecimal-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] Digits may be separated by an underscore symbol, but no underscore can be placed before the first digit or after the last one.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Hexadecimal integer literals with underscore symbols in valid places.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.2.kt
index 5d9aff086dc..e9bf226a3e8 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, hexadecimal-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] Digits may be separated by an underscore symbol, but no underscore can be placed before the first digit or after the last one.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Hexadecimal integer literals with underscore symbols after hexadecimal prefix.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.3.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.3.kt
index adf2c6d32df..6289c920318 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, hexadecimal-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] Digits may be separated by an underscore symbol, but no underscore can be placed before the first digit or after the last one.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Hexadecimal integer literals with underscore symbol after the last digit.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.4.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.4.kt
index 5f7972f3790..e4d929b5c28 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.4.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.4.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, hexadecimal-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] Digits may be separated by an underscore symbol, but no underscore can be placed before the first digit or after the last one.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 4
  * DESCRIPTION: Hexadecimal integer literals with underscore symbol before the first digit (it's considered as identifiers).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.1.kt
index be91c76ca9f..9e970b3e3d9 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] Any of the decimal, hexadecimal or binary literals may be suffixed by the long literal mark (symbol L).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Various integer literals with a long literal mark doublicate.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.2.kt
index bd2a2790b85..81af25fd2ad 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] Any of the decimal, hexadecimal or binary literals may be suffixed by the long literal mark (symbol L).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Various integer literals with a long literal mark in not allowed places.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.3.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.3.kt
index 5c276c01dca..b52d5aaf425 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] Any of the decimal, hexadecimal or binary literals may be suffixed by the long literal mark (symbol L).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Various integer literals with underscores after a long literal mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.4.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.4.kt
index 98eeefffbf4..d9215be8f4a 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.4.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.4.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] Any of the decimal, hexadecimal or binary literals may be suffixed by the long literal mark (symbol L).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: The long literal mark after not integer literals.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.1.kt
index 862cb8810f2..4908b7a8a5a 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] Any of the decimal, hexadecimal or binary literals may be suffixed by the long literal mark (symbol L).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Decimal integer literals suffixed by the long literal mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.10.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.10.kt
index 7bb2c7531e4..5799f31598f 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.10.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.10.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] Any of the decimal, hexadecimal or binary literals may be suffixed by the long literal mark (symbol L).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 10
  * DESCRIPTION: Long literal mark in not allowed places (it's considered as identifiers).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.2.kt
index e6803ca156e..42aae55c350 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] Any of the decimal, hexadecimal or binary literals may be suffixed by the long literal mark (symbol L).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Decimal integer literals with underscores suffixed by the long literal mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.3.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.3.kt
index 3e35edc5121..8ab519dba65 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] Any of the decimal, hexadecimal or binary literals may be suffixed by the long literal mark (symbol L).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Hexadecimal integer literals suffixed by the long literal mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.4.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.4.kt
index eadc364f67b..5b63308311e 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.4.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.4.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] Any of the decimal, hexadecimal or binary literals may be suffixed by the long literal mark (symbol L).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: Hexadecimal prefix only suffixed by the long literal mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.5.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.5.kt
index 12383b37392..20354269e3e 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.5.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.5.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] Any of the decimal, hexadecimal or binary literals may be suffixed by the long literal mark (symbol L).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 5
  * DESCRIPTION: Hexadecimal integer literals with underscores suffixed by the long literal mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.6.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.6.kt
index fe6ce0c9b71..cff2e1be48f 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.6.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.6.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] Any of the decimal, hexadecimal or binary literals may be suffixed by the long literal mark (symbol L).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 6
  * DESCRIPTION: Binary integer literals suffixed by the long literal mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.7.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.7.kt
index 1eab3df8119..6c84769c7c1 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.7.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.7.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] Any of the decimal, hexadecimal or binary literals may be suffixed by the long literal mark (symbol L).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 7
  * DESCRIPTION: Binary prefix only suffixed by the long literal mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.8.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.8.kt
index 174dcf8ae42..94aea3cd90c 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.8.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.8.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] Any of the decimal, hexadecimal or binary literals may be suffixed by the long literal mark (symbol L).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 8
  * DESCRIPTION: Binary integer literals with underscores suffixed by the long literal mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.9.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.9.kt
index 75aa8e2b3d2..60f7aa53918 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.9.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.9.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, integer-literals, long-integer-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] Any of the decimal, hexadecimal or binary literals may be suffixed by the long literal mark (symbol L).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 9
  * DESCRIPTION: Various integer literals with long literal mark in not allowed lower case (but valid in opinion the parser).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.1.kt
index c97836a5657..a3316cf0a3c 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A real literal consists of the following parts: the whole-number part, the decimal point (ASCII period character .), the fraction part and the exponent.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Real literals with not allowed several dots.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.2.kt
index 9f9e7571370..646bf005f28 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A real literal consists of the following parts: the whole-number part, the decimal point (ASCII period character .), the fraction part and the exponent.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 1 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals with not allowed symbols as a separator of a whole-number part and a fraction part.
  * UNEXPECTED BEHAVIOUR
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.3.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.3.kt
index 28027285364..638edcea432 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A real literal consists of the following parts: the whole-number part, the decimal point (ASCII period character .), the fraction part and the exponent.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 1 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Real literals separeted by comments.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.1.kt
index 6941c50a57f..2588203c8e4 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] Unlike other languages, Kotlin real literals may only be expressed in decimal numbers.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Not allowed hexadecimal real literals.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.2.kt
index 309996c0834..adc800ec3f1 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] Unlike other languages, Kotlin real literals may only be expressed in decimal numbers.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 1 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Not allowed binary real literals.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.3.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.3.kt
index c25b6809673..f591f36a770 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 1
- * SENTENCE: [2] Unlike other languages, Kotlin real literals may only be expressed in decimal numbers.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 1 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Not allowed real literals with a whole-number part as a hexadecimal number and a fraction part as a binary number (or vice versa).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.1.kt
index 1459083dfe2..fb88c3840ef 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 1
- * SENTENCE: [3] A real literal may also be followed by a type suffix (f or F).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 1 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: A float suffix in the real literals right after a dot.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.2.kt
index ee7d8cd3df3..b9ae1fabecf 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 1
- * SENTENCE: [3] A real literal may also be followed by a type suffix (f or F).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 1 -> sentence 3
  * NUMBER: 2
  * DESCRIPTION: A float suffix in the real literals right after a several dots (possibly separated by digits).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.3.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.3.kt
index fae9a31076a..576db55826b 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 1
- * SENTENCE: [3] A real literal may also be followed by a type suffix (f or F).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 1 -> sentence 3
  * NUMBER: 3
  * DESCRIPTION: Real literals with a float suffix and not allowed symbols as a separator of a whole-number part and a fraction part.
  * UNEXPECTED BEHAVIOUR
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/1.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/1.1.kt
index 86a69b247ca..755805de9e2 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A real literal consists of the following parts: the whole-number part, the decimal point (ASCII period character .), the fraction part and the exponent.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Simple real literals with a different whole-number part and fraction part.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/1.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/1.2.kt
index fa36c1621ed..e54f756b30d 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 1
- * SENTENCE: [1] A real literal consists of the following parts: the whole-number part, the decimal point (ASCII period character .), the fraction part and the exponent.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 1 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals with a many digits in a whole-number part and a fraction part.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/3.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/3.1.kt
index 4c1eae32da4..1e4b179a072 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/3.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/3.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 1
- * SENTENCE: [3] A real literal may also be followed by a type suffix (f or F).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 1 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: Simple real literals suffixed by f/F (the float suffix) with a different whole-number part and fraction part.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/3.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/3.2.kt
index 58a34c8fc8f..fb04849bc11 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/3.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/3.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 1
- * SENTENCE: [3] A real literal may also be followed by a type suffix (f or F).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 1 -> sentence 3
  * NUMBER: 2
  * DESCRIPTION: Real literals suffixed by f/F (the float suffix) with a many digits in a whole-number part and a fraction part.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.1.kt
index 04c10bc7269..04be7085a91 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 2
- * SENTENCE: [1] The exponent is an exponent mark (e or E) followed by an optionaly signed decimal integer (a sequence of decimal digits).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Real literals with not allowed several exponent marks.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.2.kt
index 490a63fa239..aa2d72c5a6d 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 2
- * SENTENCE: [1] The exponent is an exponent mark (e or E) followed by an optionaly signed decimal integer (a sequence of decimal digits).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals suffixed by f/F (the float suffix) with not allowed several exponent marks.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.3.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.3.kt
index babc2d6ca1c..4efe2694eb4 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 2
- * SENTENCE: [1] The exponent is an exponent mark (e or E) followed by an optionaly signed decimal integer (a sequence of decimal digits).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Real literals with a not allowed exponent mark with digits followed by a float suffix.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.4.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.4.kt
index 6749f45bb40..6b96fbfc01c 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.4.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.4.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 2
- * SENTENCE: [1] The exponent is an exponent mark (e or E) followed by an optionaly signed decimal integer (a sequence of decimal digits).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: Real literals with a not allowed digits and exponent mark followed by a float suffix.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.1.kt
index db814ae0bff..ebe9b9b8eb8 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 2
- * SENTENCE: [1] The exponent is an exponent mark (e or E) followed by an optionaly signed decimal integer (a sequence of decimal digits).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Simple real literals with an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.2.kt
index 5f42868e564..f09c0c1c99f 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 2
- * SENTENCE: [1] The exponent is an exponent mark (e or E) followed by an optionaly signed decimal integer (a sequence of decimal digits).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals with a not allowed exponent mark at the beginning.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.3.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.3.kt
index 75470020160..98a102bbb6f 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 2
- * SENTENCE: [1] The exponent is an exponent mark (e or E) followed by an optionaly signed decimal integer (a sequence of decimal digits).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Real literals without digits after an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.4.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.4.kt
index 06783b8788a..dba34f548dd 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.4.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.4.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 2
- * SENTENCE: [1] The exponent is an exponent mark (e or E) followed by an optionaly signed decimal integer (a sequence of decimal digits).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: Simple real literals suffixed by f/F (float suffix) with an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.5.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.5.kt
index 2f086c6fde7..3f5aa964322 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.5.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.5.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 2
- * SENTENCE: [1] The exponent is an exponent mark (e or E) followed by an optionaly signed decimal integer (a sequence of decimal digits).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 5
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with a not allowed exponent mark at the beginning.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.6.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.6.kt
index b25c9215f1e..04edfb3d200 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.6.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.6.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 2
- * SENTENCE: [1] The exponent is an exponent mark (e or E) followed by an optionaly signed decimal integer (a sequence of decimal digits).
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 6
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with an exponent mark without digits after it.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.1.kt
index e6989b8bead..38c8deb43b3 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [1] The whole-number part and the exponent part may be omitted.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Real literals consisting only of dots or many dots before digits.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.2.kt
index 1867b7f5ebf..3e74d9948ff 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [1] The whole-number part and the exponent part may be omitted.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals with dots at the beginning and exponent mark/float suffix right after it.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.3.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.3.kt
index 130257d4564..c455094569e 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [1] The whole-number part and the exponent part may be omitted.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with omitted whole-number part and not allowed several exponent marks.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.4.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.4.kt
index 3bcded4efcf..77a5c56b5c2 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.4.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.4.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [1] The whole-number part and the exponent part may be omitted.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: Real literals with omitted whole-number part and an exponent mark followed by a float suffix.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.5.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.5.kt
index d570b5379dc..f302333957e 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.5.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.5.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [1] The whole-number part and the exponent part may be omitted.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 5
  * DESCRIPTION: Real literals with omitted whole-number part and an exponent mark followed by a float suffix and digits.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/2.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/2.1.kt
index 8b0c7943d52..99ad06e0be2 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/2.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/2.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [2] The fraction part may be omitted only together with the decimal point, if the whole-number part and either the exponent part or the type suffix are present.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 3 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Real literals with omitted fraction part and digits followed by a float suffix.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/3.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/3.1.kt
index 1f7a69b99a1..d769cb47eca 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/3.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/3.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [3] Unlike other languages, Kotlin does not support omitting the fraction part, but leaving the decimal point in.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 3 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: Real literals with a not allowed dot at the end.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.1.kt
index d82edba1754..78f5e41d765 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [1] The whole-number part and the exponent part may be omitted.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Simple real literals with omitted a whole-number part.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.2.kt
index 9a6c1a09a4a..ed0d8c46cf9 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [1] The whole-number part and the exponent part may be omitted.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals with omitted a whole-number part and an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.3.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.3.kt
index f85c746ce27..ea28fd7d665 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [1] The whole-number part and the exponent part may be omitted.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Real literals with omitted a whole-number part and an exponent mark without digits after it.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.4.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.4.kt
index ed89deb927c..61e856098ff 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.4.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.4.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [1] The whole-number part and the exponent part may be omitted.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: Simple real literals suffixed by f/F (float suffix) with omitted a whole-number part.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.5.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.5.kt
index c5dd2f38c51..7b281e575d0 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.5.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.5.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [1] The whole-number part and the exponent part may be omitted.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 5
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with omitted a whole-number part and an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.6.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.6.kt
index 6043501f0ac..ae351cccd8d 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.6.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.6.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [1] The whole-number part and the exponent part may be omitted.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 6
  * DESCRIPTION: Real literals with omitted a whole-number part, suffixed by f/F (float suffix) followed by an exponent mark without digits.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.1.kt
index 5944401deff..c85b61eebe4 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [2] The fraction part may be omitted only together with the decimal point, if the whole-number part and either the exponent part or the type suffix are present.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 3 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Simple real literals with omitted a fraction part, suffixed by f/F (float suffix).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.2.kt
index 456027fc097..c46ae67db45 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [2] The fraction part may be omitted only together with the decimal point, if the whole-number part and either the exponent part or the type suffix are present.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 3 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Real literals with omitted a fraction part and an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.3.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.3.kt
index 02ca983c188..10c3be5d3a1 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [2] The fraction part may be omitted only together with the decimal point, if the whole-number part and either the exponent part or the type suffix are present.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 3 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Real literals with omitted a fraction part and an exponent mark, suffixed by f/F (float suffix).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.4.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.4.kt
index 862c3d69562..824b43b3f43 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.4.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.4.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 3
- * SENTENCE: [2] The fraction part may be omitted only together with the decimal point, if the whole-number part and either the exponent part or the type suffix are present.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 3 -> sentence 2
  * NUMBER: 4
  * DESCRIPTION: Real literals with omitted a fraction part and an exponent mark without digits after it.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.1.kt
index 136e8b1c7ea..b741ac832a6 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [1] The digits of the whole-number part or the fraction part or the exponent may be optionally separated by underscores, but an underscore may not be placed between, before, or after these parts.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Real literals with a not allowed underscore at the beginning.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.2.kt
index 5ad5585c467..5e4eee20fd6 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [1] The digits of the whole-number part or the fraction part or the exponent may be optionally separated by underscores, but an underscore may not be placed between, before, or after these parts.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals with dots separated by underscores.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.3.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.3.kt
index bc1de3fb46d..e15fa85ba6c 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [1] The digits of the whole-number part or the fraction part or the exponent may be optionally separated by underscores, but an underscore may not be placed between, before, or after these parts.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Real literals with float suffix not at the end and underscores at the different positions.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.4.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.4.kt
index ee678872a30..5b70d9da64f 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.4.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.4.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [1] The digits of the whole-number part or the fraction part or the exponent may be optionally separated by underscores, but an underscore may not be placed between, before, or after these parts.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: Real literals with omitted whole-number part, float suffix not at the end and underscores at the different positions.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.1.kt
index dd5b11eebab..63a5ae17cc7 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [1] The digits of the whole-number part or the fraction part or the exponent may be optionally separated by underscores, but an underscore may not be placed between, before, or after these parts.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Real literals with underscores in a whole-number part and a fraction part.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.2.kt
index e9d010651a6..ca66d34da11 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [1] The digits of the whole-number part or the fraction part or the exponent may be optionally separated by underscores, but an underscore may not be placed between, before, or after these parts.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with underscores in a whole-number part and a fraction part.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.3.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.3.kt
index be8405fca29..d5810172def 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [1] The digits of the whole-number part or the fraction part or the exponent may be optionally separated by underscores, but an underscore may not be placed between, before, or after these parts.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with an exponent mark and underscores in a whole-number part, a fraction part and an exponent part.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.4.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.4.kt
index 60eeeb38be3..f381d5c7600 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.4.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.4.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [1] The digits of the whole-number part or the fraction part or the exponent may be optionally separated by underscores, but an underscore may not be placed between, before, or after these parts.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: Real literals with an omitted whole-number part and underscores in a whole-number part, a fraction part and an exponent part.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.5.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.5.kt
index bd055bb59b6..e25afc23518 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.5.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.5.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [1] The digits of the whole-number part or the fraction part or the exponent may be optionally separated by underscores, but an underscore may not be placed between, before, or after these parts.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 5
  * DESCRIPTION: Real literals with an omitted fraction part and underscores in a whole-number part, a fraction part and an exponent part.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.6.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.6.kt
index 08574bf347c..69986d18aac 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.6.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.6.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [1] The digits of the whole-number part or the fraction part or the exponent may be optionally separated by underscores, but an underscore may not be placed between, before, or after these parts.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 6
  * DESCRIPTION: Real literals without digits after an exponent mark and with undescores in the different pisitions.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.7.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.7.kt
index b5aeea2938a..7f78f724e10 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.7.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.7.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [1] The digits of the whole-number part or the fraction part or the exponent may be optionally separated by underscores, but an underscore may not be placed between, before, or after these parts.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 7
  * DESCRIPTION: Real literals with underscores at the end.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.1.kt
index 86e38c3411a..3a4dd941014 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [2] It also may not be placed before or after the exponent mark symbol.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 4 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Real literals with underscores before an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.2.kt
index 54944412f3d..7e9c1f9eb01 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [2] It also may not be placed before or after the exponent mark symbol.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 4 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Real literals with underscores after an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.3.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.3.kt
index be2adbc006e..3ac9a6e2c7d 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 4
- * SENTENCE: [2] It also may not be placed before or after the exponent mark symbol.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 4 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Real literals with underscores around an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-6/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-6/neg/1.1.kt
index 52423f9b746..28eb7ae9524 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-6/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-6/neg/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: constant-literals, real-literals
- * PARAGRAPH: 6
- * SENTENCE: [1] Note: this means there is no special suffix associated with type kotlin.Double.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: constant-literals, real-literals -> paragraph 6 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Real literals suffixed by not supported d/D (a double suffix).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-2/neg/3.1.kt b/compiler/tests-spec/testData/psi/linked/when-expression/p-2/neg/3.1.kt
index 068f3c82123..b8adec4a5bb 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-2/neg/3.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/when-expression/p-2/neg/3.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 2
- * SENTENCE: [3] When expression has two different forms: with bound value and without it.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: when-expression -> paragraph 2 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: Empty 'when' with missed bound value.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-2/neg/3.2.kt b/compiler/tests-spec/testData/psi/linked/when-expression/p-2/neg/3.2.kt
index dca80ec7b3b..13c78e6511b 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-2/neg/3.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/when-expression/p-2/neg/3.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 2
- * SENTENCE: [3] When expression has two different forms: with bound value and without it.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: when-expression -> paragraph 2 -> sentence 3
  * NUMBER: 2
  * DESCRIPTION: Empty 'when' with missed 'when entries' section.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-2/pos/3.1.kt b/compiler/tests-spec/testData/psi/linked/when-expression/p-2/pos/3.1.kt
index e3aff5b6f98..d590c8dcda6 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-2/pos/3.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/when-expression/p-2/pos/3.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 2
- * SENTENCE: [3] When expression has two different forms: with bound value and without it.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: when-expression -> paragraph 2 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: Empty 'when' with bound value.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-2/pos/3.2.kt b/compiler/tests-spec/testData/psi/linked/when-expression/p-2/pos/3.2.kt
index fa0e7b2b154..f2fca1d40d5 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-2/pos/3.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/when-expression/p-2/pos/3.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 2
- * SENTENCE: [3] When expression has two different forms: with bound value and without it.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: when-expression -> paragraph 2 -> sentence 3
  * NUMBER: 2
  * DESCRIPTION: Empty 'when' without bound value.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/1.1.kt
index cc9a2651770..fafbb8b06b8 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 3
- * SENTENCE: [1] When expression without bound value (the form where the expression enclosed in parantheses is absent) evaluates one of the many different expressions based on corresponding conditions present in the same when entry.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: when-expression -> paragraph 3 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: 'When' without bound value and missed control structure body.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/1.2.kt b/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/1.2.kt
index 7b9da62efba..96e1a61ca1b 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 3
- * SENTENCE: [1] When expression without bound value (the form where the expression enclosed in parantheses is absent) evaluates one of the many different expressions based on corresponding conditions present in the same when entry.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: when-expression -> paragraph 3 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: 'When' without bound value and missed 'when condition'.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/2.1.kt b/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/2.1.kt
index 11d6b6b5866..230c779631e 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/2.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/2.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 3
- * SENTENCE: [2] Each entry consists of a boolean condition (or a special else condition), each of which is checked and evaluated in order of appearance.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: when-expression -> paragraph 3 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: 'When' without bound value and with invalid 'else' branch.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/2.2.kt b/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/2.2.kt
index b71692b41ad..0c4962a5986 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/2.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/2.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 3
- * SENTENCE: [2] Each entry consists of a boolean condition (or a special else condition), each of which is checked and evaluated in order of appearance.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: when-expression -> paragraph 3 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: 'When' without bound value and with invalid list of the boolean conditions in 'when entry'.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.1.kt
index be2c052b676..c174fba1441 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 6
- * SENTENCE: [1] When expression with bound value (the form where the expression enclosed in parantheses is present) are very similar to the form without bound value, but use different syntax for conditions.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: when-expression -> paragraph 6 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: 'When' with bound value and empty control structure body.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.2.kt b/compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.2.kt
index 743789b9993..36af0357c70 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 6
- * SENTENCE: [1] When expression with bound value (the form where the expression enclosed in parantheses is present) are very similar to the form without bound value, but use different syntax for conditions.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: when-expression -> paragraph 6 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: 'When' with bound value and empty 'when condition'.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.3.kt b/compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.3.kt
index 1a667c61e32..2ff559505bc 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.3.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 6
- * SENTENCE: [1] When expression with bound value (the form where the expression enclosed in parantheses is present) are very similar to the form without bound value, but use different syntax for conditions.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: when-expression -> paragraph 6 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: 'When' with bound value and with invalid list of the conditions in 'when entry'.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/1.1.kt
index 82b1f2b1ae2..48121385a91 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/1.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 7
- * SENTENCE: [1] Type test condition: type checking operator followed by type.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: when-expression -> paragraph 7 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: 'When' with bound value and type test condition, but missed type in 'when condition'.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/1.2.kt b/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/1.2.kt
index ac9198cdcc5..908888616c3 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/1.2.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 7
- * SENTENCE: [1] Type test condition: type checking operator followed by type.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: when-expression -> paragraph 7 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: 'When' with bound value and 'when condition' with type checking operator and non-type value.
  * UNEXPECTED BEHAVIOUR
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/3.1.kt b/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/3.1.kt
index 80798196999..5708f11831d 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/3.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/3.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 7
- * SENTENCE: [3] Contains test condition: containment operator followed by an expression.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: when-expression -> paragraph 7 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: 'When' with bound value and 'when condition' with range expression, but without contains operator.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/5.1.kt b/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/5.1.kt
index 28394ef8573..53f1a1789d8 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/5.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/5.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 7
- * SENTENCE: [5] Any other expression.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: when-expression -> paragraph 7 -> sentence 5
  * NUMBER: 1
  * DESCRIPTION: 'When' with bound value and not allowed spread operator in 'when condition'.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/7.1.kt b/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/7.1.kt
index 48db3a9f50b..6a8f25d1211 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/7.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/7.1.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SECTIONS: when-expression
- * PARAGRAPH: 7
- * SENTENCE: [7] The else condition, which works the exact same way as it would in the form without bound expression.
+ * SPEC VERSION: 0.1-draft
+ * PLACES: when-expression -> paragraph 7 -> sentence 7
  * NUMBER: 1
  * DESCRIPTION: 'When' with invalid else condition.
  */
diff --git a/compiler/tests-spec/testData/psi/templates/_layout/linkedTestsLayout.kt b/compiler/tests-spec/testData/psi/templates/_layout/linkedTestsLayout.kt
index 8a4b08b550b..26e61a59275 100644
--- a/compiler/tests-spec/testData/psi/templates/_layout/linkedTestsLayout.kt
+++ b/compiler/tests-spec/testData/psi/templates/_layout/linkedTestsLayout.kt
@@ -1,9 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (<!TEST_TYPE!>)
  *
- * SECTIONS: <!SECTIONS!>
- * PARAGRAPH: <!PARAGRAPH_NUMBER!>
- * SENTENCE: [<!SENTENCE_NUMBER!>] <!SENTENCE!>
+ * SPEC VERSION: 0.1-draft
+ * PLACE: <!SECTIONS!> -> paragraph <!PARAGRAPH_NUMBER!> -> sentence <!SENTENCE_NUMBER!>
  * NUMBER: <!TEST_NUMBER!>
  * DESCRIPTION: <!TEST_DESCRIPTION!>
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/models/AbstractSpecTest.kt b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/models/AbstractSpecTest.kt
index 5938d92b6f2..e1a486543be 100644
--- a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/models/AbstractSpecTest.kt
+++ b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/models/AbstractSpecTest.kt
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.spec.models
 import org.jetbrains.kotlin.spec.*
 import org.jetbrains.kotlin.spec.parsers.CommonPatterns
 import org.jetbrains.kotlin.spec.parsers.CommonPatterns.issuesPattern
+import org.jetbrains.kotlin.spec.parsers.LinkedSpecTestPatterns.relevantPlacesPattern
 import org.jetbrains.kotlin.spec.parsers.TestCasePatterns.testCaseNumberPattern
 import java.util.regex.Matcher
 import java.util.regex.Pattern
@@ -28,7 +29,6 @@ enum class CommonSpecTestFileInfoElementType(
     override val valuePattern: Pattern? = null,
     override val required: Boolean = false
 ) : SpecTestInfoElementType {
-    SECTIONS(valuePattern = CommonPatterns.sectionsInFilePattern, required = true),
     NUMBER(required = true),
     DESCRIPTION(required = true)
 }
@@ -37,7 +37,8 @@ enum class SpecTestCaseInfoElementType(
     override val valuePattern: Pattern? = null,
     override val required: Boolean = false
 ) : SpecTestInfoElementType {
-    TESTCASE_NUMBER(valuePattern = testCaseNumberPattern, required = true)
+    TESTCASE_NUMBER(valuePattern = testCaseNumberPattern, required = true),
+    RELEVANT_PLACES(valuePattern = relevantPlacesPattern),
 }
 
 abstract class AbstractSpecTest(
diff --git a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/models/LinkedSpecTest.kt b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/models/LinkedSpecTest.kt
index acf0d4d28be..4797a4b1f3c 100644
--- a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/models/LinkedSpecTest.kt
+++ b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/models/LinkedSpecTest.kt
@@ -13,7 +13,8 @@ import org.jetbrains.kotlin.spec.parsers.CommonPatterns.ls
 import org.jetbrains.kotlin.spec.parsers.CommonParser.withUnderscores
 import org.jetbrains.kotlin.spec.parsers.CommonParser.splitByPathSeparator
 import org.jetbrains.kotlin.spec.parsers.CommonParser.withSpaces
-import org.jetbrains.kotlin.spec.parsers.LinkedSpecTestPatterns.sentencePattern
+import org.jetbrains.kotlin.spec.parsers.LinkedSpecTestPatterns.placePattern
+import org.jetbrains.kotlin.spec.parsers.LinkedSpecTestPatterns.relevantPlacesPattern
 import java.util.regex.Matcher
 import java.util.regex.Pattern
 
@@ -21,37 +22,44 @@ enum class LinkedSpecTestFileInfoElementType(
     override val valuePattern: Pattern? = null,
     override val required: Boolean = false
 ) : SpecTestInfoElementType {
-    PARAGRAPH(required = true),
-    SENTENCE(valuePattern = sentencePattern, required = true)
+    SPEC_VERSION(required = true),
+    PLACE(valuePattern = placePattern, required = true),
+    RELEVANT_PLACES(valuePattern = relevantPlacesPattern)
 }
 
+data class SpecPlace(
+    val sections: List<String>,
+    val paragraphNumber: Int,
+    val sentenceNumber: Int
+)
+
 class LinkedSpecTest(
+    private val specVersion: String,
     testArea: TestArea,
     testType: TestType,
-    sections: List<String>,
-    val paragraphNumber: Int,
-    val sentenceNumber: Int,
-    private val sentence: String,
+    val place: SpecPlace,
+    private val relevantPlaces: List<SpecPlace>?,
     testNumber: Int,
     description: String,
     cases: SpecTestCasesSet,
     unexpectedBehavior: Boolean,
     issues: Set<String>
-) : AbstractSpecTest(testArea, testType, sections, testNumber, description, cases, unexpectedBehavior, issues) {
+) : AbstractSpecTest(testArea, testType, place.sections, testNumber, description, cases, unexpectedBehavior, issues) {
     override fun checkPathConsistency(pathMatcher: Matcher) =
         testArea == TestArea.valueOf(pathMatcher.group("testArea").withUnderscores())
                 && testType == TestType.fromValue(pathMatcher.group("testType"))!!
                 && sections == pathMatcher.group("sections").splitByPathSeparator()
-                && paragraphNumber == pathMatcher.group("paragraphNumber").toInt()
-                && sentenceNumber == pathMatcher.group("sentenceNumber").toInt()
+                && place.paragraphNumber == pathMatcher.group("paragraphNumber").toInt()
+                && place.sentenceNumber == pathMatcher.group("sentenceNumber").toInt()
                 && testNumber == pathMatcher.group("testNumber").toInt()
 
     override fun toString() = buildString {
         append("--------------------------------------------------$ls")
         super.getUnexpectedBehaviourText()?.let { append(it + ls) }
         append("${testArea.name.withSpaces()} $testType SPEC TEST (${testType.toString().withSpaces()})$ls")
-        append("SECTIONS: ${sections.joinToString()} (paragraph: $paragraphNumber)$ls")
-        append("SENTENCE $sentenceNumber: $sentence$ls")
+        append("SPEC VERSION: $specVersion$ls")
+        append("SPEC PLACE: ${sections.joinToString()} -> paragraph: ${place.paragraphNumber} -> sentence: ${place.sentenceNumber}$ls")
+        relevantPlaces?.let { append("OTHER RELEVANT SPEC PLACES:${it.joinToString { "$ls\t${sections.joinToString()} -> paragraph: ${place.paragraphNumber} -> sentence: ${place.sentenceNumber}" }}$ls") }
         append("NUMBER: $testNumber$ls")
         append("TEST CASES: ${cases.byNumbers.size.coerceAtLeast(1)}$ls")
         append("DESCRIPTION: $description$ls")
diff --git a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/models/NotLinkedSpecTest.kt b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/models/NotLinkedSpecTest.kt
index 98a70a465fe..09219914f91 100644
--- a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/models/NotLinkedSpecTest.kt
+++ b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/models/NotLinkedSpecTest.kt
@@ -13,13 +13,16 @@ import org.jetbrains.kotlin.spec.parsers.CommonParser.splitByPathSeparator
 import org.jetbrains.kotlin.spec.parsers.CommonParser.withUnderscores
 import org.jetbrains.kotlin.spec.parsers.CommonParser.withSpaces
 import org.jetbrains.kotlin.spec.parsers.CommonPatterns.ls
+import org.jetbrains.kotlin.spec.parsers.CommonPatterns.sectionsInFilePattern
 import java.util.regex.Matcher
 import java.util.regex.Pattern
 
 enum class NotLinkedSpecTestFileInfoElementType(
     override val valuePattern: Pattern? = null,
     override val required: Boolean = false
-) : SpecTestInfoElementType
+) : SpecTestInfoElementType {
+    SECTIONS(valuePattern = sectionsInFilePattern, required = true)
+}
 
 class NotLinkedSpecTest(
     testArea: TestArea,
diff --git a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/parsers/CommonParser.kt b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/parsers/CommonParser.kt
index 0f66f25b569..3fb8e8ef6f1 100644
--- a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/parsers/CommonParser.kt
+++ b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/parsers/CommonParser.kt
@@ -8,16 +8,14 @@ package org.jetbrains.kotlin.spec.parsers
 import org.jetbrains.kotlin.spec.*
 import org.jetbrains.kotlin.spec.SpecTestInfoElementContent
 import org.jetbrains.kotlin.spec.SpecTestLinkedType
-import org.jetbrains.kotlin.spec.models.LinkedSpecTest
-import org.jetbrains.kotlin.spec.models.LinkedSpecTestFileInfoElementType
-import org.jetbrains.kotlin.spec.models.NotLinkedSpecTest
-import org.jetbrains.kotlin.spec.models.SpecTestInfoElements
+import org.jetbrains.kotlin.spec.models.*
 import org.jetbrains.kotlin.spec.parsers.CommonPatterns.testInfoElementPattern
 import org.jetbrains.kotlin.spec.parsers.CommonPatterns.testPathBaseRegexTemplate
 import org.jetbrains.kotlin.spec.parsers.LinkedSpecTestPatterns.testInfoPattern
 import org.jetbrains.kotlin.spec.parsers.TestCasePatterns.testCaseInfoPattern
 import org.jetbrains.kotlin.spec.validators.*
 import java.io.File
+import java.util.regex.Matcher
 import java.util.regex.Pattern
 
 object CommonParser {
@@ -41,18 +39,33 @@ object CommonParser {
             throw SpecTestValidationException(SpecTestValidationFailedReason.FILENAME_NOT_VALID)
     }
 
+    private fun createSpecPlace(placeMatcher: Matcher, basePlaceMatcher: Matcher = placeMatcher) =
+        SpecPlace(
+            placeMatcher.group("sections")?.splitByComma() ?: basePlaceMatcher.group("sections").splitByComma(),
+            placeMatcher.group("paragraphNumber")?.toInt() ?: basePlaceMatcher.group("paragraphNumber").toInt(),
+            placeMatcher.group("sentenceNumber").toInt()
+        )
+
     private fun parseLinkedSpecTest(testFilePath: String, testFiles: TestFiles): LinkedSpecTest {
         val parsedTestFile = parseTestInfo(testFilePath, testFiles, SpecTestLinkedType.LINKED)
         val testInfoElements = parsedTestFile.testInfoElements
-        val sentenceMatcher = testInfoElements[LinkedSpecTestFileInfoElementType.SENTENCE]!!.additionalMatcher!!
+        val placeMatcher = testInfoElements[LinkedSpecTestFileInfoElementType.PLACE]!!.additionalMatcher!!
+        val relevantPlacesMatcher = testInfoElements[LinkedSpecTestFileInfoElementType.RELEVANT_PLACES]?.additionalMatcher
+        val relevantPlaces = relevantPlacesMatcher?.let {
+            mutableListOf<SpecPlace>().apply {
+                add(createSpecPlace(it, placeMatcher))
+                while (it.find()) {
+                    add(createSpecPlace(it, placeMatcher))
+                }
+            }
+        }
 
         return LinkedSpecTest(
+            testInfoElements[LinkedSpecTestFileInfoElementType.SPEC_VERSION]!!.content,
             parsedTestFile.testArea,
             parsedTestFile.testType,
-            parsedTestFile.sections,
-            testInfoElements[LinkedSpecTestFileInfoElementType.PARAGRAPH]!!.content.toInt(),
-            sentenceMatcher.group("number").toInt(),
-            sentenceMatcher.group("text"),
+            createSpecPlace(placeMatcher),
+            relevantPlaces,
             parsedTestFile.testNumber,
             parsedTestFile.testDescription,
             parsedTestFile.testCasesSet,
@@ -63,11 +76,13 @@ object CommonParser {
 
     private fun parseNotLinkedSpecTest(testFilePath: String, testFiles: TestFiles): NotLinkedSpecTest {
         val parsedTestFile = parseTestInfo(testFilePath, testFiles, SpecTestLinkedType.NOT_LINKED)
+        val testInfoElements = parsedTestFile.testInfoElements
+        val sectionsMatcher = testInfoElements[NotLinkedSpecTestFileInfoElementType.SECTIONS]!!.additionalMatcher!!
 
         return NotLinkedSpecTest(
             parsedTestFile.testArea,
             parsedTestFile.testType,
-            parsedTestFile.sections,
+            sectionsMatcher.group("sections").splitByComma(),
             parsedTestFile.testNumber,
             parsedTestFile.testDescription,
             parsedTestFile.testCasesSet,
diff --git a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/parsers/Patterns.kt b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/parsers/Patterns.kt
index 7e6b28c9265..ee21a028868 100644
--- a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/parsers/Patterns.kt
+++ b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/parsers/Patterns.kt
@@ -13,12 +13,13 @@ import org.jetbrains.kotlin.spec.parsers.CommonPatterns.INTEGER_REGEX
 import org.jetbrains.kotlin.spec.parsers.CommonPatterns.SINGLE_LINE_COMMENT_REGEX
 import org.jetbrains.kotlin.spec.parsers.CommonPatterns.ASTERISK_REGEX
 import org.jetbrains.kotlin.spec.parsers.CommonPatterns.directiveRegex
-import org.jetbrains.kotlin.spec.parsers.CommonPatterns.multilineCommentRegex
+import org.jetbrains.kotlin.spec.parsers.CommonPatterns.MULTILINE_COMMENT_REGEX
 import org.jetbrains.kotlin.spec.parsers.CommonPatterns.ps
 import org.jetbrains.kotlin.spec.parsers.CommonPatterns.testAreaRegex
 import org.jetbrains.kotlin.spec.parsers.CommonPatterns.testPathRegexTemplate
 import org.jetbrains.kotlin.spec.parsers.CommonPatterns.testTypeRegex
 import org.jetbrains.kotlin.spec.parsers.CommonParser.withSpaces
+import org.jetbrains.kotlin.spec.parsers.CommonPatterns.SECTIONS_IN_FILE_REGEX
 import org.jetbrains.kotlin.spec.parsers.CommonPatterns.sectionsInPathRegex
 import java.io.File
 import java.util.regex.Pattern
@@ -28,20 +29,21 @@ object CommonPatterns {
     const val INTEGER_REGEX = """[1-9]\d*"""
     const val SINGLE_LINE_COMMENT_REGEX = """\/\/\s*%s"""
     const val ASTERISK_REGEX = """\*"""
+    const val SECTIONS_IN_FILE_REGEX = """[\w-]+(,\s+[\w-]+)*"""
+    const val MULTILINE_COMMENT_REGEX = """\/\*\s+?%s\s+\*\/(?:\n)*"""
 
     val ls: String = System.lineSeparator()
     val ps: String = Pattern.quote(File.separator)
 
-    val multilineCommentRegex = """\/\*\s+?%s\s+\*\/(?:\n)*"""
     val directiveRegex =
-        """${SINGLE_LINE_COMMENT_REGEX.format("""[\w\s]+:""")}|${multilineCommentRegex.format(""" $ASTERISK_REGEX [\w\s]+:[\s\S]*?""")}"""
+        """${SINGLE_LINE_COMMENT_REGEX.format("""[\w\s]+:""")}|${MULTILINE_COMMENT_REGEX.format(""" $ASTERISK_REGEX [\w\s]+:[\s\S]*?""")}"""
     val testAreaRegex = """(?<testArea>${TestArea.joinedValues})"""
     val testTypeRegex = """(?<testType>${TestType.joinedValues})"""
     val testInfoElementPattern: Pattern = Pattern.compile("""(?: \* )?(?<name>[A-Z ]+?)(?::\s*(?<value>.*?))?\n""")
     val testPathBaseRegexTemplate = """^.*?$ps(?<testArea>diagnostics|psi|(?:codegen${ps}box))$ps%s"""
     val testPathRegexTemplate = """$testPathBaseRegexTemplate$ps(?<testType>pos|neg)$ps%s$"""
     val issuesPattern: Pattern = Pattern.compile("""(KT-[1-9]\d*)(,\s*KT-[1-9]\d*)*""")
-    val sectionsInFilePattern: Pattern = Pattern.compile("""\w+(,\s+\w+)*""")
+    val sectionsInFilePattern: Pattern = Pattern.compile("""(?<sections>$SECTIONS_IN_FILE_REGEX)""")
     val sectionsInPathRegex = """(?<sections>(?:[\w-]+)(?:$ps[\w-]+)*?)"""
     val packagePattern: Pattern = Pattern.compile("""(?:^|\n)package (?<packageName>.*?)(?:;|\n)""")
 }
@@ -59,7 +61,7 @@ object NotLinkedSpecTestPatterns : BasePatterns {
     override val testPathPattern: Pattern =
         Pattern.compile(testPathRegexTemplate.format(pathPartRegex, FILENAME_REGEX))
     override val testInfoPattern: Pattern =
-        Pattern.compile(multilineCommentRegex.format(""" $ASTERISK_REGEX KOTLIN $testAreaRegex NOT LINKED SPEC TEST \($testTypeRegex\)\n(?<infoElements>[\s\S]*?\n)"""))
+        Pattern.compile(MULTILINE_COMMENT_REGEX.format(""" $ASTERISK_REGEX KOTLIN $testAreaRegex NOT LINKED SPEC TEST \($testTypeRegex\)\n(?<infoElements>[\s\S]*?\n)"""))
 }
 
 object LinkedSpecTestPatterns : BasePatterns {
@@ -70,9 +72,13 @@ object LinkedSpecTestPatterns : BasePatterns {
     override val testPathPattern: Pattern =
         Pattern.compile(testPathRegexTemplate.format(pathPartRegex, FILENAME_REGEX))
     override val testInfoPattern: Pattern =
-        Pattern.compile(multilineCommentRegex.format(""" $ASTERISK_REGEX KOTLIN $testAreaRegex SPEC TEST \($testTypeRegex\)\n(?<infoElements>[\s\S]*?\n)"""))
+        Pattern.compile(MULTILINE_COMMENT_REGEX.format(""" $ASTERISK_REGEX KOTLIN $testAreaRegex SPEC TEST \($testTypeRegex\)\n(?<infoElements>[\s\S]*?\n)"""))
 
-    val sentencePattern: Pattern = Pattern.compile("""^\[(?<number>$INTEGER_REGEX)\]\s*(?<text>.*?)$""")
+    val placePattern: Pattern =
+        Pattern.compile("""(?<sections>$SECTIONS_IN_FILE_REGEX) -> paragraph (?<paragraphNumber>$INTEGER_REGEX) -> sentence (?<sentenceNumber>$INTEGER_REGEX)""")
+
+    val relevantPlacesPattern: Pattern =
+        Pattern.compile("""(( $ASTERISK_REGEX )?\s*((?<sections>$SECTIONS_IN_FILE_REGEX) -> )?(paragraph (?<paragraphNumber>$INTEGER_REGEX) -> )?sentence (?<sentenceNumber>$INTEGER_REGEX))+""")
 }
 
 object TestCasePatterns {
@@ -85,7 +91,7 @@ object TestCasePatterns {
             testCaseInfoElementsRegex.format("infoElementsSL", "", """\s*.""")
         ) + testCaseInfoRegex.format("codeSL", "nextDirectiveSL")
     private val testCaseInfoMultilineRegex =
-        multilineCommentRegex.format(
+        MULTILINE_COMMENT_REGEX.format(
             testCaseInfoElementsRegex.format("infoElementsML", """ $ASTERISK_REGEX """, """[\s\S]""")
         ) + testCaseInfoRegex.format("codeML", "nextDirectiveML")
 
diff --git a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/parsers/TestInfoParser.kt b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/parsers/TestInfoParser.kt
index 3821ad91ed6..7423eb0fcfa 100644
--- a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/parsers/TestInfoParser.kt
+++ b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/parsers/TestInfoParser.kt
@@ -18,7 +18,6 @@ import java.io.File
 data class ParsedTestFile(
     val testArea: TestArea,
     val testType: TestType,
-    val sections: List<String>,
     val testNumber: Int,
     val testDescription: String,
     val testInfoElements: SpecTestInfoElements<SpecTestInfoElementType>,
@@ -47,7 +46,6 @@ fun parseTestInfo(testFilePath: String, testFiles: TestFiles, linkedTestType: Sp
     return ParsedTestFile(
         testArea = TestArea.valueOf(testInfoByContentMatcher.group("testArea").withUnderscores()),
         testType = TestType.valueOf(testInfoByContentMatcher.group("testType")),
-        sections = testInfoElements[CommonSpecTestFileInfoElementType.SECTIONS]!!.content.splitByComma(),
         testNumber = testInfoElements[CommonSpecTestFileInfoElementType.NUMBER]!!.content.toInt(),
         testDescription = testInfoElements[CommonSpecTestFileInfoElementType.DESCRIPTION]!!.content,
         testInfoElements = testInfoElements,
diff --git a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/TestsJsonMapBuilder.kt b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/TestsJsonMapBuilder.kt
index 6073ca4980e..6397c1ff680 100644
--- a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/TestsJsonMapBuilder.kt
+++ b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/TestsJsonMapBuilder.kt
@@ -20,8 +20,8 @@ object TestsJsonMapBuilder {
 
     fun buildJsonElement(testInfo: LinkedSpecTest, testsMap: JsonObject) {
         val sectionElement = addJsonIfNotExist(testsMap, testInfo.sections[0])
-        val paragraphElement = addJsonIfNotExist(sectionElement, testInfo.paragraphNumber)
-        val sentenceElement = addJsonIfNotExist(paragraphElement, testInfo.sentenceNumber)
+        val paragraphElement = addJsonIfNotExist(sectionElement, testInfo.place.paragraphNumber)
+        val sentenceElement = addJsonIfNotExist(paragraphElement, testInfo.place.sentenceNumber)
         val testAreaElement = addJsonIfNotExist(sentenceElement, testInfo.testArea.name.toLowerCase())
         val testTypeElement = addJsonIfNotExist(testAreaElement, testInfo.testType.type)
         val testNumberElement = addJsonIfNotExist(testTypeElement, testInfo.testNumber)