From 425adf50f1686ce2c45257a483b6e63a895a5a0f Mon Sep 17 00:00:00 2001
From: Jonathan Hui <jonhui@google.com>
Date: Thu, 26 Feb 2026 22:31:05 -0600
Subject: [PATCH] [nexus] add '1_1' prefix to nexus test filenames (#12569)

This commit renames all nexus test files and updates corresponding
configuration and source files to include a '1_1_' prefix.

The '1_1' prefix represents the Thread 1.1 test plan. This change
prepares the nexus test suite for the addition of tests from the
Thread 1.2, 1.3, and 1.4 test plans, ensuring a clear and organized
structure for multi-version specification testing.

Changes include:
- Renaming test_<num>.cpp to test_1_1_<num>.cpp.
- Renaming verify_<num>.py to verify_1_1_<num>.py.
- Updating CMakeLists.txt to reflect new test names.
- Updating run_nexus_tests.sh for default tests and variants.
- Updating hardcoded JSON output filenames in C++ test sources.
- Updating testcase name identification in Python verification
  scripts.
---
 tests/nexus/CMakeLists.txt                    | 192 ++++++++--------
 tests/nexus/run_nexus_tests.sh                | 206 +++++++++---------
 tests/nexus/test-v1-2-LP-5-3-1.txt            |  34 +++
 .../{test_5_1_1.cpp => test_1_1_5_1_1.cpp}    |   2 +-
 .../{test_5_1_10.cpp => test_1_1_5_1_10.cpp}  |   2 +-
 .../{test_5_1_11.cpp => test_1_1_5_1_11.cpp}  |   2 +-
 .../{test_5_1_12.cpp => test_1_1_5_1_12.cpp}  |   2 +-
 .../{test_5_1_13.cpp => test_1_1_5_1_13.cpp}  |   2 +-
 .../{test_5_1_2.cpp => test_1_1_5_1_2.cpp}    |   2 +-
 .../{test_5_1_3.cpp => test_1_1_5_1_3.cpp}    |   2 +-
 .../{test_5_1_4.cpp => test_1_1_5_1_4.cpp}    |   2 +-
 .../{test_5_1_5.cpp => test_1_1_5_1_5.cpp}    |   2 +-
 .../{test_5_1_6.cpp => test_1_1_5_1_6.cpp}    |   2 +-
 .../{test_5_1_7.cpp => test_1_1_5_1_7.cpp}    |   2 +-
 .../{test_5_1_8.cpp => test_1_1_5_1_8.cpp}    |   2 +-
 .../{test_5_1_9.cpp => test_1_1_5_1_9.cpp}    |   2 +-
 .../{test_5_2_1.cpp => test_1_1_5_2_1.cpp}    |   2 +-
 .../{test_5_2_3.cpp => test_1_1_5_2_3.cpp}    |   2 +-
 .../{test_5_2_4.cpp => test_1_1_5_2_4.cpp}    |   2 +-
 .../{test_5_2_5.cpp => test_1_1_5_2_5.cpp}    |   2 +-
 .../{test_5_2_6.cpp => test_1_1_5_2_6.cpp}    |   2 +-
 .../{test_5_2_7.cpp => test_1_1_5_2_7.cpp}    |   2 +-
 .../{test_5_3_1.cpp => test_1_1_5_3_1.cpp}    |   2 +-
 .../{test_5_3_10.cpp => test_1_1_5_3_10.cpp}  |   2 +-
 .../{test_5_3_11.cpp => test_1_1_5_3_11.cpp}  |   2 +-
 .../{test_5_3_2.cpp => test_1_1_5_3_2.cpp}    |   2 +-
 .../{test_5_3_3.cpp => test_1_1_5_3_3.cpp}    |   2 +-
 .../{test_5_3_4.cpp => test_1_1_5_3_4.cpp}    |   2 +-
 .../{test_5_3_5.cpp => test_1_1_5_3_5.cpp}    |   2 +-
 .../{test_5_3_6.cpp => test_1_1_5_3_6.cpp}    |   2 +-
 .../{test_5_3_7.cpp => test_1_1_5_3_7.cpp}    |   2 +-
 .../{test_5_3_8.cpp => test_1_1_5_3_8.cpp}    |   2 +-
 .../{test_5_3_9.cpp => test_1_1_5_3_9.cpp}    |   2 +-
 .../{test_5_5_1.cpp => test_1_1_5_5_1.cpp}    |   2 +-
 .../{test_5_5_2.cpp => test_1_1_5_5_2.cpp}    |   2 +-
 .../{test_5_5_3.cpp => test_1_1_5_5_3.cpp}    |   2 +-
 ...{test_5_5_4_1.cpp => test_1_1_5_5_4_1.cpp} |   2 +-
 ...{test_5_5_4_2.cpp => test_1_1_5_5_4_2.cpp} |   2 +-
 .../{test_5_5_5.cpp => test_1_1_5_5_5.cpp}    |   2 +-
 .../{test_5_5_7.cpp => test_1_1_5_5_7.cpp}    |   2 +-
 .../{test_5_6_1.cpp => test_1_1_5_6_1.cpp}    |   2 +-
 .../{test_5_6_2.cpp => test_1_1_5_6_2.cpp}    |   2 +-
 .../{test_5_6_3.cpp => test_1_1_5_6_3.cpp}    |   2 +-
 .../{test_5_6_4.cpp => test_1_1_5_6_4.cpp}    |   2 +-
 .../{test_5_6_5.cpp => test_1_1_5_6_5.cpp}    |   2 +-
 .../{test_5_6_6.cpp => test_1_1_5_6_6.cpp}    |   2 +-
 .../{test_5_6_7.cpp => test_1_1_5_6_7.cpp}    |   2 +-
 .../{test_5_6_9.cpp => test_1_1_5_6_9.cpp}    |   2 +-
 .../{test_5_7_1.cpp => test_1_1_5_7_1.cpp}    |   2 +-
 .../{test_5_7_2.cpp => test_1_1_5_7_2.cpp}    |   2 +-
 .../{test_5_7_3.cpp => test_1_1_5_7_3.cpp}    |   2 +-
 .../{test_5_8_2.cpp => test_1_1_5_8_2.cpp}    |   2 +-
 .../{test_5_8_3.cpp => test_1_1_5_8_3.cpp}    |   2 +-
 .../{test_5_8_4.cpp => test_1_1_5_8_4.cpp}    |   2 +-
 .../{test_6_1_1.cpp => test_1_1_6_1_1.cpp}    |   8 +-
 .../{test_6_1_2.cpp => test_1_1_6_1_2.cpp}    |   8 +-
 .../{test_6_1_3.cpp => test_1_1_6_1_3.cpp}    |   8 +-
 .../{test_6_1_4.cpp => test_1_1_6_1_4.cpp}    |   2 +-
 .../{test_6_1_5.cpp => test_1_1_6_1_5.cpp}    |   2 +-
 .../{test_6_1_6.cpp => test_1_1_6_1_6.cpp}    |   8 +-
 .../{test_6_1_7.cpp => test_1_1_6_1_7.cpp}    |   2 +-
 .../{test_6_2_1.cpp => test_1_1_6_2_1.cpp}    |   8 +-
 .../{test_6_2_2.cpp => test_1_1_6_2_2.cpp}    |   8 +-
 .../{test_6_3_1.cpp => test_1_1_6_3_1.cpp}    |   8 +-
 .../{test_6_3_2.cpp => test_1_1_6_3_2.cpp}    |   8 +-
 .../{test_6_4_1.cpp => test_1_1_6_4_1.cpp}    |   6 +-
 .../{test_6_4_2.cpp => test_1_1_6_4_2.cpp}    |   8 +-
 .../{test_6_5_1.cpp => test_1_1_6_5_1.cpp}    |   8 +-
 .../{test_6_5_2.cpp => test_1_1_6_5_2.cpp}    |   8 +-
 .../{test_6_5_3.cpp => test_1_1_6_5_3.cpp}    |   8 +-
 .../{test_6_6_1.cpp => test_1_1_6_6_1.cpp}    |   8 +-
 .../{test_6_6_2.cpp => test_1_1_6_6_2.cpp}    |   8 +-
 .../{test_7_1_1.cpp => test_1_1_7_1_1.cpp}    |   2 +-
 .../{test_7_1_2.cpp => test_1_1_7_1_2.cpp}    |   2 +-
 .../{test_7_1_3.cpp => test_1_1_7_1_3.cpp}    |   2 +-
 .../{test_7_1_4.cpp => test_1_1_7_1_4.cpp}    |   2 +-
 .../{test_7_1_5.cpp => test_1_1_7_1_5.cpp}    |   2 +-
 .../{test_7_1_6.cpp => test_1_1_7_1_6.cpp}    |   2 +-
 .../{test_7_1_7.cpp => test_1_1_7_1_7.cpp}    |   2 +-
 .../{test_7_1_8.cpp => test_1_1_7_1_8.cpp}    |   2 +-
 .../{test_9_2_1.cpp => test_1_1_9_2_1.cpp}    |   8 +-
 .../{test_9_2_10.cpp => test_1_1_9_2_10.cpp}  |   2 +-
 .../{test_9_2_11.cpp => test_1_1_9_2_11.cpp}  |   2 +-
 .../{test_9_2_12.cpp => test_1_1_9_2_12.cpp}  |   2 +-
 .../{test_9_2_13.cpp => test_1_1_9_2_13.cpp}  |   2 +-
 .../{test_9_2_14.cpp => test_1_1_9_2_14.cpp}  |   2 +-
 .../{test_9_2_15.cpp => test_1_1_9_2_15.cpp}  |   2 +-
 .../{test_9_2_16.cpp => test_1_1_9_2_16.cpp}  |   2 +-
 .../{test_9_2_17.cpp => test_1_1_9_2_17.cpp}  |   2 +-
 .../{test_9_2_18.cpp => test_1_1_9_2_18.cpp}  |   2 +-
 .../{test_9_2_19.cpp => test_1_1_9_2_19.cpp}  |   8 +-
 .../{test_9_2_2.cpp => test_1_1_9_2_2.cpp}    |   2 +-
 .../{test_9_2_3.cpp => test_1_1_9_2_3.cpp}    |   8 +-
 .../{test_9_2_4.cpp => test_1_1_9_2_4.cpp}    |   8 +-
 .../{test_9_2_5.cpp => test_1_1_9_2_5.cpp}    |   2 +-
 .../{test_9_2_6.cpp => test_1_1_9_2_6.cpp}    |   2 +-
 .../{test_9_2_7.cpp => test_1_1_9_2_7.cpp}    |   2 +-
 .../{test_9_2_8.cpp => test_1_1_9_2_8.cpp}    |   2 +-
 .../{test_9_2_9.cpp => test_1_1_9_2_9.cpp}    |   2 +-
 .../{verify_5_1_1.py => verify_1_1_5_1_1.py}  |   0
 ...{verify_5_1_10.py => verify_1_1_5_1_10.py} |   0
 ...{verify_5_1_11.py => verify_1_1_5_1_11.py} |   0
 ...{verify_5_1_12.py => verify_1_1_5_1_12.py} |   0
 ...{verify_5_1_13.py => verify_1_1_5_1_13.py} |   0
 .../{verify_5_1_2.py => verify_1_1_5_1_2.py}  |   0
 .../{verify_5_1_3.py => verify_1_1_5_1_3.py}  |   0
 .../{verify_5_1_4.py => verify_1_1_5_1_4.py}  |   0
 .../{verify_5_1_5.py => verify_1_1_5_1_5.py}  |   0
 .../{verify_5_1_6.py => verify_1_1_5_1_6.py}  |   0
 .../{verify_5_1_7.py => verify_1_1_5_1_7.py}  |   0
 .../{verify_5_1_8.py => verify_1_1_5_1_8.py}  |   0
 .../{verify_5_1_9.py => verify_1_1_5_1_9.py}  |   0
 .../{verify_5_2_1.py => verify_1_1_5_2_1.py}  |   0
 .../{verify_5_2_3.py => verify_1_1_5_2_3.py}  |   0
 .../{verify_5_2_4.py => verify_1_1_5_2_4.py}  |   0
 .../{verify_5_2_5.py => verify_1_1_5_2_5.py}  |   0
 .../{verify_5_2_6.py => verify_1_1_5_2_6.py}  |   0
 .../{verify_5_2_7.py => verify_1_1_5_2_7.py}  |   0
 .../{verify_5_3_1.py => verify_1_1_5_3_1.py}  |   0
 ...{verify_5_3_10.py => verify_1_1_5_3_10.py} |   0
 ...{verify_5_3_11.py => verify_1_1_5_3_11.py} |   0
 .../{verify_5_3_2.py => verify_1_1_5_3_2.py}  |   0
 .../{verify_5_3_3.py => verify_1_1_5_3_3.py}  |   0
 .../{verify_5_3_4.py => verify_1_1_5_3_4.py}  |   0
 .../{verify_5_3_5.py => verify_1_1_5_3_5.py}  |   0
 .../{verify_5_3_6.py => verify_1_1_5_3_6.py}  |   0
 .../{verify_5_3_7.py => verify_1_1_5_3_7.py}  |   0
 .../{verify_5_3_8.py => verify_1_1_5_3_8.py}  |   0
 .../{verify_5_3_9.py => verify_1_1_5_3_9.py}  |   0
 .../{verify_5_5_1.py => verify_1_1_5_5_1.py}  |   0
 .../{verify_5_5_2.py => verify_1_1_5_5_2.py}  |   0
 .../{verify_5_5_3.py => verify_1_1_5_5_3.py}  |   0
 ...erify_5_5_4_1.py => verify_1_1_5_5_4_1.py} |   0
 ...erify_5_5_4_2.py => verify_1_1_5_5_4_2.py} |   0
 .../{verify_5_5_5.py => verify_1_1_5_5_5.py}  |   0
 .../{verify_5_5_7.py => verify_1_1_5_5_7.py}  |   0
 .../{verify_5_6_1.py => verify_1_1_5_6_1.py}  |   0
 .../{verify_5_6_2.py => verify_1_1_5_6_2.py}  |   0
 .../{verify_5_6_3.py => verify_1_1_5_6_3.py}  |   0
 .../{verify_5_6_4.py => verify_1_1_5_6_4.py}  |   0
 .../{verify_5_6_5.py => verify_1_1_5_6_5.py}  |   0
 .../{verify_5_6_6.py => verify_1_1_5_6_6.py}  |   0
 .../{verify_5_6_7.py => verify_1_1_5_6_7.py}  |   0
 .../{verify_5_6_9.py => verify_1_1_5_6_9.py}  |   0
 .../{verify_5_7_1.py => verify_1_1_5_7_1.py}  |   0
 .../{verify_5_7_2.py => verify_1_1_5_7_2.py}  |   0
 .../{verify_5_7_3.py => verify_1_1_5_7_3.py}  |   0
 .../{verify_5_8_2.py => verify_1_1_5_8_2.py}  |   0
 .../{verify_5_8_3.py => verify_1_1_5_8_3.py}  |   0
 .../{verify_5_8_4.py => verify_1_1_5_8_4.py}  |   0
 .../{verify_6_1_1.py => verify_1_1_6_1_1.py}  |   0
 .../{verify_6_1_2.py => verify_1_1_6_1_2.py}  |   0
 .../{verify_6_1_3.py => verify_1_1_6_1_3.py}  |   0
 .../{verify_6_1_4.py => verify_1_1_6_1_4.py}  |   0
 .../{verify_6_1_5.py => verify_1_1_6_1_5.py}  |   0
 .../{verify_6_1_6.py => verify_1_1_6_1_6.py}  |   0
 .../{verify_6_1_7.py => verify_1_1_6_1_7.py}  |   0
 .../{verify_6_2_1.py => verify_1_1_6_2_1.py}  |   0
 .../{verify_6_2_2.py => verify_1_1_6_2_2.py}  |   0
 .../{verify_6_3_1.py => verify_1_1_6_3_1.py}  |   0
 .../{verify_6_3_2.py => verify_1_1_6_3_2.py}  |   0
 .../{verify_6_4_1.py => verify_1_1_6_4_1.py}  |   0
 .../{verify_6_4_2.py => verify_1_1_6_4_2.py}  |   0
 .../{verify_6_5_1.py => verify_1_1_6_5_1.py}  |   0
 .../{verify_6_5_2.py => verify_1_1_6_5_2.py}  |   0
 .../{verify_6_5_3.py => verify_1_1_6_5_3.py}  |   0
 .../{verify_6_6_1.py => verify_1_1_6_6_1.py}  |   0
 .../{verify_6_6_2.py => verify_1_1_6_6_2.py}  |   0
 .../{verify_7_1_1.py => verify_1_1_7_1_1.py}  |   0
 .../{verify_7_1_2.py => verify_1_1_7_1_2.py}  |   0
 .../{verify_7_1_3.py => verify_1_1_7_1_3.py}  |   0
 .../{verify_7_1_4.py => verify_1_1_7_1_4.py}  |   0
 .../{verify_7_1_5.py => verify_1_1_7_1_5.py}  |   0
 .../{verify_7_1_6.py => verify_1_1_7_1_6.py}  |   0
 .../{verify_7_1_7.py => verify_1_1_7_1_7.py}  |   0
 .../{verify_7_1_8.py => verify_1_1_7_1_8.py}  |   0
 .../{verify_9_2_1.py => verify_1_1_9_2_1.py}  |   4 +-
 ...{verify_9_2_10.py => verify_1_1_9_2_10.py} |   0
 ...{verify_9_2_11.py => verify_1_1_9_2_11.py} |   0
 ...{verify_9_2_12.py => verify_1_1_9_2_12.py} |   0
 ...{verify_9_2_13.py => verify_1_1_9_2_13.py} |   0
 ...{verify_9_2_14.py => verify_1_1_9_2_14.py} |   0
 ...{verify_9_2_15.py => verify_1_1_9_2_15.py} |   0
 ...{verify_9_2_16.py => verify_1_1_9_2_16.py} |   0
 ...{verify_9_2_17.py => verify_1_1_9_2_17.py} |   0
 ...{verify_9_2_18.py => verify_1_1_9_2_18.py} |   0
 ...{verify_9_2_19.py => verify_1_1_9_2_19.py} |   2 +-
 .../{verify_9_2_2.py => verify_1_1_9_2_2.py}  |   0
 .../{verify_9_2_3.py => verify_1_1_9_2_3.py}  |   0
 .../{verify_9_2_4.py => verify_1_1_9_2_4.py}  |   2 +-
 .../{verify_9_2_5.py => verify_1_1_9_2_5.py}  |   0
 .../{verify_9_2_6.py => verify_1_1_9_2_6.py}  |   0
 .../{verify_9_2_7.py => verify_1_1_9_2_7.py}  |   0
 .../{verify_9_2_8.py => verify_1_1_9_2_8.py}  |   0
 .../{verify_9_2_9.py => verify_1_1_9_2_9.py}  |   0
 195 files changed, 389 insertions(+), 355 deletions(-)
 create mode 100644 tests/nexus/test-v1-2-LP-5-3-1.txt
 rename tests/nexus/{test_5_1_1.cpp => test_1_1_5_1_1.cpp} (99%)
 rename tests/nexus/{test_5_1_10.cpp => test_1_1_5_1_10.cpp} (99%)
 rename tests/nexus/{test_5_1_11.cpp => test_1_1_5_1_11.cpp} (99%)
 rename tests/nexus/{test_5_1_12.cpp => test_1_1_5_1_12.cpp} (99%)
 rename tests/nexus/{test_5_1_13.cpp => test_1_1_5_1_13.cpp} (99%)
 rename tests/nexus/{test_5_1_2.cpp => test_1_1_5_1_2.cpp} (99%)
 rename tests/nexus/{test_5_1_3.cpp => test_1_1_5_1_3.cpp} (99%)
 rename tests/nexus/{test_5_1_4.cpp => test_1_1_5_1_4.cpp} (99%)
 rename tests/nexus/{test_5_1_5.cpp => test_1_1_5_1_5.cpp} (99%)
 rename tests/nexus/{test_5_1_6.cpp => test_1_1_5_1_6.cpp} (99%)
 rename tests/nexus/{test_5_1_7.cpp => test_1_1_5_1_7.cpp} (99%)
 rename tests/nexus/{test_5_1_8.cpp => test_1_1_5_1_8.cpp} (99%)
 rename tests/nexus/{test_5_1_9.cpp => test_1_1_5_1_9.cpp} (99%)
 rename tests/nexus/{test_5_2_1.cpp => test_1_1_5_2_1.cpp} (99%)
 rename tests/nexus/{test_5_2_3.cpp => test_1_1_5_2_3.cpp} (99%)
 rename tests/nexus/{test_5_2_4.cpp => test_1_1_5_2_4.cpp} (99%)
 rename tests/nexus/{test_5_2_5.cpp => test_1_1_5_2_5.cpp} (99%)
 rename tests/nexus/{test_5_2_6.cpp => test_1_1_5_2_6.cpp} (99%)
 rename tests/nexus/{test_5_2_7.cpp => test_1_1_5_2_7.cpp} (99%)
 rename tests/nexus/{test_5_3_1.cpp => test_1_1_5_3_1.cpp} (99%)
 rename tests/nexus/{test_5_3_10.cpp => test_1_1_5_3_10.cpp} (99%)
 rename tests/nexus/{test_5_3_11.cpp => test_1_1_5_3_11.cpp} (99%)
 rename tests/nexus/{test_5_3_2.cpp => test_1_1_5_3_2.cpp} (99%)
 rename tests/nexus/{test_5_3_3.cpp => test_1_1_5_3_3.cpp} (99%)
 rename tests/nexus/{test_5_3_4.cpp => test_1_1_5_3_4.cpp} (99%)
 rename tests/nexus/{test_5_3_5.cpp => test_1_1_5_3_5.cpp} (99%)
 rename tests/nexus/{test_5_3_6.cpp => test_1_1_5_3_6.cpp} (99%)
 rename tests/nexus/{test_5_3_7.cpp => test_1_1_5_3_7.cpp} (99%)
 rename tests/nexus/{test_5_3_8.cpp => test_1_1_5_3_8.cpp} (99%)
 rename tests/nexus/{test_5_3_9.cpp => test_1_1_5_3_9.cpp} (99%)
 rename tests/nexus/{test_5_5_1.cpp => test_1_1_5_5_1.cpp} (99%)
 rename tests/nexus/{test_5_5_2.cpp => test_1_1_5_5_2.cpp} (99%)
 rename tests/nexus/{test_5_5_3.cpp => test_1_1_5_5_3.cpp} (99%)
 rename tests/nexus/{test_5_5_4_1.cpp => test_1_1_5_5_4_1.cpp} (99%)
 rename tests/nexus/{test_5_5_4_2.cpp => test_1_1_5_5_4_2.cpp} (99%)
 rename tests/nexus/{test_5_5_5.cpp => test_1_1_5_5_5.cpp} (99%)
 rename tests/nexus/{test_5_5_7.cpp => test_1_1_5_5_7.cpp} (99%)
 rename tests/nexus/{test_5_6_1.cpp => test_1_1_5_6_1.cpp} (99%)
 rename tests/nexus/{test_5_6_2.cpp => test_1_1_5_6_2.cpp} (99%)
 rename tests/nexus/{test_5_6_3.cpp => test_1_1_5_6_3.cpp} (99%)
 rename tests/nexus/{test_5_6_4.cpp => test_1_1_5_6_4.cpp} (99%)
 rename tests/nexus/{test_5_6_5.cpp => test_1_1_5_6_5.cpp} (99%)
 rename tests/nexus/{test_5_6_6.cpp => test_1_1_5_6_6.cpp} (99%)
 rename tests/nexus/{test_5_6_7.cpp => test_1_1_5_6_7.cpp} (99%)
 rename tests/nexus/{test_5_6_9.cpp => test_1_1_5_6_9.cpp} (99%)
 rename tests/nexus/{test_5_7_1.cpp => test_1_1_5_7_1.cpp} (99%)
 rename tests/nexus/{test_5_7_2.cpp => test_1_1_5_7_2.cpp} (99%)
 rename tests/nexus/{test_5_7_3.cpp => test_1_1_5_7_3.cpp} (99%)
 rename tests/nexus/{test_5_8_2.cpp => test_1_1_5_8_2.cpp} (99%)
 rename tests/nexus/{test_5_8_3.cpp => test_1_1_5_8_3.cpp} (99%)
 rename tests/nexus/{test_5_8_4.cpp => test_1_1_5_8_4.cpp} (99%)
 rename tests/nexus/{test_6_1_1.cpp => test_1_1_6_1_1.cpp} (96%)
 rename tests/nexus/{test_6_1_2.cpp => test_1_1_6_1_2.cpp} (97%)
 rename tests/nexus/{test_6_1_3.cpp => test_1_1_6_1_3.cpp} (96%)
 rename tests/nexus/{test_6_1_4.cpp => test_1_1_6_1_4.cpp} (99%)
 rename tests/nexus/{test_6_1_5.cpp => test_1_1_6_1_5.cpp} (99%)
 rename tests/nexus/{test_6_1_6.cpp => test_1_1_6_1_6.cpp} (97%)
 rename tests/nexus/{test_6_1_7.cpp => test_1_1_6_1_7.cpp} (98%)
 rename tests/nexus/{test_6_2_1.cpp => test_1_1_6_2_1.cpp} (95%)
 rename tests/nexus/{test_6_2_2.cpp => test_1_1_6_2_2.cpp} (97%)
 rename tests/nexus/{test_6_3_1.cpp => test_1_1_6_3_1.cpp} (97%)
 rename tests/nexus/{test_6_3_2.cpp => test_1_1_6_3_2.cpp} (98%)
 rename tests/nexus/{test_6_4_1.cpp => test_1_1_6_4_1.cpp} (98%)
 rename tests/nexus/{test_6_4_2.cpp => test_1_1_6_4_2.cpp} (97%)
 rename tests/nexus/{test_6_5_1.cpp => test_1_1_6_5_1.cpp} (96%)
 rename tests/nexus/{test_6_5_2.cpp => test_1_1_6_5_2.cpp} (97%)
 rename tests/nexus/{test_6_5_3.cpp => test_1_1_6_5_3.cpp} (96%)
 rename tests/nexus/{test_6_6_1.cpp => test_1_1_6_6_1.cpp} (97%)
 rename tests/nexus/{test_6_6_2.cpp => test_1_1_6_6_2.cpp} (97%)
 rename tests/nexus/{test_7_1_1.cpp => test_1_1_7_1_1.cpp} (99%)
 rename tests/nexus/{test_7_1_2.cpp => test_1_1_7_1_2.cpp} (99%)
 rename tests/nexus/{test_7_1_3.cpp => test_1_1_7_1_3.cpp} (99%)
 rename tests/nexus/{test_7_1_4.cpp => test_1_1_7_1_4.cpp} (99%)
 rename tests/nexus/{test_7_1_5.cpp => test_1_1_7_1_5.cpp} (99%)
 rename tests/nexus/{test_7_1_6.cpp => test_1_1_7_1_6.cpp} (99%)
 rename tests/nexus/{test_7_1_7.cpp => test_1_1_7_1_7.cpp} (99%)
 rename tests/nexus/{test_7_1_8.cpp => test_1_1_7_1_8.cpp} (99%)
 rename tests/nexus/{test_9_2_1.cpp => test_1_1_9_2_1.cpp} (98%)
 rename tests/nexus/{test_9_2_10.cpp => test_1_1_9_2_10.cpp} (99%)
 rename tests/nexus/{test_9_2_11.cpp => test_1_1_9_2_11.cpp} (99%)
 rename tests/nexus/{test_9_2_12.cpp => test_1_1_9_2_12.cpp} (99%)
 rename tests/nexus/{test_9_2_13.cpp => test_1_1_9_2_13.cpp} (99%)
 rename tests/nexus/{test_9_2_14.cpp => test_1_1_9_2_14.cpp} (99%)
 rename tests/nexus/{test_9_2_15.cpp => test_1_1_9_2_15.cpp} (99%)
 rename tests/nexus/{test_9_2_16.cpp => test_1_1_9_2_16.cpp} (99%)
 rename tests/nexus/{test_9_2_17.cpp => test_1_1_9_2_17.cpp} (99%)
 rename tests/nexus/{test_9_2_18.cpp => test_1_1_9_2_18.cpp} (99%)
 rename tests/nexus/{test_9_2_19.cpp => test_1_1_9_2_19.cpp} (98%)
 rename tests/nexus/{test_9_2_2.cpp => test_1_1_9_2_2.cpp} (99%)
 rename tests/nexus/{test_9_2_3.cpp => test_1_1_9_2_3.cpp} (98%)
 rename tests/nexus/{test_9_2_4.cpp => test_1_1_9_2_4.cpp} (99%)
 rename tests/nexus/{test_9_2_5.cpp => test_1_1_9_2_5.cpp} (99%)
 rename tests/nexus/{test_9_2_6.cpp => test_1_1_9_2_6.cpp} (99%)
 rename tests/nexus/{test_9_2_7.cpp => test_1_1_9_2_7.cpp} (99%)
 rename tests/nexus/{test_9_2_8.cpp => test_1_1_9_2_8.cpp} (99%)
 rename tests/nexus/{test_9_2_9.cpp => test_1_1_9_2_9.cpp} (99%)
 rename tests/nexus/{verify_5_1_1.py => verify_1_1_5_1_1.py} (100%)
 rename tests/nexus/{verify_5_1_10.py => verify_1_1_5_1_10.py} (100%)
 rename tests/nexus/{verify_5_1_11.py => verify_1_1_5_1_11.py} (100%)
 rename tests/nexus/{verify_5_1_12.py => verify_1_1_5_1_12.py} (100%)
 rename tests/nexus/{verify_5_1_13.py => verify_1_1_5_1_13.py} (100%)
 rename tests/nexus/{verify_5_1_2.py => verify_1_1_5_1_2.py} (100%)
 rename tests/nexus/{verify_5_1_3.py => verify_1_1_5_1_3.py} (100%)
 rename tests/nexus/{verify_5_1_4.py => verify_1_1_5_1_4.py} (100%)
 rename tests/nexus/{verify_5_1_5.py => verify_1_1_5_1_5.py} (100%)
 rename tests/nexus/{verify_5_1_6.py => verify_1_1_5_1_6.py} (100%)
 rename tests/nexus/{verify_5_1_7.py => verify_1_1_5_1_7.py} (100%)
 rename tests/nexus/{verify_5_1_8.py => verify_1_1_5_1_8.py} (100%)
 rename tests/nexus/{verify_5_1_9.py => verify_1_1_5_1_9.py} (100%)
 rename tests/nexus/{verify_5_2_1.py => verify_1_1_5_2_1.py} (100%)
 rename tests/nexus/{verify_5_2_3.py => verify_1_1_5_2_3.py} (100%)
 rename tests/nexus/{verify_5_2_4.py => verify_1_1_5_2_4.py} (100%)
 rename tests/nexus/{verify_5_2_5.py => verify_1_1_5_2_5.py} (100%)
 rename tests/nexus/{verify_5_2_6.py => verify_1_1_5_2_6.py} (100%)
 rename tests/nexus/{verify_5_2_7.py => verify_1_1_5_2_7.py} (100%)
 rename tests/nexus/{verify_5_3_1.py => verify_1_1_5_3_1.py} (100%)
 rename tests/nexus/{verify_5_3_10.py => verify_1_1_5_3_10.py} (100%)
 rename tests/nexus/{verify_5_3_11.py => verify_1_1_5_3_11.py} (100%)
 rename tests/nexus/{verify_5_3_2.py => verify_1_1_5_3_2.py} (100%)
 rename tests/nexus/{verify_5_3_3.py => verify_1_1_5_3_3.py} (100%)
 rename tests/nexus/{verify_5_3_4.py => verify_1_1_5_3_4.py} (100%)
 rename tests/nexus/{verify_5_3_5.py => verify_1_1_5_3_5.py} (100%)
 rename tests/nexus/{verify_5_3_6.py => verify_1_1_5_3_6.py} (100%)
 rename tests/nexus/{verify_5_3_7.py => verify_1_1_5_3_7.py} (100%)
 rename tests/nexus/{verify_5_3_8.py => verify_1_1_5_3_8.py} (100%)
 rename tests/nexus/{verify_5_3_9.py => verify_1_1_5_3_9.py} (100%)
 rename tests/nexus/{verify_5_5_1.py => verify_1_1_5_5_1.py} (100%)
 rename tests/nexus/{verify_5_5_2.py => verify_1_1_5_5_2.py} (100%)
 rename tests/nexus/{verify_5_5_3.py => verify_1_1_5_5_3.py} (100%)
 rename tests/nexus/{verify_5_5_4_1.py => verify_1_1_5_5_4_1.py} (100%)
 rename tests/nexus/{verify_5_5_4_2.py => verify_1_1_5_5_4_2.py} (100%)
 rename tests/nexus/{verify_5_5_5.py => verify_1_1_5_5_5.py} (100%)
 rename tests/nexus/{verify_5_5_7.py => verify_1_1_5_5_7.py} (100%)
 rename tests/nexus/{verify_5_6_1.py => verify_1_1_5_6_1.py} (100%)
 rename tests/nexus/{verify_5_6_2.py => verify_1_1_5_6_2.py} (100%)
 rename tests/nexus/{verify_5_6_3.py => verify_1_1_5_6_3.py} (100%)
 rename tests/nexus/{verify_5_6_4.py => verify_1_1_5_6_4.py} (100%)
 rename tests/nexus/{verify_5_6_5.py => verify_1_1_5_6_5.py} (100%)
 rename tests/nexus/{verify_5_6_6.py => verify_1_1_5_6_6.py} (100%)
 rename tests/nexus/{verify_5_6_7.py => verify_1_1_5_6_7.py} (100%)
 rename tests/nexus/{verify_5_6_9.py => verify_1_1_5_6_9.py} (100%)
 rename tests/nexus/{verify_5_7_1.py => verify_1_1_5_7_1.py} (100%)
 rename tests/nexus/{verify_5_7_2.py => verify_1_1_5_7_2.py} (100%)
 rename tests/nexus/{verify_5_7_3.py => verify_1_1_5_7_3.py} (100%)
 rename tests/nexus/{verify_5_8_2.py => verify_1_1_5_8_2.py} (100%)
 rename tests/nexus/{verify_5_8_3.py => verify_1_1_5_8_3.py} (100%)
 rename tests/nexus/{verify_5_8_4.py => verify_1_1_5_8_4.py} (100%)
 rename tests/nexus/{verify_6_1_1.py => verify_1_1_6_1_1.py} (100%)
 rename tests/nexus/{verify_6_1_2.py => verify_1_1_6_1_2.py} (100%)
 rename tests/nexus/{verify_6_1_3.py => verify_1_1_6_1_3.py} (100%)
 rename tests/nexus/{verify_6_1_4.py => verify_1_1_6_1_4.py} (100%)
 rename tests/nexus/{verify_6_1_5.py => verify_1_1_6_1_5.py} (100%)
 rename tests/nexus/{verify_6_1_6.py => verify_1_1_6_1_6.py} (100%)
 rename tests/nexus/{verify_6_1_7.py => verify_1_1_6_1_7.py} (100%)
 rename tests/nexus/{verify_6_2_1.py => verify_1_1_6_2_1.py} (100%)
 rename tests/nexus/{verify_6_2_2.py => verify_1_1_6_2_2.py} (100%)
 rename tests/nexus/{verify_6_3_1.py => verify_1_1_6_3_1.py} (100%)
 rename tests/nexus/{verify_6_3_2.py => verify_1_1_6_3_2.py} (100%)
 rename tests/nexus/{verify_6_4_1.py => verify_1_1_6_4_1.py} (100%)
 rename tests/nexus/{verify_6_4_2.py => verify_1_1_6_4_2.py} (100%)
 rename tests/nexus/{verify_6_5_1.py => verify_1_1_6_5_1.py} (100%)
 rename tests/nexus/{verify_6_5_2.py => verify_1_1_6_5_2.py} (100%)
 rename tests/nexus/{verify_6_5_3.py => verify_1_1_6_5_3.py} (100%)
 rename tests/nexus/{verify_6_6_1.py => verify_1_1_6_6_1.py} (100%)
 rename tests/nexus/{verify_6_6_2.py => verify_1_1_6_6_2.py} (100%)
 rename tests/nexus/{verify_7_1_1.py => verify_1_1_7_1_1.py} (100%)
 rename tests/nexus/{verify_7_1_2.py => verify_1_1_7_1_2.py} (100%)
 rename tests/nexus/{verify_7_1_3.py => verify_1_1_7_1_3.py} (100%)
 rename tests/nexus/{verify_7_1_4.py => verify_1_1_7_1_4.py} (100%)
 rename tests/nexus/{verify_7_1_5.py => verify_1_1_7_1_5.py} (100%)
 rename tests/nexus/{verify_7_1_6.py => verify_1_1_7_1_6.py} (100%)
 rename tests/nexus/{verify_7_1_7.py => verify_1_1_7_1_7.py} (100%)
 rename tests/nexus/{verify_7_1_8.py => verify_1_1_7_1_8.py} (100%)
 rename tests/nexus/{verify_9_2_1.py => verify_1_1_9_2_1.py} (99%)
 rename tests/nexus/{verify_9_2_10.py => verify_1_1_9_2_10.py} (100%)
 rename tests/nexus/{verify_9_2_11.py => verify_1_1_9_2_11.py} (100%)
 rename tests/nexus/{verify_9_2_12.py => verify_1_1_9_2_12.py} (100%)
 rename tests/nexus/{verify_9_2_13.py => verify_1_1_9_2_13.py} (100%)
 rename tests/nexus/{verify_9_2_14.py => verify_1_1_9_2_14.py} (100%)
 rename tests/nexus/{verify_9_2_15.py => verify_1_1_9_2_15.py} (100%)
 rename tests/nexus/{verify_9_2_16.py => verify_1_1_9_2_16.py} (100%)
 rename tests/nexus/{verify_9_2_17.py => verify_1_1_9_2_17.py} (100%)
 rename tests/nexus/{verify_9_2_18.py => verify_1_1_9_2_18.py} (100%)
 rename tests/nexus/{verify_9_2_19.py => verify_1_1_9_2_19.py} (99%)
 rename tests/nexus/{verify_9_2_2.py => verify_1_1_9_2_2.py} (100%)
 rename tests/nexus/{verify_9_2_3.py => verify_1_1_9_2_3.py} (100%)
 rename tests/nexus/{verify_9_2_4.py => verify_1_1_9_2_4.py} (99%)
 rename tests/nexus/{verify_9_2_5.py => verify_1_1_9_2_5.py} (100%)
 rename tests/nexus/{verify_9_2_6.py => verify_1_1_9_2_6.py} (100%)
 rename tests/nexus/{verify_9_2_7.py => verify_1_1_9_2_7.py} (100%)
 rename tests/nexus/{verify_9_2_8.py => verify_1_1_9_2_8.py} (100%)
 rename tests/nexus/{verify_9_2_9.py => verify_1_1_9_2_9.py} (100%)

diff --git a/tests/nexus/CMakeLists.txt b/tests/nexus/CMakeLists.txt
index b7e9cd7d9..5d745df58 100644
--- a/tests/nexus/CMakeLists.txt
+++ b/tests/nexus/CMakeLists.txt
@@ -118,102 +118,102 @@ endmacro()
 #----------------------------------------------------------------------------------------------------------------------
 
 # Cert tests
-ot_nexus_test(5_1_1 "cert;nexus")
-ot_nexus_test(5_1_2 "cert;nexus")
-ot_nexus_test(5_1_3 "cert;nexus")
-ot_nexus_test(5_1_4 "cert;nexus")
-ot_nexus_test(5_1_5 "cert;nexus")
-ot_nexus_test(5_1_6 "cert;nexus")
-ot_nexus_test(5_1_7 "cert;nexus")
-ot_nexus_test(5_1_8 "cert;nexus")
-ot_nexus_test(5_1_9 "cert;nexus")
-ot_nexus_test(5_1_10 "cert;nexus")
-ot_nexus_test(5_1_11 "cert;nexus")
-ot_nexus_test(5_1_12 "cert;nexus")
-ot_nexus_test(5_1_13 "cert;nexus")
-ot_nexus_test(5_2_1 "cert;nexus")
-ot_nexus_test(5_2_3 "cert;nexus")
-ot_nexus_test(5_2_4 "cert;nexus")
-ot_nexus_test(5_2_5 "cert;nexus")
-ot_nexus_test(5_2_6 "cert;nexus")
-ot_nexus_test(5_2_7 "cert;nexus")
-ot_nexus_test(5_3_1 "cert;nexus")
-ot_nexus_test(5_3_2 "cert;nexus")
-ot_nexus_test(5_3_3 "cert;nexus")
-ot_nexus_test(5_3_4 "cert;nexus")
-ot_nexus_test(5_3_5 "cert;nexus")
-ot_nexus_test(5_3_6 "cert;nexus")
-ot_nexus_test(5_3_7 "cert;nexus")
-ot_nexus_test(5_3_8 "cert;nexus")
-ot_nexus_test(5_3_9 "cert;nexus")
-ot_nexus_test(5_3_10 "cert;nexus")
-ot_nexus_test(5_3_11 "cert;nexus")
-ot_nexus_test(5_5_1 "cert;nexus")
-ot_nexus_test(5_5_2 "cert;nexus")
-ot_nexus_test(5_5_3 "cert;nexus")
-ot_nexus_test(5_5_4_1 "cert;nexus")
-ot_nexus_test(5_5_4_2 "cert;nexus")
-ot_nexus_test(5_5_5 "cert;nexus")
-ot_nexus_test(5_5_7 "cert;nexus")
-ot_nexus_test(5_6_1 "cert;nexus")
-ot_nexus_test(5_6_2 "cert;nexus")
-ot_nexus_test(5_6_3 "cert;nexus")
-ot_nexus_test(5_6_4 "cert;nexus")
-ot_nexus_test(5_6_5 "cert;nexus")
-ot_nexus_test(5_6_6 "cert;nexus")
-ot_nexus_test(5_6_7 "cert;nexus")
-ot_nexus_test(5_6_9 "cert;nexus")
-ot_nexus_test(5_7_1 "cert;nexus")
-ot_nexus_test(5_7_2 "cert;nexus")
-ot_nexus_test(5_7_3 "cert;nexus")
-ot_nexus_test(5_8_2 "cert;nexus")
-ot_nexus_test(5_8_3 "cert;nexus")
-ot_nexus_test(5_8_4 "cert;nexus")
-ot_nexus_test(6_1_1 "cert;nexus")
-ot_nexus_test(6_1_2 "cert;nexus")
-ot_nexus_test(6_1_3 "cert;nexus")
-ot_nexus_test(6_1_4 "cert;nexus")
-ot_nexus_test(6_1_5 "cert;nexus")
-ot_nexus_test(6_1_6 "cert;nexus")
-ot_nexus_test(6_1_7 "cert;nexus")
-ot_nexus_test(6_2_1 "cert;nexus")
-ot_nexus_test(6_2_2 "cert;nexus")
-ot_nexus_test(6_3_1 "cert;nexus")
-ot_nexus_test(6_3_2 "cert;nexus")
-ot_nexus_test(6_4_1 "cert;nexus")
-ot_nexus_test(6_4_2 "cert;nexus")
-ot_nexus_test(6_5_1 "cert;nexus")
-ot_nexus_test(6_5_2 "cert;nexus")
-ot_nexus_test(6_5_3 "cert;nexus")
-ot_nexus_test(6_6_1 "cert;nexus")
-ot_nexus_test(6_6_2 "cert;nexus")
-ot_nexus_test(7_1_1 "cert;nexus")
-ot_nexus_test(7_1_2 "cert;nexus")
-ot_nexus_test(7_1_3 "cert;nexus")
-ot_nexus_test(7_1_4 "cert;nexus")
-ot_nexus_test(7_1_5 "cert;nexus")
-ot_nexus_test(7_1_6 "cert;nexus")
-ot_nexus_test(7_1_7 "cert;nexus")
-ot_nexus_test(7_1_8 "cert;nexus")
-ot_nexus_test(9_2_1 "cert;nexus")
-ot_nexus_test(9_2_2 "cert;nexus")
-ot_nexus_test(9_2_3 "cert;nexus")
-ot_nexus_test(9_2_4 "cert;nexus")
-ot_nexus_test(9_2_5 "cert;nexus")
-ot_nexus_test(9_2_6 "cert;nexus")
-ot_nexus_test(9_2_7 "cert;nexus")
-ot_nexus_test(9_2_8 "cert;nexus")
-ot_nexus_test(9_2_9 "cert;nexus")
-ot_nexus_test(9_2_10 "cert;nexus")
-ot_nexus_test(9_2_11 "cert;nexus")
-ot_nexus_test(9_2_12 "cert;nexus")
-ot_nexus_test(9_2_13 "cert;nexus")
-ot_nexus_test(9_2_14 "cert;nexus")
-ot_nexus_test(9_2_15 "cert;nexus")
-ot_nexus_test(9_2_16 "cert;nexus")
-ot_nexus_test(9_2_17 "cert;nexus")
-ot_nexus_test(9_2_18 "cert;nexus")
-ot_nexus_test(9_2_19 "cert;nexus")
+ot_nexus_test(1_1_5_1_1 "cert;nexus")
+ot_nexus_test(1_1_5_1_2 "cert;nexus")
+ot_nexus_test(1_1_5_1_3 "cert;nexus")
+ot_nexus_test(1_1_5_1_4 "cert;nexus")
+ot_nexus_test(1_1_5_1_5 "cert;nexus")
+ot_nexus_test(1_1_5_1_6 "cert;nexus")
+ot_nexus_test(1_1_5_1_7 "cert;nexus")
+ot_nexus_test(1_1_5_1_8 "cert;nexus")
+ot_nexus_test(1_1_5_1_9 "cert;nexus")
+ot_nexus_test(1_1_5_1_10 "cert;nexus")
+ot_nexus_test(1_1_5_1_11 "cert;nexus")
+ot_nexus_test(1_1_5_1_12 "cert;nexus")
+ot_nexus_test(1_1_5_1_13 "cert;nexus")
+ot_nexus_test(1_1_5_2_1 "cert;nexus")
+ot_nexus_test(1_1_5_2_3 "cert;nexus")
+ot_nexus_test(1_1_5_2_4 "cert;nexus")
+ot_nexus_test(1_1_5_2_5 "cert;nexus")
+ot_nexus_test(1_1_5_2_6 "cert;nexus")
+ot_nexus_test(1_1_5_2_7 "cert;nexus")
+ot_nexus_test(1_1_5_3_1 "cert;nexus")
+ot_nexus_test(1_1_5_3_2 "cert;nexus")
+ot_nexus_test(1_1_5_3_3 "cert;nexus")
+ot_nexus_test(1_1_5_3_4 "cert;nexus")
+ot_nexus_test(1_1_5_3_5 "cert;nexus")
+ot_nexus_test(1_1_5_3_6 "cert;nexus")
+ot_nexus_test(1_1_5_3_7 "cert;nexus")
+ot_nexus_test(1_1_5_3_8 "cert;nexus")
+ot_nexus_test(1_1_5_3_9 "cert;nexus")
+ot_nexus_test(1_1_5_3_10 "cert;nexus")
+ot_nexus_test(1_1_5_3_11 "cert;nexus")
+ot_nexus_test(1_1_5_5_1 "cert;nexus")
+ot_nexus_test(1_1_5_5_2 "cert;nexus")
+ot_nexus_test(1_1_5_5_3 "cert;nexus")
+ot_nexus_test(1_1_5_5_4_1 "cert;nexus")
+ot_nexus_test(1_1_5_5_4_2 "cert;nexus")
+ot_nexus_test(1_1_5_5_5 "cert;nexus")
+ot_nexus_test(1_1_5_5_7 "cert;nexus")
+ot_nexus_test(1_1_5_6_1 "cert;nexus")
+ot_nexus_test(1_1_5_6_2 "cert;nexus")
+ot_nexus_test(1_1_5_6_3 "cert;nexus")
+ot_nexus_test(1_1_5_6_4 "cert;nexus")
+ot_nexus_test(1_1_5_6_5 "cert;nexus")
+ot_nexus_test(1_1_5_6_6 "cert;nexus")
+ot_nexus_test(1_1_5_6_7 "cert;nexus")
+ot_nexus_test(1_1_5_6_9 "cert;nexus")
+ot_nexus_test(1_1_5_7_1 "cert;nexus")
+ot_nexus_test(1_1_5_7_2 "cert;nexus")
+ot_nexus_test(1_1_5_7_3 "cert;nexus")
+ot_nexus_test(1_1_5_8_2 "cert;nexus")
+ot_nexus_test(1_1_5_8_3 "cert;nexus")
+ot_nexus_test(1_1_5_8_4 "cert;nexus")
+ot_nexus_test(1_1_6_1_1 "cert;nexus")
+ot_nexus_test(1_1_6_1_2 "cert;nexus")
+ot_nexus_test(1_1_6_1_3 "cert;nexus")
+ot_nexus_test(1_1_6_1_4 "cert;nexus")
+ot_nexus_test(1_1_6_1_5 "cert;nexus")
+ot_nexus_test(1_1_6_1_6 "cert;nexus")
+ot_nexus_test(1_1_6_1_7 "cert;nexus")
+ot_nexus_test(1_1_6_2_1 "cert;nexus")
+ot_nexus_test(1_1_6_2_2 "cert;nexus")
+ot_nexus_test(1_1_6_3_1 "cert;nexus")
+ot_nexus_test(1_1_6_3_2 "cert;nexus")
+ot_nexus_test(1_1_6_4_1 "cert;nexus")
+ot_nexus_test(1_1_6_4_2 "cert;nexus")
+ot_nexus_test(1_1_6_5_1 "cert;nexus")
+ot_nexus_test(1_1_6_5_2 "cert;nexus")
+ot_nexus_test(1_1_6_5_3 "cert;nexus")
+ot_nexus_test(1_1_6_6_1 "cert;nexus")
+ot_nexus_test(1_1_6_6_2 "cert;nexus")
+ot_nexus_test(1_1_7_1_1 "cert;nexus")
+ot_nexus_test(1_1_7_1_2 "cert;nexus")
+ot_nexus_test(1_1_7_1_3 "cert;nexus")
+ot_nexus_test(1_1_7_1_4 "cert;nexus")
+ot_nexus_test(1_1_7_1_5 "cert;nexus")
+ot_nexus_test(1_1_7_1_6 "cert;nexus")
+ot_nexus_test(1_1_7_1_7 "cert;nexus")
+ot_nexus_test(1_1_7_1_8 "cert;nexus")
+ot_nexus_test(1_1_9_2_1 "cert;nexus")
+ot_nexus_test(1_1_9_2_2 "cert;nexus")
+ot_nexus_test(1_1_9_2_3 "cert;nexus")
+ot_nexus_test(1_1_9_2_4 "cert;nexus")
+ot_nexus_test(1_1_9_2_5 "cert;nexus")
+ot_nexus_test(1_1_9_2_6 "cert;nexus")
+ot_nexus_test(1_1_9_2_7 "cert;nexus")
+ot_nexus_test(1_1_9_2_8 "cert;nexus")
+ot_nexus_test(1_1_9_2_9 "cert;nexus")
+ot_nexus_test(1_1_9_2_10 "cert;nexus")
+ot_nexus_test(1_1_9_2_11 "cert;nexus")
+ot_nexus_test(1_1_9_2_12 "cert;nexus")
+ot_nexus_test(1_1_9_2_13 "cert;nexus")
+ot_nexus_test(1_1_9_2_14 "cert;nexus")
+ot_nexus_test(1_1_9_2_15 "cert;nexus")
+ot_nexus_test(1_1_9_2_16 "cert;nexus")
+ot_nexus_test(1_1_9_2_17 "cert;nexus")
+ot_nexus_test(1_1_9_2_18 "cert;nexus")
+ot_nexus_test(1_1_9_2_19 "cert;nexus")
 
 # Misc tests
 ot_nexus_test(border_admitter "core;nexus")
diff --git a/tests/nexus/run_nexus_tests.sh b/tests/nexus/run_nexus_tests.sh
index 87fb142da..0c2da52a3 100755
--- a/tests/nexus/run_nexus_tests.sh
+++ b/tests/nexus/run_nexus_tests.sh
@@ -48,108 +48,108 @@ NEXUS_BIN_DIR="${BUILD_DIR}/tests/nexus"
 
 # Default test list if no arguments are provided
 DEFAULT_TESTS=(
-    "5_1_1"
-    "5_1_2"
-    "5_1_3"
-    "5_1_4"
-    "5_1_5"
-    "5_1_6"
-    "5_1_7"
-    "5_1_8"
-    "5_1_9"
-    "5_1_10"
-    "5_1_11"
-    "5_1_12"
-    "5_1_13"
-    "5_2_1"
-    "5_2_3"
-    "5_2_4"
-    "5_2_5"
-    "5_2_6"
-    "5_2_7"
-    "5_3_1"
-    "5_3_2"
-    "5_3_3"
-    "5_3_4"
-    "5_3_5"
-    "5_3_6"
-    "5_3_7"
-    "5_3_8"
-    "5_3_9"
-    "5_3_10"
-    "5_3_11"
-    "5_5_1"
-    "5_5_2"
-    "5_5_3"
-    "5_5_4_1"
-    "5_5_4_2"
-    "5_5_5"
-    "5_5_7"
-    "5_6_1"
-    "5_6_2"
-    "5_6_3"
-    "5_6_4"
-    "5_6_5"
-    "5_6_6"
-    "5_6_7"
-    "5_6_9"
-    "5_7_1"
-    "5_7_2"
-    "5_7_3"
-    "5_8_2"
-    "5_8_3"
-    "5_8_4"
-    "6_1_1_A"
-    "6_1_1_B"
-    "6_1_2_A"
-    "6_1_2_B"
-    "6_1_3_A"
-    "6_1_3_B"
-    "6_1_4"
-    "6_1_5"
-    "6_1_6"
-    "6_1_7"
-    "6_2_1_A"
-    "6_2_1_B"
-    "6_2_2"
-    "6_3_1_A"
-    "6_3_1_B"
-    "6_3_2"
-    "6_4_1_A"
-    "6_4_1_B"
-    "6_4_2"
-    "6_5_1"
-    "6_5_2"
-    "6_5_3"
-    "6_6_1"
-    "6_6_2"
-    "7_1_1"
-    "7_1_2"
-    "7_1_3"
-    "7_1_4"
-    "7_1_5"
-    "7_1_6"
-    "7_1_7"
-    "7_1_8"
-    "9_2_1"
-    "9_2_2"
-    "9_2_3"
-    "9_2_4"
-    "9_2_5"
-    "9_2_6"
-    "9_2_7"
-    "9_2_8"
-    "9_2_9"
-    "9_2_10"
-    "9_2_11"
-    "9_2_12"
-    "9_2_13"
-    "9_2_14"
-    "9_2_15"
-    "9_2_16"
-    "9_2_17"
-    "9_2_18"
-    "9_2_19"
+    "1_1_5_1_1"
+    "1_1_5_1_2"
+    "1_1_5_1_3"
+    "1_1_5_1_4"
+    "1_1_5_1_5"
+    "1_1_5_1_6"
+    "1_1_5_1_7"
+    "1_1_5_1_8"
+    "1_1_5_1_9"
+    "1_1_5_1_10"
+    "1_1_5_1_11"
+    "1_1_5_1_12"
+    "1_1_5_1_13"
+    "1_1_5_2_1"
+    "1_1_5_2_3"
+    "1_1_5_2_4"
+    "1_1_5_2_5"
+    "1_1_5_2_6"
+    "1_1_5_2_7"
+    "1_1_5_3_1"
+    "1_1_5_3_2"
+    "1_1_5_3_3"
+    "1_1_5_3_4"
+    "1_1_5_3_5"
+    "1_1_5_3_6"
+    "1_1_5_3_7"
+    "1_1_5_3_8"
+    "1_1_5_3_9"
+    "1_1_5_3_10"
+    "1_1_5_3_11"
+    "1_1_5_5_1"
+    "1_1_5_5_2"
+    "1_1_5_5_3"
+    "1_1_5_5_4_1"
+    "1_1_5_5_4_2"
+    "1_1_5_5_5"
+    "1_1_5_5_7"
+    "1_1_5_6_1"
+    "1_1_5_6_2"
+    "1_1_5_6_3"
+    "1_1_5_6_4"
+    "1_1_5_6_5"
+    "1_1_5_6_6"
+    "1_1_5_6_7"
+    "1_1_5_6_9"
+    "1_1_5_7_1"
+    "1_1_5_7_2"
+    "1_1_5_7_3"
+    "1_1_5_8_2"
+    "1_1_5_8_3"
+    "1_1_5_8_4"
+    "1_1_6_1_1_A"
+    "1_1_6_1_1_B"
+    "1_1_6_1_2_A"
+    "1_1_6_1_2_B"
+    "1_1_6_1_3_A"
+    "1_1_6_1_3_B"
+    "1_1_6_1_4"
+    "1_1_6_1_5"
+    "1_1_6_1_6"
+    "1_1_6_1_7"
+    "1_1_6_2_1_A"
+    "1_1_6_2_1_B"
+    "1_1_6_2_2"
+    "1_1_6_3_1_A"
+    "1_1_6_3_1_B"
+    "1_1_6_3_2"
+    "1_1_6_4_1_A"
+    "1_1_6_4_1_B"
+    "1_1_6_4_2"
+    "1_1_6_5_1"
+    "1_1_6_5_2"
+    "1_1_6_5_3"
+    "1_1_6_6_1"
+    "1_1_6_6_2"
+    "1_1_7_1_1"
+    "1_1_7_1_2"
+    "1_1_7_1_3"
+    "1_1_7_1_4"
+    "1_1_7_1_5"
+    "1_1_7_1_6"
+    "1_1_7_1_7"
+    "1_1_7_1_8"
+    "1_1_9_2_1"
+    "1_1_9_2_2"
+    "1_1_9_2_3"
+    "1_1_9_2_4"
+    "1_1_9_2_5"
+    "1_1_9_2_6"
+    "1_1_9_2_7"
+    "1_1_9_2_8"
+    "1_1_9_2_9"
+    "1_1_9_2_10"
+    "1_1_9_2_11"
+    "1_1_9_2_12"
+    "1_1_9_2_13"
+    "1_1_9_2_14"
+    "1_1_9_2_15"
+    "1_1_9_2_16"
+    "1_1_9_2_17"
+    "1_1_9_2_18"
+    "1_1_9_2_19"
 )
 
 # Use provided arguments or the default test list
@@ -239,7 +239,7 @@ run_test()
 expanded_tests=()
 for t in "${TESTS_TO_RUN[@]}"; do
     case "$t" in
-        6_1_1 | 6_1_2 | 6_1_3 | 6_1_6 | 6_2_1 | 6_2_2 | 6_3_1 | 6_3_2 | 6_4_1 | 6_4_2 | 6_5_1 | 6_5_2 | 6_5_3 | 6_6_1 | 6_6_2 | 9_2_1 | 9_2_3 | 9_2_4 | 9_2_19)
+        1_1_6_1_1 | 1_1_6_1_2 | 1_1_6_1_3 | 1_1_6_1_6 | 1_1_6_2_1 | 1_1_6_2_2 | 1_1_6_3_1 | 1_1_6_3_2 | 1_1_6_4_1 | 1_1_6_4_2 | 1_1_6_5_1 | 1_1_6_5_2 | 1_1_6_5_3 | 1_1_6_6_1 | 1_1_6_6_2 | 1_1_9_2_1 | 1_1_9_2_3 | 1_1_9_2_4 | 1_1_9_2_19)
             expanded_tests+=("${t}_A" "${t}_B")
             ;;
         *)
diff --git a/tests/nexus/test-v1-2-LP-5-3-1.txt b/tests/nexus/test-v1-2-LP-5-3-1.txt
new file mode 100644
index 000000000..6cefa031b
--- /dev/null
+++ b/tests/nexus/test-v1-2-LP-5-3-1.txt
@@ -0,0 +1,34 @@
+### 5.3.1 SSED Attachment
+
+#### 5.3.1.1 Topology
+*(Note: The specific topology diagram is not included in the provided text, but it involves a Leader/DUT, Router_1, and SSED_1.)*
+
+#### 5.3.1.2 Purpose & Description
+The purpose of this test is to validate that the DUT can successfully support a SSED that establishes CSL Synchronization after attach using Child Update Request.
+
+**Specification Reference:** 4.6.5.2
+
+#### 5.3.1.3 Test Procedure Description
+
+**Step 1: All**
+*   **Description:** Topology formation: DUT, Router_1, SSED_1.
+*   **Pass Criteria:** N/A.
+
+**Step 2: SSED_1**
+*   **Description:** Automatically attaches to the DUT. Automatically initiates a CSL connection via a MLE Child Update Request that contains the CSL IEs and the CSL Synchronized Timeout TLV.
+*   **Pass Criteria:** N/A.
+
+**Step 3: Leader (DUT)**
+*   **Description:** Automatically completes the CSL connection with SSED_1 by unicasting MLE Child Update Response.
+*   **Pass Criteria:** The DUT MUST unicast MLE Child Update Response to SSED_1.
+    *   The Frame Version of the packet MUST be: IEEE Std 802.15.4-2015 (value = 0b10).
+
+**Step 4: Router_1**
+*   **Description:** Harness verifies connectivity by instructing the device to send an ICMPv6 Echo Request to the SSED_1 mesh-local address (via the DUT).
+*   **Pass Criteria:** 
+    *   The DUT MUST forward the ICMPv6 Echo Request to SSED_1.
+    *   The Frame Version of the packet MUST be: IEEE Std 802.15.4-2015 (value = 0b10).
+    *   SSED_1 MUST NOT send a MAC Data Request prior to receiving the ICMPv6 Echo Request from the Leader.
+    *   Router_1 MUST receive an ICMPv6 Echo Response from SSED_1.
+
+*(End of Test Case)*
\ No newline at end of file
diff --git a/tests/nexus/test_5_1_1.cpp b/tests/nexus/test_1_1_5_1_1.cpp
similarity index 99%
rename from tests/nexus/test_5_1_1.cpp
rename to tests/nexus/test_1_1_5_1_1.cpp
index 507f324b2..aeac0cfee 100644
--- a/tests/nexus/test_5_1_1.cpp
+++ b/tests/nexus/test_1_1_5_1_1.cpp
@@ -152,7 +152,7 @@ void Test5_1_1(void)
     Log("Step 11.2: Sending Echo Request from Leader to Router Link-Local");
     nexus.SendAndVerifyEchoRequest(leader, router.Get<Mle::Mle>().GetLinkLocalAddress());
 
-    nexus.SaveTestInfo("test_5_1_1.json");
+    nexus.SaveTestInfo("test_1_1_5_1_1.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_1_10.cpp b/tests/nexus/test_1_1_5_1_10.cpp
similarity index 99%
rename from tests/nexus/test_5_1_10.cpp
rename to tests/nexus/test_1_1_5_1_10.cpp
index d3a4d0ba0..030edc0de 100644
--- a/tests/nexus/test_5_1_10.cpp
+++ b/tests/nexus/test_1_1_5_1_10.cpp
@@ -200,7 +200,7 @@ void Test5_1_10(void)
     VerifyOrQuit(dut.Get<Mle::Mle>().IsChild());
     VerifyOrQuit(dut.Get<Mle::Mle>().GetParent().GetExtAddress() == router1.Get<Mac::Mac>().GetExtAddress());
 
-    nexus.SaveTestInfo("test_5_1_10.json");
+    nexus.SaveTestInfo("test_1_1_5_1_10.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_1_11.cpp b/tests/nexus/test_1_1_5_1_11.cpp
similarity index 99%
rename from tests/nexus/test_5_1_11.cpp
rename to tests/nexus/test_1_1_5_1_11.cpp
index f1e27d73f..e5688a933 100644
--- a/tests/nexus/test_5_1_11.cpp
+++ b/tests/nexus/test_1_1_5_1_11.cpp
@@ -235,7 +235,7 @@ void Test5_1_11(void)
     VerifyOrQuit(dut.Get<Mle::Mle>().IsChild());
     VerifyOrQuit(dut.Get<Mle::Mle>().GetParent().GetExtAddress() == reed1.Get<Mac::Mac>().GetExtAddress());
 
-    nexus.SaveTestInfo("test_5_1_11.json");
+    nexus.SaveTestInfo("test_1_1_5_1_11.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_1_12.cpp b/tests/nexus/test_1_1_5_1_12.cpp
similarity index 99%
rename from tests/nexus/test_5_1_12.cpp
rename to tests/nexus/test_1_1_5_1_12.cpp
index 3e883402d..aef59e5fd 100644
--- a/tests/nexus/test_5_1_12.cpp
+++ b/tests/nexus/test_1_1_5_1_12.cpp
@@ -165,7 +165,7 @@ void Test5_1_12(void)
      */
     nexus.AdvanceTime(kLinkSyncTime);
 
-    nexus.SaveTestInfo("test_5_1_12.json");
+    nexus.SaveTestInfo("test_1_1_5_1_12.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_1_13.cpp b/tests/nexus/test_1_1_5_1_13.cpp
similarity index 99%
rename from tests/nexus/test_5_1_13.cpp
rename to tests/nexus/test_1_1_5_1_13.cpp
index f833c50ba..8525e9f06 100644
--- a/tests/nexus/test_5_1_13.cpp
+++ b/tests/nexus/test_1_1_5_1_13.cpp
@@ -172,7 +172,7 @@ void Test5_1_13(void)
 
     VerifyOrQuit(router.Get<Mle::Mle>().IsRouter());
 
-    nexus.SaveTestInfo("test_5_1_13.json");
+    nexus.SaveTestInfo("test_1_1_5_1_13.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_1_2.cpp b/tests/nexus/test_1_1_5_1_2.cpp
similarity index 99%
rename from tests/nexus/test_5_1_2.cpp
rename to tests/nexus/test_1_1_5_1_2.cpp
index 69625f642..5ea43933c 100644
--- a/tests/nexus/test_5_1_2.cpp
+++ b/tests/nexus/test_1_1_5_1_2.cpp
@@ -189,7 +189,7 @@ void Test5_1_2(void)
      */
     nexus.AdvanceTime(kEchoRequestWaitTime);
 
-    nexus.SaveTestInfo("test_5_1_2.json");
+    nexus.SaveTestInfo("test_1_1_5_1_2.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_1_3.cpp b/tests/nexus/test_1_1_5_1_3.cpp
similarity index 99%
rename from tests/nexus/test_5_1_3.cpp
rename to tests/nexus/test_1_1_5_1_3.cpp
index 6c6ec39a9..e127f3941 100644
--- a/tests/nexus/test_5_1_3.cpp
+++ b/tests/nexus/test_1_1_5_1_3.cpp
@@ -225,7 +225,7 @@ void Test5_1_3(void)
      * - Pass Criteria: N/A
      */
 
-    nexus.SaveTestInfo("test_5_1_3.json");
+    nexus.SaveTestInfo("test_1_1_5_1_3.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_1_4.cpp b/tests/nexus/test_1_1_5_1_4.cpp
similarity index 99%
rename from tests/nexus/test_5_1_4.cpp
rename to tests/nexus/test_1_1_5_1_4.cpp
index 87993c2be..42effe72f 100644
--- a/tests/nexus/test_5_1_4.cpp
+++ b/tests/nexus/test_1_1_5_1_4.cpp
@@ -214,7 +214,7 @@ void Test5_1_4(void)
     nexus.AdvanceTime(kAttachToRouterTime);
     VerifyOrQuit(router2.Get<Mle::Mle>().IsRouter());
 
-    nexus.SaveTestInfo("test_5_1_4.json");
+    nexus.SaveTestInfo("test_1_1_5_1_4.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_1_5.cpp b/tests/nexus/test_1_1_5_1_5.cpp
similarity index 99%
rename from tests/nexus/test_5_1_5.cpp
rename to tests/nexus/test_1_1_5_1_5.cpp
index 8c794b9e2..0ab7eae55 100644
--- a/tests/nexus/test_5_1_5.cpp
+++ b/tests/nexus/test_1_1_5_1_5.cpp
@@ -202,7 +202,7 @@ void Test5_1_5(void)
     Log("Router_1 re-joined after ID_REUSE_DELAY with Router ID: %u", thirdRouterId);
     VerifyOrQuit(thirdRouterId == secondRouterId, "Router ID was not reused after ID_REUSE_DELAY");
 
-    nexus.SaveTestInfo("test_5_1_5.json");
+    nexus.SaveTestInfo("test_1_1_5_1_5.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_1_6.cpp b/tests/nexus/test_1_1_5_1_6.cpp
similarity index 99%
rename from tests/nexus/test_5_1_6.cpp
rename to tests/nexus/test_1_1_5_1_6.cpp
index e074bcf93..bcc4124ce 100644
--- a/tests/nexus/test_5_1_6.cpp
+++ b/tests/nexus/test_1_1_5_1_6.cpp
@@ -143,7 +143,7 @@ void Test5_1_6(void)
      */
     nexus.SendAndVerifyEchoRequest(leader, router.Get<Mle::Mle>().GetLinkLocalAddress());
 
-    nexus.SaveTestInfo("test_5_1_6.json");
+    nexus.SaveTestInfo("test_1_1_5_1_6.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_1_7.cpp b/tests/nexus/test_1_1_5_1_7.cpp
similarity index 99%
rename from tests/nexus/test_5_1_7.cpp
rename to tests/nexus/test_1_1_5_1_7.cpp
index a7d6240e5..8b41ee08f 100644
--- a/tests/nexus/test_5_1_7.cpp
+++ b/tests/nexus/test_1_1_5_1_7.cpp
@@ -244,7 +244,7 @@ void Test5_1_7(void)
 
     nexus.AdvanceTime(kEchoResponseWaitTime);
 
-    nexus.SaveTestInfo("test_5_1_7.json");
+    nexus.SaveTestInfo("test_1_1_5_1_7.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_1_8.cpp b/tests/nexus/test_1_1_5_1_8.cpp
similarity index 99%
rename from tests/nexus/test_5_1_8.cpp
rename to tests/nexus/test_1_1_5_1_8.cpp
index 16c28ec7e..7d383c0ae 100644
--- a/tests/nexus/test_5_1_8.cpp
+++ b/tests/nexus/test_1_1_5_1_8.cpp
@@ -208,7 +208,7 @@ void Test5_1_8(void)
     VerifyOrQuit(dut.Get<Mle::Mle>().IsChild());
     VerifyOrQuit(dut.Get<Mle::Mle>().GetParent().GetExtAddress() == router3.Get<Mac::Mac>().GetExtAddress());
 
-    nexus.SaveTestInfo("test_5_1_8.json");
+    nexus.SaveTestInfo("test_1_1_5_1_8.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_1_9.cpp b/tests/nexus/test_1_1_5_1_9.cpp
similarity index 99%
rename from tests/nexus/test_5_1_9.cpp
rename to tests/nexus/test_1_1_5_1_9.cpp
index 80ae906de..2e0589d1c 100644
--- a/tests/nexus/test_5_1_9.cpp
+++ b/tests/nexus/test_1_1_5_1_9.cpp
@@ -247,7 +247,7 @@ void Test5_1_9(void)
     VerifyOrQuit(dut.Get<Mle::Mle>().IsChild());
     VerifyOrQuit(dut.Get<Mle::Mle>().GetParent().GetExtAddress() == reed1.Get<Mac::Mac>().GetExtAddress());
 
-    nexus.SaveTestInfo("test_5_1_9.json");
+    nexus.SaveTestInfo("test_1_1_5_1_9.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_2_1.cpp b/tests/nexus/test_1_1_5_2_1.cpp
similarity index 99%
rename from tests/nexus/test_5_2_1.cpp
rename to tests/nexus/test_1_1_5_2_1.cpp
index 8d5bf333f..0dabc591f 100644
--- a/tests/nexus/test_5_2_1.cpp
+++ b/tests/nexus/test_1_1_5_2_1.cpp
@@ -212,7 +212,7 @@ void Test5_2_1(void)
      */
     nexus.SendAndVerifyEchoRequest(leader, reed1.Get<Mle::Mle>().GetMeshLocalEid());
 
-    nexus.SaveTestInfo("test_5_2_1.json");
+    nexus.SaveTestInfo("test_1_1_5_2_1.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_2_3.cpp b/tests/nexus/test_1_1_5_2_3.cpp
similarity index 99%
rename from tests/nexus/test_5_2_3.cpp
rename to tests/nexus/test_1_1_5_2_3.cpp
index 0faea7350..c1bcbccbc 100644
--- a/tests/nexus/test_5_2_3.cpp
+++ b/tests/nexus/test_1_1_5_2_3.cpp
@@ -198,7 +198,7 @@ void Test5_2_3(void)
     nexus.AdvanceTime(kWaitTime);
     VerifyOrQuit(routers[kMaxRouters - 1]->Get<Mle::Mle>().IsChild());
 
-    nexus.SaveTestInfo("test_5_2_3.json");
+    nexus.SaveTestInfo("test_1_1_5_2_3.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_2_4.cpp b/tests/nexus/test_1_1_5_2_4.cpp
similarity index 99%
rename from tests/nexus/test_5_2_4.cpp
rename to tests/nexus/test_1_1_5_2_4.cpp
index 55972cd7c..6d19e5a59 100644
--- a/tests/nexus/test_5_2_4.cpp
+++ b/tests/nexus/test_1_1_5_2_4.cpp
@@ -268,7 +268,7 @@ void Test5_2_4(void)
      */
     nexus.SendAndVerifyEchoRequest(med1, leader.Get<Mle::Mle>().GetMeshLocalEid());
 
-    nexus.SaveTestInfo("test_5_2_4.json");
+    nexus.SaveTestInfo("test_1_1_5_2_4.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_2_5.cpp b/tests/nexus/test_1_1_5_2_5.cpp
similarity index 99%
rename from tests/nexus/test_5_2_5.cpp
rename to tests/nexus/test_1_1_5_2_5.cpp
index 4020b35cb..b76c1d600 100644
--- a/tests/nexus/test_5_2_5.cpp
+++ b/tests/nexus/test_1_1_5_2_5.cpp
@@ -284,7 +284,7 @@ void Test5_2_5(void)
      */
     nexus.SendAndVerifyEchoRequest(med1, reed1.FindMatchingAddress("2002::/64"), 0, 64, kEchoResponseTime);
 
-    nexus.SaveTestInfo("test_5_2_5.json");
+    nexus.SaveTestInfo("test_1_1_5_2_5.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_2_6.cpp b/tests/nexus/test_1_1_5_2_6.cpp
similarity index 99%
rename from tests/nexus/test_5_2_6.cpp
rename to tests/nexus/test_1_1_5_2_6.cpp
index f8726a199..4a7cd34a8 100644
--- a/tests/nexus/test_5_2_6.cpp
+++ b/tests/nexus/test_1_1_5_2_6.cpp
@@ -208,7 +208,7 @@ void Test_5_2_6(void)
     nexus.SendAndVerifyEchoRequest(leader, router1.Get<Mle::Mle>().GetMeshLocalEid(), /* aPayloadSize */ 0,
                                    /* aHopLimit */ 64, kEchoResponseWaitTime);
 
-    nexus.SaveTestInfo("test_5_2_6.json");
+    nexus.SaveTestInfo("test_1_1_5_2_6.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_2_7.cpp b/tests/nexus/test_1_1_5_2_7.cpp
similarity index 99%
rename from tests/nexus/test_5_2_7.cpp
rename to tests/nexus/test_1_1_5_2_7.cpp
index 75ef300bd..4559b7880 100644
--- a/tests/nexus/test_5_2_7.cpp
+++ b/tests/nexus/test_1_1_5_2_7.cpp
@@ -210,7 +210,7 @@ void Test5_2_7(void)
      */
     nexus.AdvanceTime(kAttachToChildTime);
 
-    nexus.SaveTestInfo("test_5_2_7.json");
+    nexus.SaveTestInfo("test_1_1_5_2_7.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_3_1.cpp b/tests/nexus/test_1_1_5_3_1.cpp
similarity index 99%
rename from tests/nexus/test_5_3_1.cpp
rename to tests/nexus/test_1_1_5_3_1.cpp
index 0666ba4be..7e8d0a661 100644
--- a/tests/nexus/test_5_3_1.cpp
+++ b/tests/nexus/test_1_1_5_3_1.cpp
@@ -180,7 +180,7 @@ void Test5_3_1(void)
      */
     nexus.SendAndVerifyEchoRequest(leader, dut.Get<Mle::Mle>().GetLinkLocalAllThreadNodesAddress(), kEchoPayloadSize);
 
-    nexus.SaveTestInfo("test_5_3_1.json");
+    nexus.SaveTestInfo("test_1_1_5_3_1.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_3_10.cpp b/tests/nexus/test_1_1_5_3_10.cpp
similarity index 99%
rename from tests/nexus/test_5_3_10.cpp
rename to tests/nexus/test_1_1_5_3_10.cpp
index 6cafb36a5..95409abc2 100644
--- a/tests/nexus/test_5_3_10.cpp
+++ b/tests/nexus/test_1_1_5_3_10.cpp
@@ -244,7 +244,7 @@ void Test5_3_10(void)
 
     nexus.SendAndVerifyEchoRequest(med1, router1.FindMatchingAddress(kPrefix1), 0, kDefaultHopLimit, kEchoResponseTime);
 
-    nexus.SaveTestInfo("test_5_3_10.json");
+    nexus.SaveTestInfo("test_1_1_5_3_10.json");
 
     Log("Step 6: Router_2 (DUT)");
 
diff --git a/tests/nexus/test_5_3_11.cpp b/tests/nexus/test_1_1_5_3_11.cpp
similarity index 99%
rename from tests/nexus/test_5_3_11.cpp
rename to tests/nexus/test_1_1_5_3_11.cpp
index c4f61ba44..9852ae212 100644
--- a/tests/nexus/test_5_3_11.cpp
+++ b/tests/nexus/test_1_1_5_3_11.cpp
@@ -181,7 +181,7 @@ void Test5_3_11(void)
     med1.SendEchoRequest(x, kEchoIdentifier);
     nexus.AdvanceTime(kAqTimeout);
 
-    nexus.SaveTestInfo("test_5_3_11.json");
+    nexus.SaveTestInfo("test_1_1_5_3_11.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_3_2.cpp b/tests/nexus/test_1_1_5_3_2.cpp
similarity index 99%
rename from tests/nexus/test_5_3_2.cpp
rename to tests/nexus/test_1_1_5_3_2.cpp
index 79cdc3c8a..d9e8c201d 100644
--- a/tests/nexus/test_5_3_2.cpp
+++ b/tests/nexus/test_1_1_5_3_2.cpp
@@ -209,7 +209,7 @@ void Test5_3_2(void)
         nexus.SendAndVerifyEchoRequest(leader, multicastAddr, kLargePayloadSize);
     }
 
-    nexus.SaveTestInfo("test_5_3_2.json");
+    nexus.SaveTestInfo("test_1_1_5_3_2.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_3_3.cpp b/tests/nexus/test_1_1_5_3_3.cpp
similarity index 99%
rename from tests/nexus/test_5_3_3.cpp
rename to tests/nexus/test_1_1_5_3_3.cpp
index d06c1e784..5689e29bc 100644
--- a/tests/nexus/test_5_3_3.cpp
+++ b/tests/nexus/test_1_1_5_3_3.cpp
@@ -258,7 +258,7 @@ void Test5_3_3(void)
     router1.SendEchoRequest(med1.Get<Mle::Mle>().GetMeshLocalEid(), kIcmpIdentifierStep6b);
     nexus.AdvanceTime(kEchoResponseWaitTime);
 
-    nexus.SaveTestInfo("test_5_3_3.json");
+    nexus.SaveTestInfo("test_1_1_5_3_3.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_3_4.cpp b/tests/nexus/test_1_1_5_3_4.cpp
similarity index 99%
rename from tests/nexus/test_5_3_4.cpp
rename to tests/nexus/test_1_1_5_3_4.cpp
index fd8937c02..5eddadbca 100644
--- a/tests/nexus/test_5_3_4.cpp
+++ b/tests/nexus/test_1_1_5_3_4.cpp
@@ -190,7 +190,7 @@ void Test5_3_4(void)
         nexus.AdvanceTime(kEchoProcessingTime);
     }
 
-    nexus.SaveTestInfo("test_5_3_4.json");
+    nexus.SaveTestInfo("test_1_1_5_3_4.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_3_5.cpp b/tests/nexus/test_1_1_5_3_5.cpp
similarity index 99%
rename from tests/nexus/test_5_3_5.cpp
rename to tests/nexus/test_1_1_5_3_5.cpp
index 0e44aba83..2e1cd296c 100644
--- a/tests/nexus/test_5_3_5.cpp
+++ b/tests/nexus/test_1_1_5_3_5.cpp
@@ -262,7 +262,7 @@ void Test5_3_5(void)
     router3.SendEchoRequest(leader.Get<Mle::Mle>().GetMeshLocalEid(), kEchoIdentifier);
     nexus.AdvanceTime(kStabilizationTime);
 
-    nexus.SaveTestInfo("test_5_3_5.json");
+    nexus.SaveTestInfo("test_1_1_5_3_5.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_3_6.cpp b/tests/nexus/test_1_1_5_3_6.cpp
similarity index 99%
rename from tests/nexus/test_5_3_6.cpp
rename to tests/nexus/test_1_1_5_3_6.cpp
index 3a007f92a..fda6f62d4 100644
--- a/tests/nexus/test_5_3_6.cpp
+++ b/tests/nexus/test_1_1_5_3_6.cpp
@@ -197,7 +197,7 @@ void Test5_3_6(void)
     VerifyOrQuit(!leader.Get<RouterTable>().IsAllocated(router1Id));
     VerifyOrQuit(!leader.Get<RouterTable>().IsAllocated(router2Id));
 
-    nexus.SaveTestInfo("test_5_3_6.json");
+    nexus.SaveTestInfo("test_1_1_5_3_6.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_3_7.cpp b/tests/nexus/test_1_1_5_3_7.cpp
similarity index 99%
rename from tests/nexus/test_5_3_7.cpp
rename to tests/nexus/test_1_1_5_3_7.cpp
index c19566409..131b6bac8 100644
--- a/tests/nexus/test_5_3_7.cpp
+++ b/tests/nexus/test_1_1_5_3_7.cpp
@@ -270,7 +270,7 @@ void Test5_3_7(void)
 
     nexus.AdvanceTime(kStabilizationTime);
 
-    nexus.SaveTestInfo("test_5_3_7.json");
+    nexus.SaveTestInfo("test_1_1_5_3_7.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_3_8.cpp b/tests/nexus/test_1_1_5_3_8.cpp
similarity index 99%
rename from tests/nexus/test_5_3_8.cpp
rename to tests/nexus/test_1_1_5_3_8.cpp
index 231a19290..282523c1b 100644
--- a/tests/nexus/test_5_3_8.cpp
+++ b/tests/nexus/test_1_1_5_3_8.cpp
@@ -251,7 +251,7 @@ void Test5_3_8(void)
     nexus.SendAndVerifyEchoRequest(med1, med2.FindMatchingAddress("2003::/64"), kEchoPayloadSize, kEchoHopLimit,
                                    kEchoResponseWaitTime);
 
-    nexus.SaveTestInfo("test_5_3_8.json");
+    nexus.SaveTestInfo("test_1_1_5_3_8.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_3_9.cpp b/tests/nexus/test_1_1_5_3_9.cpp
similarity index 99%
rename from tests/nexus/test_5_3_9.cpp
rename to tests/nexus/test_1_1_5_3_9.cpp
index 373d97579..44982a4f0 100644
--- a/tests/nexus/test_5_3_9.cpp
+++ b/tests/nexus/test_1_1_5_3_9.cpp
@@ -190,7 +190,7 @@ void Test5_3_9(void)
     SuccessOrQuit(sed1.Get<DataPollSender>().SetExternalPollPeriod(kSedPollPeriod));
 
     // Save test info while all nodes have their addresses.
-    nexus.SaveTestInfo("test_5_3_9.json");
+    nexus.SaveTestInfo("test_1_1_5_3_9.json");
 
     /**
      * Step 3: SED_1
diff --git a/tests/nexus/test_5_5_1.cpp b/tests/nexus/test_1_1_5_5_1.cpp
similarity index 99%
rename from tests/nexus/test_5_5_1.cpp
rename to tests/nexus/test_1_1_5_5_1.cpp
index 7579f6e31..5a1f18bdf 100644
--- a/tests/nexus/test_5_5_1.cpp
+++ b/tests/nexus/test_1_1_5_5_1.cpp
@@ -206,7 +206,7 @@ void Test5_5_1(void)
      */
     nexus.SendAndVerifyEchoRequest(leader, router1.Get<Mle::Mle>().GetLinkLocalAddress());
 
-    nexus.SaveTestInfo("test_5_5_1.json");
+    nexus.SaveTestInfo("test_1_1_5_5_1.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_5_2.cpp b/tests/nexus/test_1_1_5_5_2.cpp
similarity index 99%
rename from tests/nexus/test_5_5_2.cpp
rename to tests/nexus/test_1_1_5_5_2.cpp
index 0864973be..3d4b88ca9 100644
--- a/tests/nexus/test_5_5_2.cpp
+++ b/tests/nexus/test_1_1_5_5_2.cpp
@@ -383,7 +383,7 @@ void Test5_5_2(void)
     leader.SendEchoRequest(med1.Get<Mle::Mle>().GetLinkLocalAddress(), 0);
     nexus.AdvanceTime(kStabilizationTime);
 
-    nexus.SaveTestInfo("test_5_5_2.json");
+    nexus.SaveTestInfo("test_1_1_5_5_2.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_5_3.cpp b/tests/nexus/test_1_1_5_5_3.cpp
similarity index 99%
rename from tests/nexus/test_5_5_3.cpp
rename to tests/nexus/test_1_1_5_5_3.cpp
index cfc5738ac..07dd12e0f 100644
--- a/tests/nexus/test_5_5_3.cpp
+++ b/tests/nexus/test_1_1_5_5_3.cpp
@@ -377,7 +377,7 @@ void Test5_5_3(void)
     med2.SendEchoRequest(med3.Get<Mle::Mle>().GetMeshLocalEid(), kEchoIdentifier);
     nexus.AdvanceTime(kStabilizationTime);
 
-    nexus.SaveTestInfo("test_5_5_3.json");
+    nexus.SaveTestInfo("test_1_1_5_5_3.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_5_4_1.cpp b/tests/nexus/test_1_1_5_5_4_1.cpp
similarity index 99%
rename from tests/nexus/test_5_5_4_1.cpp
rename to tests/nexus/test_1_1_5_5_4_1.cpp
index c3844f600..c35cb5de6 100644
--- a/tests/nexus/test_5_5_4_1.cpp
+++ b/tests/nexus/test_1_1_5_5_4_1.cpp
@@ -218,7 +218,7 @@ void Test5_5_4_1(void)
     router3.SendEchoRequest(router4.Get<Mle::Mle>().GetMeshLocalEid(), kEchoIdentifier);
     nexus.AdvanceTime(kStabilizationTime);
 
-    nexus.SaveTestInfo("test_5_5_4_1.json");
+    nexus.SaveTestInfo("test_1_1_5_5_4_1.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_5_4_2.cpp b/tests/nexus/test_1_1_5_5_4_2.cpp
similarity index 99%
rename from tests/nexus/test_5_5_4_2.cpp
rename to tests/nexus/test_1_1_5_5_4_2.cpp
index 2021f57a5..563c41fe0 100644
--- a/tests/nexus/test_5_5_4_2.cpp
+++ b/tests/nexus/test_1_1_5_5_4_2.cpp
@@ -265,7 +265,7 @@ void Test5_5_4_2(void)
     Log("Step 11: Router_4");
     nexus.SendAndVerifyEchoRequest(router4, router1.Get<Mle::Mle>().GetMeshLocalEid());
 
-    nexus.SaveTestInfo("test_5_5_4_2.json");
+    nexus.SaveTestInfo("test_1_1_5_5_4_2.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_5_5.cpp b/tests/nexus/test_1_1_5_5_5.cpp
similarity index 99%
rename from tests/nexus/test_5_5_5.cpp
rename to tests/nexus/test_1_1_5_5_5.cpp
index 2eac4d3eb..389d52972 100644
--- a/tests/nexus/test_5_5_5.cpp
+++ b/tests/nexus/test_1_1_5_5_5.cpp
@@ -265,7 +265,7 @@ void Test5_5_5(void)
      */
     nexus.SendAndVerifyEchoRequest(*r[1], leader.Get<Mle::Mle>().GetMeshLocalEid(), 0, 64, kPingTimeout);
 
-    nexus.SaveTestInfo("test_5_5_5.json");
+    nexus.SaveTestInfo("test_1_1_5_5_5.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_5_7.cpp b/tests/nexus/test_1_1_5_5_7.cpp
similarity index 99%
rename from tests/nexus/test_5_5_7.cpp
rename to tests/nexus/test_1_1_5_5_7.cpp
index 2bf047f7b..ffedd4a9a 100644
--- a/tests/nexus/test_5_5_7.cpp
+++ b/tests/nexus/test_1_1_5_5_7.cpp
@@ -296,7 +296,7 @@ void Test5_5_7(void)
         }
     }
 
-    nexus.SaveTestInfo("test_5_5_7.json");
+    nexus.SaveTestInfo("test_1_1_5_5_7.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_6_1.cpp b/tests/nexus/test_1_1_5_6_1.cpp
similarity index 99%
rename from tests/nexus/test_5_6_1.cpp
rename to tests/nexus/test_1_1_5_6_1.cpp
index a597017fa..15f5620d6 100644
--- a/tests/nexus/test_5_6_1.cpp
+++ b/tests/nexus/test_1_1_5_6_1.cpp
@@ -238,7 +238,7 @@ void Test5_6_1(void)
     nexus.SendAndVerifyEchoRequest(leader, router1.FindMatchingAddress(kPrefix3));
     nexus.SendAndVerifyEchoRequest(leader, router1.FindMatchingAddress(kPrefix4));
 
-    nexus.SaveTestInfo("test_5_6_1.json");
+    nexus.SaveTestInfo("test_1_1_5_6_1.json");
 
     Log("Test 5.6.1 passed");
 }
diff --git a/tests/nexus/test_5_6_2.cpp b/tests/nexus/test_1_1_5_6_2.cpp
similarity index 99%
rename from tests/nexus/test_5_6_2.cpp
rename to tests/nexus/test_1_1_5_6_2.cpp
index 35fb4f86c..4e6a5af5e 100644
--- a/tests/nexus/test_5_6_2.cpp
+++ b/tests/nexus/test_1_1_5_6_2.cpp
@@ -271,7 +271,7 @@ void Test5_6_2(void)
     Log("Step 11: Leader (DUT) sends MLE Child Update Response to MED_1 and SED_1.");
     nexus.AdvanceTime(kStabilizationTime);
 
-    nexus.SaveTestInfo("test_5_6_2.json");
+    nexus.SaveTestInfo("test_1_1_5_6_2.json");
     Log("Test 5.6.2 passed");
 }
 
diff --git a/tests/nexus/test_5_6_3.cpp b/tests/nexus/test_1_1_5_6_3.cpp
similarity index 99%
rename from tests/nexus/test_5_6_3.cpp
rename to tests/nexus/test_1_1_5_6_3.cpp
index 6743a3e9b..25ffbb058 100644
--- a/tests/nexus/test_5_6_3.cpp
+++ b/tests/nexus/test_1_1_5_6_3.cpp
@@ -275,7 +275,7 @@ void Test5_6_3(void)
 
     nexus.AdvanceTime(kNetworkDataPropagationTime);
 
-    nexus.SaveTestInfo("test_5_6_3.json");
+    nexus.SaveTestInfo("test_1_1_5_6_3.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_6_4.cpp b/tests/nexus/test_1_1_5_6_4.cpp
similarity index 99%
rename from tests/nexus/test_5_6_4.cpp
rename to tests/nexus/test_1_1_5_6_4.cpp
index 1fd5d3292..33e4fd4ca 100644
--- a/tests/nexus/test_5_6_4.cpp
+++ b/tests/nexus/test_1_1_5_6_4.cpp
@@ -318,7 +318,7 @@ void Test5_6_4(void)
 
     nexus.AdvanceTime(2 * kUpdateProcessTime);
 
-    nexus.SaveTestInfo("test_5_6_4.json");
+    nexus.SaveTestInfo("test_1_1_5_6_4.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_6_5.cpp b/tests/nexus/test_1_1_5_6_5.cpp
similarity index 99%
rename from tests/nexus/test_5_6_5.cpp
rename to tests/nexus/test_1_1_5_6_5.cpp
index 545f29797..bc11ad41c 100644
--- a/tests/nexus/test_5_6_5.cpp
+++ b/tests/nexus/test_1_1_5_6_5.cpp
@@ -310,7 +310,7 @@ void Test5_6_5(void)
 
     nexus.AdvanceTime(kStabilizationTime);
 
-    nexus.SaveTestInfo("test_5_6_5.json");
+    nexus.SaveTestInfo("test_1_1_5_6_5.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_6_6.cpp b/tests/nexus/test_1_1_5_6_6.cpp
similarity index 99%
rename from tests/nexus/test_5_6_6.cpp
rename to tests/nexus/test_1_1_5_6_6.cpp
index f944386e9..4da54a28e 100644
--- a/tests/nexus/test_5_6_6.cpp
+++ b/tests/nexus/test_1_1_5_6_6.cpp
@@ -454,7 +454,7 @@ void Test5_6_6(void)
     // Handled automatically by the stack.
     nexus.AdvanceTime(kShortIntervalTime);
 
-    nexus.SaveTestInfo("test_5_6_6.json");
+    nexus.SaveTestInfo("test_1_1_5_6_6.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_6_7.cpp b/tests/nexus/test_1_1_5_6_7.cpp
similarity index 99%
rename from tests/nexus/test_5_6_7.cpp
rename to tests/nexus/test_1_1_5_6_7.cpp
index 2d240a8d9..f6ddfa64d 100644
--- a/tests/nexus/test_5_6_7.cpp
+++ b/tests/nexus/test_1_1_5_6_7.cpp
@@ -319,7 +319,7 @@ void Test5_6_7(void)
      */
     nexus.AdvanceTime(kReedAdvertisementInterval);
 
-    nexus.SaveTestInfo("test_5_6_7.json");
+    nexus.SaveTestInfo("test_1_1_5_6_7.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_6_9.cpp b/tests/nexus/test_1_1_5_6_9.cpp
similarity index 99%
rename from tests/nexus/test_5_6_9.cpp
rename to tests/nexus/test_1_1_5_6_9.cpp
index 24f01701d..e1384728b 100644
--- a/tests/nexus/test_5_6_9.cpp
+++ b/tests/nexus/test_1_1_5_6_9.cpp
@@ -412,7 +412,7 @@ void Test5_6_9(void)
     sed1.SendEchoRequest(dest2007_0, kEchoId15);
     nexus.AdvanceTime(kStabilizationTime);
 
-    nexus.SaveTestInfo("test_5_6_9.json");
+    nexus.SaveTestInfo("test_1_1_5_6_9.json");
     Log("Test 5.6.9 passed");
 }
 
diff --git a/tests/nexus/test_5_7_1.cpp b/tests/nexus/test_1_1_5_7_1.cpp
similarity index 99%
rename from tests/nexus/test_5_7_1.cpp
rename to tests/nexus/test_1_1_5_7_1.cpp
index 9c6fb2386..41a1fc867 100644
--- a/tests/nexus/test_5_7_1.cpp
+++ b/tests/nexus/test_1_1_5_7_1.cpp
@@ -291,7 +291,7 @@ void Test5_7_1(void)
                                                                             nullptr, nullptr));
     nexus.AdvanceTime(kDiagResponseTime);
 
-    nexus.SaveTestInfo("test_5_7_1.json");
+    nexus.SaveTestInfo("test_1_1_5_7_1.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_7_2.cpp b/tests/nexus/test_1_1_5_7_2.cpp
similarity index 99%
rename from tests/nexus/test_5_7_2.cpp
rename to tests/nexus/test_1_1_5_7_2.cpp
index f5314b29e..543db7c1b 100644
--- a/tests/nexus/test_5_7_2.cpp
+++ b/tests/nexus/test_1_1_5_7_2.cpp
@@ -363,7 +363,7 @@ void Test5_7_2(void)
         Ip6::Address::GetRealmLocalAllNodesMulticast(), kBaseDiagGetTlvs, sizeof(kBaseDiagGetTlvs), nullptr, nullptr));
     nexus.AdvanceTime(kDiagResponseTime);
 
-    nexus.SaveTestInfo("test_5_7_2.json");
+    nexus.SaveTestInfo("test_1_1_5_7_2.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_7_3.cpp b/tests/nexus/test_1_1_5_7_3.cpp
similarity index 99%
rename from tests/nexus/test_5_7_3.cpp
rename to tests/nexus/test_1_1_5_7_3.cpp
index 41ce85af8..8e72ac691 100644
--- a/tests/nexus/test_5_7_3.cpp
+++ b/tests/nexus/test_1_1_5_7_3.cpp
@@ -274,7 +274,7 @@ void Test5_7_3(void)
     // Note: Leader doesn't respond to its own multicast query, so 4 responses.
     VerifyOrQuit(context.mResponseCount >= 4);
 
-    nexus.SaveTestInfo("test_5_7_3.json");
+    nexus.SaveTestInfo("test_1_1_5_7_3.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_8_2.cpp b/tests/nexus/test_1_1_5_8_2.cpp
similarity index 99%
rename from tests/nexus/test_5_8_2.cpp
rename to tests/nexus/test_1_1_5_8_2.cpp
index c5b97bb24..5bcb56f55 100644
--- a/tests/nexus/test_5_8_2.cpp
+++ b/tests/nexus/test_1_1_5_8_2.cpp
@@ -169,7 +169,7 @@ void Test5_8_2(void)
      */
     nexus.AdvanceTime(kStabilizationTime);
 
-    nexus.SaveTestInfo("test_5_8_2.json");
+    nexus.SaveTestInfo("test_1_1_5_8_2.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_8_3.cpp b/tests/nexus/test_1_1_5_8_3.cpp
similarity index 99%
rename from tests/nexus/test_5_8_3.cpp
rename to tests/nexus/test_1_1_5_8_3.cpp
index c8aedf020..85e13f0e1 100644
--- a/tests/nexus/test_5_8_3.cpp
+++ b/tests/nexus/test_1_1_5_8_3.cpp
@@ -174,7 +174,7 @@ void Test5_8_3(void)
     nexus.AdvanceTime(kMaxAdvertisementTime);
     VerifyOrQuit(router1.Get<KeyManager>().GetCurrentKeySequence() == kInitialKeySequence + 1);
 
-    nexus.SaveTestInfo("test_5_8_3.json");
+    nexus.SaveTestInfo("test_1_1_5_8_3.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_5_8_4.cpp b/tests/nexus/test_1_1_5_8_4.cpp
similarity index 99%
rename from tests/nexus/test_5_8_4.cpp
rename to tests/nexus/test_1_1_5_8_4.cpp
index a91ab0bcf..2625a06c4 100644
--- a/tests/nexus/test_5_8_4.cpp
+++ b/tests/nexus/test_1_1_5_8_4.cpp
@@ -464,7 +464,7 @@ void Test5_8_4(void)
 
     nexus.AdvanceTime(kStabilizationTime);
 
-    nexus.SaveTestInfo("test_5_8_4.json");
+    nexus.SaveTestInfo("test_1_1_5_8_4.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_6_1_1.cpp b/tests/nexus/test_1_1_6_1_1.cpp
similarity index 96%
rename from tests/nexus/test_6_1_1.cpp
rename to tests/nexus/test_1_1_6_1_1.cpp
index 27117e2d3..16b262f42 100644
--- a/tests/nexus/test_6_1_1.cpp
+++ b/tests/nexus/test_1_1_6_1_1.cpp
@@ -214,16 +214,16 @@ int main(int argc, char *argv[])
     if (argc < 2)
     {
         // If no argument, run both topologies.
-        ot::Nexus::RunTest6_1_1(ot::Nexus::kTopologyA, "test_6_1_1_A.json");
-        ot::Nexus::RunTest6_1_1(ot::Nexus::kTopologyB, "test_6_1_1_B.json");
+        ot::Nexus::RunTest6_1_1(ot::Nexus::kTopologyA, "test_1_1_6_1_1_A.json");
+        ot::Nexus::RunTest6_1_1(ot::Nexus::kTopologyB, "test_1_1_6_1_1_B.json");
     }
     else if (strcmp(argv[1], "A") == 0)
     {
-        ot::Nexus::RunTest6_1_1(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_6_1_1_A.json");
+        ot::Nexus::RunTest6_1_1(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_1_1_6_1_1_A.json");
     }
     else if (strcmp(argv[1], "B") == 0)
     {
-        ot::Nexus::RunTest6_1_1(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_6_1_1_B.json");
+        ot::Nexus::RunTest6_1_1(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_1_1_6_1_1_B.json");
     }
     else
     {
diff --git a/tests/nexus/test_6_1_2.cpp b/tests/nexus/test_1_1_6_1_2.cpp
similarity index 97%
rename from tests/nexus/test_6_1_2.cpp
rename to tests/nexus/test_1_1_6_1_2.cpp
index 90d219938..d42a64c46 100644
--- a/tests/nexus/test_6_1_2.cpp
+++ b/tests/nexus/test_1_1_6_1_2.cpp
@@ -286,19 +286,19 @@ int main(int argc, char *argv[])
     if (argc > 1 && strcmp(argv[1], "A") == 0)
     {
         printf("Running Topology A...\n");
-        ot::Nexus::RunTest6_1_2(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_6_1_2_A.json");
+        ot::Nexus::RunTest6_1_2(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_1_1_6_1_2_A.json");
     }
     else if (argc > 1 && strcmp(argv[1], "B") == 0)
     {
         printf("Running Topology B...\n");
-        ot::Nexus::RunTest6_1_2(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_6_1_2_B.json");
+        ot::Nexus::RunTest6_1_2(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_1_1_6_1_2_B.json");
     }
     else
     {
         printf("Running Topology A...\n");
-        ot::Nexus::RunTest6_1_2(ot::Nexus::kTopologyA, "test_6_1_2_A.json");
+        ot::Nexus::RunTest6_1_2(ot::Nexus::kTopologyA, "test_1_1_6_1_2_A.json");
         printf("Running Topology B...\n");
-        ot::Nexus::RunTest6_1_2(ot::Nexus::kTopologyB, "test_6_1_2_B.json");
+        ot::Nexus::RunTest6_1_2(ot::Nexus::kTopologyB, "test_1_1_6_1_2_B.json");
     }
 
     printf("All tests passed\n");
diff --git a/tests/nexus/test_6_1_3.cpp b/tests/nexus/test_1_1_6_1_3.cpp
similarity index 96%
rename from tests/nexus/test_6_1_3.cpp
rename to tests/nexus/test_1_1_6_1_3.cpp
index 40e821656..d33777f2b 100644
--- a/tests/nexus/test_6_1_3.cpp
+++ b/tests/nexus/test_1_1_6_1_3.cpp
@@ -251,8 +251,8 @@ int main(int argc, char *argv[])
 {
     if (argc < 2)
     {
-        ot::Nexus::RunTest6_1_3(ot::Nexus::kTopologyA, "test_6_1_3_A.json");
-        ot::Nexus::RunTest6_1_3(ot::Nexus::kTopologyB, "test_6_1_3_B.json");
+        ot::Nexus::RunTest6_1_3(ot::Nexus::kTopologyA, "test_1_1_6_1_3_A.json");
+        ot::Nexus::RunTest6_1_3(ot::Nexus::kTopologyB, "test_1_1_6_1_3_B.json");
     }
     else
     {
@@ -262,12 +262,12 @@ int main(int argc, char *argv[])
         if (strcmp(argv[1], "A") == 0)
         {
             topology        = ot::Nexus::kTopologyA;
-            defaultJsonFile = "test_6_1_3_A.json";
+            defaultJsonFile = "test_1_1_6_1_3_A.json";
         }
         else if (strcmp(argv[1], "B") == 0)
         {
             topology        = ot::Nexus::kTopologyB;
-            defaultJsonFile = "test_6_1_3_B.json";
+            defaultJsonFile = "test_1_1_6_1_3_B.json";
         }
         else
         {
diff --git a/tests/nexus/test_6_1_4.cpp b/tests/nexus/test_1_1_6_1_4.cpp
similarity index 99%
rename from tests/nexus/test_6_1_4.cpp
rename to tests/nexus/test_1_1_6_1_4.cpp
index f68066804..7d334a067 100644
--- a/tests/nexus/test_6_1_4.cpp
+++ b/tests/nexus/test_1_1_6_1_4.cpp
@@ -278,7 +278,7 @@ void Test6_1_4(void)
      */
     nexus.SendAndVerifyEchoRequest(router3, dut.Get<Mle::Mle>().GetLinkLocalAddress(), 0, 64, kEchoTimeout);
 
-    nexus.SaveTestInfo("test_6_1_4.json");
+    nexus.SaveTestInfo("test_1_1_6_1_4.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_6_1_5.cpp b/tests/nexus/test_1_1_6_1_5.cpp
similarity index 99%
rename from tests/nexus/test_6_1_5.cpp
rename to tests/nexus/test_1_1_6_1_5.cpp
index 1baa3d304..a22b50021 100644
--- a/tests/nexus/test_6_1_5.cpp
+++ b/tests/nexus/test_1_1_6_1_5.cpp
@@ -233,7 +233,7 @@ void Test6_1_5(void)
     router1.SendEchoRequest(sed1.Get<Mle::Mle>().GetLinkLocalAddress(), kEchoIdentifier);
     nexus.AdvanceTime(kStabilizationTime);
 
-    nexus.SaveTestInfo("test_6_1_5.json");
+    nexus.SaveTestInfo("test_1_1_6_1_5.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_6_1_6.cpp b/tests/nexus/test_1_1_6_1_6.cpp
similarity index 97%
rename from tests/nexus/test_6_1_6.cpp
rename to tests/nexus/test_1_1_6_1_6.cpp
index 534191294..c2080ac6e 100644
--- a/tests/nexus/test_6_1_6.cpp
+++ b/tests/nexus/test_1_1_6_1_6.cpp
@@ -259,8 +259,8 @@ int main(int argc, char *argv[])
 {
     if (argc < 2)
     {
-        ot::Nexus::RunTest6_1_6(ot::Nexus::kTopologyA, "test_6_1_6_A.json");
-        ot::Nexus::RunTest6_1_6(ot::Nexus::kTopologyB, "test_6_1_6_B.json");
+        ot::Nexus::RunTest6_1_6(ot::Nexus::kTopologyA, "test_1_1_6_1_6_A.json");
+        ot::Nexus::RunTest6_1_6(ot::Nexus::kTopologyB, "test_1_1_6_1_6_B.json");
     }
     else
     {
@@ -270,12 +270,12 @@ int main(int argc, char *argv[])
         if (strcmp(argv[1], "A") == 0)
         {
             topology        = ot::Nexus::kTopologyA;
-            defaultJsonFile = "test_6_1_6_A.json";
+            defaultJsonFile = "test_1_1_6_1_6_A.json";
         }
         else if (strcmp(argv[1], "B") == 0)
         {
             topology        = ot::Nexus::kTopologyB;
-            defaultJsonFile = "test_6_1_6_B.json";
+            defaultJsonFile = "test_1_1_6_1_6_B.json";
         }
         else
         {
diff --git a/tests/nexus/test_6_1_7.cpp b/tests/nexus/test_1_1_6_1_7.cpp
similarity index 98%
rename from tests/nexus/test_6_1_7.cpp
rename to tests/nexus/test_1_1_6_1_7.cpp
index b9136371e..798b2d04d 100644
--- a/tests/nexus/test_6_1_7.cpp
+++ b/tests/nexus/test_1_1_6_1_7.cpp
@@ -187,7 +187,7 @@ void RunTest6_1_7(const char *aJsonFile)
 
 int main(int argc, char *argv[])
 {
-    ot::Nexus::RunTest6_1_7((argc > 2) ? argv[2] : "test_6_1_7.json");
+    ot::Nexus::RunTest6_1_7((argc > 2) ? argv[2] : "test_1_1_6_1_7.json");
     printf("All tests passed\n");
     return 0;
 }
diff --git a/tests/nexus/test_6_2_1.cpp b/tests/nexus/test_1_1_6_2_1.cpp
similarity index 95%
rename from tests/nexus/test_6_2_1.cpp
rename to tests/nexus/test_1_1_6_2_1.cpp
index 29fc00d0d..4f784fc6c 100644
--- a/tests/nexus/test_6_2_1.cpp
+++ b/tests/nexus/test_1_1_6_2_1.cpp
@@ -176,8 +176,8 @@ int main(int argc, char *argv[])
 {
     if (argc < 2)
     {
-        ot::Nexus::RunTest6_2_1(ot::Nexus::kTopologyA, "test_6_2_1_A.json");
-        ot::Nexus::RunTest6_2_1(ot::Nexus::kTopologyB, "test_6_2_1_B.json");
+        ot::Nexus::RunTest6_2_1(ot::Nexus::kTopologyA, "test_1_1_6_2_1_A.json");
+        ot::Nexus::RunTest6_2_1(ot::Nexus::kTopologyB, "test_1_1_6_2_1_B.json");
     }
     else
     {
@@ -187,12 +187,12 @@ int main(int argc, char *argv[])
         if (strcmp(argv[1], "A") == 0)
         {
             topology        = ot::Nexus::kTopologyA;
-            defaultJsonFile = "test_6_2_1_A.json";
+            defaultJsonFile = "test_1_1_6_2_1_A.json";
         }
         else if (strcmp(argv[1], "B") == 0)
         {
             topology        = ot::Nexus::kTopologyB;
-            defaultJsonFile = "test_6_2_1_B.json";
+            defaultJsonFile = "test_1_1_6_2_1_B.json";
         }
         else
         {
diff --git a/tests/nexus/test_6_2_2.cpp b/tests/nexus/test_1_1_6_2_2.cpp
similarity index 97%
rename from tests/nexus/test_6_2_2.cpp
rename to tests/nexus/test_1_1_6_2_2.cpp
index d6d330ced..6aac01752 100644
--- a/tests/nexus/test_6_2_2.cpp
+++ b/tests/nexus/test_1_1_6_2_2.cpp
@@ -287,16 +287,16 @@ int main(int argc, char *argv[])
 {
     if (argc < 2)
     {
-        ot::Nexus::RunTest_6_2_2(ot::Nexus::kTopologyA, "test_6_2_2_A.json");
-        ot::Nexus::RunTest_6_2_2(ot::Nexus::kTopologyB, "test_6_2_2_B.json");
+        ot::Nexus::RunTest_6_2_2(ot::Nexus::kTopologyA, "test_1_1_6_2_2_A.json");
+        ot::Nexus::RunTest_6_2_2(ot::Nexus::kTopologyB, "test_1_1_6_2_2_B.json");
     }
     else if (strcmp(argv[1], "A") == 0)
     {
-        ot::Nexus::RunTest_6_2_2(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_6_2_2_A.json");
+        ot::Nexus::RunTest_6_2_2(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_1_1_6_2_2_A.json");
     }
     else if (strcmp(argv[1], "B") == 0)
     {
-        ot::Nexus::RunTest_6_2_2(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_6_2_2_B.json");
+        ot::Nexus::RunTest_6_2_2(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_1_1_6_2_2_B.json");
     }
     else
     {
diff --git a/tests/nexus/test_6_3_1.cpp b/tests/nexus/test_1_1_6_3_1.cpp
similarity index 97%
rename from tests/nexus/test_6_3_1.cpp
rename to tests/nexus/test_1_1_6_3_1.cpp
index 7572782b0..7c1ac95cc 100644
--- a/tests/nexus/test_6_3_1.cpp
+++ b/tests/nexus/test_1_1_6_3_1.cpp
@@ -278,16 +278,16 @@ int main(int argc, char *argv[])
 {
     if (argc < 2)
     {
-        ot::Nexus::RunTest6_3_1(ot::Nexus::kTopologyA, "test_6_3_1_A.json");
-        ot::Nexus::RunTest6_3_1(ot::Nexus::kTopologyB, "test_6_3_1_B.json");
+        ot::Nexus::RunTest6_3_1(ot::Nexus::kTopologyA, "test_1_1_6_3_1_A.json");
+        ot::Nexus::RunTest6_3_1(ot::Nexus::kTopologyB, "test_1_1_6_3_1_B.json");
     }
     else if (strcmp(argv[1], "A") == 0)
     {
-        ot::Nexus::RunTest6_3_1(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_6_3_1_A.json");
+        ot::Nexus::RunTest6_3_1(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_1_1_6_3_1_A.json");
     }
     else if (strcmp(argv[1], "B") == 0)
     {
-        ot::Nexus::RunTest6_3_1(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_6_3_1_B.json");
+        ot::Nexus::RunTest6_3_1(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_1_1_6_3_1_B.json");
     }
     else
     {
diff --git a/tests/nexus/test_6_3_2.cpp b/tests/nexus/test_1_1_6_3_2.cpp
similarity index 98%
rename from tests/nexus/test_6_3_2.cpp
rename to tests/nexus/test_1_1_6_3_2.cpp
index 811886578..088f93ada 100644
--- a/tests/nexus/test_6_3_2.cpp
+++ b/tests/nexus/test_1_1_6_3_2.cpp
@@ -315,16 +315,16 @@ int main(int argc, char *argv[])
 {
     if (argc < 2)
     {
-        ot::Nexus::RunTest6_3_2(ot::Nexus::kTopologyA, "test_6_3_2_A.json");
-        ot::Nexus::RunTest6_3_2(ot::Nexus::kTopologyB, "test_6_3_2_B.json");
+        ot::Nexus::RunTest6_3_2(ot::Nexus::kTopologyA, "test_1_1_6_3_2_A.json");
+        ot::Nexus::RunTest6_3_2(ot::Nexus::kTopologyB, "test_1_1_6_3_2_B.json");
     }
     else if (strcmp(argv[1], "A") == 0)
     {
-        ot::Nexus::RunTest6_3_2(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_6_3_2_A.json");
+        ot::Nexus::RunTest6_3_2(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_1_1_6_3_2_A.json");
     }
     else if (strcmp(argv[1], "B") == 0)
     {
-        ot::Nexus::RunTest6_3_2(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_6_3_2_B.json");
+        ot::Nexus::RunTest6_3_2(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_1_1_6_3_2_B.json");
     }
     else
     {
diff --git a/tests/nexus/test_6_4_1.cpp b/tests/nexus/test_1_1_6_4_1.cpp
similarity index 98%
rename from tests/nexus/test_6_4_1.cpp
rename to tests/nexus/test_1_1_6_4_1.cpp
index fb2fe3a8d..700d7adaf 100644
--- a/tests/nexus/test_6_4_1.cpp
+++ b/tests/nexus/test_1_1_6_4_1.cpp
@@ -245,15 +245,15 @@ int main(int argc, char *argv[])
 {
     if (argc < 2)
     {
-        ot::Nexus::RunTest6_4_1(ot::Nexus::kTopologyB, "test_6_4_1.json");
+        ot::Nexus::RunTest6_4_1(ot::Nexus::kTopologyB, "test_1_1_6_4_1.json");
     }
     else if (strcmp(argv[1], "A") == 0)
     {
-        ot::Nexus::RunTest6_4_1(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_6_4_1.json");
+        ot::Nexus::RunTest6_4_1(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_1_1_6_4_1.json");
     }
     else if (strcmp(argv[1], "B") == 0)
     {
-        ot::Nexus::RunTest6_4_1(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_6_4_1.json");
+        ot::Nexus::RunTest6_4_1(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_1_1_6_4_1.json");
     }
     else
     {
diff --git a/tests/nexus/test_6_4_2.cpp b/tests/nexus/test_1_1_6_4_2.cpp
similarity index 97%
rename from tests/nexus/test_6_4_2.cpp
rename to tests/nexus/test_1_1_6_4_2.cpp
index 36637034a..1d42564cf 100644
--- a/tests/nexus/test_6_4_2.cpp
+++ b/tests/nexus/test_1_1_6_4_2.cpp
@@ -242,16 +242,16 @@ int main(int argc, char *argv[])
     if (argc < 2)
     {
         // If no argument, run both topologies.
-        ot::Nexus::RunTest6_4_2(ot::Nexus::kTopologyA, "test_6_4_2_A.json");
-        ot::Nexus::RunTest6_4_2(ot::Nexus::kTopologyB, "test_6_4_2_B.json");
+        ot::Nexus::RunTest6_4_2(ot::Nexus::kTopologyA, "test_1_1_6_4_2_A.json");
+        ot::Nexus::RunTest6_4_2(ot::Nexus::kTopologyB, "test_1_1_6_4_2_B.json");
     }
     else if (strcmp(argv[1], "A") == 0)
     {
-        ot::Nexus::RunTest6_4_2(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_6_4_2_A.json");
+        ot::Nexus::RunTest6_4_2(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_1_1_6_4_2_A.json");
     }
     else if (strcmp(argv[1], "B") == 0)
     {
-        ot::Nexus::RunTest6_4_2(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_6_4_2_B.json");
+        ot::Nexus::RunTest6_4_2(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_1_1_6_4_2_B.json");
     }
     else
     {
diff --git a/tests/nexus/test_6_5_1.cpp b/tests/nexus/test_1_1_6_5_1.cpp
similarity index 96%
rename from tests/nexus/test_6_5_1.cpp
rename to tests/nexus/test_1_1_6_5_1.cpp
index e773b68f9..70f68085b 100644
--- a/tests/nexus/test_6_5_1.cpp
+++ b/tests/nexus/test_1_1_6_5_1.cpp
@@ -218,16 +218,16 @@ int main(int argc, char *argv[])
 {
     if (argc < 2)
     {
-        ot::Nexus::RunTest6_5_1(ot::Nexus::kTopologyA, "test_6_5_1_A.json");
-        ot::Nexus::RunTest6_5_1(ot::Nexus::kTopologyB, "test_6_5_1_B.json");
+        ot::Nexus::RunTest6_5_1(ot::Nexus::kTopologyA, "test_1_1_6_5_1_A.json");
+        ot::Nexus::RunTest6_5_1(ot::Nexus::kTopologyB, "test_1_1_6_5_1_B.json");
     }
     else if (strcmp(argv[1], "A") == 0)
     {
-        ot::Nexus::RunTest6_5_1(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_6_5_1_A.json");
+        ot::Nexus::RunTest6_5_1(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_1_1_6_5_1_A.json");
     }
     else if (strcmp(argv[1], "B") == 0)
     {
-        ot::Nexus::RunTest6_5_1(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_6_5_1_B.json");
+        ot::Nexus::RunTest6_5_1(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_1_1_6_5_1_B.json");
     }
     else
     {
diff --git a/tests/nexus/test_6_5_2.cpp b/tests/nexus/test_1_1_6_5_2.cpp
similarity index 97%
rename from tests/nexus/test_6_5_2.cpp
rename to tests/nexus/test_1_1_6_5_2.cpp
index cdae2f34c..144b8782e 100644
--- a/tests/nexus/test_6_5_2.cpp
+++ b/tests/nexus/test_1_1_6_5_2.cpp
@@ -266,16 +266,16 @@ int main(int argc, char *argv[])
 {
     if (argc < 2)
     {
-        ot::Nexus::RunTest_6_5_2(ot::Nexus::kTopologyA, "test_6_5_2_A.json");
-        ot::Nexus::RunTest_6_5_2(ot::Nexus::kTopologyB, "test_6_5_2_B.json");
+        ot::Nexus::RunTest_6_5_2(ot::Nexus::kTopologyA, "test_1_1_6_5_2_A.json");
+        ot::Nexus::RunTest_6_5_2(ot::Nexus::kTopologyB, "test_1_1_6_5_2_B.json");
     }
     else if (strcmp(argv[1], "A") == 0)
     {
-        ot::Nexus::RunTest_6_5_2(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_6_5_2_A.json");
+        ot::Nexus::RunTest_6_5_2(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_1_1_6_5_2_A.json");
     }
     else if (strcmp(argv[1], "B") == 0)
     {
-        ot::Nexus::RunTest_6_5_2(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_6_5_2_B.json");
+        ot::Nexus::RunTest_6_5_2(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_1_1_6_5_2_B.json");
     }
     else
     {
diff --git a/tests/nexus/test_6_5_3.cpp b/tests/nexus/test_1_1_6_5_3.cpp
similarity index 96%
rename from tests/nexus/test_6_5_3.cpp
rename to tests/nexus/test_1_1_6_5_3.cpp
index f0ea46c55..df3aa352b 100644
--- a/tests/nexus/test_6_5_3.cpp
+++ b/tests/nexus/test_1_1_6_5_3.cpp
@@ -229,16 +229,16 @@ int main(int argc, char *argv[])
 {
     if (argc < 2)
     {
-        ot::Nexus::RunTest6_5_3(ot::Nexus::kTopologyA, "test_6_5_3_A.json");
-        ot::Nexus::RunTest6_5_3(ot::Nexus::kTopologyB, "test_6_5_3_B.json");
+        ot::Nexus::RunTest6_5_3(ot::Nexus::kTopologyA, "test_1_1_6_5_3_A.json");
+        ot::Nexus::RunTest6_5_3(ot::Nexus::kTopologyB, "test_1_1_6_5_3_B.json");
     }
     else if (strcmp(argv[1], "A") == 0)
     {
-        ot::Nexus::RunTest6_5_3(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_6_5_3_A.json");
+        ot::Nexus::RunTest6_5_3(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_1_1_6_5_3_A.json");
     }
     else if (strcmp(argv[1], "B") == 0)
     {
-        ot::Nexus::RunTest6_5_3(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_6_5_3_B.json");
+        ot::Nexus::RunTest6_5_3(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_1_1_6_5_3_B.json");
     }
     else
     {
diff --git a/tests/nexus/test_6_6_1.cpp b/tests/nexus/test_1_1_6_6_1.cpp
similarity index 97%
rename from tests/nexus/test_6_6_1.cpp
rename to tests/nexus/test_1_1_6_6_1.cpp
index 406584fed..7ad4bbf3b 100644
--- a/tests/nexus/test_6_6_1.cpp
+++ b/tests/nexus/test_1_1_6_6_1.cpp
@@ -242,16 +242,16 @@ int main(int argc, char *argv[])
 {
     if (argc < 2)
     {
-        ot::Nexus::RunTest6_6_1(ot::Nexus::kTopologyA, "test_6_6_1_A.json");
-        ot::Nexus::RunTest6_6_1(ot::Nexus::kTopologyB, "test_6_6_1_B.json");
+        ot::Nexus::RunTest6_6_1(ot::Nexus::kTopologyA, "test_1_1_6_6_1_A.json");
+        ot::Nexus::RunTest6_6_1(ot::Nexus::kTopologyB, "test_1_1_6_6_1_B.json");
     }
     else if (strcmp(argv[1], "A") == 0)
     {
-        ot::Nexus::RunTest6_6_1(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_6_6_1_A.json");
+        ot::Nexus::RunTest6_6_1(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_1_1_6_6_1_A.json");
     }
     else if (strcmp(argv[1], "B") == 0)
     {
-        ot::Nexus::RunTest6_6_1(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_6_6_1_B.json");
+        ot::Nexus::RunTest6_6_1(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_1_1_6_6_1_B.json");
     }
     else
     {
diff --git a/tests/nexus/test_6_6_2.cpp b/tests/nexus/test_1_1_6_6_2.cpp
similarity index 97%
rename from tests/nexus/test_6_6_2.cpp
rename to tests/nexus/test_1_1_6_6_2.cpp
index 15a686dd7..fac5569de 100644
--- a/tests/nexus/test_6_6_2.cpp
+++ b/tests/nexus/test_1_1_6_6_2.cpp
@@ -243,16 +243,16 @@ int main(int argc, char *argv[])
 {
     if (argc < 2)
     {
-        ot::Nexus::RunTest6_6_2(ot::Nexus::kTopologyA, "test_6_6_2_A.json");
-        ot::Nexus::RunTest6_6_2(ot::Nexus::kTopologyB, "test_6_6_2_B.json");
+        ot::Nexus::RunTest6_6_2(ot::Nexus::kTopologyA, "test_1_1_6_6_2_A.json");
+        ot::Nexus::RunTest6_6_2(ot::Nexus::kTopologyB, "test_1_1_6_6_2_B.json");
     }
     else if (strcmp(argv[1], "A") == 0)
     {
-        ot::Nexus::RunTest6_6_2(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_6_6_2_A.json");
+        ot::Nexus::RunTest6_6_2(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_1_1_6_6_2_A.json");
     }
     else if (strcmp(argv[1], "B") == 0)
     {
-        ot::Nexus::RunTest6_6_2(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_6_6_2_B.json");
+        ot::Nexus::RunTest6_6_2(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_1_1_6_6_2_B.json");
     }
     else
     {
diff --git a/tests/nexus/test_7_1_1.cpp b/tests/nexus/test_1_1_7_1_1.cpp
similarity index 99%
rename from tests/nexus/test_7_1_1.cpp
rename to tests/nexus/test_1_1_7_1_1.cpp
index 498127dbc..a9f239a30 100644
--- a/tests/nexus/test_7_1_1.cpp
+++ b/tests/nexus/test_1_1_7_1_1.cpp
@@ -235,7 +235,7 @@ void Test7_1_1(const char *aJsonFile)
 
 int main(int argc, char *argv[])
 {
-    ot::Nexus::Test7_1_1((argc > 2) ? argv[2] : "test_7_1_1.json");
+    ot::Nexus::Test7_1_1((argc > 2) ? argv[2] : "test_1_1_7_1_1.json");
     printf("All tests passed\n");
     return 0;
 }
diff --git a/tests/nexus/test_7_1_2.cpp b/tests/nexus/test_1_1_7_1_2.cpp
similarity index 99%
rename from tests/nexus/test_7_1_2.cpp
rename to tests/nexus/test_1_1_7_1_2.cpp
index b13f3ceae..d586d2c51 100644
--- a/tests/nexus/test_7_1_2.cpp
+++ b/tests/nexus/test_1_1_7_1_2.cpp
@@ -247,7 +247,7 @@ void Test7_1_2(void)
     Log("Step 10: Leader (DUT)");
     nexus.AdvanceTime(kStabilizationTime);
 
-    nexus.SaveTestInfo("test_7_1_2.json");
+    nexus.SaveTestInfo("test_1_1_7_1_2.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_7_1_3.cpp b/tests/nexus/test_1_1_7_1_3.cpp
similarity index 99%
rename from tests/nexus/test_7_1_3.cpp
rename to tests/nexus/test_1_1_7_1_3.cpp
index 8dbc9b4ae..134a2d13a 100644
--- a/tests/nexus/test_7_1_3.cpp
+++ b/tests/nexus/test_1_1_7_1_3.cpp
@@ -237,7 +237,7 @@ void Test7_1_3(const char *aJsonFile)
 
 int main(int argc, char *argv[])
 {
-    ot::Nexus::Test7_1_3((argc > 2) ? argv[2] : "test_7_1_3.json");
+    ot::Nexus::Test7_1_3((argc > 2) ? argv[2] : "test_1_1_7_1_3.json");
     printf("All tests passed\n");
     return 0;
 }
diff --git a/tests/nexus/test_7_1_4.cpp b/tests/nexus/test_1_1_7_1_4.cpp
similarity index 99%
rename from tests/nexus/test_7_1_4.cpp
rename to tests/nexus/test_1_1_7_1_4.cpp
index cff301dbd..0dc1ec08c 100644
--- a/tests/nexus/test_7_1_4.cpp
+++ b/tests/nexus/test_1_1_7_1_4.cpp
@@ -242,7 +242,7 @@ void Test7_1_4(const char *aJsonFile)
 
 int main(int argc, char *argv[])
 {
-    ot::Nexus::Test7_1_4((argc > 2) ? argv[2] : "test_7_1_4.json");
+    ot::Nexus::Test7_1_4((argc > 2) ? argv[2] : "test_1_1_7_1_4.json");
     printf("All tests passed\n");
     return 0;
 }
diff --git a/tests/nexus/test_7_1_5.cpp b/tests/nexus/test_1_1_7_1_5.cpp
similarity index 99%
rename from tests/nexus/test_7_1_5.cpp
rename to tests/nexus/test_1_1_7_1_5.cpp
index 206823ad4..11b93b993 100644
--- a/tests/nexus/test_7_1_5.cpp
+++ b/tests/nexus/test_1_1_7_1_5.cpp
@@ -260,7 +260,7 @@ void Test7_1_5(void)
 
     nexus.AdvanceTime(kStabilizationTime);
 
-    nexus.SaveTestInfo("test_7_1_5.json");
+    nexus.SaveTestInfo("test_1_1_7_1_5.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_7_1_6.cpp b/tests/nexus/test_1_1_7_1_6.cpp
similarity index 99%
rename from tests/nexus/test_7_1_6.cpp
rename to tests/nexus/test_1_1_7_1_6.cpp
index 4779f8b30..9da6bb0d7 100644
--- a/tests/nexus/test_7_1_6.cpp
+++ b/tests/nexus/test_1_1_7_1_6.cpp
@@ -457,7 +457,7 @@ void Test7_1_6(void)
         nexus.AdvanceTime(kSedEchoResponseDelay);
     }
 
-    nexus.SaveTestInfo("test_7_1_6.json");
+    nexus.SaveTestInfo("test_1_1_7_1_6.json");
 }
 
 } /* namespace Nexus */
diff --git a/tests/nexus/test_7_1_7.cpp b/tests/nexus/test_1_1_7_1_7.cpp
similarity index 99%
rename from tests/nexus/test_7_1_7.cpp
rename to tests/nexus/test_1_1_7_1_7.cpp
index d29dead7c..fd4f05a24 100644
--- a/tests/nexus/test_7_1_7.cpp
+++ b/tests/nexus/test_1_1_7_1_7.cpp
@@ -551,7 +551,7 @@ void Test7_1_7(const char *aJsonFile)
 
 int main(int argc, char *argv[])
 {
-    ot::Nexus::Test7_1_7((argc > 2) ? argv[2] : "test_7_1_7.json");
+    ot::Nexus::Test7_1_7((argc > 2) ? argv[2] : "test_1_1_7_1_7.json");
     printf("All tests passed\n");
     return 0;
 }
diff --git a/tests/nexus/test_7_1_8.cpp b/tests/nexus/test_1_1_7_1_8.cpp
similarity index 99%
rename from tests/nexus/test_7_1_8.cpp
rename to tests/nexus/test_1_1_7_1_8.cpp
index 3cc42e540..d070a6a62 100644
--- a/tests/nexus/test_7_1_8.cpp
+++ b/tests/nexus/test_1_1_7_1_8.cpp
@@ -247,7 +247,7 @@ void Test7_1_8(const char *aJsonFile)
 
 int main(int argc, char *argv[])
 {
-    ot::Nexus::Test7_1_8((argc > 2) ? argv[2] : "test_7_1_8.json");
+    ot::Nexus::Test7_1_8((argc > 2) ? argv[2] : "test_1_1_7_1_8.json");
     printf("All tests passed\n");
     return 0;
 }
diff --git a/tests/nexus/test_9_2_1.cpp b/tests/nexus/test_1_1_9_2_1.cpp
similarity index 98%
rename from tests/nexus/test_9_2_1.cpp
rename to tests/nexus/test_1_1_9_2_1.cpp
index 3a8f0f047..3acf9f922 100644
--- a/tests/nexus/test_9_2_1.cpp
+++ b/tests/nexus/test_1_1_9_2_1.cpp
@@ -308,16 +308,16 @@ int main(int argc, char *argv[])
 {
     if (argc < 2)
     {
-        ot::Nexus::RunTest9_2_1(ot::Nexus::kTopologyA, "test_9_2_1_A.json");
-        ot::Nexus::RunTest9_2_1(ot::Nexus::kTopologyB, "test_9_2_1_B.json");
+        ot::Nexus::RunTest9_2_1(ot::Nexus::kTopologyA, "test_1_1_9_2_1_A.json");
+        ot::Nexus::RunTest9_2_1(ot::Nexus::kTopologyB, "test_1_1_9_2_1_B.json");
     }
     else if (strcmp(argv[1], "A") == 0)
     {
-        ot::Nexus::RunTest9_2_1(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_9_2_1_A.json");
+        ot::Nexus::RunTest9_2_1(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_1_1_9_2_1_A.json");
     }
     else if (strcmp(argv[1], "B") == 0)
     {
-        ot::Nexus::RunTest9_2_1(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_9_2_1_B.json");
+        ot::Nexus::RunTest9_2_1(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_1_1_9_2_1_B.json");
     }
     else
     {
diff --git a/tests/nexus/test_9_2_10.cpp b/tests/nexus/test_1_1_9_2_10.cpp
similarity index 99%
rename from tests/nexus/test_9_2_10.cpp
rename to tests/nexus/test_1_1_9_2_10.cpp
index 439a991aa..5342e1ee2 100644
--- a/tests/nexus/test_9_2_10.cpp
+++ b/tests/nexus/test_1_1_9_2_10.cpp
@@ -597,7 +597,7 @@ void Test9_2_10(void)
 
     nexus.SendAndVerifyEchoRequest(leader, router1.Get<Mle::Mle>().GetMeshLocalEid(), 0, 64, kEchoTimeout);
 
-    nexus.SaveTestInfo("test_9_2_10.json");
+    nexus.SaveTestInfo("test_1_1_9_2_10.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_9_2_11.cpp b/tests/nexus/test_1_1_9_2_11.cpp
similarity index 99%
rename from tests/nexus/test_9_2_11.cpp
rename to tests/nexus/test_1_1_9_2_11.cpp
index 8a7d8502b..8a830183c 100644
--- a/tests/nexus/test_9_2_11.cpp
+++ b/tests/nexus/test_1_1_9_2_11.cpp
@@ -571,7 +571,7 @@ void Test9_2_11(void)
 
     nexus.AdvanceTime(kResponseTime * 5); // Added extra wait at the very end
 
-    nexus.SaveTestInfo("test_9_2_11.json");
+    nexus.SaveTestInfo("test_1_1_9_2_11.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_9_2_12.cpp b/tests/nexus/test_1_1_9_2_12.cpp
similarity index 99%
rename from tests/nexus/test_9_2_12.cpp
rename to tests/nexus/test_1_1_9_2_12.cpp
index 2a268b15e..c5e9cea6a 100644
--- a/tests/nexus/test_9_2_12.cpp
+++ b/tests/nexus/test_1_1_9_2_12.cpp
@@ -310,7 +310,7 @@ void Test9_2_12(void)
     nexus.SendAndVerifyEchoRequest(leader1, leader2.Get<Mle::Mle>().GetMeshLocalEid(), 0, 64, kEchoTimeout);
     nexus.SendAndVerifyEchoRequest(leader1, med1.Get<Mle::Mle>().GetMeshLocalEid(), 0, 64, kEchoTimeout);
 
-    nexus.SaveTestInfo("test_9_2_12.json");
+    nexus.SaveTestInfo("test_1_1_9_2_12.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_9_2_13.cpp b/tests/nexus/test_1_1_9_2_13.cpp
similarity index 99%
rename from tests/nexus/test_9_2_13.cpp
rename to tests/nexus/test_1_1_9_2_13.cpp
index 5e136bfad..d481595f8 100644
--- a/tests/nexus/test_9_2_13.cpp
+++ b/tests/nexus/test_1_1_9_2_13.cpp
@@ -312,7 +312,7 @@ void Test9_2_13(void)
 
     nexus.SendAndVerifyEchoRequest(commissioner, router1.Get<Mle::Mle>().GetMeshLocalEid(), 0, 64, kEchoTimeout);
 
-    nexus.SaveTestInfo("test_9_2_13.json", &leader1);
+    nexus.SaveTestInfo("test_1_1_9_2_13.json", &leader1);
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_9_2_14.cpp b/tests/nexus/test_1_1_9_2_14.cpp
similarity index 99%
rename from tests/nexus/test_9_2_14.cpp
rename to tests/nexus/test_1_1_9_2_14.cpp
index ee1cc919a..a518b1e25 100644
--- a/tests/nexus/test_9_2_14.cpp
+++ b/tests/nexus/test_1_1_9_2_14.cpp
@@ -258,7 +258,7 @@ void Test9_2_14(void)
 
     nexus.SendAndVerifyEchoRequest(commissioner, router1.Get<Mle::Mle>().GetMeshLocalEid(), 0, 64, kEchoTimeout);
 
-    nexus.SaveTestInfo("test_9_2_14.json");
+    nexus.SaveTestInfo("test_1_1_9_2_14.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_9_2_15.cpp b/tests/nexus/test_1_1_9_2_15.cpp
similarity index 99%
rename from tests/nexus/test_9_2_15.cpp
rename to tests/nexus/test_1_1_9_2_15.cpp
index b23750ea8..747fc5ae8 100644
--- a/tests/nexus/test_9_2_15.cpp
+++ b/tests/nexus/test_1_1_9_2_15.cpp
@@ -563,7 +563,7 @@ void Test9_2_15(void)
     nexus.SendAndVerifyEchoRequest(commissioner, dut.Get<Mle::Mle>().GetMeshLocalEid(), kEchoPayloadSize, kEchoHopLimit,
                                    kEchoTimeout);
 
-    nexus.SaveTestInfo("test_9_2_15.json");
+    nexus.SaveTestInfo("test_1_1_9_2_15.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_9_2_16.cpp b/tests/nexus/test_1_1_9_2_16.cpp
similarity index 99%
rename from tests/nexus/test_9_2_16.cpp
rename to tests/nexus/test_1_1_9_2_16.cpp
index 138cffda0..f95388a11 100644
--- a/tests/nexus/test_9_2_16.cpp
+++ b/tests/nexus/test_1_1_9_2_16.cpp
@@ -647,7 +647,7 @@ void Test9_2_16(void)
 
     nexus.SendAndVerifyEchoRequest(commissioner, router2.Get<Mle::Mle>().GetMeshLocalEid(), 0, 64, kEchoTimeout);
 
-    nexus.SaveTestInfo("test_9_2_16.json");
+    nexus.SaveTestInfo("test_1_1_9_2_16.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_9_2_17.cpp b/tests/nexus/test_1_1_9_2_17.cpp
similarity index 99%
rename from tests/nexus/test_9_2_17.cpp
rename to tests/nexus/test_1_1_9_2_17.cpp
index c7a628871..21d86fa5b 100644
--- a/tests/nexus/test_9_2_17.cpp
+++ b/tests/nexus/test_1_1_9_2_17.cpp
@@ -329,7 +329,7 @@ void Test9_2_17(void)
 
     nexus.SendAndVerifyEchoRequest(leader2, dut.Get<Mle::Mle>().GetMeshLocalEid(), 0, 64, kEchoTimeout);
 
-    nexus.SaveTestInfo("test_9_2_17.json");
+    nexus.SaveTestInfo("test_1_1_9_2_17.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_9_2_18.cpp b/tests/nexus/test_1_1_9_2_18.cpp
similarity index 99%
rename from tests/nexus/test_9_2_18.cpp
rename to tests/nexus/test_1_1_9_2_18.cpp
index b95eed534..4606035f6 100644
--- a/tests/nexus/test_9_2_18.cpp
+++ b/tests/nexus/test_1_1_9_2_18.cpp
@@ -517,7 +517,7 @@ void Test9_2_18(void)
     commissioner.SendEchoRequest(leader.Get<Mle::Mle>().GetMeshLocalEid(), 0);
     nexus.AdvanceTime(kStabilizationTime);
 
-    nexus.SaveTestInfo("test_9_2_18.json");
+    nexus.SaveTestInfo("test_1_1_9_2_18.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_9_2_19.cpp b/tests/nexus/test_1_1_9_2_19.cpp
similarity index 98%
rename from tests/nexus/test_9_2_19.cpp
rename to tests/nexus/test_1_1_9_2_19.cpp
index 296d94200..f1a3967a2 100644
--- a/tests/nexus/test_9_2_19.cpp
+++ b/tests/nexus/test_1_1_9_2_19.cpp
@@ -378,16 +378,16 @@ int main(int argc, char *argv[])
 {
     if (argc < 2)
     {
-        ot::Nexus::RunTest9_2_19(ot::Nexus::kTopologyA, "test_9_2_19_A.json");
-        ot::Nexus::RunTest9_2_19(ot::Nexus::kTopologyB, "test_9_2_19_B.json");
+        ot::Nexus::RunTest9_2_19(ot::Nexus::kTopologyA, "test_1_1_9_2_19_A.json");
+        ot::Nexus::RunTest9_2_19(ot::Nexus::kTopologyB, "test_1_1_9_2_19_B.json");
     }
     else if (strcmp(argv[1], "A") == 0)
     {
-        ot::Nexus::RunTest9_2_19(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_9_2_19_A.json");
+        ot::Nexus::RunTest9_2_19(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_1_1_9_2_19_A.json");
     }
     else if (strcmp(argv[1], "B") == 0)
     {
-        ot::Nexus::RunTest9_2_19(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_9_2_19_B.json");
+        ot::Nexus::RunTest9_2_19(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_1_1_9_2_19_B.json");
     }
     else
     {
diff --git a/tests/nexus/test_9_2_2.cpp b/tests/nexus/test_1_1_9_2_2.cpp
similarity index 99%
rename from tests/nexus/test_9_2_2.cpp
rename to tests/nexus/test_1_1_9_2_2.cpp
index e86c4f946..9fbe44630 100644
--- a/tests/nexus/test_9_2_2.cpp
+++ b/tests/nexus/test_1_1_9_2_2.cpp
@@ -360,7 +360,7 @@ void Test9_2_2(void)
     nexus.SendAndVerifyEchoRequest(commissioner, leader.Get<Mle::Mle>().GetMeshLocalEid());
     nexus.AdvanceTime(kResponseTimeout);
 
-    nexus.SaveTestInfo("test_9_2_2.json");
+    nexus.SaveTestInfo("test_1_1_9_2_2.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_9_2_3.cpp b/tests/nexus/test_1_1_9_2_3.cpp
similarity index 98%
rename from tests/nexus/test_9_2_3.cpp
rename to tests/nexus/test_1_1_9_2_3.cpp
index efe71c692..f0230eb98 100644
--- a/tests/nexus/test_9_2_3.cpp
+++ b/tests/nexus/test_1_1_9_2_3.cpp
@@ -288,16 +288,16 @@ int main(int argc, char *argv[])
 {
     if (argc < 2)
     {
-        ot::Nexus::RunTest9_2_3(ot::Nexus::kTopologyA, "test_9_2_3_A.json");
-        ot::Nexus::RunTest9_2_3(ot::Nexus::kTopologyB, "test_9_2_3_B.json");
+        ot::Nexus::RunTest9_2_3(ot::Nexus::kTopologyA, "test_1_1_9_2_3_A.json");
+        ot::Nexus::RunTest9_2_3(ot::Nexus::kTopologyB, "test_1_1_9_2_3_B.json");
     }
     else if (strcmp(argv[1], "A") == 0)
     {
-        ot::Nexus::RunTest9_2_3(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_9_2_3_A.json");
+        ot::Nexus::RunTest9_2_3(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_1_1_9_2_3_A.json");
     }
     else if (strcmp(argv[1], "B") == 0)
     {
-        ot::Nexus::RunTest9_2_3(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_9_2_3_B.json");
+        ot::Nexus::RunTest9_2_3(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_1_1_9_2_3_B.json");
     }
     else
     {
diff --git a/tests/nexus/test_9_2_4.cpp b/tests/nexus/test_1_1_9_2_4.cpp
similarity index 99%
rename from tests/nexus/test_9_2_4.cpp
rename to tests/nexus/test_1_1_9_2_4.cpp
index e5746eb6d..87827de71 100644
--- a/tests/nexus/test_9_2_4.cpp
+++ b/tests/nexus/test_1_1_9_2_4.cpp
@@ -953,16 +953,16 @@ int main(int argc, char *argv[])
 {
     if (argc < 2)
     {
-        ot::Nexus::RunTest9_2_4(ot::Nexus::kTopologyA, "test_9_2_4_A.json");
-        ot::Nexus::RunTest9_2_4(ot::Nexus::kTopologyB, "test_9_2_4_B.json");
+        ot::Nexus::RunTest9_2_4(ot::Nexus::kTopologyA, "test_1_1_9_2_4_A.json");
+        ot::Nexus::RunTest9_2_4(ot::Nexus::kTopologyB, "test_1_1_9_2_4_B.json");
     }
     else if (strcmp(argv[1], "A") == 0)
     {
-        ot::Nexus::RunTest9_2_4(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_9_2_4_A.json");
+        ot::Nexus::RunTest9_2_4(ot::Nexus::kTopologyA, (argc > 2) ? argv[2] : "test_1_1_9_2_4_A.json");
     }
     else if (strcmp(argv[1], "B") == 0)
     {
-        ot::Nexus::RunTest9_2_4(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_9_2_4_B.json");
+        ot::Nexus::RunTest9_2_4(ot::Nexus::kTopologyB, (argc > 2) ? argv[2] : "test_1_1_9_2_4_B.json");
     }
     else
     {
diff --git a/tests/nexus/test_9_2_5.cpp b/tests/nexus/test_1_1_9_2_5.cpp
similarity index 99%
rename from tests/nexus/test_9_2_5.cpp
rename to tests/nexus/test_1_1_9_2_5.cpp
index e9e8c6b2c..2fe73b273 100644
--- a/tests/nexus/test_9_2_5.cpp
+++ b/tests/nexus/test_1_1_9_2_5.cpp
@@ -462,7 +462,7 @@ void Test9_2_5(void)
 
     nexus.SendAndVerifyEchoRequest(router1, leader.Get<Mle::Mle>().GetMeshLocalEid(), 0, 64, kEchoTimeout);
 
-    nexus.SaveTestInfo("test_9_2_5.json");
+    nexus.SaveTestInfo("test_1_1_9_2_5.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_9_2_6.cpp b/tests/nexus/test_1_1_9_2_6.cpp
similarity index 99%
rename from tests/nexus/test_9_2_6.cpp
rename to tests/nexus/test_1_1_9_2_6.cpp
index 038f32cba..495e438ec 100644
--- a/tests/nexus/test_9_2_6.cpp
+++ b/tests/nexus/test_1_1_9_2_6.cpp
@@ -715,7 +715,7 @@ void Test9_2_6(void)
     nexus.SendAndVerifyEchoRequest(commissioner, med1.Get<Mle::Mle>().GetMeshLocalEid(), 0, 64, kEchoTimeout);
     nexus.SendAndVerifyEchoRequest(commissioner, sed1.Get<Mle::Mle>().GetMeshLocalEid(), 0, 64, kEchoTimeout);
 
-    nexus.SaveTestInfo("test_9_2_6.json");
+    nexus.SaveTestInfo("test_1_1_9_2_6.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_9_2_7.cpp b/tests/nexus/test_1_1_9_2_7.cpp
similarity index 99%
rename from tests/nexus/test_9_2_7.cpp
rename to tests/nexus/test_1_1_9_2_7.cpp
index a8d54405b..48de20698 100644
--- a/tests/nexus/test_9_2_7.cpp
+++ b/tests/nexus/test_1_1_9_2_7.cpp
@@ -655,7 +655,7 @@ void Test9_2_7(void)
 
     nexus.SendAndVerifyEchoRequest(router, leader.Get<Mle::Mle>().GetMeshLocalEid(), 0, 0, kEchoTimeout);
 
-    nexus.SaveTestInfo("test_9_2_7.json");
+    nexus.SaveTestInfo("test_1_1_9_2_7.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_9_2_8.cpp b/tests/nexus/test_1_1_9_2_8.cpp
similarity index 99%
rename from tests/nexus/test_9_2_8.cpp
rename to tests/nexus/test_1_1_9_2_8.cpp
index 929bcb4d7..8c3711ff9 100644
--- a/tests/nexus/test_9_2_8.cpp
+++ b/tests/nexus/test_1_1_9_2_8.cpp
@@ -384,7 +384,7 @@ void Test9_2_8(void)
     nexus.SendAndVerifyEchoRequest(commissioner, med1.Get<Mle::Mle>().GetMeshLocalEid());
     nexus.SendAndVerifyEchoRequest(commissioner, sed1.Get<Mle::Mle>().GetMeshLocalEid(), 0, 64, 5000);
 
-    nexus.SaveTestInfo("test_9_2_8.json");
+    nexus.SaveTestInfo("test_1_1_9_2_8.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/test_9_2_9.cpp b/tests/nexus/test_1_1_9_2_9.cpp
similarity index 99%
rename from tests/nexus/test_9_2_9.cpp
rename to tests/nexus/test_1_1_9_2_9.cpp
index 693166f95..103ac2fb4 100644
--- a/tests/nexus/test_9_2_9.cpp
+++ b/tests/nexus/test_1_1_9_2_9.cpp
@@ -952,7 +952,7 @@ void Test9_2_9(void)
     nexus.SendAndVerifyEchoRequest(commissioner, router1.Get<Mle::Mle>().GetMeshLocalEid());
     nexus.SendAndVerifyEchoRequest(router2, leader.Get<Mle::Mle>().GetMeshLocalEid());
 
-    nexus.SaveTestInfo("test_9_2_9.json");
+    nexus.SaveTestInfo("test_1_1_9_2_9.json");
 }
 
 } // namespace Nexus
diff --git a/tests/nexus/verify_5_1_1.py b/tests/nexus/verify_1_1_5_1_1.py
similarity index 100%
rename from tests/nexus/verify_5_1_1.py
rename to tests/nexus/verify_1_1_5_1_1.py
diff --git a/tests/nexus/verify_5_1_10.py b/tests/nexus/verify_1_1_5_1_10.py
similarity index 100%
rename from tests/nexus/verify_5_1_10.py
rename to tests/nexus/verify_1_1_5_1_10.py
diff --git a/tests/nexus/verify_5_1_11.py b/tests/nexus/verify_1_1_5_1_11.py
similarity index 100%
rename from tests/nexus/verify_5_1_11.py
rename to tests/nexus/verify_1_1_5_1_11.py
diff --git a/tests/nexus/verify_5_1_12.py b/tests/nexus/verify_1_1_5_1_12.py
similarity index 100%
rename from tests/nexus/verify_5_1_12.py
rename to tests/nexus/verify_1_1_5_1_12.py
diff --git a/tests/nexus/verify_5_1_13.py b/tests/nexus/verify_1_1_5_1_13.py
similarity index 100%
rename from tests/nexus/verify_5_1_13.py
rename to tests/nexus/verify_1_1_5_1_13.py
diff --git a/tests/nexus/verify_5_1_2.py b/tests/nexus/verify_1_1_5_1_2.py
similarity index 100%
rename from tests/nexus/verify_5_1_2.py
rename to tests/nexus/verify_1_1_5_1_2.py
diff --git a/tests/nexus/verify_5_1_3.py b/tests/nexus/verify_1_1_5_1_3.py
similarity index 100%
rename from tests/nexus/verify_5_1_3.py
rename to tests/nexus/verify_1_1_5_1_3.py
diff --git a/tests/nexus/verify_5_1_4.py b/tests/nexus/verify_1_1_5_1_4.py
similarity index 100%
rename from tests/nexus/verify_5_1_4.py
rename to tests/nexus/verify_1_1_5_1_4.py
diff --git a/tests/nexus/verify_5_1_5.py b/tests/nexus/verify_1_1_5_1_5.py
similarity index 100%
rename from tests/nexus/verify_5_1_5.py
rename to tests/nexus/verify_1_1_5_1_5.py
diff --git a/tests/nexus/verify_5_1_6.py b/tests/nexus/verify_1_1_5_1_6.py
similarity index 100%
rename from tests/nexus/verify_5_1_6.py
rename to tests/nexus/verify_1_1_5_1_6.py
diff --git a/tests/nexus/verify_5_1_7.py b/tests/nexus/verify_1_1_5_1_7.py
similarity index 100%
rename from tests/nexus/verify_5_1_7.py
rename to tests/nexus/verify_1_1_5_1_7.py
diff --git a/tests/nexus/verify_5_1_8.py b/tests/nexus/verify_1_1_5_1_8.py
similarity index 100%
rename from tests/nexus/verify_5_1_8.py
rename to tests/nexus/verify_1_1_5_1_8.py
diff --git a/tests/nexus/verify_5_1_9.py b/tests/nexus/verify_1_1_5_1_9.py
similarity index 100%
rename from tests/nexus/verify_5_1_9.py
rename to tests/nexus/verify_1_1_5_1_9.py
diff --git a/tests/nexus/verify_5_2_1.py b/tests/nexus/verify_1_1_5_2_1.py
similarity index 100%
rename from tests/nexus/verify_5_2_1.py
rename to tests/nexus/verify_1_1_5_2_1.py
diff --git a/tests/nexus/verify_5_2_3.py b/tests/nexus/verify_1_1_5_2_3.py
similarity index 100%
rename from tests/nexus/verify_5_2_3.py
rename to tests/nexus/verify_1_1_5_2_3.py
diff --git a/tests/nexus/verify_5_2_4.py b/tests/nexus/verify_1_1_5_2_4.py
similarity index 100%
rename from tests/nexus/verify_5_2_4.py
rename to tests/nexus/verify_1_1_5_2_4.py
diff --git a/tests/nexus/verify_5_2_5.py b/tests/nexus/verify_1_1_5_2_5.py
similarity index 100%
rename from tests/nexus/verify_5_2_5.py
rename to tests/nexus/verify_1_1_5_2_5.py
diff --git a/tests/nexus/verify_5_2_6.py b/tests/nexus/verify_1_1_5_2_6.py
similarity index 100%
rename from tests/nexus/verify_5_2_6.py
rename to tests/nexus/verify_1_1_5_2_6.py
diff --git a/tests/nexus/verify_5_2_7.py b/tests/nexus/verify_1_1_5_2_7.py
similarity index 100%
rename from tests/nexus/verify_5_2_7.py
rename to tests/nexus/verify_1_1_5_2_7.py
diff --git a/tests/nexus/verify_5_3_1.py b/tests/nexus/verify_1_1_5_3_1.py
similarity index 100%
rename from tests/nexus/verify_5_3_1.py
rename to tests/nexus/verify_1_1_5_3_1.py
diff --git a/tests/nexus/verify_5_3_10.py b/tests/nexus/verify_1_1_5_3_10.py
similarity index 100%
rename from tests/nexus/verify_5_3_10.py
rename to tests/nexus/verify_1_1_5_3_10.py
diff --git a/tests/nexus/verify_5_3_11.py b/tests/nexus/verify_1_1_5_3_11.py
similarity index 100%
rename from tests/nexus/verify_5_3_11.py
rename to tests/nexus/verify_1_1_5_3_11.py
diff --git a/tests/nexus/verify_5_3_2.py b/tests/nexus/verify_1_1_5_3_2.py
similarity index 100%
rename from tests/nexus/verify_5_3_2.py
rename to tests/nexus/verify_1_1_5_3_2.py
diff --git a/tests/nexus/verify_5_3_3.py b/tests/nexus/verify_1_1_5_3_3.py
similarity index 100%
rename from tests/nexus/verify_5_3_3.py
rename to tests/nexus/verify_1_1_5_3_3.py
diff --git a/tests/nexus/verify_5_3_4.py b/tests/nexus/verify_1_1_5_3_4.py
similarity index 100%
rename from tests/nexus/verify_5_3_4.py
rename to tests/nexus/verify_1_1_5_3_4.py
diff --git a/tests/nexus/verify_5_3_5.py b/tests/nexus/verify_1_1_5_3_5.py
similarity index 100%
rename from tests/nexus/verify_5_3_5.py
rename to tests/nexus/verify_1_1_5_3_5.py
diff --git a/tests/nexus/verify_5_3_6.py b/tests/nexus/verify_1_1_5_3_6.py
similarity index 100%
rename from tests/nexus/verify_5_3_6.py
rename to tests/nexus/verify_1_1_5_3_6.py
diff --git a/tests/nexus/verify_5_3_7.py b/tests/nexus/verify_1_1_5_3_7.py
similarity index 100%
rename from tests/nexus/verify_5_3_7.py
rename to tests/nexus/verify_1_1_5_3_7.py
diff --git a/tests/nexus/verify_5_3_8.py b/tests/nexus/verify_1_1_5_3_8.py
similarity index 100%
rename from tests/nexus/verify_5_3_8.py
rename to tests/nexus/verify_1_1_5_3_8.py
diff --git a/tests/nexus/verify_5_3_9.py b/tests/nexus/verify_1_1_5_3_9.py
similarity index 100%
rename from tests/nexus/verify_5_3_9.py
rename to tests/nexus/verify_1_1_5_3_9.py
diff --git a/tests/nexus/verify_5_5_1.py b/tests/nexus/verify_1_1_5_5_1.py
similarity index 100%
rename from tests/nexus/verify_5_5_1.py
rename to tests/nexus/verify_1_1_5_5_1.py
diff --git a/tests/nexus/verify_5_5_2.py b/tests/nexus/verify_1_1_5_5_2.py
similarity index 100%
rename from tests/nexus/verify_5_5_2.py
rename to tests/nexus/verify_1_1_5_5_2.py
diff --git a/tests/nexus/verify_5_5_3.py b/tests/nexus/verify_1_1_5_5_3.py
similarity index 100%
rename from tests/nexus/verify_5_5_3.py
rename to tests/nexus/verify_1_1_5_5_3.py
diff --git a/tests/nexus/verify_5_5_4_1.py b/tests/nexus/verify_1_1_5_5_4_1.py
similarity index 100%
rename from tests/nexus/verify_5_5_4_1.py
rename to tests/nexus/verify_1_1_5_5_4_1.py
diff --git a/tests/nexus/verify_5_5_4_2.py b/tests/nexus/verify_1_1_5_5_4_2.py
similarity index 100%
rename from tests/nexus/verify_5_5_4_2.py
rename to tests/nexus/verify_1_1_5_5_4_2.py
diff --git a/tests/nexus/verify_5_5_5.py b/tests/nexus/verify_1_1_5_5_5.py
similarity index 100%
rename from tests/nexus/verify_5_5_5.py
rename to tests/nexus/verify_1_1_5_5_5.py
diff --git a/tests/nexus/verify_5_5_7.py b/tests/nexus/verify_1_1_5_5_7.py
similarity index 100%
rename from tests/nexus/verify_5_5_7.py
rename to tests/nexus/verify_1_1_5_5_7.py
diff --git a/tests/nexus/verify_5_6_1.py b/tests/nexus/verify_1_1_5_6_1.py
similarity index 100%
rename from tests/nexus/verify_5_6_1.py
rename to tests/nexus/verify_1_1_5_6_1.py
diff --git a/tests/nexus/verify_5_6_2.py b/tests/nexus/verify_1_1_5_6_2.py
similarity index 100%
rename from tests/nexus/verify_5_6_2.py
rename to tests/nexus/verify_1_1_5_6_2.py
diff --git a/tests/nexus/verify_5_6_3.py b/tests/nexus/verify_1_1_5_6_3.py
similarity index 100%
rename from tests/nexus/verify_5_6_3.py
rename to tests/nexus/verify_1_1_5_6_3.py
diff --git a/tests/nexus/verify_5_6_4.py b/tests/nexus/verify_1_1_5_6_4.py
similarity index 100%
rename from tests/nexus/verify_5_6_4.py
rename to tests/nexus/verify_1_1_5_6_4.py
diff --git a/tests/nexus/verify_5_6_5.py b/tests/nexus/verify_1_1_5_6_5.py
similarity index 100%
rename from tests/nexus/verify_5_6_5.py
rename to tests/nexus/verify_1_1_5_6_5.py
diff --git a/tests/nexus/verify_5_6_6.py b/tests/nexus/verify_1_1_5_6_6.py
similarity index 100%
rename from tests/nexus/verify_5_6_6.py
rename to tests/nexus/verify_1_1_5_6_6.py
diff --git a/tests/nexus/verify_5_6_7.py b/tests/nexus/verify_1_1_5_6_7.py
similarity index 100%
rename from tests/nexus/verify_5_6_7.py
rename to tests/nexus/verify_1_1_5_6_7.py
diff --git a/tests/nexus/verify_5_6_9.py b/tests/nexus/verify_1_1_5_6_9.py
similarity index 100%
rename from tests/nexus/verify_5_6_9.py
rename to tests/nexus/verify_1_1_5_6_9.py
diff --git a/tests/nexus/verify_5_7_1.py b/tests/nexus/verify_1_1_5_7_1.py
similarity index 100%
rename from tests/nexus/verify_5_7_1.py
rename to tests/nexus/verify_1_1_5_7_1.py
diff --git a/tests/nexus/verify_5_7_2.py b/tests/nexus/verify_1_1_5_7_2.py
similarity index 100%
rename from tests/nexus/verify_5_7_2.py
rename to tests/nexus/verify_1_1_5_7_2.py
diff --git a/tests/nexus/verify_5_7_3.py b/tests/nexus/verify_1_1_5_7_3.py
similarity index 100%
rename from tests/nexus/verify_5_7_3.py
rename to tests/nexus/verify_1_1_5_7_3.py
diff --git a/tests/nexus/verify_5_8_2.py b/tests/nexus/verify_1_1_5_8_2.py
similarity index 100%
rename from tests/nexus/verify_5_8_2.py
rename to tests/nexus/verify_1_1_5_8_2.py
diff --git a/tests/nexus/verify_5_8_3.py b/tests/nexus/verify_1_1_5_8_3.py
similarity index 100%
rename from tests/nexus/verify_5_8_3.py
rename to tests/nexus/verify_1_1_5_8_3.py
diff --git a/tests/nexus/verify_5_8_4.py b/tests/nexus/verify_1_1_5_8_4.py
similarity index 100%
rename from tests/nexus/verify_5_8_4.py
rename to tests/nexus/verify_1_1_5_8_4.py
diff --git a/tests/nexus/verify_6_1_1.py b/tests/nexus/verify_1_1_6_1_1.py
similarity index 100%
rename from tests/nexus/verify_6_1_1.py
rename to tests/nexus/verify_1_1_6_1_1.py
diff --git a/tests/nexus/verify_6_1_2.py b/tests/nexus/verify_1_1_6_1_2.py
similarity index 100%
rename from tests/nexus/verify_6_1_2.py
rename to tests/nexus/verify_1_1_6_1_2.py
diff --git a/tests/nexus/verify_6_1_3.py b/tests/nexus/verify_1_1_6_1_3.py
similarity index 100%
rename from tests/nexus/verify_6_1_3.py
rename to tests/nexus/verify_1_1_6_1_3.py
diff --git a/tests/nexus/verify_6_1_4.py b/tests/nexus/verify_1_1_6_1_4.py
similarity index 100%
rename from tests/nexus/verify_6_1_4.py
rename to tests/nexus/verify_1_1_6_1_4.py
diff --git a/tests/nexus/verify_6_1_5.py b/tests/nexus/verify_1_1_6_1_5.py
similarity index 100%
rename from tests/nexus/verify_6_1_5.py
rename to tests/nexus/verify_1_1_6_1_5.py
diff --git a/tests/nexus/verify_6_1_6.py b/tests/nexus/verify_1_1_6_1_6.py
similarity index 100%
rename from tests/nexus/verify_6_1_6.py
rename to tests/nexus/verify_1_1_6_1_6.py
diff --git a/tests/nexus/verify_6_1_7.py b/tests/nexus/verify_1_1_6_1_7.py
similarity index 100%
rename from tests/nexus/verify_6_1_7.py
rename to tests/nexus/verify_1_1_6_1_7.py
diff --git a/tests/nexus/verify_6_2_1.py b/tests/nexus/verify_1_1_6_2_1.py
similarity index 100%
rename from tests/nexus/verify_6_2_1.py
rename to tests/nexus/verify_1_1_6_2_1.py
diff --git a/tests/nexus/verify_6_2_2.py b/tests/nexus/verify_1_1_6_2_2.py
similarity index 100%
rename from tests/nexus/verify_6_2_2.py
rename to tests/nexus/verify_1_1_6_2_2.py
diff --git a/tests/nexus/verify_6_3_1.py b/tests/nexus/verify_1_1_6_3_1.py
similarity index 100%
rename from tests/nexus/verify_6_3_1.py
rename to tests/nexus/verify_1_1_6_3_1.py
diff --git a/tests/nexus/verify_6_3_2.py b/tests/nexus/verify_1_1_6_3_2.py
similarity index 100%
rename from tests/nexus/verify_6_3_2.py
rename to tests/nexus/verify_1_1_6_3_2.py
diff --git a/tests/nexus/verify_6_4_1.py b/tests/nexus/verify_1_1_6_4_1.py
similarity index 100%
rename from tests/nexus/verify_6_4_1.py
rename to tests/nexus/verify_1_1_6_4_1.py
diff --git a/tests/nexus/verify_6_4_2.py b/tests/nexus/verify_1_1_6_4_2.py
similarity index 100%
rename from tests/nexus/verify_6_4_2.py
rename to tests/nexus/verify_1_1_6_4_2.py
diff --git a/tests/nexus/verify_6_5_1.py b/tests/nexus/verify_1_1_6_5_1.py
similarity index 100%
rename from tests/nexus/verify_6_5_1.py
rename to tests/nexus/verify_1_1_6_5_1.py
diff --git a/tests/nexus/verify_6_5_2.py b/tests/nexus/verify_1_1_6_5_2.py
similarity index 100%
rename from tests/nexus/verify_6_5_2.py
rename to tests/nexus/verify_1_1_6_5_2.py
diff --git a/tests/nexus/verify_6_5_3.py b/tests/nexus/verify_1_1_6_5_3.py
similarity index 100%
rename from tests/nexus/verify_6_5_3.py
rename to tests/nexus/verify_1_1_6_5_3.py
diff --git a/tests/nexus/verify_6_6_1.py b/tests/nexus/verify_1_1_6_6_1.py
similarity index 100%
rename from tests/nexus/verify_6_6_1.py
rename to tests/nexus/verify_1_1_6_6_1.py
diff --git a/tests/nexus/verify_6_6_2.py b/tests/nexus/verify_1_1_6_6_2.py
similarity index 100%
rename from tests/nexus/verify_6_6_2.py
rename to tests/nexus/verify_1_1_6_6_2.py
diff --git a/tests/nexus/verify_7_1_1.py b/tests/nexus/verify_1_1_7_1_1.py
similarity index 100%
rename from tests/nexus/verify_7_1_1.py
rename to tests/nexus/verify_1_1_7_1_1.py
diff --git a/tests/nexus/verify_7_1_2.py b/tests/nexus/verify_1_1_7_1_2.py
similarity index 100%
rename from tests/nexus/verify_7_1_2.py
rename to tests/nexus/verify_1_1_7_1_2.py
diff --git a/tests/nexus/verify_7_1_3.py b/tests/nexus/verify_1_1_7_1_3.py
similarity index 100%
rename from tests/nexus/verify_7_1_3.py
rename to tests/nexus/verify_1_1_7_1_3.py
diff --git a/tests/nexus/verify_7_1_4.py b/tests/nexus/verify_1_1_7_1_4.py
similarity index 100%
rename from tests/nexus/verify_7_1_4.py
rename to tests/nexus/verify_1_1_7_1_4.py
diff --git a/tests/nexus/verify_7_1_5.py b/tests/nexus/verify_1_1_7_1_5.py
similarity index 100%
rename from tests/nexus/verify_7_1_5.py
rename to tests/nexus/verify_1_1_7_1_5.py
diff --git a/tests/nexus/verify_7_1_6.py b/tests/nexus/verify_1_1_7_1_6.py
similarity index 100%
rename from tests/nexus/verify_7_1_6.py
rename to tests/nexus/verify_1_1_7_1_6.py
diff --git a/tests/nexus/verify_7_1_7.py b/tests/nexus/verify_1_1_7_1_7.py
similarity index 100%
rename from tests/nexus/verify_7_1_7.py
rename to tests/nexus/verify_1_1_7_1_7.py
diff --git a/tests/nexus/verify_7_1_8.py b/tests/nexus/verify_1_1_7_1_8.py
similarity index 100%
rename from tests/nexus/verify_7_1_8.py
rename to tests/nexus/verify_1_1_7_1_8.py
diff --git a/tests/nexus/verify_9_2_1.py b/tests/nexus/verify_1_1_9_2_1.py
similarity index 99%
rename from tests/nexus/verify_9_2_1.py
rename to tests/nexus/verify_1_1_9_2_1.py
index e3be2dbee..d20361e5d 100644
--- a/tests/nexus/verify_9_2_1.py
+++ b/tests/nexus/verify_1_1_9_2_1.py
@@ -214,7 +214,7 @@ def verify(pv):
     # - Description: Verify connectivity by sending an ICMPv6 Echo Request to the DUT mesh local address.
     # - Pass Criteria: The DUT MUST respond with an ICMPv6 Echo Reply.
     print("Step 10: Verify connectivity by sending an ICMPv6 Echo Request to the DUT mesh local address.")
-    if pv.test_info.testcase == 'test_9_2_1_A':
+    if pv.test_info.testcase == 'test_1_1_9_2_1_A':
         src_ext = COMMISSIONER
         dst_addr = pv.vars['LEADER_MLEID']
     else:
@@ -226,7 +226,7 @@ def verify(pv):
         filter_ipv6_dst(dst_addr).\
         must_next()
 
-    if pv.test_info.testcase == 'test_9_2_1_A':
+    if pv.test_info.testcase == 'test_1_1_9_2_1_A':
         requester_addr = pv.vars['COMMISSIONER_MLEID']
     else:
         requester_addr = pv.vars['LEADER_MLEID']
diff --git a/tests/nexus/verify_9_2_10.py b/tests/nexus/verify_1_1_9_2_10.py
similarity index 100%
rename from tests/nexus/verify_9_2_10.py
rename to tests/nexus/verify_1_1_9_2_10.py
diff --git a/tests/nexus/verify_9_2_11.py b/tests/nexus/verify_1_1_9_2_11.py
similarity index 100%
rename from tests/nexus/verify_9_2_11.py
rename to tests/nexus/verify_1_1_9_2_11.py
diff --git a/tests/nexus/verify_9_2_12.py b/tests/nexus/verify_1_1_9_2_12.py
similarity index 100%
rename from tests/nexus/verify_9_2_12.py
rename to tests/nexus/verify_1_1_9_2_12.py
diff --git a/tests/nexus/verify_9_2_13.py b/tests/nexus/verify_1_1_9_2_13.py
similarity index 100%
rename from tests/nexus/verify_9_2_13.py
rename to tests/nexus/verify_1_1_9_2_13.py
diff --git a/tests/nexus/verify_9_2_14.py b/tests/nexus/verify_1_1_9_2_14.py
similarity index 100%
rename from tests/nexus/verify_9_2_14.py
rename to tests/nexus/verify_1_1_9_2_14.py
diff --git a/tests/nexus/verify_9_2_15.py b/tests/nexus/verify_1_1_9_2_15.py
similarity index 100%
rename from tests/nexus/verify_9_2_15.py
rename to tests/nexus/verify_1_1_9_2_15.py
diff --git a/tests/nexus/verify_9_2_16.py b/tests/nexus/verify_1_1_9_2_16.py
similarity index 100%
rename from tests/nexus/verify_9_2_16.py
rename to tests/nexus/verify_1_1_9_2_16.py
diff --git a/tests/nexus/verify_9_2_17.py b/tests/nexus/verify_1_1_9_2_17.py
similarity index 100%
rename from tests/nexus/verify_9_2_17.py
rename to tests/nexus/verify_1_1_9_2_17.py
diff --git a/tests/nexus/verify_9_2_18.py b/tests/nexus/verify_1_1_9_2_18.py
similarity index 100%
rename from tests/nexus/verify_9_2_18.py
rename to tests/nexus/verify_1_1_9_2_18.py
diff --git a/tests/nexus/verify_9_2_19.py b/tests/nexus/verify_1_1_9_2_19.py
similarity index 99%
rename from tests/nexus/verify_9_2_19.py
rename to tests/nexus/verify_1_1_9_2_19.py
index 8520dd3e2..48a19ba8c 100644
--- a/tests/nexus/verify_9_2_19.py
+++ b/tests/nexus/verify_1_1_9_2_19.py
@@ -59,7 +59,7 @@ def verify(pv):
     pkts = pv.pkts
     pv.summary.show()
 
-    IS_DUT_COMMISSIONER = pv.test_info.testcase == 'test_9_2_19_B'
+    IS_DUT_COMMISSIONER = pv.test_info.testcase == 'test_1_1_9_2_19_B'
 
     # Step 1: All
     # - Description: Ensure topology is formed correctly.
diff --git a/tests/nexus/verify_9_2_2.py b/tests/nexus/verify_1_1_9_2_2.py
similarity index 100%
rename from tests/nexus/verify_9_2_2.py
rename to tests/nexus/verify_1_1_9_2_2.py
diff --git a/tests/nexus/verify_9_2_3.py b/tests/nexus/verify_1_1_9_2_3.py
similarity index 100%
rename from tests/nexus/verify_9_2_3.py
rename to tests/nexus/verify_1_1_9_2_3.py
diff --git a/tests/nexus/verify_9_2_4.py b/tests/nexus/verify_1_1_9_2_4.py
similarity index 99%
rename from tests/nexus/verify_9_2_4.py
rename to tests/nexus/verify_1_1_9_2_4.py
index 3e75878a0..52ce52da6 100644
--- a/tests/nexus/verify_9_2_4.py
+++ b/tests/nexus/verify_1_1_9_2_4.py
@@ -442,7 +442,7 @@ def verify(pv):
     # - Description: Verify connectivity by sending an ICMPv6 Echo Request to the DUT mesh local address.
     # - Pass Criteria: The DUT MUST respond with an ICMPv6 Echo Reply.
     print("Step 22: All")
-    if pv.test_info.testcase == 'test_9_2_4_A':
+    if pv.test_info.testcase == 'test_1_1_9_2_4_A':
         src_ext = pv.vars['COMMISSIONER']
         dst_addr = pv.vars['LEADER_MLEID']
         requester_addr = pv.vars['COMMISSIONER_MLEID']
diff --git a/tests/nexus/verify_9_2_5.py b/tests/nexus/verify_1_1_9_2_5.py
similarity index 100%
rename from tests/nexus/verify_9_2_5.py
rename to tests/nexus/verify_1_1_9_2_5.py
diff --git a/tests/nexus/verify_9_2_6.py b/tests/nexus/verify_1_1_9_2_6.py
similarity index 100%
rename from tests/nexus/verify_9_2_6.py
rename to tests/nexus/verify_1_1_9_2_6.py
diff --git a/tests/nexus/verify_9_2_7.py b/tests/nexus/verify_1_1_9_2_7.py
similarity index 100%
rename from tests/nexus/verify_9_2_7.py
rename to tests/nexus/verify_1_1_9_2_7.py
diff --git a/tests/nexus/verify_9_2_8.py b/tests/nexus/verify_1_1_9_2_8.py
similarity index 100%
rename from tests/nexus/verify_9_2_8.py
rename to tests/nexus/verify_1_1_9_2_8.py
diff --git a/tests/nexus/verify_9_2_9.py b/tests/nexus/verify_1_1_9_2_9.py
similarity index 100%
rename from tests/nexus/verify_9_2_9.py
rename to tests/nexus/verify_1_1_9_2_9.py