validation: Derive names from item UIDs

Use the item UID converted to CamelCase for Doxygen group names and
testsuite names.

95 files changed, 78 insertions, 162 deletions

diff --git a/rtemsspec/items.py b/rtemsspec/items.py
index 7e116075..fb4a1d0b 100644
--- a/rtemsspec/items.py
+++ b/rtemsspec/items.py
@@ -29,10 +29,11 @@ import base64
 import hashlib
 import os
 import pickle
+import re
 import string
 import stat
-from typing import Any, Callable, Dict, Iterable, Iterator, List, NamedTuple, \
-    Optional, Set, TextIO, Tuple, Union
+from typing import Any, Callable, Dict, Iterable, Iterator, List, Match, \
+    NamedTuple, Optional, Set, TextIO, Tuple, Union
 import json
 import yaml
 
@@ -180,12 +181,20 @@ def data_digest(data: Any) -> str:
     return base64.urlsafe_b64encode(state.digest()).decode("ascii")
 
 
+_UID_TO_UPPER = re.compile(r"[/_-]+(.)")
+
+
+def _match_to_upper(match: Match) -> str:
+    return match.group(1).upper()
+
+
 class Item:
     """ Objects of this class represent a specification item. """
 
     # pylint: disable=too-many-public-methods
     def __init__(self, item_cache: "ItemCache", uid: str, data: Any):
         self._cache = item_cache
+        self._ident = _UID_TO_UPPER.sub(_match_to_upper, uid)
         self._uid = uid
         self._data = data
         self._links_to_parents: List[Link] = []
@@ -265,6 +274,11 @@ class Item:
         return self._uid
 
     @property
+    def ident(self) -> str:
+        """ Returns the identifier of the item. """
+        return self._ident
+
+    @property
     def spec(self) -> str:
         """ Returns the UID of the item with an URL-like format. """
         return f"spec:{self._uid}"
diff --git a/rtemsspec/tests/spec-validation/ts.yml b/rtemsspec/tests/spec-validation/ts.yml
index 83fbc05a..cbea16f2 100644
--- a/rtemsspec/tests/spec-validation/ts.yml
+++ b/rtemsspec/tests/spec-validation/ts.yml
@@ -8,7 +8,7 @@ enabled-by: true
 links: []
 test-brief: The Blue Green brief description.
 test-code: |
-  /* Blue green code */
+  /* Blue green code for ${.:test-suite-name} */
 test-description: The Blue Green description.
 test-includes:
 - blue.h
diff --git a/rtemsspec/tests/test_validation.py b/rtemsspec/tests/test_validation.py
index b123c4af..51c209a4 100644
--- a/rtemsspec/tests/test_validation.py
+++ b/rtemsspec/tests/test_validation.py
@@ -70,7 +70,7 @@ def test_validation(tmpdir):
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTs
+ * @ingroup Ts
  */
 
 /*
@@ -126,7 +126,7 @@ def test_validation(tmpdir):
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTs spec:/ts
+ * @defgroup Ts spec:/ts
  *
  * @ingroup RTEMSTestSuites
  *
@@ -137,7 +137,7 @@ def test_validation(tmpdir):
  * @{
  */
 
-/* Blue green code */
+/* Blue green code for Ts */
 
 /** @} */
 """
@@ -148,9 +148,9 @@ def test_validation(tmpdir):
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseDirective
- * @ingroup RTEMSTestCaseTc
- * @ingroup RTEMSTestCaseTc2
+ * @ingroup Directive
+ * @ingroup Tc
+ * @ingroup Tc2
  */
 
 /*
@@ -209,9 +209,9 @@ def test_validation(tmpdir):
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseDirective spec:/directive
+ * @defgroup Directive spec:/directive
  *
- * @ingroup RTEMSTestSuiteTs
+ * @ingroup Ts
  *
  * @brief Test rtems_task_ident() brief description.
  *
@@ -753,9 +753,9 @@ T_TEST_CASE_FIXTURE( Directive, &Directive_Fixture )
 /** @} */
 
 /**
- * @defgroup RTEMSTestCaseTc spec:/tc
+ * @defgroup Tc spec:/tc
  *
- * @ingroup RTEMSTestSuiteTs
+ * @ingroup Ts
  *
  * @brief Test case brief description.
  *
@@ -830,9 +830,9 @@ T_TEST_CASE( Tc )
 /** @} */
 
 /**
- * @defgroup RTEMSTestCaseTc2 spec:/tc2
+ * @defgroup Tc2 spec:/tc2
  *
- * @ingroup RTEMSTestSuiteTs
+ * @ingroup Ts
  *
  * @brief Test case 2 brief description.
  *
@@ -940,13 +940,13 @@ T_TEST_CASE_FIXTURE( Tc2, &Tc2_Fixture )
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtm
- * @ingroup RTEMSTestCaseTc3
- * @ingroup RTEMSTestCaseTc4
- * @ingroup RTEMSTestCaseTc5
- * @ingroup RTEMSTestCaseTc6
- * @ingroup RTEMSTestCaseTc7
- * @ingroup RTEMSTestCaseTc8
+ * @ingroup Rtm
+ * @ingroup Tc3
+ * @ingroup Tc4
+ * @ingroup Tc5
+ * @ingroup Tc6
+ * @ingroup Tc7
+ * @ingroup Tc8
  */
 
 /*
@@ -1004,9 +1004,9 @@ T_TEST_CASE_FIXTURE( Tc2, &Tc2_Fixture )
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtm spec:/rtm
+ * @defgroup Rtm spec:/rtm
  *
- * @ingroup RTEMSTestSuiteTs
+ * @ingroup Ts
  *
  * @brief Test brief.
  *
@@ -1236,9 +1236,9 @@ T_TEST_CASE_FIXTURE( Rtm, &Rtm_Fixture )
 /** @} */
 
 /**
- * @defgroup RTEMSTestCaseTc3 spec:/tc3
+ * @defgroup Tc3 spec:/tc3
  *
- * @ingroup RTEMSTestSuiteTs
+ * @ingroup Ts
  *
  * @brief Test case 3 brief description.
  *
@@ -1279,9 +1279,9 @@ T_TEST_CASE( Tc3 )
 /** @} */
 
 /**
- * @defgroup RTEMSTestCaseTc4 spec:/tc4
+ * @defgroup Tc4 spec:/tc4
  *
- * @ingroup RTEMSTestSuiteTs
+ * @ingroup Ts
  *
  * @brief Test case 4 brief description.
  *
@@ -1300,9 +1300,9 @@ T_TEST_CASE( Tc4 )
 /** @} */
 
 /**
- * @defgroup RTEMSTestCaseTc5 spec:/tc5
+ * @defgroup Tc5 spec:/tc5
  *
- * @ingroup RTEMSTestSuiteTs
+ * @ingroup Ts
  *
  * @brief Test case 5 brief description.
  *
@@ -1417,9 +1417,9 @@ void Tc5_Run( int *a, int b, int *c )
 /** @} */
 
 /**
- * @defgroup RTEMSTestCaseTc6 spec:/tc6
+ * @defgroup Tc6 spec:/tc6
  *
- * @ingroup RTEMSTestSuiteTs
+ * @ingroup Ts
  *
  * @{
  */
@@ -1431,9 +1431,9 @@ void Tc6_Run( void )
 /** @} */
 
 /**
- * @defgroup RTEMSTestCaseTc7 spec:/tc7
+ * @defgroup Tc7 spec:/tc7
  *
- * @ingroup RTEMSTestSuiteTs
+ * @ingroup Ts
  *
  * This test case performs the following actions:
  *
@@ -1466,9 +1466,9 @@ void Tc7_Run( void )
 /** @} */
 
 /**
- * @defgroup RTEMSTestCaseTc8 spec:/tc8
+ * @defgroup Tc8 spec:/tc8
  *
- * @ingroup RTEMSTestSuiteTs
+ * @ingroup Ts
  *
  * This test case performs the following actions:
  *
@@ -1527,7 +1527,7 @@ void Tc8_Run( void )
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseTc5
+ * @ingroup Tc5
  */
 
 /*
@@ -1584,7 +1584,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseTc5
+ * @addtogroup Tc5
  *
  * @{
  */
@@ -1617,7 +1617,7 @@ void Tc5_Run( int *a, int b, int *c );
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseTc6
+ * @ingroup Tc6
  */
 
 /*
@@ -1670,7 +1670,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseTc6
+ * @addtogroup Tc6
  *
  * @{
  */
@@ -1695,7 +1695,7 @@ void Tc6_Run( void );
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseAction2
+ * @ingroup Action2
  */
 
 /*
@@ -1752,7 +1752,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseAction2
+ * @addtogroup Action2
  *
  * @{
  */
@@ -1820,7 +1820,7 @@ void Action2_Run( int *a, int b, int *c );
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseAction2
+ * @ingroup Action2
  */
 
 /*
@@ -1876,9 +1876,9 @@ void Action2_Run( int *a, int b, int *c );
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseAction2 spec:/action2
+ * @defgroup Action2 spec:/action2
  *
- * @ingroup RTEMSTestSuiteTs
+ * @ingroup Ts
  *
  * @brief Test brief.
  *
diff --git a/rtemsspec/validation.py b/rtemsspec/validation.py
index 2bf5384b..aa96e79f 100644
--- a/rtemsspec/validation.py
+++ b/rtemsspec/validation.py
@@ -34,8 +34,7 @@ from typing import Any, Dict, List, Optional, Tuple
 
 from rtemsspec.content import CContent, CInclude, enabled_by_to_exp, \
     ExpressionMapper, GenericContent, get_integer_type, get_value_params, \
-    get_value_plural, get_value_doxygen_group, get_value_doxygen_function, \
-    to_camel_case
+    get_value_plural, get_value_doxygen_group, get_value_doxygen_function
 from rtemsspec.items import create_unique_link, Item, ItemCache, \
     ItemGetValueContext, ItemMapper
 from rtemsspec.transitionmap import TransitionMap
@@ -46,15 +45,19 @@ _STEPS = re.compile(r"^steps/([0-9]+)$")
 
 
 def _get_test_context_instance(ctx: ItemGetValueContext) -> Any:
-    return f"{to_camel_case(ctx.item.uid[1:])}_Instance"
+    return f"{ctx.item.ident}_Instance"
 
 
 def _get_test_context_type(ctx: ItemGetValueContext) -> Any:
-    return f"{to_camel_case(ctx.item.uid[1:])}_Context"
+    return f"{ctx.item.ident}_Context"
 
 
 def _get_test_run(ctx: ItemGetValueContext) -> Any:
-    return f"{to_camel_case(ctx.item.uid[1:])}_Run"
+    return f"{ctx.item.ident}_Run"
+
+
+def _get_test_suite_name(ctx: ItemGetValueContext) -> Any:
+    return ctx.item.ident
 
 
 class _Mapper(ItemMapper):
@@ -71,6 +74,8 @@ class _Mapper(ItemMapper):
         self.add_get_value("interface/macro:/params/name", get_value_params)
         self.add_get_value("interface/unspecified-function:/name",
                            get_value_doxygen_function)
+        self.add_get_value("memory-benchmark:/test-suite-name",
+                           _get_test_suite_name)
         self.add_get_value(
             "requirement/functional/action:/test-context-instance",
             _get_test_context_instance)
@@ -85,6 +90,7 @@ class _Mapper(ItemMapper):
         self.add_get_value("test-case:/test-context-type",
                            _get_test_context_type)
         self.add_get_value("test-case:/test-run", _get_test_run)
+        self.add_get_value("test-suite:/test-suite-name", _get_test_suite_name)
 
     @property
     def steps(self):
@@ -112,7 +118,7 @@ class _Mapper(ItemMapper):
 
 
 def _add_ingroup(content: CContent, items: List["_TestItem"]) -> None:
-    content.add_ingroup([item.group_identifier for item in items])
+    content.add_ingroup([item.ident for item in items])
 
 
 class _TestItem:
@@ -121,8 +127,7 @@ class _TestItem:
     # pylint: disable=too-many-public-methods
     def __init__(self, item: Item):
         self._item = item
-        self._ident = to_camel_case(item.uid[1:])
-        self._context = f"{self._ident}_Context"
+        self._context = f"{self.ident}_Context"
         self._mapper = _Mapper(item)
 
     def __getitem__(self, key: str):
@@ -141,7 +146,7 @@ class _TestItem:
     @property
     def ident(self) -> str:
         """ Returns the test identifier. """
-        return self._ident
+        return self._item.ident
 
     @property
     def context(self) -> str:
@@ -173,11 +178,6 @@ class _TestItem:
         """ Returns the substituted description. """
         return self.substitute_text(self["test-description"])
 
-    @property
-    def group_identifier(self) -> str:
-        """ Returns the group identifier. """
-        return f"RTEMSTestCase{self.ident}"
-
     def substitute_code(self,
                         text: Optional[str],
                         prefix: Optional[str] = None) -> str:
@@ -197,7 +197,7 @@ class _TestItem:
     def add_test_case_description(self, content: CContent,
                                   test_case_to_suites: _CaseToSuite) -> None:
         """ Adds the test case description. """
-        with content.defgroup_block(self.group_identifier, self.name):
+        with content.defgroup_block(self.ident, self.name):
             try:
                 test_suites = test_case_to_suites[self.uid]
             except KeyError as err:
@@ -227,7 +227,7 @@ class _TestItem:
     def _add_test_case_actions(self, content: CContent) -> CContent:
         actions = CContent()
         for index, action in enumerate(self["test-actions"]):
-            method = f"{self._ident}_Action_{index}"
+            method = f"{self.ident}_Action_{index}"
             if self.context == "void":
                 args = []
                 params = []
@@ -373,7 +373,7 @@ class _TestItem:
         content.register_license_and_copyrights_of_item(self._item)
         content.prepend_spdx_license_identifier()
         with content.file_block():
-            content.add_ingroup([self.group_identifier])
+            content.add_ingroup([self.ident])
         content.add_copyrights_and_licenses()
         content.add_automatically_generated_warning()
         with content.header_guard(os.path.basename(header["target"])):
@@ -381,7 +381,7 @@ class _TestItem:
             content.add_includes(list(map(CInclude, header["local-includes"])),
                                  local=True)
             with content.extern_c():
-                with content.add_to_group(self.group_identifier):
+                with content.add_to_group(self.ident):
                     self.add_header_body(content, header)
         content.write(os.path.join(base_directory, header["target"]))
 
@@ -495,13 +495,9 @@ class _TestItem:
 class _TestSuiteItem(_TestItem):
     """ A test suite item. """
 
-    @property
-    def group_identifier(self) -> str:
-        return f"RTEMSTestSuite{self.ident}"
-
     def generate(self, content: CContent, _base_directory: str,
                  _test_case_to_suites: _CaseToSuite) -> None:
-        with content.defgroup_block(self.group_identifier, self.name):
+        with content.defgroup_block(self.ident, self.name):
             content.add("@ingroup RTEMSTestSuites")
             content.add_brief_description(self.brief)
             content.wrap(self.description)
diff --git a/spec/bsp/val/mem-clock.yml b/spec/bsp/val/mem-clock.yml
index 4be84daf..08d16531 100644
--- a/spec/bsp/val/mem-clock.yml
+++ b/spec/bsp/val/mem-clock.yml
@@ -51,6 +51,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemClock
 test-target: testsuites/membench/mem-bsp-clock.c
 type: memory-benchmark
diff --git a/spec/rtems/barrier/val/mem-wait-rel-del.yml b/spec/rtems/barrier/val/mem-wait-rel-del.yml
index 7d278c45..48b24129 100644
--- a/spec/rtems/barrier/val/mem-wait-rel-del.yml
+++ b/spec/rtems/barrier/val/mem-wait-rel-del.yml
@@ -57,6 +57,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemWaitRelDel
 test-target: testsuites/membench/mem-barrier-wait-rel-del.c
 type: memory-benchmark
diff --git a/spec/rtems/barrier/val/mem-wait-rel.yml b/spec/rtems/barrier/val/mem-wait-rel.yml
index 76d8786e..25f3528e 100644
--- a/spec/rtems/barrier/val/mem-wait-rel.yml
+++ b/spec/rtems/barrier/val/mem-wait-rel.yml
@@ -55,6 +55,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemWaitRel
 test-target: testsuites/membench/mem-barrier-wait-rel.c
 type: memory-benchmark
diff --git a/spec/rtems/clock/val/mem-get-uptime.yml b/spec/rtems/clock/val/mem-get-uptime.yml
index a32d4987..ae299e4d 100644
--- a/spec/rtems/clock/val/mem-get-uptime.yml
+++ b/spec/rtems/clock/val/mem-get-uptime.yml
@@ -50,6 +50,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemGetUptime
 test-target: testsuites/membench/mem-clock-get-uptime.c
 type: memory-benchmark
diff --git a/spec/rtems/clock/val/mem-set-get-tod.yml b/spec/rtems/clock/val/mem-set-get-tod.yml
index b9fcb439..a44c6c01 100644
--- a/spec/rtems/clock/val/mem-set-get-tod.yml
+++ b/spec/rtems/clock/val/mem-set-get-tod.yml
@@ -51,6 +51,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemSetGetTod
 test-target: testsuites/membench/mem-clock-set-get-tod.c
 type: memory-benchmark
diff --git a/spec/rtems/clock/val/mem-set.yml b/spec/rtems/clock/val/mem-set.yml
index 72422be6..17a01e39 100644
--- a/spec/rtems/clock/val/mem-set.yml
+++ b/spec/rtems/clock/val/mem-set.yml
@@ -50,6 +50,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemSet
 test-target: testsuites/membench/mem-clock-set.c
 type: memory-benchmark
diff --git a/spec/rtems/event/val/mem-snd-rcv.yml b/spec/rtems/event/val/mem-snd-rcv.yml
index a06a5257..1c7e7d14 100644
--- a/spec/rtems/event/val/mem-snd-rcv.yml
+++ b/spec/rtems/event/val/mem-snd-rcv.yml
@@ -51,6 +51,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemSndRcv
 test-target: testsuites/membench/mem-event-snd-rcv.c
 type: memory-benchmark
diff --git a/spec/rtems/fatal/val/mem-fatal.yml b/spec/rtems/fatal/val/mem-fatal.yml
index 896b244c..73c9c4be 100644
--- a/spec/rtems/fatal/val/mem-fatal.yml
+++ b/spec/rtems/fatal/val/mem-fatal.yml
@@ -50,6 +50,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemFatal
 test-target: testsuites/membench/mem-fatal-fatal.c
 type: memory-benchmark
diff --git a/spec/rtems/message/val/mem-bcst-rcv.yml b/spec/rtems/message/val/mem-bcst-rcv.yml
index ba27ec9e..4ed72b59 100644
--- a/spec/rtems/message/val/mem-bcst-rcv.yml
+++ b/spec/rtems/message/val/mem-bcst-rcv.yml
@@ -53,6 +53,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemBcstRcv
 test-target: testsuites/membench/mem-message-bcst-rcv.c
 type: memory-benchmark
diff --git a/spec/rtems/message/val/mem-snd-rcv-del.yml b/spec/rtems/message/val/mem-snd-rcv-del.yml
index 5bf90252..15ff9bc8 100644
--- a/spec/rtems/message/val/mem-snd-rcv-del.yml
+++ b/spec/rtems/message/val/mem-snd-rcv-del.yml
@@ -54,6 +54,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemSndRcvDel
 test-target: testsuites/membench/mem-message-snd-rcv-del.c
 type: memory-benchmark
diff --git a/spec/rtems/message/val/mem-snd-rcv.yml b/spec/rtems/message/val/mem-snd-rcv.yml
index c6649012..f5a60582 100644
--- a/spec/rtems/message/val/mem-snd-rcv.yml
+++ b/spec/rtems/message/val/mem-snd-rcv.yml
@@ -53,6 +53,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemSndRcv
 test-target: testsuites/membench/mem-message-snd-rcv.c
 type: memory-benchmark
diff --git a/spec/rtems/message/val/mem-ugt-rcv.yml b/spec/rtems/message/val/mem-ugt-rcv.yml
index 067a112e..4c96a02d 100644
--- a/spec/rtems/message/val/mem-ugt-rcv.yml
+++ b/spec/rtems/message/val/mem-ugt-rcv.yml
@@ -53,6 +53,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemUgtRcv
 test-target: testsuites/membench/mem-message-ugt-rcv.c
 type: memory-benchmark
diff --git a/spec/rtems/part/val/mem-get-ret-del.yml b/spec/rtems/part/val/mem-get-ret-del.yml
index 6b747b58..a9973ec8 100644
--- a/spec/rtems/part/val/mem-get-ret-del.yml
+++ b/spec/rtems/part/val/mem-get-ret-del.yml
@@ -57,6 +57,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemGetRetDel
 test-target: testsuites/membench/mem-part-get-ret-del.c
 type: memory-benchmark
diff --git a/spec/rtems/part/val/mem-get-ret.yml b/spec/rtems/part/val/mem-get-ret.yml
index af8c8456..6154273a 100644
--- a/spec/rtems/part/val/mem-get-ret.yml
+++ b/spec/rtems/part/val/mem-get-ret.yml
@@ -56,6 +56,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemGetRet
 test-target: testsuites/membench/mem-part-get-ret.c
 type: memory-benchmark
diff --git a/spec/rtems/ratemon/val/mem-period-del.yml b/spec/rtems/ratemon/val/mem-period-del.yml
index 8da2570d..aa61f6d5 100644
--- a/spec/rtems/ratemon/val/mem-period-del.yml
+++ b/spec/rtems/ratemon/val/mem-period-del.yml
@@ -55,6 +55,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemPeriodDel
 test-target: testsuites/membench/mem-ratemon-period-del.c
 type: memory-benchmark
diff --git a/spec/rtems/ratemon/val/mem-period.yml b/spec/rtems/ratemon/val/mem-period.yml
index 852cf8df..fe8ca219 100644
--- a/spec/rtems/ratemon/val/mem-period.yml
+++ b/spec/rtems/ratemon/val/mem-period.yml
@@ -54,6 +54,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemPeriod
 test-target: testsuites/membench/mem-ratemon-period.c
 type: memory-benchmark
diff --git a/spec/rtems/scheduler/val/mem-add-cpu.yml b/spec/rtems/scheduler/val/mem-add-cpu.yml
index 5a01b571..c5e080d3 100644
--- a/spec/rtems/scheduler/val/mem-add-cpu.yml
+++ b/spec/rtems/scheduler/val/mem-add-cpu.yml
@@ -56,6 +56,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemAddCpu
 test-target: testsuites/membench/mem-scheduler-add-cpu.c
 type: memory-benchmark
diff --git a/spec/rtems/scheduler/val/mem-rm-cpu.yml b/spec/rtems/scheduler/val/mem-rm-cpu.yml
index 161b4c87..83eaab75 100644
--- a/spec/rtems/scheduler/val/mem-rm-cpu.yml
+++ b/spec/rtems/scheduler/val/mem-rm-cpu.yml
@@ -56,6 +56,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemRmCpu
 test-target: testsuites/membench/mem-scheduler-rm-cpu.c
 type: memory-benchmark
diff --git a/spec/rtems/sem/val/mem-obt-rel-del.yml b/spec/rtems/sem/val/mem-obt-rel-del.yml
index 25d6965d..7e4851f3 100644
--- a/spec/rtems/sem/val/mem-obt-rel-del.yml
+++ b/spec/rtems/sem/val/mem-obt-rel-del.yml
@@ -57,6 +57,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemObtRelDel
 test-target: testsuites/membench/mem-sem-obt-rel-del.c
 type: memory-benchmark
diff --git a/spec/rtems/sem/val/mem-obt-rel.yml b/spec/rtems/sem/val/mem-obt-rel.yml
index 512b580f..0814edb3 100644
--- a/spec/rtems/sem/val/mem-obt-rel.yml
+++ b/spec/rtems/sem/val/mem-obt-rel.yml
@@ -55,6 +55,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemObtRel
 test-target: testsuites/membench/mem-sem-obt-rel.c
 type: memory-benchmark
diff --git a/spec/rtems/signal/val/mem-catch-snd.yml b/spec/rtems/signal/val/mem-catch-snd.yml
index b86d3710..5e55aa52 100644
--- a/spec/rtems/signal/val/mem-catch-snd.yml
+++ b/spec/rtems/signal/val/mem-catch-snd.yml
@@ -51,6 +51,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemCatchSnd
 test-target: testsuites/membench/mem-signal-catch-snd.c
 type: memory-benchmark
diff --git a/spec/rtems/task/val/mem-delete.yml b/spec/rtems/task/val/mem-delete.yml
index 98fb3d02..39f7ddc0 100644
--- a/spec/rtems/task/val/mem-delete.yml
+++ b/spec/rtems/task/val/mem-delete.yml
@@ -50,6 +50,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemDelete
 test-target: testsuites/membench/mem-task-delete.c
 type: memory-benchmark
diff --git a/spec/rtems/task/val/mem-exit.yml b/spec/rtems/task/val/mem-exit.yml
index bfaf14df..92d21e07 100644
--- a/spec/rtems/task/val/mem-exit.yml
+++ b/spec/rtems/task/val/mem-exit.yml
@@ -50,6 +50,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemExit
 test-target: testsuites/membench/mem-task-exit.c
 type: memory-benchmark
diff --git a/spec/rtems/task/val/mem-get-affinity.yml b/spec/rtems/task/val/mem-get-affinity.yml
index 5aa194fb..e5691985 100644
--- a/spec/rtems/task/val/mem-get-affinity.yml
+++ b/spec/rtems/task/val/mem-get-affinity.yml
@@ -50,6 +50,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemGetAffinity
 test-target: testsuites/membench/mem-task-get-affinity.c
 type: memory-benchmark
diff --git a/spec/rtems/task/val/mem-get-priority.yml b/spec/rtems/task/val/mem-get-priority.yml
index f65e6652..34d4fec5 100644
--- a/spec/rtems/task/val/mem-get-priority.yml
+++ b/spec/rtems/task/val/mem-get-priority.yml
@@ -50,6 +50,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemGetPriority
 test-target: testsuites/membench/mem-task-get-priority.c
 type: memory-benchmark
diff --git a/spec/rtems/task/val/mem-get-scheduler.yml b/spec/rtems/task/val/mem-get-scheduler.yml
index 3be4f6fc..ae2e35ef 100644
--- a/spec/rtems/task/val/mem-get-scheduler.yml
+++ b/spec/rtems/task/val/mem-get-scheduler.yml
@@ -50,6 +50,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemGetScheduler
 test-target: testsuites/membench/mem-task-get-scheduler.c
 type: memory-benchmark
diff --git a/spec/rtems/task/val/mem-mode.yml b/spec/rtems/task/val/mem-mode.yml
index b8086934..4cd38599 100644
--- a/spec/rtems/task/val/mem-mode.yml
+++ b/spec/rtems/task/val/mem-mode.yml
@@ -50,6 +50,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemMode
 test-target: testsuites/membench/mem-task-mode.c
 type: memory-benchmark
diff --git a/spec/rtems/task/val/mem-restart.yml b/spec/rtems/task/val/mem-restart.yml
index 3a91d5f9..c17cb549 100644
--- a/spec/rtems/task/val/mem-restart.yml
+++ b/spec/rtems/task/val/mem-restart.yml
@@ -50,6 +50,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemRestart
 test-target: testsuites/membench/mem-task-restart.c
 type: memory-benchmark
diff --git a/spec/rtems/task/val/mem-set-affinity.yml b/spec/rtems/task/val/mem-set-affinity.yml
index 981e7e94..c4793343 100644
--- a/spec/rtems/task/val/mem-set-affinity.yml
+++ b/spec/rtems/task/val/mem-set-affinity.yml
@@ -50,6 +50,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemSetAffinity
 test-target: testsuites/membench/mem-task-set-affinity.c
 type: memory-benchmark
diff --git a/spec/rtems/task/val/mem-set-priority.yml b/spec/rtems/task/val/mem-set-priority.yml
index 5571f23d..16f8b40d 100644
--- a/spec/rtems/task/val/mem-set-priority.yml
+++ b/spec/rtems/task/val/mem-set-priority.yml
@@ -50,6 +50,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemSetPriority
 test-target: testsuites/membench/mem-task-set-priority.c
 type: memory-benchmark
diff --git a/spec/rtems/task/val/mem-set-scheduler.yml b/spec/rtems/task/val/mem-set-scheduler.yml
index 18466ec8..20fc8fba 100644
--- a/spec/rtems/task/val/mem-set-scheduler.yml
+++ b/spec/rtems/task/val/mem-set-scheduler.yml
@@ -50,6 +50,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemSetScheduler
 test-target: testsuites/membench/mem-task-set-scheduler.c
 type: memory-benchmark
diff --git a/spec/rtems/task/val/mem-sus-res.yml b/spec/rtems/task/val/mem-sus-res.yml
index df2ca5df..097b9ddb 100644
--- a/spec/rtems/task/val/mem-sus-res.yml
+++ b/spec/rtems/task/val/mem-sus-res.yml
@@ -51,6 +51,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemSusRes
 test-target: testsuites/membench/mem-task-sus-res.c
 type: memory-benchmark
diff --git a/spec/rtems/task/val/mem-wake-after.yml b/spec/rtems/task/val/mem-wake-after.yml
index f5a71622..8a456eda 100644
--- a/spec/rtems/task/val/mem-wake-after.yml
+++ b/spec/rtems/task/val/mem-wake-after.yml
@@ -50,6 +50,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemWakeAfter
 test-target: testsuites/membench/mem-task-wake-after.c
 type: memory-benchmark
diff --git a/spec/rtems/task/val/mem-wake-when.yml b/spec/rtems/task/val/mem-wake-when.yml
index 92ad3565..aa950e52 100644
--- a/spec/rtems/task/val/mem-wake-when.yml
+++ b/spec/rtems/task/val/mem-wake-when.yml
@@ -50,6 +50,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemWakeWhen
 test-target: testsuites/membench/mem-task-wake-when.c
 type: memory-benchmark
diff --git a/spec/rtems/timer/val/mem-after.yml b/spec/rtems/timer/val/mem-after.yml
index a433d5c1..bf1f1a7f 100644
--- a/spec/rtems/timer/val/mem-after.yml
+++ b/spec/rtems/timer/val/mem-after.yml
@@ -52,6 +52,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemAfter
 test-target: testsuites/membench/mem-timer-after.c
 type: memory-benchmark
diff --git a/spec/rtems/timer/val/mem-cancel.yml b/spec/rtems/timer/val/mem-cancel.yml
index 3f9e4d49..32525b5a 100644
--- a/spec/rtems/timer/val/mem-cancel.yml
+++ b/spec/rtems/timer/val/mem-cancel.yml
@@ -51,6 +51,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemCancel
 test-target: testsuites/membench/mem-timer-cancel.c
 type: memory-benchmark
diff --git a/spec/rtems/timer/val/mem-delete.yml b/spec/rtems/timer/val/mem-delete.yml
index a754c77a..bf432c0a 100644
--- a/spec/rtems/timer/val/mem-delete.yml
+++ b/spec/rtems/timer/val/mem-delete.yml
@@ -51,6 +51,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemDelete
 test-target: testsuites/membench/mem-timer-delete.c
 type: memory-benchmark
diff --git a/spec/rtems/timer/val/mem-reset.yml b/spec/rtems/timer/val/mem-reset.yml
index 0b0f73ba..cd7f96d4 100644
--- a/spec/rtems/timer/val/mem-reset.yml
+++ b/spec/rtems/timer/val/mem-reset.yml
@@ -51,6 +51,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemReset
 test-target: testsuites/membench/mem-timer-reset.c
 type: memory-benchmark
diff --git a/spec/rtems/timer/val/mem-srv-after.yml b/spec/rtems/timer/val/mem-srv-after.yml
index 31ffd328..2fa7b37d 100644
--- a/spec/rtems/timer/val/mem-srv-after.yml
+++ b/spec/rtems/timer/val/mem-srv-after.yml
@@ -52,6 +52,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemSrvAfter
 test-target: testsuites/membench/mem-timer-srv-after.c
 type: memory-benchmark
diff --git a/spec/rtems/timer/val/mem-srv-init.yml b/spec/rtems/timer/val/mem-srv-init.yml
index 6f12b1f4..77bb2225 100644
--- a/spec/rtems/timer/val/mem-srv-init.yml
+++ b/spec/rtems/timer/val/mem-srv-init.yml
@@ -65,6 +65,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemSrvInit
 test-target: testsuites/membench/mem-timer-srv-init.c
 type: memory-benchmark
diff --git a/spec/rtems/timer/val/mem-srv-when.yml b/spec/rtems/timer/val/mem-srv-when.yml
index 3cd7779e..899a31eb 100644
--- a/spec/rtems/timer/val/mem-srv-when.yml
+++ b/spec/rtems/timer/val/mem-srv-when.yml
@@ -52,6 +52,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemSrvWhen
 test-target: testsuites/membench/mem-timer-srv-when.c
 type: memory-benchmark
diff --git a/spec/rtems/timer/val/mem-when.yml b/spec/rtems/timer/val/mem-when.yml
index aef0aca5..5afe73cd 100644
--- a/spec/rtems/timer/val/mem-when.yml
+++ b/spec/rtems/timer/val/mem-when.yml
@@ -52,6 +52,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemWhen
 test-target: testsuites/membench/mem-timer-when.c
 type: memory-benchmark
diff --git a/spec/rtems/userext/val/mem-create.yml b/spec/rtems/userext/val/mem-create.yml
index 357ea104..b9a3967a 100644
--- a/spec/rtems/userext/val/mem-create.yml
+++ b/spec/rtems/userext/val/mem-create.yml
@@ -53,6 +53,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemCreate
 test-target: testsuites/membench/mem-userext-create.c
 type: memory-benchmark
diff --git a/spec/rtems/userext/val/mem-delete.yml b/spec/rtems/userext/val/mem-delete.yml
index ee19b4eb..9fabc642 100644
--- a/spec/rtems/userext/val/mem-delete.yml
+++ b/spec/rtems/userext/val/mem-delete.yml
@@ -54,6 +54,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemDelete
 test-target: testsuites/membench/mem-userext-delete.c
 type: memory-benchmark
diff --git a/spec/rtems/val/mem-basic.yml b/spec/rtems/val/mem-basic.yml
index f2dda316..3d400e54 100644
--- a/spec/rtems/val/mem-basic.yml
+++ b/spec/rtems/val/mem-basic.yml
@@ -52,6 +52,5 @@ test-description: |
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemBasic
 test-target: testsuites/membench/mem-rtems-basic.c
 type: memory-benchmark
diff --git a/spec/rtems/val/mem-smp-1.yml b/spec/rtems/val/mem-smp-1.yml
index 276ea181..44473054 100644
--- a/spec/rtems/val/mem-smp-1.yml
+++ b/spec/rtems/val/mem-smp-1.yml
@@ -57,6 +57,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemSmp1
 test-target: testsuites/membench/mem-rtems-smp-1.c
 type: memory-benchmark
diff --git a/spec/rtems/val/mem-smp-global-2.yml b/spec/rtems/val/mem-smp-global-2.yml
index 4169306b..d256d1b4 100644
--- a/spec/rtems/val/mem-smp-global-2.yml
+++ b/spec/rtems/val/mem-smp-global-2.yml
@@ -57,6 +57,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemSmpGlobal2
 test-target: testsuites/membench/mem-rtems-smp-global-2.c
 type: memory-benchmark
diff --git a/spec/rtems/val/mem-smp-global-4.yml b/spec/rtems/val/mem-smp-global-4.yml
index 1300fa38..3f66789d 100644
--- a/spec/rtems/val/mem-smp-global-4.yml
+++ b/spec/rtems/val/mem-smp-global-4.yml
@@ -57,6 +57,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemSmpGlobal4
 test-target: testsuites/membench/mem-rtems-smp-global-4.c
 type: memory-benchmark
diff --git a/spec/rtems/val/mem-smp-part-2.yml b/spec/rtems/val/mem-smp-part-2.yml
index 24403803..bdce299a 100644
--- a/spec/rtems/val/mem-smp-part-2.yml
+++ b/spec/rtems/val/mem-smp-part-2.yml
@@ -74,6 +74,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemSmpPart2
 test-target: testsuites/membench/mem-rtems-smp-part-2.c
 type: memory-benchmark
diff --git a/spec/rtems/val/mem-smp-part-4.yml b/spec/rtems/val/mem-smp-part-4.yml
index ac329ee7..c1a9f5e5 100644
--- a/spec/rtems/val/mem-smp-part-4.yml
+++ b/spec/rtems/val/mem-smp-part-4.yml
@@ -82,6 +82,5 @@ test-description: null
 test-includes:
 - rtems.h
 test-local-includes: []
-test-suite-name: MemSmpPart4
 test-target: testsuites/membench/mem-rtems-smp-part-4.c
 type: memory-benchmark
diff --git a/spec/spec/test-suite.yml b/spec/spec/test-suite.yml
index f1987347..819ece5f 100644
--- a/spec/spec/test-suite.yml
+++ b/spec/spec/test-suite.yml
@@ -39,10 +39,6 @@ spec-info:
         description: |
           It shall be a list of header files included via ``#include "..."``.
         spec-type: list-str
-      test-suite-name:
-        description: |
-          It shall be the name of the test suite.
-        spec-type: str
       test-target:
         description: |
           It shall be the path to the generated target test suite source file.
diff --git a/spec/testsuites/bsp-sparc-leon3-gr712rc.yml b/spec/testsuites/bsp-sparc-leon3-gr712rc.yml
index c0f788a6..2a485f17 100644
--- a/spec/testsuites/bsp-sparc-leon3-gr712rc.yml
+++ b/spec/testsuites/bsp-sparc-leon3-gr712rc.yml
@@ -14,6 +14,5 @@ test-code: |
 test-description: null
 test-includes: []
 test-local-includes: []
-test-suite-name: BspSparcLeon3Gr712rc
 test-target: testsuites/validation/ts-bsp-sparc-leon3-gr712rc.c
 type: test-suite
diff --git a/spec/testsuites/fatal-boot-processor-not-assigned-to-scheduler.yml b/spec/testsuites/fatal-boot-processor-not-assigned-to-scheduler.yml
index 4bba3e7e..a960620a 100644
--- a/spec/testsuites/fatal-boot-processor-not-assigned-to-scheduler.yml
+++ b/spec/testsuites/fatal-boot-processor-not-assigned-to-scheduler.yml
@@ -39,6 +39,5 @@ test-includes: []
 test-local-includes:
 - tr-fatal-boot-processor-not-assigned-to-scheduler.h
 - ts-config.h
-test-suite-name: FatalBootProcessorNotAssignedToScheduler
 test-target: testsuites/validation/ts-fatal-boot-processor-not-assigned-to-scheduler.c
 type: test-suite
diff --git a/spec/testsuites/fatal-bsp-sparc-leon3-cache-snooping-disabled-boot.yml b/spec/testsuites/fatal-bsp-sparc-leon3-cache-snooping-disabled-boot.yml
index 69993764..d3655ae5 100644
--- a/spec/testsuites/fatal-bsp-sparc-leon3-cache-snooping-disabled-boot.yml
+++ b/spec/testsuites/fatal-bsp-sparc-leon3-cache-snooping-disabled-boot.yml
@@ -23,6 +23,5 @@ test-description: null
 test-includes: []
 test-local-includes:
 - tr-fatal-bsp-sparc-leon3-cache-snooping-disabled-boot.h
-test-suite-name: FatalBspSparcLeon3CacheSnoopingDisabledBoot
 test-target: testsuites/validation/ts-fatal-bsp-sparc-leon3-cache-snooping-disabled-boot.c
 type: test-suite
diff --git a/spec/testsuites/fatal-bsp-sparc-leon3-cache-snooping-disabled-secondary.yml b/spec/testsuites/fatal-bsp-sparc-leon3-cache-snooping-disabled-secondary.yml
index 893d17ea..441d432b 100644
--- a/spec/testsuites/fatal-bsp-sparc-leon3-cache-snooping-disabled-secondary.yml
+++ b/spec/testsuites/fatal-bsp-sparc-leon3-cache-snooping-disabled-secondary.yml
@@ -26,6 +26,5 @@ test-description: null
 test-includes: []
 test-local-includes:
 - tr-fatal-bsp-sparc-leon3-cache-snooping-disabled-secondary.h
-test-suite-name: FatalBspSparcLeon3CacheSnoopingDisabledSecondary
 test-target: testsuites/validation/ts-fatal-bsp-sparc-leon3-cache-snooping-disabled-secondary.c
 type: test-suite
diff --git a/spec/testsuites/fatal-bsp-sparc-leon3-clock-initialization.yml b/spec/testsuites/fatal-bsp-sparc-leon3-clock-initialization.yml
index fdda9aa4..7d8bc652 100644
--- a/spec/testsuites/fatal-bsp-sparc-leon3-clock-initialization.yml
+++ b/spec/testsuites/fatal-bsp-sparc-leon3-clock-initialization.yml
@@ -20,6 +20,5 @@ test-description: null
 test-includes: []
 test-local-includes:
 - tr-fatal-bsp-sparc-leon3-clock-initialization.h
-test-suite-name: FatalBspSparcLeon3ClockInitialization
 test-target: testsuites/validation/ts-fatal-bsp-sparc-leon3-clock-initialization.c
 type: test-suite
diff --git a/spec/testsuites/fatal-bsp-sparc-leon3-shutdown.yml b/spec/testsuites/fatal-bsp-sparc-leon3-shutdown.yml
index 4df77ecc..9c519a78 100644
--- a/spec/testsuites/fatal-bsp-sparc-leon3-shutdown.yml
+++ b/spec/testsuites/fatal-bsp-sparc-leon3-shutdown.yml
@@ -113,6 +113,5 @@ test-includes:
 test-local-includes:
 - ts-config.h
 - tx-support.h
-test-suite-name: FatalBspSparcLeon3Shutdown
 test-target: testsuites/validation/ts-fatal-bsp-sparc-leon3-shutdown.c
 type: test-suite
diff --git a/spec/testsuites/fatal-idle-thread-create-failed.yml b/spec/testsuites/fatal-idle-thread-create-failed.yml
index a805e6e8..1f5cd4d5 100644
--- a/spec/testsuites/fatal-idle-thread-create-failed.yml
+++ b/spec/testsuites/fatal-idle-thread-create-failed.yml
@@ -31,6 +31,5 @@ test-description: null
 test-includes: []
 test-local-includes:
 - tr-fatal-idle-thread-create-failed.h
-test-suite-name: FatalIdleThreadCreateFailed
 test-target: testsuites/validation/ts-fatal-idle-thread-create-failed.c
 type: test-suite
diff --git a/spec/testsuites/fatal-idle-thread-stack-too-small.yml b/spec/testsuites/fatal-idle-thread-stack-too-small.yml
index cb19edfa..88255ad3 100644
--- a/spec/testsuites/fatal-idle-thread-stack-too-small.yml
+++ b/spec/testsuites/fatal-idle-thread-stack-too-small.yml
@@ -38,6 +38,5 @@ test-description: null
 test-includes: []
 test-local-includes:
 - tr-fatal-idle-thread-stack-too-small.h
-test-suite-name: FatalIdleThreadStackTooSmall
 test-target: testsuites/validation/ts-fatal-idle-thread-stack-too-small.c
 type: test-suite
diff --git a/spec/testsuites/fatal-init-task-construct-failed.yml b/spec/testsuites/fatal-init-task-construct-failed.yml
index d292c124..274eb5b5 100644
--- a/spec/testsuites/fatal-init-task-construct-failed.yml
+++ b/spec/testsuites/fatal-init-task-construct-failed.yml
@@ -36,6 +36,5 @@ test-description: null
 test-includes: []
 test-local-includes:
 - tr-fatal-init-task-construct-failed.h
-test-suite-name: FatalInitTaskConstructFailed
 test-target: testsuites/validation/ts-fatal-init-task-construct-failed.c
 type: test-suite
diff --git a/spec/testsuites/fatal-mandatory-processor-not-present.yml b/spec/testsuites/fatal-mandatory-processor-not-present.yml
index 1302b1b4..52c2a35b 100644
--- a/spec/testsuites/fatal-mandatory-processor-not-present.yml
+++ b/spec/testsuites/fatal-mandatory-processor-not-present.yml
@@ -68,6 +68,5 @@ test-includes: []
 test-local-includes:
 - tr-fatal-mandatory-processor-not-present.h
 - ts-config.h
-test-suite-name: FatalMandatoryProcessorNotPresent
 test-target: testsuites/validation/ts-fatal-mandatory-processor-not-present.c
 type: test-suite
diff --git a/spec/testsuites/fatal-scheduler-requires-exactly-one-processor.yml b/spec/testsuites/fatal-scheduler-requires-exactly-one-processor.yml
index 8ce3e344..2d653470 100644
--- a/spec/testsuites/fatal-scheduler-requires-exactly-one-processor.yml
+++ b/spec/testsuites/fatal-scheduler-requires-exactly-one-processor.yml
@@ -39,6 +39,5 @@ test-includes: []
 test-local-includes:
 - tr-fatal-scheduler-requires-exactly-one-processor.h
 - ts-config.h
-test-suite-name: FatalSchedulerRequiresExactlyOneProcessor
 test-target: testsuites/validation/ts-fatal-scheduler-requires-exactly-one-processor.c
 type: test-suite
diff --git a/spec/testsuites/fatal-smp.yml b/spec/testsuites/fatal-smp.yml
index a33c2b13..f66416b4 100644
--- a/spec/testsuites/fatal-smp.yml
+++ b/spec/testsuites/fatal-smp.yml
@@ -39,6 +39,5 @@ test-includes: []
 test-local-includes:
 - tr-fatal-smp.h
 - ts-config.h
-test-suite-name: FatalSmp
 test-target: testsuites/validation/ts-fatal-smp.c
 type: test-suite
diff --git a/spec/testsuites/fatal-start-of-mandatory-processor-failed.yml b/spec/testsuites/fatal-start-of-mandatory-processor-failed.yml
index 57469912..110add14 100644
--- a/spec/testsuites/fatal-start-of-mandatory-processor-failed.yml
+++ b/spec/testsuites/fatal-start-of-mandatory-processor-failed.yml
@@ -38,6 +38,5 @@ test-includes: []
 test-local-includes:
 - tr-fatal-start-of-mandatory-processor-failed.h
 - ts-config.h
-test-suite-name: FatalStartOfMandatoryProcessorFailed
 test-target: testsuites/validation/ts-fatal-start-of-mandatory-processor-failed.c
 type: test-suite
diff --git a/spec/testsuites/fatal-start-on-not-online-processor.yml b/spec/testsuites/fatal-start-on-not-online-processor.yml
index 36408094..dd8bd66d 100644
--- a/spec/testsuites/fatal-start-on-not-online-processor.yml
+++ b/spec/testsuites/fatal-start-on-not-online-processor.yml
@@ -25,6 +25,5 @@ test-includes: []
 test-local-includes:
 - tr-fatal-start-on-not-online-processor.h
 - ts-config.h
-test-suite-name: FatalStartOnNotOnlineProcessor
 test-target: testsuites/validation/ts-fatal-start-on-not-online-processor.c
 type: test-suite
diff --git a/spec/testsuites/fatal-too-large-tls-size.yml b/spec/testsuites/fatal-too-large-tls-size.yml
index 54dc98a7..dd677bed 100644
--- a/spec/testsuites/fatal-too-large-tls-size.yml
+++ b/spec/testsuites/fatal-too-large-tls-size.yml
@@ -23,6 +23,5 @@ test-description: null
 test-includes: []
 test-local-includes:
 - tr-fatal-too-large-tls-size.h
-test-suite-name: FatalTooLargeTlsSize
 test-target: testsuites/validation/ts-fatal-too-large-tls-size.c
 type: test-suite
diff --git a/spec/testsuites/model-0.yml b/spec/testsuites/model-0.yml
index 1e67e5f9..89e76a0c 100644
--- a/spec/testsuites/model-0.yml
+++ b/spec/testsuites/model-0.yml
@@ -20,6 +20,5 @@ test-description: |
   scheduler are provided using up to four processors.
 test-includes: []
 test-local-includes: []
-test-suite-name: Model0
 test-target: testsuites/validation/ts-model-0.c
 type: test-suite
diff --git a/spec/testsuites/performance-no-clock-0.yml b/spec/testsuites/performance-no-clock-0.yml
index bb1c2091..c80a8589 100644
--- a/spec/testsuites/performance-no-clock-0.yml
+++ b/spec/testsuites/performance-no-clock-0.yml
@@ -22,6 +22,5 @@ test-description: |
 test-includes:
 - rtems/test-info.h
 test-local-includes: []
-test-suite-name: PerformanceNoClock0
 test-target: testsuites/validation/ts-performance-no-clock-0.c
 type: test-suite
diff --git a/spec/testsuites/terminate.yml b/spec/testsuites/terminate.yml
index fdf36357..1edbe512 100644
--- a/spec/testsuites/terminate.yml
+++ b/spec/testsuites/terminate.yml
@@ -24,6 +24,5 @@ test-description: null
 test-includes: []
 test-local-includes:
 - tc-userext.h
-test-suite-name: Terminate
 test-target: testsuites/validation/ts-terminate.c
 type: test-suite
diff --git a/spec/testsuites/unit-no-clock-0.yml b/spec/testsuites/unit-no-clock-0.yml
index 685daf90..80c92986 100644
--- a/spec/testsuites/unit-no-clock-0.yml
+++ b/spec/testsuites/unit-no-clock-0.yml
@@ -22,6 +22,5 @@ test-description: |
   scheduler are provided using up to four processors.
 test-includes: []
 test-local-includes: []
-test-suite-name: UnitNoClock0
 test-target: testsuites/unit/ts-unit-no-clock-0.c
 type: test-suite
diff --git a/spec/testsuites/userext.yml b/spec/testsuites/userext.yml
index 4e1aa505..e60b7c27 100644
--- a/spec/testsuites/userext.yml
+++ b/spec/testsuites/userext.yml
@@ -39,6 +39,5 @@ test-description: null
 test-includes: []
 test-local-includes:
 - tc-userext.h
-test-suite-name: Userext
 test-target: testsuites/validation/ts-userext.c
 type: test-suite
diff --git a/spec/testsuites/validation-0.yml b/spec/testsuites/validation-0.yml
index 2204e869..09922c8f 100644
--- a/spec/testsuites/validation-0.yml
+++ b/spec/testsuites/validation-0.yml
@@ -19,6 +19,5 @@ test-description: |
   scheduler are provided using up to four processors.
 test-includes: []
 test-local-includes: []
-test-suite-name: Validation0
 test-target: testsuites/validation/ts-validation-0.c
 type: test-suite
diff --git a/spec/testsuites/validation-1.yml b/spec/testsuites/validation-1.yml
index f23bb2b3..e95d3abd 100644
--- a/spec/testsuites/validation-1.yml
+++ b/spec/testsuites/validation-1.yml
@@ -19,6 +19,5 @@ test-description: |
   scheduler are provided using up to four processors.
 test-includes: []
 test-local-includes: []
-test-suite-name: Validation1
 test-target: testsuites/validation/ts-validation-1.c
 type: test-suite
diff --git a/spec/testsuites/validation-acfg-0.yml b/spec/testsuites/validation-acfg-0.yml
index ff2b227d..06e0521e 100644
--- a/spec/testsuites/validation-acfg-0.yml
+++ b/spec/testsuites/validation-acfg-0.yml
@@ -32,6 +32,5 @@ test-includes: []
 test-local-includes:
 - ts-acfg.h
 - tx-support.h
-test-suite-name: ValidationAcfg0
 test-target: testsuites/validation/ts-validation-acfg-0.c
 type: test-suite
diff --git a/spec/testsuites/validation-acfg-1.yml b/spec/testsuites/validation-acfg-1.yml
index 97f52b80..16a023b6 100644
--- a/spec/testsuites/validation-acfg-1.yml
+++ b/spec/testsuites/validation-acfg-1.yml
@@ -53,6 +53,5 @@ test-includes:
 - bsp.h
 test-local-includes:
 - ts-acfg.h
-test-suite-name: ValidationAcfg1
 test-target: testsuites/validation/ts-validation-acfg-1.c
 type: test-suite
diff --git a/spec/testsuites/validation-cache.yml b/spec/testsuites/validation-cache.yml
index a93de8ec..2d64e2f6 100644
--- a/spec/testsuites/validation-cache.yml
+++ b/spec/testsuites/validation-cache.yml
@@ -19,6 +19,5 @@ test-description: |
   scheduler are provided using up to four processors.
 test-includes: []
 test-local-includes: []
-test-suite-name: ValidationCache
 test-target: testsuites/validation/ts-validation-cache.c
 type: test-suite
diff --git a/spec/testsuites/validation-dev-0.yml b/spec/testsuites/validation-dev-0.yml
index 56ad0542..753c29e2 100644
--- a/spec/testsuites/validation-dev-0.yml
+++ b/spec/testsuites/validation-dev-0.yml
@@ -15,6 +15,5 @@ test-code: |
 test-description: null
 test-includes: []
 test-local-includes: []
-test-suite-name: ValidationDev0
 test-target: testsuites/validation/ts-validation-dev-0.c
 type: test-suite
diff --git a/spec/testsuites/validation-intr.yml b/spec/testsuites/validation-intr.yml
index 42ac5da0..897c8e5f 100644
--- a/spec/testsuites/validation-intr.yml
+++ b/spec/testsuites/validation-intr.yml
@@ -21,6 +21,5 @@ test-description: |
   scheduler are provided using up to four processors.
 test-includes: []
 test-local-includes: []
-test-suite-name: ValidationIntr
 test-target: testsuites/validation/ts-validation-intr.c
 type: test-suite
diff --git a/spec/testsuites/validation-io-kernel.yml b/spec/testsuites/validation-io-kernel.yml
index 4f592ae6..0fbf4d59 100644
--- a/spec/testsuites/validation-io-kernel.yml
+++ b/spec/testsuites/validation-io-kernel.yml
@@ -91,6 +91,5 @@ test-includes:
 - rtems/testopts.h
 test-local-includes:
 - tr-io-kernel.h
-test-suite-name: ValidationIoKernel
 test-target: testsuites/validation/ts-validation-io-kernel.c
 type: test-suite
diff --git a/spec/testsuites/validation-no-clock-0.yml b/spec/testsuites/validation-no-clock-0.yml
index 9e1026fd..f687e8e7 100644
--- a/spec/testsuites/validation-no-clock-0.yml
+++ b/spec/testsuites/validation-no-clock-0.yml
@@ -22,6 +22,5 @@ test-description: |
   scheduler are provided using up to four processors.
 test-includes: []
 test-local-includes: []
-test-suite-name: ValidationNoClock0
 test-target: testsuites/validation/ts-validation-no-clock-0.c
 type: test-suite
diff --git a/spec/testsuites/validation-non-smp.yml b/spec/testsuites/validation-non-smp.yml
index 59aecb2e..a48b1142 100644
--- a/spec/testsuites/validation-non-smp.yml
+++ b/spec/testsuites/validation-non-smp.yml
@@ -18,6 +18,5 @@ test-code: |
 test-description: null
 test-includes: []
 test-local-includes: []
-test-suite-name: ValidationNonSMP
 test-target: testsuites/validation/ts-validation-non-smp.c
 type: test-suite
diff --git a/spec/testsuites/validation-one-cpu-0.yml b/spec/testsuites/validation-one-cpu-0.yml
index a28544f7..ba605438 100644
--- a/spec/testsuites/validation-one-cpu-0.yml
+++ b/spec/testsuites/validation-one-cpu-0.yml
@@ -22,6 +22,5 @@ test-description: |
   duration.
 test-includes: []
 test-local-includes: []
-test-suite-name: ValidationOneCpu0
 test-target: testsuites/validation/ts-validation-one-cpu-0.c
 type: test-suite
diff --git a/spec/testsuites/validation-one-cpu-1.yml b/spec/testsuites/validation-one-cpu-1.yml
index 8f02d5f2..3b6febb2 100644
--- a/spec/testsuites/validation-one-cpu-1.yml
+++ b/spec/testsuites/validation-one-cpu-1.yml
@@ -26,6 +26,5 @@ test-description: |
 test-includes: []
 test-local-includes:
 - ts-config.h
-test-suite-name: ValidationOneCpu1
 test-target: testsuites/validation/ts-validation-one-cpu-1.c
 type: test-suite
diff --git a/spec/testsuites/validation-smp-one-cpu-0.yml b/spec/testsuites/validation-smp-one-cpu-0.yml
index 8e1c75fc..7f997b2a 100644
--- a/spec/testsuites/validation-smp-one-cpu-0.yml
+++ b/spec/testsuites/validation-smp-one-cpu-0.yml
@@ -18,6 +18,5 @@ test-code: |
 test-description: null
 test-includes: []
 test-local-includes: []
-test-suite-name: ValidationSmpOneCpu0
 test-target: testsuites/validation/ts-validation-smp-one-cpu-0.c
 type: test-suite
diff --git a/spec/testsuites/validation-smp-only-0.yml b/spec/testsuites/validation-smp-only-0.yml
index 6d744901..4f810b0e 100644
--- a/spec/testsuites/validation-smp-only-0.yml
+++ b/spec/testsuites/validation-smp-only-0.yml
@@ -19,6 +19,5 @@ test-description: |
   using up to four processors.
 test-includes: []
 test-local-includes: []
-test-suite-name: ValidationSMPOnly0
 test-target: testsuites/validation/ts-validation-smp-only-0.c
 type: test-suite
diff --git a/spec/testsuites/validation-smp-only-2.yml b/spec/testsuites/validation-smp-only-2.yml
index 4336d236..e25282c1 100644
--- a/spec/testsuites/validation-smp-only-2.yml
+++ b/spec/testsuites/validation-smp-only-2.yml
@@ -42,6 +42,5 @@ test-description: null
 test-includes: []
 test-local-includes:
 - ts-config.h
-test-suite-name: ValidationSMPOnly2
 test-target: testsuites/validation/ts-validation-smp-only-2.c
 type: test-suite
diff --git a/spec/testsuites/validation-timecounter-0.yml b/spec/testsuites/validation-timecounter-0.yml
index 8fdd3262..d69f9d2f 100644
--- a/spec/testsuites/validation-timecounter-0.yml
+++ b/spec/testsuites/validation-timecounter-0.yml
@@ -19,6 +19,5 @@ test-code: |
 test-description: null
 test-includes: []
 test-local-includes: []
-test-suite-name: ValidationTimecounter0
 test-target: testsuites/validation/ts-validation-timecounter-0.c
 type: test-suite
diff --git a/spec/testsuites/validation-timecounter-1.yml b/spec/testsuites/validation-timecounter-1.yml
index 8324feab..ee77a1c1 100644
--- a/spec/testsuites/validation-timecounter-1.yml
+++ b/spec/testsuites/validation-timecounter-1.yml
@@ -17,6 +17,5 @@ test-code: |
 test-description: null
 test-includes: []
 test-local-includes: []
-test-suite-name: ValidationTimecounter1
 test-target: testsuites/validation/ts-validation-timecounter-1.c
 type: test-suite
diff --git a/spec/testsuites/validation-timecounter-smp-0.yml b/spec/testsuites/validation-timecounter-smp-0.yml
index d238b13b..06a83f93 100644
--- a/spec/testsuites/validation-timecounter-smp-0.yml
+++ b/spec/testsuites/validation-timecounter-smp-0.yml
@@ -19,6 +19,5 @@ test-code: |
 test-description: null
 test-includes: []
 test-local-includes: []
-test-suite-name: ValidationTimecounterSmp0
 test-target: testsuites/validation/ts-validation-timecounter-smp-0.c
 type: test-suite
diff --git a/spec/testsuites/validation-tls-0.yml b/spec/testsuites/validation-tls-0.yml
index 1c2e5cff..dcc0a69f 100644
--- a/spec/testsuites/validation-tls-0.yml
+++ b/spec/testsuites/validation-tls-0.yml
@@ -17,6 +17,5 @@ test-code: |
 test-description: null
 test-includes: []
 test-local-includes: []
-test-suite-name: ValidationTls0
 test-target: testsuites/validation/ts-validation-tls-0.c
 type: test-suite
diff --git a/spec/testsuites/validation-tls-1.yml b/spec/testsuites/validation-tls-1.yml
index 1f4dcaa7..f430983c 100644
--- a/spec/testsuites/validation-tls-1.yml
+++ b/spec/testsuites/validation-tls-1.yml
@@ -18,6 +18,5 @@ test-code: |
 test-description: null
 test-includes: []
 test-local-includes: []
-test-suite-name: ValidationTls1
 test-target: testsuites/validation/ts-validation-tls-1.c
 type: test-suite