[PATCH] validation: Derive names from item UIDs

Sebastian Huber sebastian.huber at embedded-brains.de
Tue Feb 14 15:00:50 UTC 2023


Use the item UID converted to CamelCase for Doxygen group names and test
suite names.
---
 testsuites/unit/tc-score-rbtree.c                   |  6 +++---
 testsuites/unit/ts-unit-no-clock-0.c                |  7 +++----
 .../tc-acfg-appl-does-not-need-clock-driver.c       |  6 +++---
 .../validation/tc-acfg-appl-needs-clock-driver.c    |  7 +++----
 testsuites/validation/tc-acfg-default.c             |  6 +++---
 .../validation/tc-acfg-disabled-bsp-settings.c      |  7 +++----
 testsuites/validation/tc-acfg-one-cpu.c             |  6 +++---
 testsuites/validation/tc-acfg-scheduler-edf-smp.c   |  7 +++----
 .../tc-acfg-scheduler-table-entries-one-cpu.c       |  6 +++---
 testsuites/validation/tc-acfg.c                     |  6 +++---
 testsuites/validation/tc-attr.c                     |  6 +++---
 testsuites/validation/tc-barrier-create.c           |  6 +++---
 testsuites/validation/tc-barrier-delete.c           |  6 +++---
 testsuites/validation/tc-barrier-ident.c            |  6 +++---
 testsuites/validation/tc-barrier-performance.c      |  6 +++---
 testsuites/validation/tc-barrier-release.c          |  7 +++----
 testsuites/validation/tc-barrier-wait.c             |  6 +++---
 testsuites/validation/tc-basedefs-no-debug.c        |  6 +++---
 testsuites/validation/tc-basedefs.c                 |  7 +++----
 .../tc-bsp-interrupt-handler-dispatch-unchecked.c   |  6 +++---
 testsuites/validation/tc-c.c                        |  6 +++---
 testsuites/validation/tc-cache.c                    |  6 +++---
 testsuites/validation/tc-clock-get-tod.c            |  6 +++---
 testsuites/validation/tc-clock-get-uptime.c         |  7 +++----
 testsuites/validation/tc-clock-nanosleep.c          |  6 +++---
 testsuites/validation/tc-clock-set.c                |  6 +++---
 testsuites/validation/tc-clock.c                    |  6 +++---
 testsuites/validation/tc-cpuuse.c                   |  6 +++---
 testsuites/validation/tc-event-performance.c        |  6 +++---
 testsuites/validation/tc-event-send-receive.c       | 13 ++++++-------
 testsuites/validation/tc-events.c                   |  6 +++---
 testsuites/validation/tc-flsl.c                     |  6 +++---
 testsuites/validation/tc-futex-wait.c               |  6 +++---
 testsuites/validation/tc-futex-wake.c               |  6 +++---
 testsuites/validation/tc-intr-clear.c               |  6 +++---
 testsuites/validation/tc-intr-entry-install.c       |  7 +++----
 testsuites/validation/tc-intr-entry-remove.c        |  7 +++----
 testsuites/validation/tc-intr-get-affinity.c        |  7 +++----
 testsuites/validation/tc-intr-get-attributes.c      |  7 +++----
 testsuites/validation/tc-intr-handler-iterate.c     |  7 +++----
 testsuites/validation/tc-intr-is-pending.c          |  6 +++---
 testsuites/validation/tc-intr-non-smp.c             |  7 +++----
 testsuites/validation/tc-intr-raise-on.c            |  6 +++---
 testsuites/validation/tc-intr-raise.c               |  6 +++---
 testsuites/validation/tc-intr-set-affinity.c        |  7 +++----
 testsuites/validation/tc-intr-smp-only.c            |  7 +++----
 testsuites/validation/tc-intr-vector-disable.c      |  7 +++----
 testsuites/validation/tc-intr-vector-enable.c       |  7 +++----
 testsuites/validation/tc-intr-vector-is-enabled.c   |  7 +++----
 testsuites/validation/tc-intr.c                     |  6 +++---
 testsuites/validation/tc-io-getchark.c              |  6 +++---
 testsuites/validation/tc-io-put-char.c              |  6 +++---
 testsuites/validation/tc-io-putc.c                  |  6 +++---
 testsuites/validation/tc-message-broadcast.c        |  7 +++----
 testsuites/validation/tc-message-construct.c        |  7 +++----
 testsuites/validation/tc-message-delete.c           |  6 +++---
 testsuites/validation/tc-message-flush-pending.c    |  7 +++----
 testsuites/validation/tc-message-ident.c            |  6 +++---
 testsuites/validation/tc-message-macros.c           |  6 +++---
 testsuites/validation/tc-message-performance.c      |  6 +++---
 testsuites/validation/tc-message-receive.c          |  7 +++----
 testsuites/validation/tc-message-urgent-send.c      |  7 +++----
 testsuites/validation/tc-modes.c                    |  6 +++---
 testsuites/validation/tc-object.c                   |  6 +++---
 testsuites/validation/tc-options.c                  |  6 +++---
 testsuites/validation/tc-part-create.c              |  6 +++---
 testsuites/validation/tc-part-delete.c              |  6 +++---
 testsuites/validation/tc-part-get.c                 |  6 +++---
 testsuites/validation/tc-part-ident.c               |  6 +++---
 testsuites/validation/tc-part-performance.c         |  6 +++---
 testsuites/validation/tc-part-return.c              |  7 +++----
 testsuites/validation/tc-part.c                     |  6 +++---
 testsuites/validation/tc-ratemon-cancel.c           |  8 ++++----
 testsuites/validation/tc-ratemon-create.c           |  6 +++---
 testsuites/validation/tc-ratemon-delete.c           |  6 +++---
 testsuites/validation/tc-ratemon-get-status.c       |  9 ++++-----
 testsuites/validation/tc-ratemon-ident.c            |  6 +++---
 testsuites/validation/tc-ratemon-period.c           |  8 ++++----
 testsuites/validation/tc-ratemon-timeout.c          |  9 ++++-----
 .../validation/tc-sched-smp-edf-set-affinity.c      |  6 +++---
 testsuites/validation/tc-sched-smp-edf.c            |  7 +++----
 testsuites/validation/tc-sched-smp.c                |  6 +++---
 testsuites/validation/tc-sched-yield.c              |  6 +++---
 testsuites/validation/tc-scheduler-add-processor.c  |  6 +++---
 .../validation/tc-scheduler-get-maximum-priority.c  |  6 +++---
 .../validation/tc-scheduler-get-processor-set.c     |  6 +++---
 .../tc-scheduler-ident-by-processor-set.c           |  6 +++---
 .../validation/tc-scheduler-ident-by-processor.c    |  6 +++---
 testsuites/validation/tc-scheduler-ident.c          |  7 +++----
 testsuites/validation/tc-scheduler-non-smp.c        |  7 +++----
 .../validation/tc-scheduler-remove-processor.c      |  6 +++---
 testsuites/validation/tc-scheduler-smp-only.c       |  7 +++----
 testsuites/validation/tc-scheduler.c                |  7 +++----
 testsuites/validation/tc-score-fatal.c              |  8 ++++----
 testsuites/validation/tc-score-smp-per-cpu-jobs.c   |  7 +++----
 testsuites/validation/tc-score-smp-thread.c         |  6 +++---
 testsuites/validation/tc-score-thread-smp-one-cpu.c |  7 +++----
 .../validation/tc-score-thread-tls-max-zero.c       |  7 +++----
 testsuites/validation/tc-score-thread-tls.c         |  8 ++++----
 testsuites/validation/tc-score-thread.c             |  6 +++---
 testsuites/validation/tc-score-tq-smp.c             |  6 +++---
 testsuites/validation/tc-score-tq.c                 |  6 +++---
 testsuites/validation/tc-sem-create.c               |  6 +++---
 testsuites/validation/tc-sem-delete.c               |  6 +++---
 testsuites/validation/tc-sem-flush.c                |  6 +++---
 testsuites/validation/tc-sem-ident.c                |  6 +++---
 testsuites/validation/tc-sem-mrsp-obtain.c          |  6 +++---
 testsuites/validation/tc-sem-obtain.c               |  6 +++---
 testsuites/validation/tc-sem-performance.c          |  6 +++---
 testsuites/validation/tc-sem-release.c              |  6 +++---
 testsuites/validation/tc-sem-set-priority.c         |  7 +++----
 testsuites/validation/tc-sem-smp.c                  |  6 +++---
 testsuites/validation/tc-sem-timeout.c              |  6 +++---
 testsuites/validation/tc-sem-uni.c                  |  6 +++---
 testsuites/validation/tc-signal-catch.c             |  8 ++++----
 testsuites/validation/tc-signal-send.c              |  8 ++++----
 testsuites/validation/tc-signals.c                  |  6 +++---
 .../tc-start-of-optional-processor-failed.c         |  6 +++---
 testsuites/validation/tc-status-is-equal.c          |  6 +++---
 testsuites/validation/tc-status-is-successful.c     |  7 +++----
 testsuites/validation/tc-status-text.c              |  6 +++---
 testsuites/validation/tc-status.c                   |  6 +++---
 testsuites/validation/tc-support-is-name-valid.c    |  7 +++----
 testsuites/validation/tc-support.c                  |  7 +++----
 testsuites/validation/tc-sys-lock.c                 |  6 +++---
 testsuites/validation/tc-task-construct.c           |  8 ++++----
 testsuites/validation/tc-task-create-errors.c       |  9 ++++-----
 testsuites/validation/tc-task-delete.c              |  6 +++---
 testsuites/validation/tc-task-exit.c                |  6 +++---
 testsuites/validation/tc-task-get-affinity.c        |  7 +++----
 testsuites/validation/tc-task-get-priority.c        |  7 +++----
 testsuites/validation/tc-task-get-scheduler.c       |  7 +++----
 testsuites/validation/tc-task-ident.c               |  6 +++---
 testsuites/validation/tc-task-is-suspended.c        |  7 +++----
 testsuites/validation/tc-task-mode.c                |  8 ++++----
 testsuites/validation/tc-task-performance.c         |  6 +++---
 testsuites/validation/tc-task-restart.c             |  6 +++---
 testsuites/validation/tc-task-resume.c              |  6 +++---
 testsuites/validation/tc-task-set-affinity.c        |  9 ++++-----
 testsuites/validation/tc-task-set-priority.c        |  9 ++++-----
 testsuites/validation/tc-task-set-scheduler.c       |  7 +++----
 testsuites/validation/tc-task-smp.c                 |  6 +++---
 testsuites/validation/tc-task-start.c               |  6 +++---
 testsuites/validation/tc-task-storage-size.c        |  7 +++----
 testsuites/validation/tc-task-suspend.c             |  6 +++---
 testsuites/validation/tc-task-wake-after.c          |  8 ++++----
 testsuites/validation/tc-task-wake-when.c           |  6 +++---
 testsuites/validation/tc-task.c                     |  6 +++---
 testsuites/validation/tc-terminate.c                |  7 +++----
 .../validation/tc-thread-idle-body-no-return.c      |  6 +++---
 testsuites/validation/tc-timecounter-get-smp.c      |  7 +++----
 testsuites/validation/tc-timecounter-get.c          |  7 +++----
 testsuites/validation/tc-timecounter-install.c      |  7 +++----
 testsuites/validation/tc-timer-cancel.c             |  6 +++---
 testsuites/validation/tc-timer-create.c             |  6 +++---
 testsuites/validation/tc-timer-delete.c             |  6 +++---
 testsuites/validation/tc-timer-fire-after.c         |  7 +++----
 testsuites/validation/tc-timer-fire-when.c          |  6 +++---
 testsuites/validation/tc-timer-ident.c              |  6 +++---
 testsuites/validation/tc-timer-initiate-server.c    |  7 +++----
 testsuites/validation/tc-timer-reset.c              |  6 +++---
 testsuites/validation/tc-timer-server-fire-after.c  |  6 +++---
 testsuites/validation/tc-timer-server-fire-when.c   |  7 +++----
 testsuites/validation/tc-timer.c                    |  6 +++---
 testsuites/validation/tc-type.c                     |  6 +++---
 testsuites/validation/tc-userext-create.c           |  6 +++---
 testsuites/validation/tc-userext-delete.c           |  6 +++---
 testsuites/validation/tc-userext-ident.c            |  6 +++---
 testsuites/validation/tc-userext.c                  |  7 +++----
 testsuites/validation/tr-event-constant.c           |  7 +++----
 testsuites/validation/tr-event-constant.h           |  4 ++--
 testsuites/validation/tr-event-send-receive.c       |  7 +++----
 testsuites/validation/tr-event-send-receive.h       |  4 ++--
 ...fatal-boot-processor-not-assigned-to-scheduler.c |  6 +++---
 ...fatal-boot-processor-not-assigned-to-scheduler.h |  4 ++--
 .../validation/tr-fatal-idle-thread-create-failed.c |  6 +++---
 .../validation/tr-fatal-idle-thread-create-failed.h |  4 ++--
 .../tr-fatal-idle-thread-stack-too-small.c          |  6 +++---
 .../tr-fatal-idle-thread-stack-too-small.h          |  4 ++--
 .../tr-fatal-init-task-construct-failed.c           |  6 +++---
 .../tr-fatal-init-task-construct-failed.h           |  4 ++--
 .../tr-fatal-mandatory-processor-not-present.c      |  6 +++---
 .../tr-fatal-mandatory-processor-not-present.h      |  4 ++--
 ...fatal-scheduler-requires-exactly-one-processor.c |  6 +++---
 ...fatal-scheduler-requires-exactly-one-processor.h |  4 ++--
 testsuites/validation/tr-fatal-smp.c                |  6 +++---
 testsuites/validation/tr-fatal-smp.h                |  4 ++--
 .../tr-fatal-start-of-mandatory-processor-failed.c  |  6 +++---
 .../tr-fatal-start-of-mandatory-processor-failed.h  |  4 ++--
 .../tr-fatal-start-on-not-online-processor.c        |  6 +++---
 .../tr-fatal-start-on-not-online-processor.h        |  4 ++--
 testsuites/validation/tr-fatal-too-large-tls-size.c |  6 +++---
 testsuites/validation/tr-fatal-too-large-tls-size.h |  4 ++--
 testsuites/validation/tr-io-kernel.c                |  6 +++---
 testsuites/validation/tr-io-kernel.h                |  4 ++--
 testsuites/validation/tr-mtx-seize-try.c            |  6 +++---
 testsuites/validation/tr-mtx-seize-try.h            |  4 ++--
 testsuites/validation/tr-mtx-seize-wait.c           |  6 +++---
 testsuites/validation/tr-mtx-seize-wait.h           |  4 ++--
 testsuites/validation/tr-mtx-surrender.c            |  6 +++---
 testsuites/validation/tr-mtx-surrender.h            |  4 ++--
 testsuites/validation/tr-object-ident-local.c       |  6 +++---
 testsuites/validation/tr-object-ident-local.h       |  4 ++--
 testsuites/validation/tr-object-ident.c             |  6 +++---
 testsuites/validation/tr-object-ident.h             |  4 ++--
 testsuites/validation/tr-sem-seize-try.c            |  6 +++---
 testsuites/validation/tr-sem-seize-try.h            |  4 ++--
 testsuites/validation/tr-sem-seize-wait.c           |  6 +++---
 testsuites/validation/tr-sem-seize-wait.h           |  4 ++--
 testsuites/validation/tr-sem-surrender.c            |  6 +++---
 testsuites/validation/tr-sem-surrender.h            |  4 ++--
 testsuites/validation/tr-signal-constant.c          |  6 +++---
 testsuites/validation/tr-signal-constant.h          |  4 ++--
 testsuites/validation/tr-tq-enqueue-ceiling.c       |  7 +++----
 testsuites/validation/tr-tq-enqueue-ceiling.h       |  4 ++--
 testsuites/validation/tr-tq-enqueue-deadlock.c      |  7 +++----
 testsuites/validation/tr-tq-enqueue-deadlock.h      |  4 ++--
 testsuites/validation/tr-tq-enqueue-fifo.c          |  6 +++---
 testsuites/validation/tr-tq-enqueue-fifo.h          |  4 ++--
 testsuites/validation/tr-tq-enqueue-mrsp.c          |  6 +++---
 testsuites/validation/tr-tq-enqueue-mrsp.h          |  4 ++--
 .../validation/tr-tq-enqueue-priority-inherit.c     |  6 +++---
 .../validation/tr-tq-enqueue-priority-inherit.h     |  4 ++--
 testsuites/validation/tr-tq-enqueue-priority.c      |  7 +++----
 testsuites/validation/tr-tq-enqueue-priority.h      |  4 ++--
 testsuites/validation/tr-tq-flush-fifo.c            |  6 +++---
 testsuites/validation/tr-tq-flush-fifo.h            |  4 ++--
 .../validation/tr-tq-flush-priority-inherit.c       |  6 +++---
 .../validation/tr-tq-flush-priority-inherit.h       |  4 ++--
 testsuites/validation/tr-tq-flush-priority.c        |  7 +++----
 testsuites/validation/tr-tq-flush-priority.h        |  4 ++--
 testsuites/validation/tr-tq-surrender-mrsp.c        |  7 +++----
 testsuites/validation/tr-tq-surrender-mrsp.h        |  4 ++--
 .../validation/tr-tq-surrender-priority-inherit.c   |  6 +++---
 .../validation/tr-tq-surrender-priority-inherit.h   |  4 ++--
 testsuites/validation/tr-tq-surrender.c             |  6 +++---
 testsuites/validation/tr-tq-surrender.h             |  4 ++--
 testsuites/validation/tr-tq-timeout-mrsp.c          |  6 +++---
 testsuites/validation/tr-tq-timeout-mrsp.h          |  4 ++--
 .../validation/tr-tq-timeout-priority-inherit.c     |  6 +++---
 .../validation/tr-tq-timeout-priority-inherit.h     |  4 ++--
 testsuites/validation/tr-tq-timeout.c               |  6 +++---
 testsuites/validation/tr-tq-timeout.h               |  4 ++--
 ...fatal-boot-processor-not-assigned-to-scheduler.c |  6 +++---
 .../validation/ts-fatal-idle-thread-create-failed.c |  6 +++---
 .../ts-fatal-idle-thread-stack-too-small.c          |  6 +++---
 .../ts-fatal-init-task-construct-failed.c           |  6 +++---
 .../ts-fatal-mandatory-processor-not-present.c      |  6 +++---
 ...fatal-scheduler-requires-exactly-one-processor.c |  6 +++---
 testsuites/validation/ts-fatal-smp.c                |  6 +++---
 .../ts-fatal-start-of-mandatory-processor-failed.c  |  6 +++---
 .../ts-fatal-start-on-not-online-processor.c        |  6 +++---
 testsuites/validation/ts-fatal-too-large-tls-size.c |  6 +++---
 testsuites/validation/ts-performance-no-clock-0.c   |  6 +++---
 testsuites/validation/ts-terminate.c                |  6 +++---
 testsuites/validation/ts-userext.c                  |  6 +++---
 testsuites/validation/ts-validation-0.c             |  6 +++---
 testsuites/validation/ts-validation-1.c             |  6 +++---
 testsuites/validation/ts-validation-acfg-0.c        |  7 +++----
 testsuites/validation/ts-validation-acfg-1.c        |  7 +++----
 testsuites/validation/ts-validation-cache.c         |  7 +++----
 testsuites/validation/ts-validation-intr.c          |  7 +++----
 testsuites/validation/ts-validation-io-kernel.c     |  7 +++----
 testsuites/validation/ts-validation-no-clock-0.c    |  6 +++---
 testsuites/validation/ts-validation-non-smp.c       |  7 +++----
 testsuites/validation/ts-validation-one-cpu-0.c     |  7 +++----
 testsuites/validation/ts-validation-one-cpu-1.c     |  7 +++----
 testsuites/validation/ts-validation-smp-one-cpu-0.c |  6 +++---
 testsuites/validation/ts-validation-smp-only-0.c    |  6 +++---
 testsuites/validation/ts-validation-smp-only-2.c    |  6 +++---
 testsuites/validation/ts-validation-timecounter-0.c |  6 +++---
 testsuites/validation/ts-validation-timecounter-1.c |  6 +++---
 .../validation/ts-validation-timecounter-smp-0.c    |  6 +++---
 testsuites/validation/ts-validation-tls-0.c         |  7 +++----
 testsuites/validation/ts-validation-tls-1.c         |  7 +++----
 275 files changed, 805 insertions(+), 878 deletions(-)

diff --git a/testsuites/unit/tc-score-rbtree.c b/testsuites/unit/tc-score-rbtree.c
index 36fff61b8f..b073d9bba9 100644
--- a/testsuites/unit/tc-score-rbtree.c
+++ b/testsuites/unit/tc-score-rbtree.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreRbtreeUnitRbtree
+ * @ingroup ScoreRbtreeUnitRbtree
  */
 
 /*
@@ -59,9 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreRbtreeUnitRbtree spec:/score/rbtree/unit/rbtree
+ * @defgroup ScoreRbtreeUnitRbtree spec:/score/rbtree/unit/rbtree
  *
- * @ingroup RTEMSTestSuiteTestsuitesUnitNoClock0
+ * @ingroup TestsuitesUnitNoClock0
  *
  * @brief Unit tests for the red-black tree implementation.
  *
diff --git a/testsuites/unit/ts-unit-no-clock-0.c b/testsuites/unit/ts-unit-no-clock-0.c
index 8fa8518d36..4bbb0b8000 100644
--- a/testsuites/unit/ts-unit-no-clock-0.c
+++ b/testsuites/unit/ts-unit-no-clock-0.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesUnitNoClock0
+ * @ingroup TestsuitesUnitNoClock0
  */
 
 /*
@@ -55,8 +55,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesUnitNoClock0 \
- *   spec:/testsuites/unit-no-clock-0
+ * @defgroup TestsuitesUnitNoClock0 spec:/testsuites/unit-no-clock-0
  *
  * @ingroup RTEMSTestSuites
  *
@@ -70,7 +69,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "UnitNoClock0";
+const char rtems_test_name[] = "TestsuitesUnitNoClock0";
 
 #define CONFIGURE_MAXIMUM_PROCESSORS 4
 
diff --git a/testsuites/validation/tc-acfg-appl-does-not-need-clock-driver.c b/testsuites/validation/tc-acfg-appl-does-not-need-clock-driver.c
index 3aef1497be..f134fddcf6 100644
--- a/testsuites/validation/tc-acfg-appl-does-not-need-clock-driver.c
+++ b/testsuites/validation/tc-acfg-appl-does-not-need-clock-driver.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseAcfgValApplDoesNotNeedClockDriver
+ * @ingroup AcfgValApplDoesNotNeedClockDriver
  */
 
 /*
@@ -57,10 +57,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseAcfgValApplDoesNotNeedClockDriver \
+ * @defgroup AcfgValApplDoesNotNeedClockDriver \
  *   spec:/acfg/val/appl-does-not-need-clock-driver
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationAcfg0
+ * @ingroup TestsuitesValidationAcfg0
  *
  * @brief Tests the effect of the
  *   CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER application configuration
diff --git a/testsuites/validation/tc-acfg-appl-needs-clock-driver.c b/testsuites/validation/tc-acfg-appl-needs-clock-driver.c
index 5da259977f..c9b1338d6e 100644
--- a/testsuites/validation/tc-acfg-appl-needs-clock-driver.c
+++ b/testsuites/validation/tc-acfg-appl-needs-clock-driver.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseAcfgValApplNeedsClockDriver
+ * @ingroup AcfgValApplNeedsClockDriver
  */
 
 /*
@@ -57,10 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseAcfgValApplNeedsClockDriver \
- *   spec:/acfg/val/appl-needs-clock-driver
+ * @defgroup AcfgValApplNeedsClockDriver spec:/acfg/val/appl-needs-clock-driver
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidation0
+ * @ingroup TestsuitesValidation0
  *
  * @brief Tests the effect of the CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
  *   application configuration option.
diff --git a/testsuites/validation/tc-acfg-default.c b/testsuites/validation/tc-acfg-default.c
index 04876285fb..26af8ac440 100644
--- a/testsuites/validation/tc-acfg-default.c
+++ b/testsuites/validation/tc-acfg-default.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseAcfgValDefault
+ * @ingroup AcfgValDefault
  */
 
 /*
@@ -61,9 +61,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseAcfgValDefault spec:/acfg/val/default
+ * @defgroup AcfgValDefault spec:/acfg/val/default
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationAcfg0
+ * @ingroup TestsuitesValidationAcfg0
  *
  * @brief Tests the default values of application configuration options.
  *
diff --git a/testsuites/validation/tc-acfg-disabled-bsp-settings.c b/testsuites/validation/tc-acfg-disabled-bsp-settings.c
index 0dbae670f3..7729812840 100644
--- a/testsuites/validation/tc-acfg-disabled-bsp-settings.c
+++ b/testsuites/validation/tc-acfg-disabled-bsp-settings.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseAcfgValDisabledBspSettings
+ * @ingroup AcfgValDisabledBspSettings
  */
 
 /*
@@ -58,10 +58,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseAcfgValDisabledBspSettings \
- *   spec:/acfg/val/disabled-bsp-settings
+ * @defgroup AcfgValDisabledBspSettings spec:/acfg/val/disabled-bsp-settings
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationAcfg1
+ * @ingroup TestsuitesValidationAcfg1
  *
  * @brief Tests the default values of application configuration options where
  *   all optional BSP provided settings are disabled.
diff --git a/testsuites/validation/tc-acfg-one-cpu.c b/testsuites/validation/tc-acfg-one-cpu.c
index 5175829d55..8979bcf39f 100644
--- a/testsuites/validation/tc-acfg-one-cpu.c
+++ b/testsuites/validation/tc-acfg-one-cpu.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseAcfgValOneCpu
+ * @ingroup AcfgValOneCpu
  */
 
 /*
@@ -61,9 +61,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseAcfgValOneCpu spec:/acfg/val/one-cpu
+ * @defgroup AcfgValOneCpu spec:/acfg/val/one-cpu
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationOneCpu0
+ * @ingroup TestsuitesValidationOneCpu0
  *
  * @brief Tests the effect of application configuration options.
  *
diff --git a/testsuites/validation/tc-acfg-scheduler-edf-smp.c b/testsuites/validation/tc-acfg-scheduler-edf-smp.c
index 75b24b97d3..78e85a2137 100644
--- a/testsuites/validation/tc-acfg-scheduler-edf-smp.c
+++ b/testsuites/validation/tc-acfg-scheduler-edf-smp.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseAcfgValSchedulerEdfSmp
+ * @ingroup AcfgValSchedulerEdfSmp
  */
 
 /*
@@ -61,10 +61,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseAcfgValSchedulerEdfSmp \
- *   spec:/acfg/val/scheduler-edf-smp
+ * @defgroup AcfgValSchedulerEdfSmp spec:/acfg/val/scheduler-edf-smp
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationSmpOnly0
+ * @ingroup TestsuitesValidationSmpOnly0
  *
  * @brief Tests the effect of application configuration options.
  *
diff --git a/testsuites/validation/tc-acfg-scheduler-table-entries-one-cpu.c b/testsuites/validation/tc-acfg-scheduler-table-entries-one-cpu.c
index 1039c66d90..e0bd87cabc 100644
--- a/testsuites/validation/tc-acfg-scheduler-table-entries-one-cpu.c
+++ b/testsuites/validation/tc-acfg-scheduler-table-entries-one-cpu.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseAcfgValSchedulerTableEntriesOneCpu
+ * @ingroup AcfgValSchedulerTableEntriesOneCpu
  */
 
 /*
@@ -57,10 +57,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseAcfgValSchedulerTableEntriesOneCpu \
+ * @defgroup AcfgValSchedulerTableEntriesOneCpu \
  *   spec:/acfg/val/scheduler-table-entries-one-cpu
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationOneCpu1
+ * @ingroup TestsuitesValidationOneCpu1
  *
  * @brief Tests the effect of CONFIGURE_SCHEDULER_TABLE_ENTRIES the application
  *   configuration options in a configuration with only one processor.
diff --git a/testsuites/validation/tc-acfg.c b/testsuites/validation/tc-acfg.c
index fb16536737..3902e287e1 100644
--- a/testsuites/validation/tc-acfg.c
+++ b/testsuites/validation/tc-acfg.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseAcfgValAcfg
+ * @ingroup AcfgValAcfg
  */
 
 /*
@@ -62,9 +62,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseAcfgValAcfg spec:/acfg/val/acfg
+ * @defgroup AcfgValAcfg spec:/acfg/val/acfg
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Tests the effect of application configuration options.
  *
diff --git a/testsuites/validation/tc-attr.c b/testsuites/validation/tc-attr.c
index 3d39dcd6d5..1b4cea0fe6 100644
--- a/testsuites/validation/tc-attr.c
+++ b/testsuites/validation/tc-attr.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsAttrValAttr
+ * @ingroup RtemsAttrValAttr
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsAttrValAttr spec:/rtems/attr/val/attr
+ * @defgroup RtemsAttrValAttr spec:/rtems/attr/val/attr
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Tests the attribute constants of the Classic API.
  *
diff --git a/testsuites/validation/tc-barrier-create.c b/testsuites/validation/tc-barrier-create.c
index 64b2540c79..cd700f2915 100644
--- a/testsuites/validation/tc-barrier-create.c
+++ b/testsuites/validation/tc-barrier-create.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsBarrierReqCreate
+ * @ingroup RtemsBarrierReqCreate
  */
 
 /*
@@ -60,9 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsBarrierReqCreate spec:/rtems/barrier/req/create
+ * @defgroup RtemsBarrierReqCreate spec:/rtems/barrier/req/create
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-barrier-delete.c b/testsuites/validation/tc-barrier-delete.c
index 1915ffb7ad..5832bedb53 100644
--- a/testsuites/validation/tc-barrier-delete.c
+++ b/testsuites/validation/tc-barrier-delete.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsBarrierReqDelete
+ * @ingroup RtemsBarrierReqDelete
  */
 
 /*
@@ -60,9 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsBarrierReqDelete spec:/rtems/barrier/req/delete
+ * @defgroup RtemsBarrierReqDelete spec:/rtems/barrier/req/delete
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-barrier-ident.c b/testsuites/validation/tc-barrier-ident.c
index dcb4a1c273..d1f8cc3113 100644
--- a/testsuites/validation/tc-barrier-ident.c
+++ b/testsuites/validation/tc-barrier-ident.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsBarrierValIdent
+ * @ingroup RtemsBarrierValIdent
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsBarrierValIdent spec:/rtems/barrier/val/ident
+ * @defgroup RtemsBarrierValIdent spec:/rtems/barrier/val/ident
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Test the rtems_barrier_ident() directive.
  *
diff --git a/testsuites/validation/tc-barrier-performance.c b/testsuites/validation/tc-barrier-performance.c
index 91573e4c10..5b6b4a24bb 100644
--- a/testsuites/validation/tc-barrier-performance.c
+++ b/testsuites/validation/tc-barrier-performance.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsBarrierValPerf
+ * @ingroup RtemsBarrierValPerf
  */
 
 /*
@@ -59,9 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsBarrierValPerf spec:/rtems/barrier/val/perf
+ * @defgroup RtemsBarrierValPerf spec:/rtems/barrier/val/perf
  *
- * @ingroup RTEMSTestSuiteTestsuitesPerformanceNoClock0
+ * @ingroup TestsuitesPerformanceNoClock0
  *
  * @brief This test case provides a context to run @ref RTEMSAPIClassicBarrier
  *   performance tests.
diff --git a/testsuites/validation/tc-barrier-release.c b/testsuites/validation/tc-barrier-release.c
index beb26f4660..27b721361d 100644
--- a/testsuites/validation/tc-barrier-release.c
+++ b/testsuites/validation/tc-barrier-release.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsBarrierReqRelease
+ * @ingroup RtemsBarrierReqRelease
  */
 
 /*
@@ -60,10 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsBarrierReqRelease \
- *   spec:/rtems/barrier/req/release
+ * @defgroup RtemsBarrierReqRelease spec:/rtems/barrier/req/release
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-barrier-wait.c b/testsuites/validation/tc-barrier-wait.c
index 700b846cad..e3a4a9d347 100644
--- a/testsuites/validation/tc-barrier-wait.c
+++ b/testsuites/validation/tc-barrier-wait.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsBarrierReqWait
+ * @ingroup RtemsBarrierReqWait
  */
 
 /*
@@ -60,9 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsBarrierReqWait spec:/rtems/barrier/req/wait
+ * @defgroup RtemsBarrierReqWait spec:/rtems/barrier/req/wait
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-basedefs-no-debug.c b/testsuites/validation/tc-basedefs-no-debug.c
index df4590a866..2566107730 100644
--- a/testsuites/validation/tc-basedefs-no-debug.c
+++ b/testsuites/validation/tc-basedefs-no-debug.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsBasedefsValBasedefsNoDebug
+ * @ingroup RtemsBasedefsValBasedefsNoDebug
  */
 
 /*
@@ -59,10 +59,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsBasedefsValBasedefsNoDebug \
+ * @defgroup RtemsBasedefsValBasedefsNoDebug \
  *   spec:/rtems/basedefs/val/basedefs-no-debug
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Tests the basedefs macros where RTEMS_DEBUG is disabled.
  *
diff --git a/testsuites/validation/tc-basedefs.c b/testsuites/validation/tc-basedefs.c
index bec43fa476..1aa92de5a1 100644
--- a/testsuites/validation/tc-basedefs.c
+++ b/testsuites/validation/tc-basedefs.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsBasedefsValBasedefs
+ * @ingroup RtemsBasedefsValBasedefs
  */
 
 /*
@@ -59,10 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsBasedefsValBasedefs \
- *   spec:/rtems/basedefs/val/basedefs
+ * @defgroup RtemsBasedefsValBasedefs spec:/rtems/basedefs/val/basedefs
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Tests the basedefs macros of the Classic API.
  *
diff --git a/testsuites/validation/tc-bsp-interrupt-handler-dispatch-unchecked.c b/testsuites/validation/tc-bsp-interrupt-handler-dispatch-unchecked.c
index 107a0e9688..31a58cbbf8 100644
--- a/testsuites/validation/tc-bsp-interrupt-handler-dispatch-unchecked.c
+++ b/testsuites/validation/tc-bsp-interrupt-handler-dispatch-unchecked.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseBspReqInterruptHandlerDispatchUnchecked
+ * @ingroup BspReqInterruptHandlerDispatchUnchecked
  */
 
 /*
@@ -60,10 +60,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseBspReqInterruptHandlerDispatchUnchecked \
+ * @defgroup BspReqInterruptHandlerDispatchUnchecked \
  *   spec:/bsp/req/interrupt-handler-dispatch-unchecked
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationIntr
+ * @ingroup TestsuitesValidationIntr
  *
  * @{
  */
diff --git a/testsuites/validation/tc-c.c b/testsuites/validation/tc-c.c
index 32b55fd845..3c0b933948 100644
--- a/testsuites/validation/tc-c.c
+++ b/testsuites/validation/tc-c.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseCValC
+ * @ingroup CValC
  */
 
 /*
@@ -58,9 +58,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseCValC spec:/c/val/c
+ * @defgroup CValC spec:/c/val/c
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Tests C library functions.
  *
diff --git a/testsuites/validation/tc-cache.c b/testsuites/validation/tc-cache.c
index 3e0cdf7deb..61291e95c7 100644
--- a/testsuites/validation/tc-cache.c
+++ b/testsuites/validation/tc-cache.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsCacheValCache
+ * @ingroup RtemsCacheValCache
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsCacheValCache spec:/rtems/cache/val/cache
+ * @defgroup RtemsCacheValCache spec:/rtems/cache/val/cache
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationCache
+ * @ingroup TestsuitesValidationCache
  *
  * @brief Tests some @ref RTEMSAPIClassicCache directives.
  *
diff --git a/testsuites/validation/tc-clock-get-tod.c b/testsuites/validation/tc-clock-get-tod.c
index f3ff4a3830..c80775bea9 100644
--- a/testsuites/validation/tc-clock-get-tod.c
+++ b/testsuites/validation/tc-clock-get-tod.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsClockReqGetTod
+ * @ingroup RtemsClockReqGetTod
  */
 
 /*
@@ -59,9 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsClockReqGetTod spec:/rtems/clock/req/get-tod
+ * @defgroup RtemsClockReqGetTod spec:/rtems/clock/req/get-tod
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-clock-get-uptime.c b/testsuites/validation/tc-clock-get-uptime.c
index ebc8b2de74..a0c4fabbae 100644
--- a/testsuites/validation/tc-clock-get-uptime.c
+++ b/testsuites/validation/tc-clock-get-uptime.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsClockReqGetUptime
+ * @ingroup RtemsClockReqGetUptime
  */
 
 /*
@@ -57,10 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsClockReqGetUptime \
- *   spec:/rtems/clock/req/get-uptime
+ * @defgroup RtemsClockReqGetUptime spec:/rtems/clock/req/get-uptime
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-clock-nanosleep.c b/testsuites/validation/tc-clock-nanosleep.c
index 45a3355384..66fce762dd 100644
--- a/testsuites/validation/tc-clock-nanosleep.c
+++ b/testsuites/validation/tc-clock-nanosleep.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseCReqClockNanosleep
+ * @ingroup CReqClockNanosleep
  */
 
 /*
@@ -64,9 +64,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseCReqClockNanosleep spec:/c/req/clock-nanosleep
+ * @defgroup CReqClockNanosleep spec:/c/req/clock-nanosleep
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-clock-set.c b/testsuites/validation/tc-clock-set.c
index 55012dffd3..66e69e2995 100644
--- a/testsuites/validation/tc-clock-set.c
+++ b/testsuites/validation/tc-clock-set.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsClockReqSet
+ * @ingroup RtemsClockReqSet
  */
 
 /*
@@ -58,9 +58,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsClockReqSet spec:/rtems/clock/req/set
+ * @defgroup RtemsClockReqSet spec:/rtems/clock/req/set
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-clock.c b/testsuites/validation/tc-clock.c
index 5ff8b24ca4..173902f47c 100644
--- a/testsuites/validation/tc-clock.c
+++ b/testsuites/validation/tc-clock.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsClockValClock
+ * @ingroup RtemsClockValClock
  */
 
 /*
@@ -60,9 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsClockValClock spec:/rtems/clock/val/clock
+ * @defgroup RtemsClockValClock spec:/rtems/clock/val/clock
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Tests some @ref RTEMSAPIClassicClock directives.
  *
diff --git a/testsuites/validation/tc-cpuuse.c b/testsuites/validation/tc-cpuuse.c
index 977a7acbee..9d816acc74 100644
--- a/testsuites/validation/tc-cpuuse.c
+++ b/testsuites/validation/tc-cpuuse.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsCpuuseValCpuuse
+ * @ingroup RtemsCpuuseValCpuuse
  */
 
 /*
@@ -60,9 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsCpuuseValCpuuse spec:/rtems/cpuuse/val/cpuuse
+ * @defgroup RtemsCpuuseValCpuuse spec:/rtems/cpuuse/val/cpuuse
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Tests the CPU usage reporting and reset.
  *
diff --git a/testsuites/validation/tc-event-performance.c b/testsuites/validation/tc-event-performance.c
index 1baefecea5..7018adaee1 100644
--- a/testsuites/validation/tc-event-performance.c
+++ b/testsuites/validation/tc-event-performance.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsEventValPerf
+ * @ingroup RtemsEventValPerf
  */
 
 /*
@@ -59,9 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsEventValPerf spec:/rtems/event/val/perf
+ * @defgroup RtemsEventValPerf spec:/rtems/event/val/perf
  *
- * @ingroup RTEMSTestSuiteTestsuitesPerformanceNoClock0
+ * @ingroup TestsuitesPerformanceNoClock0
  *
  * @brief This test case provides a context to run @ref RTEMSAPIClassicEvent
  *   performance tests.
diff --git a/testsuites/validation/tc-event-send-receive.c b/testsuites/validation/tc-event-send-receive.c
index 7db58bedcd..28d67f3ea3 100644
--- a/testsuites/validation/tc-event-send-receive.c
+++ b/testsuites/validation/tc-event-send-receive.c
@@ -3,8 +3,8 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsEventValSendReceive
- * @ingroup RTEMSTestCaseRtemsEventValSystemSendReceive
+ * @ingroup RtemsEventValSendReceive
+ * @ingroup RtemsEventValSystemSendReceive
  */
 
 /*
@@ -63,10 +63,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsEventValSendReceive \
- *   spec:/rtems/event/val/send-receive
+ * @defgroup RtemsEventValSendReceive spec:/rtems/event/val/send-receive
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidation0
+ * @ingroup TestsuitesValidation0
  *
  * @brief Tests the rtems_event_send() and rtems_event_receive() directives.
  *
@@ -130,10 +129,10 @@ T_TEST_CASE( RtemsEventValSendReceive )
 /** @} */
 
 /**
- * @defgroup RTEMSTestCaseRtemsEventValSystemSendReceive \
+ * @defgroup RtemsEventValSystemSendReceive \
  *   spec:/rtems/event/val/system-send-receive
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidation0
+ * @ingroup TestsuitesValidation0
  *
  * @brief Tests the rtems_event_system_send() and rtems_event_system_receive()
  *   directives.
diff --git a/testsuites/validation/tc-events.c b/testsuites/validation/tc-events.c
index 54df2f7ceb..503be78908 100644
--- a/testsuites/validation/tc-events.c
+++ b/testsuites/validation/tc-events.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsEventValEvents
+ * @ingroup RtemsEventValEvents
  */
 
 /*
@@ -59,9 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsEventValEvents spec:/rtems/event/val/events
+ * @defgroup RtemsEventValEvents spec:/rtems/event/val/events
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Tests the Event Manager API.
  *
diff --git a/testsuites/validation/tc-flsl.c b/testsuites/validation/tc-flsl.c
index fef1f2bae1..2894ec8f6e 100644
--- a/testsuites/validation/tc-flsl.c
+++ b/testsuites/validation/tc-flsl.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseCReqFlsl
+ * @ingroup CReqFlsl
  */
 
 /*
@@ -58,9 +58,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseCReqFlsl spec:/c/req/flsl
+ * @defgroup CReqFlsl spec:/c/req/flsl
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-futex-wait.c b/testsuites/validation/tc-futex-wait.c
index 396b26525f..56084a5e36 100644
--- a/testsuites/validation/tc-futex-wait.c
+++ b/testsuites/validation/tc-futex-wait.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseNewlibReqFutexWait
+ * @ingroup NewlibReqFutexWait
  */
 
 /*
@@ -62,9 +62,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseNewlibReqFutexWait spec:/newlib/req/futex-wait
+ * @defgroup NewlibReqFutexWait spec:/newlib/req/futex-wait
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-futex-wake.c b/testsuites/validation/tc-futex-wake.c
index aa0a93a3ef..dcde59edf2 100644
--- a/testsuites/validation/tc-futex-wake.c
+++ b/testsuites/validation/tc-futex-wake.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseNewlibReqFutexWake
+ * @ingroup NewlibReqFutexWake
  */
 
 /*
@@ -62,9 +62,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseNewlibReqFutexWake spec:/newlib/req/futex-wake
+ * @defgroup NewlibReqFutexWake spec:/newlib/req/futex-wake
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-intr-clear.c b/testsuites/validation/tc-intr-clear.c
index 1c6c451a39..c2f7a3f906 100644
--- a/testsuites/validation/tc-intr-clear.c
+++ b/testsuites/validation/tc-intr-clear.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsIntrReqClear
+ * @ingroup RtemsIntrReqClear
  */
 
 /*
@@ -61,9 +61,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsIntrReqClear spec:/rtems/intr/req/clear
+ * @defgroup RtemsIntrReqClear spec:/rtems/intr/req/clear
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationIntr
+ * @ingroup TestsuitesValidationIntr
  *
  * @{
  */
diff --git a/testsuites/validation/tc-intr-entry-install.c b/testsuites/validation/tc-intr-entry-install.c
index 40f91ca510..2fb92f590a 100644
--- a/testsuites/validation/tc-intr-entry-install.c
+++ b/testsuites/validation/tc-intr-entry-install.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsIntrReqEntryInstall
+ * @ingroup RtemsIntrReqEntryInstall
  */
 
 /*
@@ -60,10 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsIntrReqEntryInstall \
- *   spec:/rtems/intr/req/entry-install
+ * @defgroup RtemsIntrReqEntryInstall spec:/rtems/intr/req/entry-install
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationIntr
+ * @ingroup TestsuitesValidationIntr
  *
  * @{
  */
diff --git a/testsuites/validation/tc-intr-entry-remove.c b/testsuites/validation/tc-intr-entry-remove.c
index b9960618c6..53d51f196f 100644
--- a/testsuites/validation/tc-intr-entry-remove.c
+++ b/testsuites/validation/tc-intr-entry-remove.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsIntrReqEntryRemove
+ * @ingroup RtemsIntrReqEntryRemove
  */
 
 /*
@@ -60,10 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsIntrReqEntryRemove \
- *   spec:/rtems/intr/req/entry-remove
+ * @defgroup RtemsIntrReqEntryRemove spec:/rtems/intr/req/entry-remove
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationIntr
+ * @ingroup TestsuitesValidationIntr
  *
  * @{
  */
diff --git a/testsuites/validation/tc-intr-get-affinity.c b/testsuites/validation/tc-intr-get-affinity.c
index 5b5ca2e25f..0bee17f2e5 100644
--- a/testsuites/validation/tc-intr-get-affinity.c
+++ b/testsuites/validation/tc-intr-get-affinity.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsIntrReqGetAffinity
+ * @ingroup RtemsIntrReqGetAffinity
  */
 
 /*
@@ -61,10 +61,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsIntrReqGetAffinity \
- *   spec:/rtems/intr/req/get-affinity
+ * @defgroup RtemsIntrReqGetAffinity spec:/rtems/intr/req/get-affinity
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationIntr
+ * @ingroup TestsuitesValidationIntr
  *
  * @{
  */
diff --git a/testsuites/validation/tc-intr-get-attributes.c b/testsuites/validation/tc-intr-get-attributes.c
index 713defaa1a..386ab03e13 100644
--- a/testsuites/validation/tc-intr-get-attributes.c
+++ b/testsuites/validation/tc-intr-get-attributes.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsIntrReqGetAttributes
+ * @ingroup RtemsIntrReqGetAttributes
  */
 
 /*
@@ -59,10 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsIntrReqGetAttributes \
- *   spec:/rtems/intr/req/get-attributes
+ * @defgroup RtemsIntrReqGetAttributes spec:/rtems/intr/req/get-attributes
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationIntr
+ * @ingroup TestsuitesValidationIntr
  *
  * @{
  */
diff --git a/testsuites/validation/tc-intr-handler-iterate.c b/testsuites/validation/tc-intr-handler-iterate.c
index dae9a0cce1..a614d7e5a3 100644
--- a/testsuites/validation/tc-intr-handler-iterate.c
+++ b/testsuites/validation/tc-intr-handler-iterate.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsIntrReqHandlerIterate
+ * @ingroup RtemsIntrReqHandlerIterate
  */
 
 /*
@@ -60,10 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsIntrReqHandlerIterate \
- *   spec:/rtems/intr/req/handler-iterate
+ * @defgroup RtemsIntrReqHandlerIterate spec:/rtems/intr/req/handler-iterate
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationIntr
+ * @ingroup TestsuitesValidationIntr
  *
  * @{
  */
diff --git a/testsuites/validation/tc-intr-is-pending.c b/testsuites/validation/tc-intr-is-pending.c
index 93be686038..e2d66f0de0 100644
--- a/testsuites/validation/tc-intr-is-pending.c
+++ b/testsuites/validation/tc-intr-is-pending.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsIntrReqIsPending
+ * @ingroup RtemsIntrReqIsPending
  */
 
 /*
@@ -61,9 +61,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsIntrReqIsPending spec:/rtems/intr/req/is-pending
+ * @defgroup RtemsIntrReqIsPending spec:/rtems/intr/req/is-pending
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationIntr
+ * @ingroup TestsuitesValidationIntr
  *
  * @{
  */
diff --git a/testsuites/validation/tc-intr-non-smp.c b/testsuites/validation/tc-intr-non-smp.c
index bb75ccc1b6..b197706370 100644
--- a/testsuites/validation/tc-intr-non-smp.c
+++ b/testsuites/validation/tc-intr-non-smp.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsIntrValIntrNonSmp
+ * @ingroup RtemsIntrValIntrNonSmp
  */
 
 /*
@@ -59,10 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsIntrValIntrNonSmp \
- *   spec:/rtems/intr/val/intr-non-smp
+ * @defgroup RtemsIntrValIntrNonSmp spec:/rtems/intr/val/intr-non-smp
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNonSmp
+ * @ingroup TestsuitesValidationNonSmp
  *
  * @brief Tests some @ref RTEMSAPIClassicIntr interfaces.
  *
diff --git a/testsuites/validation/tc-intr-raise-on.c b/testsuites/validation/tc-intr-raise-on.c
index 4d305258b3..ea1edcfa79 100644
--- a/testsuites/validation/tc-intr-raise-on.c
+++ b/testsuites/validation/tc-intr-raise-on.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsIntrReqRaiseOn
+ * @ingroup RtemsIntrReqRaiseOn
  */
 
 /*
@@ -61,9 +61,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsIntrReqRaiseOn spec:/rtems/intr/req/raise-on
+ * @defgroup RtemsIntrReqRaiseOn spec:/rtems/intr/req/raise-on
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationIntr
+ * @ingroup TestsuitesValidationIntr
  *
  * @{
  */
diff --git a/testsuites/validation/tc-intr-raise.c b/testsuites/validation/tc-intr-raise.c
index dde5f2c0e0..9c8a8a4d2e 100644
--- a/testsuites/validation/tc-intr-raise.c
+++ b/testsuites/validation/tc-intr-raise.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsIntrReqRaise
+ * @ingroup RtemsIntrReqRaise
  */
 
 /*
@@ -61,9 +61,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsIntrReqRaise spec:/rtems/intr/req/raise
+ * @defgroup RtemsIntrReqRaise spec:/rtems/intr/req/raise
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationIntr
+ * @ingroup TestsuitesValidationIntr
  *
  * @{
  */
diff --git a/testsuites/validation/tc-intr-set-affinity.c b/testsuites/validation/tc-intr-set-affinity.c
index e49d83e8e1..3a8c2e3f22 100644
--- a/testsuites/validation/tc-intr-set-affinity.c
+++ b/testsuites/validation/tc-intr-set-affinity.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsIntrReqSetAffinity
+ * @ingroup RtemsIntrReqSetAffinity
  */
 
 /*
@@ -60,10 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsIntrReqSetAffinity \
- *   spec:/rtems/intr/req/set-affinity
+ * @defgroup RtemsIntrReqSetAffinity spec:/rtems/intr/req/set-affinity
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationIntr
+ * @ingroup TestsuitesValidationIntr
  *
  * @{
  */
diff --git a/testsuites/validation/tc-intr-smp-only.c b/testsuites/validation/tc-intr-smp-only.c
index 4bf596141c..b0b6a59784 100644
--- a/testsuites/validation/tc-intr-smp-only.c
+++ b/testsuites/validation/tc-intr-smp-only.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsIntrValIntrSmpOnly
+ * @ingroup RtemsIntrValIntrSmpOnly
  */
 
 /*
@@ -59,10 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsIntrValIntrSmpOnly \
- *   spec:/rtems/intr/val/intr-smp-only
+ * @defgroup RtemsIntrValIntrSmpOnly spec:/rtems/intr/val/intr-smp-only
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationSmpOnly0
+ * @ingroup TestsuitesValidationSmpOnly0
  *
  * @brief Tests some @ref RTEMSAPIClassicIntr directives.
  *
diff --git a/testsuites/validation/tc-intr-vector-disable.c b/testsuites/validation/tc-intr-vector-disable.c
index 3c7eb11838..d8638b9d2d 100644
--- a/testsuites/validation/tc-intr-vector-disable.c
+++ b/testsuites/validation/tc-intr-vector-disable.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsIntrReqVectorDisable
+ * @ingroup RtemsIntrReqVectorDisable
  */
 
 /*
@@ -61,10 +61,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsIntrReqVectorDisable \
- *   spec:/rtems/intr/req/vector-disable
+ * @defgroup RtemsIntrReqVectorDisable spec:/rtems/intr/req/vector-disable
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationIntr
+ * @ingroup TestsuitesValidationIntr
  *
  * @{
  */
diff --git a/testsuites/validation/tc-intr-vector-enable.c b/testsuites/validation/tc-intr-vector-enable.c
index 024953ab48..00a2e42fd2 100644
--- a/testsuites/validation/tc-intr-vector-enable.c
+++ b/testsuites/validation/tc-intr-vector-enable.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsIntrReqVectorEnable
+ * @ingroup RtemsIntrReqVectorEnable
  */
 
 /*
@@ -61,10 +61,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsIntrReqVectorEnable \
- *   spec:/rtems/intr/req/vector-enable
+ * @defgroup RtemsIntrReqVectorEnable spec:/rtems/intr/req/vector-enable
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationIntr
+ * @ingroup TestsuitesValidationIntr
  *
  * @{
  */
diff --git a/testsuites/validation/tc-intr-vector-is-enabled.c b/testsuites/validation/tc-intr-vector-is-enabled.c
index ea26b80aee..60f17620e9 100644
--- a/testsuites/validation/tc-intr-vector-is-enabled.c
+++ b/testsuites/validation/tc-intr-vector-is-enabled.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsIntrReqVectorIsEnabled
+ * @ingroup RtemsIntrReqVectorIsEnabled
  */
 
 /*
@@ -61,10 +61,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsIntrReqVectorIsEnabled \
- *   spec:/rtems/intr/req/vector-is-enabled
+ * @defgroup RtemsIntrReqVectorIsEnabled spec:/rtems/intr/req/vector-is-enabled
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationIntr
+ * @ingroup TestsuitesValidationIntr
  *
  * @{
  */
diff --git a/testsuites/validation/tc-intr.c b/testsuites/validation/tc-intr.c
index 7b2e6b0d48..2bf747d0a2 100644
--- a/testsuites/validation/tc-intr.c
+++ b/testsuites/validation/tc-intr.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsIntrValIntr
+ * @ingroup RtemsIntrValIntr
  */
 
 /*
@@ -60,9 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsIntrValIntr spec:/rtems/intr/val/intr
+ * @defgroup RtemsIntrValIntr spec:/rtems/intr/val/intr
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Tests some @ref RTEMSAPIClassicIntr directives.
  *
diff --git a/testsuites/validation/tc-io-getchark.c b/testsuites/validation/tc-io-getchark.c
index 54a24d5694..fcbea36acb 100644
--- a/testsuites/validation/tc-io-getchark.c
+++ b/testsuites/validation/tc-io-getchark.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsIoReqGetchark
+ * @ingroup RtemsIoReqGetchark
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsIoReqGetchark spec:/rtems/io/req/getchark
+ * @defgroup RtemsIoReqGetchark spec:/rtems/io/req/getchark
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-io-put-char.c b/testsuites/validation/tc-io-put-char.c
index ab4c82ffda..83851f10c8 100644
--- a/testsuites/validation/tc-io-put-char.c
+++ b/testsuites/validation/tc-io-put-char.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsIoReqPutChar
+ * @ingroup RtemsIoReqPutChar
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsIoReqPutChar spec:/rtems/io/req/put-char
+ * @defgroup RtemsIoReqPutChar spec:/rtems/io/req/put-char
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-io-putc.c b/testsuites/validation/tc-io-putc.c
index d55ed5dae7..59feb6dcad 100644
--- a/testsuites/validation/tc-io-putc.c
+++ b/testsuites/validation/tc-io-putc.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsIoReqPutc
+ * @ingroup RtemsIoReqPutc
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsIoReqPutc spec:/rtems/io/req/putc
+ * @defgroup RtemsIoReqPutc spec:/rtems/io/req/putc
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-message-broadcast.c b/testsuites/validation/tc-message-broadcast.c
index 62e5aa5c7e..1391c56e53 100644
--- a/testsuites/validation/tc-message-broadcast.c
+++ b/testsuites/validation/tc-message-broadcast.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsMessageReqBroadcast
+ * @ingroup RtemsMessageReqBroadcast
  */
 
 /*
@@ -59,10 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsMessageReqBroadcast \
- *   spec:/rtems/message/req/broadcast
+ * @defgroup RtemsMessageReqBroadcast spec:/rtems/message/req/broadcast
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-message-construct.c b/testsuites/validation/tc-message-construct.c
index a7093b28e1..f438002831 100644
--- a/testsuites/validation/tc-message-construct.c
+++ b/testsuites/validation/tc-message-construct.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsMessageReqConstruct
+ * @ingroup RtemsMessageReqConstruct
  */
 
 /*
@@ -60,10 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsMessageReqConstruct \
- *   spec:/rtems/message/req/construct
+ * @defgroup RtemsMessageReqConstruct spec:/rtems/message/req/construct
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-message-delete.c b/testsuites/validation/tc-message-delete.c
index 0835a5c5e9..6566e91c44 100644
--- a/testsuites/validation/tc-message-delete.c
+++ b/testsuites/validation/tc-message-delete.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsMessageReqDelete
+ * @ingroup RtemsMessageReqDelete
  */
 
 /*
@@ -60,9 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsMessageReqDelete spec:/rtems/message/req/delete
+ * @defgroup RtemsMessageReqDelete spec:/rtems/message/req/delete
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-message-flush-pending.c b/testsuites/validation/tc-message-flush-pending.c
index 67d2ede6bd..b2989f6754 100644
--- a/testsuites/validation/tc-message-flush-pending.c
+++ b/testsuites/validation/tc-message-flush-pending.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsMessageReqFlushPending
+ * @ingroup RtemsMessageReqFlushPending
  */
 
 /*
@@ -59,10 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsMessageReqFlushPending \
- *   spec:/rtems/message/req/flush-pending
+ * @defgroup RtemsMessageReqFlushPending spec:/rtems/message/req/flush-pending
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-message-ident.c b/testsuites/validation/tc-message-ident.c
index 70e7d53350..2ddbdb7929 100644
--- a/testsuites/validation/tc-message-ident.c
+++ b/testsuites/validation/tc-message-ident.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsMessageValIdent
+ * @ingroup RtemsMessageValIdent
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsMessageValIdent spec:/rtems/message/val/ident
+ * @defgroup RtemsMessageValIdent spec:/rtems/message/val/ident
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Test the rtems_message_queue_ident() directive.
  *
diff --git a/testsuites/validation/tc-message-macros.c b/testsuites/validation/tc-message-macros.c
index f8e6a46252..2987a772bd 100644
--- a/testsuites/validation/tc-message-macros.c
+++ b/testsuites/validation/tc-message-macros.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsMessageValMessageMacros
+ * @ingroup RtemsMessageValMessageMacros
  */
 
 /*
@@ -57,10 +57,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsMessageValMessageMacros \
+ * @defgroup RtemsMessageValMessageMacros \
  *   spec:/rtems/message/val/message-macros
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Tests the macros of the @ref RTEMSAPIClassicMessage.
  *
diff --git a/testsuites/validation/tc-message-performance.c b/testsuites/validation/tc-message-performance.c
index 8b1828c9f5..5a33d1a148 100644
--- a/testsuites/validation/tc-message-performance.c
+++ b/testsuites/validation/tc-message-performance.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsMessageValPerf
+ * @ingroup RtemsMessageValPerf
  */
 
 /*
@@ -59,9 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsMessageValPerf spec:/rtems/message/val/perf
+ * @defgroup RtemsMessageValPerf spec:/rtems/message/val/perf
  *
- * @ingroup RTEMSTestSuiteTestsuitesPerformanceNoClock0
+ * @ingroup TestsuitesPerformanceNoClock0
  *
  * @brief This test case provides a context to run @ref RTEMSAPIClassicMessage
  *   performance tests.
diff --git a/testsuites/validation/tc-message-receive.c b/testsuites/validation/tc-message-receive.c
index 4d3dcc623e..0e8c5fcb3b 100644
--- a/testsuites/validation/tc-message-receive.c
+++ b/testsuites/validation/tc-message-receive.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsMessageReqReceive
+ * @ingroup RtemsMessageReqReceive
  */
 
 /*
@@ -63,10 +63,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsMessageReqReceive \
- *   spec:/rtems/message/req/receive
+ * @defgroup RtemsMessageReqReceive spec:/rtems/message/req/receive
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-message-urgent-send.c b/testsuites/validation/tc-message-urgent-send.c
index fb42f94b84..8b52562988 100644
--- a/testsuites/validation/tc-message-urgent-send.c
+++ b/testsuites/validation/tc-message-urgent-send.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsMessageReqUrgentSend
+ * @ingroup RtemsMessageReqUrgentSend
  */
 
 /*
@@ -59,10 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsMessageReqUrgentSend \
- *   spec:/rtems/message/req/urgent-send
+ * @defgroup RtemsMessageReqUrgentSend spec:/rtems/message/req/urgent-send
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-modes.c b/testsuites/validation/tc-modes.c
index c9f8fe65ca..8a092bcd95 100644
--- a/testsuites/validation/tc-modes.c
+++ b/testsuites/validation/tc-modes.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsModeValModes
+ * @ingroup RtemsModeValModes
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsModeValModes spec:/rtems/mode/val/modes
+ * @defgroup RtemsModeValModes spec:/rtems/mode/val/modes
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Tests the task mode constants and function-like macros of the Classic
  *   API.
diff --git a/testsuites/validation/tc-object.c b/testsuites/validation/tc-object.c
index 9e63d2a44e..ca459f0557 100644
--- a/testsuites/validation/tc-object.c
+++ b/testsuites/validation/tc-object.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsObjectValObject
+ * @ingroup RtemsObjectValObject
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsObjectValObject spec:/rtems/object/val/object
+ * @defgroup RtemsObjectValObject spec:/rtems/object/val/object
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Tests some @ref RTEMSAPIClassicObject directives.
  *
diff --git a/testsuites/validation/tc-options.c b/testsuites/validation/tc-options.c
index 9db52bdaaf..74d0b12e1f 100644
--- a/testsuites/validation/tc-options.c
+++ b/testsuites/validation/tc-options.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsOptionValOptions
+ * @ingroup RtemsOptionValOptions
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsOptionValOptions spec:/rtems/option/val/options
+ * @defgroup RtemsOptionValOptions spec:/rtems/option/val/options
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Tests the option constants of the Classic API.
  *
diff --git a/testsuites/validation/tc-part-create.c b/testsuites/validation/tc-part-create.c
index 7121b07d4e..a8380f62dd 100644
--- a/testsuites/validation/tc-part-create.c
+++ b/testsuites/validation/tc-part-create.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsPartReqCreate
+ * @ingroup RtemsPartReqCreate
  */
 
 /*
@@ -61,9 +61,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsPartReqCreate spec:/rtems/part/req/create
+ * @defgroup RtemsPartReqCreate spec:/rtems/part/req/create
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-part-delete.c b/testsuites/validation/tc-part-delete.c
index 0ec1dd0bde..6bec191ad0 100644
--- a/testsuites/validation/tc-part-delete.c
+++ b/testsuites/validation/tc-part-delete.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsPartReqDelete
+ * @ingroup RtemsPartReqDelete
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsPartReqDelete spec:/rtems/part/req/delete
+ * @defgroup RtemsPartReqDelete spec:/rtems/part/req/delete
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-part-get.c b/testsuites/validation/tc-part-get.c
index 9308c1350a..fa372a832e 100644
--- a/testsuites/validation/tc-part-get.c
+++ b/testsuites/validation/tc-part-get.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsPartReqGetBuffer
+ * @ingroup RtemsPartReqGetBuffer
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsPartReqGetBuffer spec:/rtems/part/req/get-buffer
+ * @defgroup RtemsPartReqGetBuffer spec:/rtems/part/req/get-buffer
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-part-ident.c b/testsuites/validation/tc-part-ident.c
index fccdf9671c..a330e205da 100644
--- a/testsuites/validation/tc-part-ident.c
+++ b/testsuites/validation/tc-part-ident.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsPartValIdent
+ * @ingroup RtemsPartValIdent
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsPartValIdent spec:/rtems/part/val/ident
+ * @defgroup RtemsPartValIdent spec:/rtems/part/val/ident
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Test the rtems_partition_ident() directive.
  *
diff --git a/testsuites/validation/tc-part-performance.c b/testsuites/validation/tc-part-performance.c
index 4c223910d0..7acc713816 100644
--- a/testsuites/validation/tc-part-performance.c
+++ b/testsuites/validation/tc-part-performance.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsPartValPerf
+ * @ingroup RtemsPartValPerf
  */
 
 /*
@@ -58,9 +58,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsPartValPerf spec:/rtems/part/val/perf
+ * @defgroup RtemsPartValPerf spec:/rtems/part/val/perf
  *
- * @ingroup RTEMSTestSuiteTestsuitesPerformanceNoClock0
+ * @ingroup TestsuitesPerformanceNoClock0
  *
  * @brief This test case provides a context to run @ref RTEMSAPIClassicPart
  *   performance tests.
diff --git a/testsuites/validation/tc-part-return.c b/testsuites/validation/tc-part-return.c
index 71c6a31e66..2f99409fec 100644
--- a/testsuites/validation/tc-part-return.c
+++ b/testsuites/validation/tc-part-return.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsPartReqReturnBuffer
+ * @ingroup RtemsPartReqReturnBuffer
  */
 
 /*
@@ -57,10 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsPartReqReturnBuffer \
- *   spec:/rtems/part/req/return-buffer
+ * @defgroup RtemsPartReqReturnBuffer spec:/rtems/part/req/return-buffer
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-part.c b/testsuites/validation/tc-part.c
index 220c8a6b63..2143a5ee70 100644
--- a/testsuites/validation/tc-part.c
+++ b/testsuites/validation/tc-part.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsPartValPart
+ * @ingroup RtemsPartValPart
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsPartValPart spec:/rtems/part/val/part
+ * @defgroup RtemsPartValPart spec:/rtems/part/val/part
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief This test case collection provides validation test cases for
  *   requirements of the @ref RTEMSAPIClassicPart.
diff --git a/testsuites/validation/tc-ratemon-cancel.c b/testsuites/validation/tc-ratemon-cancel.c
index 7cbbbcda7d..df1fe7636e 100644
--- a/testsuites/validation/tc-ratemon-cancel.c
+++ b/testsuites/validation/tc-ratemon-cancel.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsRatemonReqCancel
+ * @ingroup RtemsRatemonReqCancel
  */
 
 /*
@@ -59,10 +59,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsRatemonReqCancel spec:/rtems/ratemon/req/cancel
+ * @defgroup RtemsRatemonReqCancel spec:/rtems/ratemon/req/cancel
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
- * @ingroup RTEMSTestSuiteTestsuitesValidationOneCpu0
+ * @ingroup TestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationOneCpu0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-ratemon-create.c b/testsuites/validation/tc-ratemon-create.c
index d86cd977c9..d5fa8124c2 100644
--- a/testsuites/validation/tc-ratemon-create.c
+++ b/testsuites/validation/tc-ratemon-create.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsRatemonReqCreate
+ * @ingroup RtemsRatemonReqCreate
  */
 
 /*
@@ -60,9 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsRatemonReqCreate spec:/rtems/ratemon/req/create
+ * @defgroup RtemsRatemonReqCreate spec:/rtems/ratemon/req/create
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-ratemon-delete.c b/testsuites/validation/tc-ratemon-delete.c
index 3b30188fe1..00e62b1e5a 100644
--- a/testsuites/validation/tc-ratemon-delete.c
+++ b/testsuites/validation/tc-ratemon-delete.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsRatemonReqDelete
+ * @ingroup RtemsRatemonReqDelete
  */
 
 /*
@@ -58,9 +58,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsRatemonReqDelete spec:/rtems/ratemon/req/delete
+ * @defgroup RtemsRatemonReqDelete spec:/rtems/ratemon/req/delete
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-ratemon-get-status.c b/testsuites/validation/tc-ratemon-get-status.c
index fe3fb300e3..2250eec864 100644
--- a/testsuites/validation/tc-ratemon-get-status.c
+++ b/testsuites/validation/tc-ratemon-get-status.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsRatemonReqGetStatus
+ * @ingroup RtemsRatemonReqGetStatus
  */
 
 /*
@@ -60,11 +60,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsRatemonReqGetStatus \
- *   spec:/rtems/ratemon/req/get-status
+ * @defgroup RtemsRatemonReqGetStatus spec:/rtems/ratemon/req/get-status
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
- * @ingroup RTEMSTestSuiteTestsuitesValidationOneCpu0
+ * @ingroup TestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationOneCpu0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-ratemon-ident.c b/testsuites/validation/tc-ratemon-ident.c
index beeb0bfd14..19fd5ef0a3 100644
--- a/testsuites/validation/tc-ratemon-ident.c
+++ b/testsuites/validation/tc-ratemon-ident.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsRatemonValIdent
+ * @ingroup RtemsRatemonValIdent
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsRatemonValIdent spec:/rtems/ratemon/val/ident
+ * @defgroup RtemsRatemonValIdent spec:/rtems/ratemon/val/ident
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Test the rtems_rate_monotonic_ident() directive.
  *
diff --git a/testsuites/validation/tc-ratemon-period.c b/testsuites/validation/tc-ratemon-period.c
index 9e2d294581..6dba641218 100644
--- a/testsuites/validation/tc-ratemon-period.c
+++ b/testsuites/validation/tc-ratemon-period.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsRatemonReqPeriod
+ * @ingroup RtemsRatemonReqPeriod
  */
 
 /*
@@ -59,10 +59,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsRatemonReqPeriod spec:/rtems/ratemon/req/period
+ * @defgroup RtemsRatemonReqPeriod spec:/rtems/ratemon/req/period
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
- * @ingroup RTEMSTestSuiteTestsuitesValidationOneCpu0
+ * @ingroup TestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationOneCpu0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-ratemon-timeout.c b/testsuites/validation/tc-ratemon-timeout.c
index b70a5cc85c..e6f56b95cf 100644
--- a/testsuites/validation/tc-ratemon-timeout.c
+++ b/testsuites/validation/tc-ratemon-timeout.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsRatemonReqTimeout
+ * @ingroup RtemsRatemonReqTimeout
  */
 
 /*
@@ -60,11 +60,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsRatemonReqTimeout \
- *   spec:/rtems/ratemon/req/timeout
+ * @defgroup RtemsRatemonReqTimeout spec:/rtems/ratemon/req/timeout
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
- * @ingroup RTEMSTestSuiteTestsuitesValidationOneCpu0
+ * @ingroup TestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationOneCpu0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-sched-smp-edf-set-affinity.c b/testsuites/validation/tc-sched-smp-edf-set-affinity.c
index 4e5fab70dc..0b499b736e 100644
--- a/testsuites/validation/tc-sched-smp-edf-set-affinity.c
+++ b/testsuites/validation/tc-sched-smp-edf-set-affinity.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreSchedSmpEdfReqSetAffinity
+ * @ingroup ScoreSchedSmpEdfReqSetAffinity
  */
 
 /*
@@ -63,10 +63,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreSchedSmpEdfReqSetAffinity \
+ * @defgroup ScoreSchedSmpEdfReqSetAffinity \
  *   spec:/score/sched/smp/edf/req/set-affinity
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationSmpOnly0
+ * @ingroup TestsuitesValidationSmpOnly0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-sched-smp-edf.c b/testsuites/validation/tc-sched-smp-edf.c
index 94d685bd08..9cba9734a8 100644
--- a/testsuites/validation/tc-sched-smp-edf.c
+++ b/testsuites/validation/tc-sched-smp-edf.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreSchedSmpEdfValEdf
+ * @ingroup ScoreSchedSmpEdfValEdf
  */
 
 /*
@@ -59,10 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreSchedSmpEdfValEdf \
- *   spec:/score/sched/smp/edf/val/edf
+ * @defgroup ScoreSchedSmpEdfValEdf spec:/score/sched/smp/edf/val/edf
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationSmpOnly0
+ * @ingroup TestsuitesValidationSmpOnly0
  *
  * @brief Tests for operations of the EDF SMP scheduler.
  *
diff --git a/testsuites/validation/tc-sched-smp.c b/testsuites/validation/tc-sched-smp.c
index 6eb98b5360..4d68ce6818 100644
--- a/testsuites/validation/tc-sched-smp.c
+++ b/testsuites/validation/tc-sched-smp.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreSchedSmpValSmp
+ * @ingroup ScoreSchedSmpValSmp
  */
 
 /*
@@ -63,9 +63,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreSchedSmpValSmp spec:/score/sched/smp/val/smp
+ * @defgroup ScoreSchedSmpValSmp spec:/score/sched/smp/val/smp
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationSmpOnly0
+ * @ingroup TestsuitesValidationSmpOnly0
  *
  * @brief Tests SMP-specific scheduler behaviour.
  *
diff --git a/testsuites/validation/tc-sched-yield.c b/testsuites/validation/tc-sched-yield.c
index 8aa953fd46..5f17a554f6 100644
--- a/testsuites/validation/tc-sched-yield.c
+++ b/testsuites/validation/tc-sched-yield.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreSchedReqYield
+ * @ingroup ScoreSchedReqYield
  */
 
 /*
@@ -62,9 +62,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreSchedReqYield spec:/score/sched/req/yield
+ * @defgroup ScoreSchedReqYield spec:/score/sched/req/yield
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-scheduler-add-processor.c b/testsuites/validation/tc-scheduler-add-processor.c
index dbeaaa7b16..a17288da8d 100644
--- a/testsuites/validation/tc-scheduler-add-processor.c
+++ b/testsuites/validation/tc-scheduler-add-processor.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSchedulerReqAddProcessor
+ * @ingroup RtemsSchedulerReqAddProcessor
  */
 
 /*
@@ -62,10 +62,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSchedulerReqAddProcessor \
+ * @defgroup RtemsSchedulerReqAddProcessor \
  *   spec:/rtems/scheduler/req/add-processor
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-scheduler-get-maximum-priority.c b/testsuites/validation/tc-scheduler-get-maximum-priority.c
index 45ef88c5a6..f433a7409d 100644
--- a/testsuites/validation/tc-scheduler-get-maximum-priority.c
+++ b/testsuites/validation/tc-scheduler-get-maximum-priority.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSchedulerReqGetMaximumPriority
+ * @ingroup RtemsSchedulerReqGetMaximumPriority
  */
 
 /*
@@ -61,10 +61,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSchedulerReqGetMaximumPriority \
+ * @defgroup RtemsSchedulerReqGetMaximumPriority \
  *   spec:/rtems/scheduler/req/get-maximum-priority
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-scheduler-get-processor-set.c b/testsuites/validation/tc-scheduler-get-processor-set.c
index 3b48df44f9..eb875a64a8 100644
--- a/testsuites/validation/tc-scheduler-get-processor-set.c
+++ b/testsuites/validation/tc-scheduler-get-processor-set.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSchedulerReqGetProcessorSet
+ * @ingroup RtemsSchedulerReqGetProcessorSet
  */
 
 /*
@@ -60,10 +60,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSchedulerReqGetProcessorSet \
+ * @defgroup RtemsSchedulerReqGetProcessorSet \
  *   spec:/rtems/scheduler/req/get-processor-set
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-scheduler-ident-by-processor-set.c b/testsuites/validation/tc-scheduler-ident-by-processor-set.c
index 57b660c835..3f31face4b 100644
--- a/testsuites/validation/tc-scheduler-ident-by-processor-set.c
+++ b/testsuites/validation/tc-scheduler-ident-by-processor-set.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSchedulerReqIdentByProcessorSet
+ * @ingroup RtemsSchedulerReqIdentByProcessorSet
  */
 
 /*
@@ -60,10 +60,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSchedulerReqIdentByProcessorSet \
+ * @defgroup RtemsSchedulerReqIdentByProcessorSet \
  *   spec:/rtems/scheduler/req/ident-by-processor-set
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-scheduler-ident-by-processor.c b/testsuites/validation/tc-scheduler-ident-by-processor.c
index 43021fdc23..fd4419c0b3 100644
--- a/testsuites/validation/tc-scheduler-ident-by-processor.c
+++ b/testsuites/validation/tc-scheduler-ident-by-processor.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSchedulerReqIdentByProcessor
+ * @ingroup RtemsSchedulerReqIdentByProcessor
  */
 
 /*
@@ -60,10 +60,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSchedulerReqIdentByProcessor \
+ * @defgroup RtemsSchedulerReqIdentByProcessor \
  *   spec:/rtems/scheduler/req/ident-by-processor
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-scheduler-ident.c b/testsuites/validation/tc-scheduler-ident.c
index 2517e1b50f..120d9e5540 100644
--- a/testsuites/validation/tc-scheduler-ident.c
+++ b/testsuites/validation/tc-scheduler-ident.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSchedulerReqIdent
+ * @ingroup RtemsSchedulerReqIdent
  */
 
 /*
@@ -60,10 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSchedulerReqIdent \
- *   spec:/rtems/scheduler/req/ident
+ * @defgroup RtemsSchedulerReqIdent spec:/rtems/scheduler/req/ident
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-scheduler-non-smp.c b/testsuites/validation/tc-scheduler-non-smp.c
index a3eec8fd2d..d0353ebca0 100644
--- a/testsuites/validation/tc-scheduler-non-smp.c
+++ b/testsuites/validation/tc-scheduler-non-smp.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSchedulerValNonSmp
+ * @ingroup RtemsSchedulerValNonSmp
  */
 
 /*
@@ -57,10 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSchedulerValNonSmp \
- *   spec:/rtems/scheduler/val/non-smp
+ * @defgroup RtemsSchedulerValNonSmp spec:/rtems/scheduler/val/non-smp
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNonSmp
+ * @ingroup TestsuitesValidationNonSmp
  *
  * @brief This test case collection provides validation test cases for non-SMP
  *   requirements of the @ref RTEMSAPIClassicScheduler.
diff --git a/testsuites/validation/tc-scheduler-remove-processor.c b/testsuites/validation/tc-scheduler-remove-processor.c
index 6be66fa961..8b213e0095 100644
--- a/testsuites/validation/tc-scheduler-remove-processor.c
+++ b/testsuites/validation/tc-scheduler-remove-processor.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSchedulerReqRemoveProcessor
+ * @ingroup RtemsSchedulerReqRemoveProcessor
  */
 
 /*
@@ -63,10 +63,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSchedulerReqRemoveProcessor \
+ * @defgroup RtemsSchedulerReqRemoveProcessor \
  *   spec:/rtems/scheduler/req/remove-processor
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-scheduler-smp-only.c b/testsuites/validation/tc-scheduler-smp-only.c
index 2a6f0b53c6..b4ff000000 100644
--- a/testsuites/validation/tc-scheduler-smp-only.c
+++ b/testsuites/validation/tc-scheduler-smp-only.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSchedulerValSmpOnly
+ * @ingroup RtemsSchedulerValSmpOnly
  */
 
 /*
@@ -60,10 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSchedulerValSmpOnly \
- *   spec:/rtems/scheduler/val/smp-only
+ * @defgroup RtemsSchedulerValSmpOnly spec:/rtems/scheduler/val/smp-only
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationSmpOnly0
+ * @ingroup TestsuitesValidationSmpOnly0
  *
  * @brief This test case collection provides validation test cases for SMP-only
  *   requirements of the @ref RTEMSAPIClassicScheduler.
diff --git a/testsuites/validation/tc-scheduler.c b/testsuites/validation/tc-scheduler.c
index e930d3ee51..01e237e06e 100644
--- a/testsuites/validation/tc-scheduler.c
+++ b/testsuites/validation/tc-scheduler.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSchedulerValScheduler
+ * @ingroup RtemsSchedulerValScheduler
  */
 
 /*
@@ -59,10 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSchedulerValScheduler \
- *   spec:/rtems/scheduler/val/scheduler
+ * @defgroup RtemsSchedulerValScheduler spec:/rtems/scheduler/val/scheduler
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief This test case collection provides validation test cases for general
  *   requirements of the @ref RTEMSAPIClassicScheduler.
diff --git a/testsuites/validation/tc-score-fatal.c b/testsuites/validation/tc-score-fatal.c
index 02131ee68e..94440b3637 100644
--- a/testsuites/validation/tc-score-fatal.c
+++ b/testsuites/validation/tc-score-fatal.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreValFatal
+ * @ingroup ScoreValFatal
  */
 
 /*
@@ -64,10 +64,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreValFatal spec:/score/val/fatal
+ * @defgroup ScoreValFatal spec:/score/val/fatal
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
- * @ingroup RTEMSTestSuiteTestsuitesValidationOneCpu0
+ * @ingroup TestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationOneCpu0
  *
  * @brief Tests some fatal errors.
  *
diff --git a/testsuites/validation/tc-score-smp-per-cpu-jobs.c b/testsuites/validation/tc-score-smp-per-cpu-jobs.c
index dad4a6a90f..fe24747a10 100644
--- a/testsuites/validation/tc-score-smp-per-cpu-jobs.c
+++ b/testsuites/validation/tc-score-smp-per-cpu-jobs.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreSmpValPerCpuJobs
+ * @ingroup ScoreSmpValPerCpuJobs
  */
 
 /*
@@ -59,10 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreSmpValPerCpuJobs \
- *   spec:/score/smp/val/per-cpu-jobs
+ * @defgroup ScoreSmpValPerCpuJobs spec:/score/smp/val/per-cpu-jobs
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationSmpOnly0
+ * @ingroup TestsuitesValidationSmpOnly0
  *
  * @brief Tests the processing order of per-processor jobs.
  *
diff --git a/testsuites/validation/tc-score-smp-thread.c b/testsuites/validation/tc-score-smp-thread.c
index fc1dd394c2..7208514b32 100644
--- a/testsuites/validation/tc-score-smp-thread.c
+++ b/testsuites/validation/tc-score-smp-thread.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreThreadValSmp
+ * @ingroup ScoreThreadValSmp
  */
 
 /*
@@ -63,9 +63,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreThreadValSmp spec:/score/thread/val/smp
+ * @defgroup ScoreThreadValSmp spec:/score/thread/val/smp
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationSmpOnly0
+ * @ingroup TestsuitesValidationSmpOnly0
  *
  * @brief Tests SMP-specific thread behaviour.
  *
diff --git a/testsuites/validation/tc-score-thread-smp-one-cpu.c b/testsuites/validation/tc-score-thread-smp-one-cpu.c
index 3375f27e1d..f78afe6e06 100644
--- a/testsuites/validation/tc-score-thread-smp-one-cpu.c
+++ b/testsuites/validation/tc-score-thread-smp-one-cpu.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreThreadValSmpOneCpu
+ * @ingroup ScoreThreadValSmpOneCpu
  */
 
 /*
@@ -59,10 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreThreadValSmpOneCpu \
- *   spec:/score/thread/val/smp-one-cpu
+ * @defgroup ScoreThreadValSmpOneCpu spec:/score/thread/val/smp-one-cpu
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationSmpOneCpu0
+ * @ingroup TestsuitesValidationSmpOneCpu0
  *
  * @brief Tests SMP-specific thread behaviour using only one processor and a
  *   uniprocessor scheduler.
diff --git a/testsuites/validation/tc-score-thread-tls-max-zero.c b/testsuites/validation/tc-score-thread-tls-max-zero.c
index d0d367437e..816b7dfdc8 100644
--- a/testsuites/validation/tc-score-thread-tls-max-zero.c
+++ b/testsuites/validation/tc-score-thread-tls-max-zero.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreThreadValTlsMaxZero
+ * @ingroup ScoreThreadValTlsMaxZero
  */
 
 /*
@@ -57,10 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreThreadValTlsMaxZero \
- *   spec:/score/thread/val/tls-max-zero
+ * @defgroup ScoreThreadValTlsMaxZero spec:/score/thread/val/tls-max-zero
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationTls1
+ * @ingroup TestsuitesValidationTls1
  *
  * @brief Tests properties of thread-local objects.
  *
diff --git a/testsuites/validation/tc-score-thread-tls.c b/testsuites/validation/tc-score-thread-tls.c
index 0676d4249a..846722600c 100644
--- a/testsuites/validation/tc-score-thread-tls.c
+++ b/testsuites/validation/tc-score-thread-tls.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreThreadValTls
+ * @ingroup ScoreThreadValTls
  */
 
 /*
@@ -59,10 +59,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreThreadValTls spec:/score/thread/val/tls
+ * @defgroup ScoreThreadValTls spec:/score/thread/val/tls
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationTls0
- * @ingroup RTEMSTestSuiteTestsuitesValidationTls1
+ * @ingroup TestsuitesValidationTls0
+ * @ingroup TestsuitesValidationTls1
  *
  * @brief Tests properties of thread-local objects.
  *
diff --git a/testsuites/validation/tc-score-thread.c b/testsuites/validation/tc-score-thread.c
index 694fcaefab..9ed4645417 100644
--- a/testsuites/validation/tc-score-thread.c
+++ b/testsuites/validation/tc-score-thread.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreThreadValThread
+ * @ingroup ScoreThreadValThread
  */
 
 /*
@@ -62,9 +62,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreThreadValThread spec:/score/thread/val/thread
+ * @defgroup ScoreThreadValThread spec:/score/thread/val/thread
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Tests general thread behaviour.
  *
diff --git a/testsuites/validation/tc-score-tq-smp.c b/testsuites/validation/tc-score-tq-smp.c
index 4eff2de3c6..dffc14d391 100644
--- a/testsuites/validation/tc-score-tq-smp.c
+++ b/testsuites/validation/tc-score-tq-smp.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqValSmp
+ * @ingroup ScoreTqValSmp
  */
 
 /*
@@ -61,9 +61,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreTqValSmp spec:/score/tq/val/smp
+ * @defgroup ScoreTqValSmp spec:/score/tq/val/smp
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationSmpOnly0
+ * @ingroup TestsuitesValidationSmpOnly0
  *
  * @brief Tests SMP-specific thread queue behaviour.
  *
diff --git a/testsuites/validation/tc-score-tq.c b/testsuites/validation/tc-score-tq.c
index 26626bc8e2..bbd814e8d4 100644
--- a/testsuites/validation/tc-score-tq.c
+++ b/testsuites/validation/tc-score-tq.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqValTq
+ * @ingroup ScoreTqValTq
  */
 
 /*
@@ -58,9 +58,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreTqValTq spec:/score/tq/val/tq
+ * @defgroup ScoreTqValTq spec:/score/tq/val/tq
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Tests special thread queue behaviour.
  *
diff --git a/testsuites/validation/tc-sem-create.c b/testsuites/validation/tc-sem-create.c
index 7012c28275..69a47bba78 100644
--- a/testsuites/validation/tc-sem-create.c
+++ b/testsuites/validation/tc-sem-create.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSemReqCreate
+ * @ingroup RtemsSemReqCreate
  */
 
 /*
@@ -62,9 +62,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSemReqCreate spec:/rtems/sem/req/create
+ * @defgroup RtemsSemReqCreate spec:/rtems/sem/req/create
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-sem-delete.c b/testsuites/validation/tc-sem-delete.c
index 7c31547eba..265e7c0390 100644
--- a/testsuites/validation/tc-sem-delete.c
+++ b/testsuites/validation/tc-sem-delete.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSemReqDelete
+ * @ingroup RtemsSemReqDelete
  */
 
 /*
@@ -60,9 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSemReqDelete spec:/rtems/sem/req/delete
+ * @defgroup RtemsSemReqDelete spec:/rtems/sem/req/delete
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationOneCpu0
+ * @ingroup TestsuitesValidationOneCpu0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-sem-flush.c b/testsuites/validation/tc-sem-flush.c
index 9a5d00b570..88755d7727 100644
--- a/testsuites/validation/tc-sem-flush.c
+++ b/testsuites/validation/tc-sem-flush.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSemReqFlush
+ * @ingroup RtemsSemReqFlush
  */
 
 /*
@@ -64,9 +64,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSemReqFlush spec:/rtems/sem/req/flush
+ * @defgroup RtemsSemReqFlush spec:/rtems/sem/req/flush
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-sem-ident.c b/testsuites/validation/tc-sem-ident.c
index 3014113189..8e2d01b97e 100644
--- a/testsuites/validation/tc-sem-ident.c
+++ b/testsuites/validation/tc-sem-ident.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSemValIdent
+ * @ingroup RtemsSemValIdent
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSemValIdent spec:/rtems/sem/val/ident
+ * @defgroup RtemsSemValIdent spec:/rtems/sem/val/ident
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Test the rtems_semaphore_ident() directive.
  *
diff --git a/testsuites/validation/tc-sem-mrsp-obtain.c b/testsuites/validation/tc-sem-mrsp-obtain.c
index dcbf7655ab..a33ea8ee8b 100644
--- a/testsuites/validation/tc-sem-mrsp-obtain.c
+++ b/testsuites/validation/tc-sem-mrsp-obtain.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSemReqMrspObtain
+ * @ingroup RtemsSemReqMrspObtain
  */
 
 /*
@@ -63,9 +63,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSemReqMrspObtain spec:/rtems/sem/req/mrsp-obtain
+ * @defgroup RtemsSemReqMrspObtain spec:/rtems/sem/req/mrsp-obtain
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationSmpOnly0
+ * @ingroup TestsuitesValidationSmpOnly0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-sem-obtain.c b/testsuites/validation/tc-sem-obtain.c
index b07421f186..a098b26d08 100644
--- a/testsuites/validation/tc-sem-obtain.c
+++ b/testsuites/validation/tc-sem-obtain.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSemReqObtain
+ * @ingroup RtemsSemReqObtain
  */
 
 /*
@@ -65,9 +65,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSemReqObtain spec:/rtems/sem/req/obtain
+ * @defgroup RtemsSemReqObtain spec:/rtems/sem/req/obtain
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-sem-performance.c b/testsuites/validation/tc-sem-performance.c
index 5bbff6a587..df2e6c8546 100644
--- a/testsuites/validation/tc-sem-performance.c
+++ b/testsuites/validation/tc-sem-performance.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSemValPerf
+ * @ingroup RtemsSemValPerf
  */
 
 /*
@@ -59,9 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSemValPerf spec:/rtems/sem/val/perf
+ * @defgroup RtemsSemValPerf spec:/rtems/sem/val/perf
  *
- * @ingroup RTEMSTestSuiteTestsuitesPerformanceNoClock0
+ * @ingroup TestsuitesPerformanceNoClock0
  *
  * @brief This test case provides a context to run @ref RTEMSAPIClassicSem
  *   performance tests.
diff --git a/testsuites/validation/tc-sem-release.c b/testsuites/validation/tc-sem-release.c
index cfb5315a2a..ecd2ea11d0 100644
--- a/testsuites/validation/tc-sem-release.c
+++ b/testsuites/validation/tc-sem-release.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSemReqRelease
+ * @ingroup RtemsSemReqRelease
  */
 
 /*
@@ -63,9 +63,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSemReqRelease spec:/rtems/sem/req/release
+ * @defgroup RtemsSemReqRelease spec:/rtems/sem/req/release
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-sem-set-priority.c b/testsuites/validation/tc-sem-set-priority.c
index d4418ad4de..0abb682200 100644
--- a/testsuites/validation/tc-sem-set-priority.c
+++ b/testsuites/validation/tc-sem-set-priority.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSemReqSetPriority
+ * @ingroup RtemsSemReqSetPriority
  */
 
 /*
@@ -61,10 +61,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSemReqSetPriority \
- *   spec:/rtems/sem/req/set-priority
+ * @defgroup RtemsSemReqSetPriority spec:/rtems/sem/req/set-priority
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-sem-smp.c b/testsuites/validation/tc-sem-smp.c
index cfe82b3982..1b22a6076f 100644
--- a/testsuites/validation/tc-sem-smp.c
+++ b/testsuites/validation/tc-sem-smp.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSemValSmp
+ * @ingroup RtemsSemValSmp
  */
 
 /*
@@ -61,9 +61,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSemValSmp spec:/rtems/sem/val/smp
+ * @defgroup RtemsSemValSmp spec:/rtems/sem/val/smp
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationSmpOnly0
+ * @ingroup TestsuitesValidationSmpOnly0
  *
  * @brief Tests SMP-specific semaphore behaviour.
  *
diff --git a/testsuites/validation/tc-sem-timeout.c b/testsuites/validation/tc-sem-timeout.c
index 254a6be5db..1b2ddad97e 100644
--- a/testsuites/validation/tc-sem-timeout.c
+++ b/testsuites/validation/tc-sem-timeout.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSemReqTimeout
+ * @ingroup RtemsSemReqTimeout
  */
 
 /*
@@ -64,9 +64,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSemReqTimeout spec:/rtems/sem/req/timeout
+ * @defgroup RtemsSemReqTimeout spec:/rtems/sem/req/timeout
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-sem-uni.c b/testsuites/validation/tc-sem-uni.c
index 08c38adb6c..7fc7809f2d 100644
--- a/testsuites/validation/tc-sem-uni.c
+++ b/testsuites/validation/tc-sem-uni.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSemValUni
+ * @ingroup RtemsSemValUni
  */
 
 /*
@@ -59,9 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSemValUni spec:/rtems/sem/val/uni
+ * @defgroup RtemsSemValUni spec:/rtems/sem/val/uni
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationOneCpu0
+ * @ingroup TestsuitesValidationOneCpu0
  *
  * @brief Tests uniprocessor-specific semaphore behaviour.
  *
diff --git a/testsuites/validation/tc-signal-catch.c b/testsuites/validation/tc-signal-catch.c
index 3618290443..2acaefbfc6 100644
--- a/testsuites/validation/tc-signal-catch.c
+++ b/testsuites/validation/tc-signal-catch.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSignalReqCatch
+ * @ingroup RtemsSignalReqCatch
  */
 
 /*
@@ -61,10 +61,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSignalReqCatch spec:/rtems/signal/req/catch
+ * @defgroup RtemsSignalReqCatch spec:/rtems/signal/req/catch
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
- * @ingroup RTEMSTestSuiteTestsuitesValidationOneCpu0
+ * @ingroup TestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationOneCpu0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-signal-send.c b/testsuites/validation/tc-signal-send.c
index e6efbfd7cf..450714fe55 100644
--- a/testsuites/validation/tc-signal-send.c
+++ b/testsuites/validation/tc-signal-send.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSignalReqSend
+ * @ingroup RtemsSignalReqSend
  */
 
 /*
@@ -59,10 +59,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSignalReqSend spec:/rtems/signal/req/send
+ * @defgroup RtemsSignalReqSend spec:/rtems/signal/req/send
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
- * @ingroup RTEMSTestSuiteTestsuitesValidationOneCpu0
+ * @ingroup TestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationOneCpu0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-signals.c b/testsuites/validation/tc-signals.c
index 86ae17e018..a9ebfc3212 100644
--- a/testsuites/validation/tc-signals.c
+++ b/testsuites/validation/tc-signals.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSignalValSignals
+ * @ingroup RtemsSignalValSignals
  */
 
 /*
@@ -59,9 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSignalValSignals spec:/rtems/signal/val/signals
+ * @defgroup RtemsSignalValSignals spec:/rtems/signal/val/signals
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief This test case collection provides validation test cases for the @ref
  *   RTEMSAPIClassicSignal.
diff --git a/testsuites/validation/tc-start-of-optional-processor-failed.c b/testsuites/validation/tc-start-of-optional-processor-failed.c
index b033a18bae..c378652974 100644
--- a/testsuites/validation/tc-start-of-optional-processor-failed.c
+++ b/testsuites/validation/tc-start-of-optional-processor-failed.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreSmpValStartOfOptionalProcessorFailed
+ * @ingroup ScoreSmpValStartOfOptionalProcessorFailed
  */
 
 /*
@@ -57,10 +57,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreSmpValStartOfOptionalProcessorFailed \
+ * @defgroup ScoreSmpValStartOfOptionalProcessorFailed \
  *   spec:/score/smp/val/start-of-optional-processor-failed
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationSmpOnly2
+ * @ingroup TestsuitesValidationSmpOnly2
  *
  * @brief Tests the state of an optional processor which failed to start.
  *
diff --git a/testsuites/validation/tc-status-is-equal.c b/testsuites/validation/tc-status-is-equal.c
index 6960270420..3dc1eceb38 100644
--- a/testsuites/validation/tc-status-is-equal.c
+++ b/testsuites/validation/tc-status-is-equal.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsStatusReqIsEqual
+ * @ingroup RtemsStatusReqIsEqual
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsStatusReqIsEqual spec:/rtems/status/req/is-equal
+ * @defgroup RtemsStatusReqIsEqual spec:/rtems/status/req/is-equal
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-status-is-successful.c b/testsuites/validation/tc-status-is-successful.c
index 9ffe7a7df8..3cfafd222a 100644
--- a/testsuites/validation/tc-status-is-successful.c
+++ b/testsuites/validation/tc-status-is-successful.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsStatusReqIsSuccessful
+ * @ingroup RtemsStatusReqIsSuccessful
  */
 
 /*
@@ -57,10 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsStatusReqIsSuccessful \
- *   spec:/rtems/status/req/is-successful
+ * @defgroup RtemsStatusReqIsSuccessful spec:/rtems/status/req/is-successful
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-status-text.c b/testsuites/validation/tc-status-text.c
index dfed1501ed..e2d79427f3 100644
--- a/testsuites/validation/tc-status-text.c
+++ b/testsuites/validation/tc-status-text.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsStatusReqText
+ * @ingroup RtemsStatusReqText
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsStatusReqText spec:/rtems/status/req/text
+ * @defgroup RtemsStatusReqText spec:/rtems/status/req/text
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-status.c b/testsuites/validation/tc-status.c
index 6b8c599516..be706fa86f 100644
--- a/testsuites/validation/tc-status.c
+++ b/testsuites/validation/tc-status.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsStatusValStatus
+ * @ingroup RtemsStatusValStatus
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsStatusValStatus spec:/rtems/status/val/status
+ * @defgroup RtemsStatusValStatus spec:/rtems/status/val/status
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Tests some @ref RTEMSAPIClassicStatus interfaces.
  *
diff --git a/testsuites/validation/tc-support-is-name-valid.c b/testsuites/validation/tc-support-is-name-valid.c
index 589cc4f7f4..83f4b603de 100644
--- a/testsuites/validation/tc-support-is-name-valid.c
+++ b/testsuites/validation/tc-support-is-name-valid.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSupportReqIsNameValid
+ * @ingroup RtemsSupportReqIsNameValid
  */
 
 /*
@@ -57,10 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSupportReqIsNameValid \
- *   spec:/rtems/support/req/is-name-valid
+ * @defgroup RtemsSupportReqIsNameValid spec:/rtems/support/req/is-name-valid
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-support.c b/testsuites/validation/tc-support.c
index fc13488d79..e68eef58d0 100644
--- a/testsuites/validation/tc-support.c
+++ b/testsuites/validation/tc-support.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSupportValSupport
+ * @ingroup RtemsSupportValSupport
  */
 
 /*
@@ -57,10 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSupportValSupport \
- *   spec:/rtems/support/val/support
+ * @defgroup RtemsSupportValSupport spec:/rtems/support/val/support
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Tests some @ref RTEMSAPIClassicSupport directives.
  *
diff --git a/testsuites/validation/tc-sys-lock.c b/testsuites/validation/tc-sys-lock.c
index 85b290ab9b..0e43fec591 100644
--- a/testsuites/validation/tc-sys-lock.c
+++ b/testsuites/validation/tc-sys-lock.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseNewlibValSysLock
+ * @ingroup NewlibValSysLock
  */
 
 /*
@@ -65,9 +65,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseNewlibValSysLock spec:/newlib/val/sys-lock
+ * @defgroup NewlibValSysLock spec:/newlib/val/sys-lock
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Tests the <sys/lock.h> mutex directives.
  *
diff --git a/testsuites/validation/tc-task-construct.c b/testsuites/validation/tc-task-construct.c
index 2b0c75daa1..d3a818cc7f 100644
--- a/testsuites/validation/tc-task-construct.c
+++ b/testsuites/validation/tc-task-construct.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTaskReqConstruct
+ * @ingroup RtemsTaskReqConstruct
  */
 
 /*
@@ -64,10 +64,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTaskReqConstruct spec:/rtems/task/req/construct
+ * @defgroup RtemsTaskReqConstruct spec:/rtems/task/req/construct
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidation1
- * @ingroup RTEMSTestSuiteTestsuitesValidationOneCpu1
+ * @ingroup TestsuitesValidation1
+ * @ingroup TestsuitesValidationOneCpu1
  *
  * @{
  */
diff --git a/testsuites/validation/tc-task-create-errors.c b/testsuites/validation/tc-task-create-errors.c
index 590fe47cb7..0bf0481beb 100644
--- a/testsuites/validation/tc-task-create-errors.c
+++ b/testsuites/validation/tc-task-create-errors.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTaskReqCreateErrors
+ * @ingroup RtemsTaskReqCreateErrors
  */
 
 /*
@@ -62,11 +62,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTaskReqCreateErrors \
- *   spec:/rtems/task/req/create-errors
+ * @defgroup RtemsTaskReqCreateErrors spec:/rtems/task/req/create-errors
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
- * @ingroup RTEMSTestSuiteTestsuitesValidationOneCpu0
+ * @ingroup TestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationOneCpu0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-task-delete.c b/testsuites/validation/tc-task-delete.c
index a9340b4f20..f411e64c1f 100644
--- a/testsuites/validation/tc-task-delete.c
+++ b/testsuites/validation/tc-task-delete.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTaskReqDelete
+ * @ingroup RtemsTaskReqDelete
  */
 
 /*
@@ -67,9 +67,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTaskReqDelete spec:/rtems/task/req/delete
+ * @defgroup RtemsTaskReqDelete spec:/rtems/task/req/delete
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-task-exit.c b/testsuites/validation/tc-task-exit.c
index 2f2733fe90..e0524ad892 100644
--- a/testsuites/validation/tc-task-exit.c
+++ b/testsuites/validation/tc-task-exit.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTaskReqExit
+ * @ingroup RtemsTaskReqExit
  */
 
 /*
@@ -63,9 +63,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTaskReqExit spec:/rtems/task/req/exit
+ * @defgroup RtemsTaskReqExit spec:/rtems/task/req/exit
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-task-get-affinity.c b/testsuites/validation/tc-task-get-affinity.c
index 8200f9f840..fc1e03fe52 100644
--- a/testsuites/validation/tc-task-get-affinity.c
+++ b/testsuites/validation/tc-task-get-affinity.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTaskReqGetAffinity
+ * @ingroup RtemsTaskReqGetAffinity
  */
 
 /*
@@ -59,10 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTaskReqGetAffinity \
- *   spec:/rtems/task/req/get-affinity
+ * @defgroup RtemsTaskReqGetAffinity spec:/rtems/task/req/get-affinity
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-task-get-priority.c b/testsuites/validation/tc-task-get-priority.c
index 83843f4175..3158948498 100644
--- a/testsuites/validation/tc-task-get-priority.c
+++ b/testsuites/validation/tc-task-get-priority.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTaskReqGetPriority
+ * @ingroup RtemsTaskReqGetPriority
  */
 
 /*
@@ -60,10 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTaskReqGetPriority \
- *   spec:/rtems/task/req/get-priority
+ * @defgroup RtemsTaskReqGetPriority spec:/rtems/task/req/get-priority
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-task-get-scheduler.c b/testsuites/validation/tc-task-get-scheduler.c
index 1cd907cd09..6357fc9fef 100644
--- a/testsuites/validation/tc-task-get-scheduler.c
+++ b/testsuites/validation/tc-task-get-scheduler.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTaskReqGetScheduler
+ * @ingroup RtemsTaskReqGetScheduler
  */
 
 /*
@@ -59,10 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTaskReqGetScheduler \
- *   spec:/rtems/task/req/get-scheduler
+ * @defgroup RtemsTaskReqGetScheduler spec:/rtems/task/req/get-scheduler
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-task-ident.c b/testsuites/validation/tc-task-ident.c
index c4247f22cf..7a116e6860 100644
--- a/testsuites/validation/tc-task-ident.c
+++ b/testsuites/validation/tc-task-ident.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTaskReqIdent
+ * @ingroup RtemsTaskReqIdent
  */
 
 /*
@@ -58,9 +58,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTaskReqIdent spec:/rtems/task/req/ident
+ * @defgroup RtemsTaskReqIdent spec:/rtems/task/req/ident
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-task-is-suspended.c b/testsuites/validation/tc-task-is-suspended.c
index 0897d28f56..daf0503b7b 100644
--- a/testsuites/validation/tc-task-is-suspended.c
+++ b/testsuites/validation/tc-task-is-suspended.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTaskReqIsSuspended
+ * @ingroup RtemsTaskReqIsSuspended
  */
 
 /*
@@ -59,10 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTaskReqIsSuspended \
- *   spec:/rtems/task/req/is-suspended
+ * @defgroup RtemsTaskReqIsSuspended spec:/rtems/task/req/is-suspended
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-task-mode.c b/testsuites/validation/tc-task-mode.c
index f5e225a206..c70555e353 100644
--- a/testsuites/validation/tc-task-mode.c
+++ b/testsuites/validation/tc-task-mode.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTaskReqMode
+ * @ingroup RtemsTaskReqMode
  */
 
 /*
@@ -60,10 +60,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTaskReqMode spec:/rtems/task/req/mode
+ * @defgroup RtemsTaskReqMode spec:/rtems/task/req/mode
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
- * @ingroup RTEMSTestSuiteTestsuitesValidationOneCpu0
+ * @ingroup TestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationOneCpu0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-task-performance.c b/testsuites/validation/tc-task-performance.c
index 2900ac6ca0..d660c3ef2f 100644
--- a/testsuites/validation/tc-task-performance.c
+++ b/testsuites/validation/tc-task-performance.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTaskValPerf
+ * @ingroup RtemsTaskValPerf
  */
 
 /*
@@ -60,9 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTaskValPerf spec:/rtems/task/val/perf
+ * @defgroup RtemsTaskValPerf spec:/rtems/task/val/perf
  *
- * @ingroup RTEMSTestSuiteTestsuitesPerformanceNoClock0
+ * @ingroup TestsuitesPerformanceNoClock0
  *
  * @brief This test case provides a context to run @ref RTEMSAPIClassicTasks
  *   performance tests.
diff --git a/testsuites/validation/tc-task-restart.c b/testsuites/validation/tc-task-restart.c
index f6c3aabd33..318f29c729 100644
--- a/testsuites/validation/tc-task-restart.c
+++ b/testsuites/validation/tc-task-restart.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTaskReqRestart
+ * @ingroup RtemsTaskReqRestart
  */
 
 /*
@@ -65,9 +65,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTaskReqRestart spec:/rtems/task/req/restart
+ * @defgroup RtemsTaskReqRestart spec:/rtems/task/req/restart
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-task-resume.c b/testsuites/validation/tc-task-resume.c
index f7c63234d6..94426642e4 100644
--- a/testsuites/validation/tc-task-resume.c
+++ b/testsuites/validation/tc-task-resume.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTaskReqResume
+ * @ingroup RtemsTaskReqResume
  */
 
 /*
@@ -59,9 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTaskReqResume spec:/rtems/task/req/resume
+ * @defgroup RtemsTaskReqResume spec:/rtems/task/req/resume
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-task-set-affinity.c b/testsuites/validation/tc-task-set-affinity.c
index ffa40fcf58..da5a468609 100644
--- a/testsuites/validation/tc-task-set-affinity.c
+++ b/testsuites/validation/tc-task-set-affinity.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTaskReqSetAffinity
+ * @ingroup RtemsTaskReqSetAffinity
  */
 
 /*
@@ -60,11 +60,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTaskReqSetAffinity \
- *   spec:/rtems/task/req/set-affinity
+ * @defgroup RtemsTaskReqSetAffinity spec:/rtems/task/req/set-affinity
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
- * @ingroup RTEMSTestSuiteTestsuitesValidationOneCpu0
+ * @ingroup TestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationOneCpu0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-task-set-priority.c b/testsuites/validation/tc-task-set-priority.c
index cbe4bfda2b..5630ebeab0 100644
--- a/testsuites/validation/tc-task-set-priority.c
+++ b/testsuites/validation/tc-task-set-priority.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTaskReqSetPriority
+ * @ingroup RtemsTaskReqSetPriority
  */
 
 /*
@@ -59,11 +59,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTaskReqSetPriority \
- *   spec:/rtems/task/req/set-priority
+ * @defgroup RtemsTaskReqSetPriority spec:/rtems/task/req/set-priority
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
- * @ingroup RTEMSTestSuiteTestsuitesValidationOneCpu0
+ * @ingroup TestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationOneCpu0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-task-set-scheduler.c b/testsuites/validation/tc-task-set-scheduler.c
index 018aa2c338..4ac1ffb280 100644
--- a/testsuites/validation/tc-task-set-scheduler.c
+++ b/testsuites/validation/tc-task-set-scheduler.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTaskReqSetScheduler
+ * @ingroup RtemsTaskReqSetScheduler
  */
 
 /*
@@ -61,10 +61,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTaskReqSetScheduler \
- *   spec:/rtems/task/req/set-scheduler
+ * @defgroup RtemsTaskReqSetScheduler spec:/rtems/task/req/set-scheduler
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-task-smp.c b/testsuites/validation/tc-task-smp.c
index 51165153f5..475715d001 100644
--- a/testsuites/validation/tc-task-smp.c
+++ b/testsuites/validation/tc-task-smp.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTaskValSmp
+ * @ingroup RtemsTaskValSmp
  */
 
 /*
@@ -60,9 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTaskValSmp spec:/rtems/task/val/smp
+ * @defgroup RtemsTaskValSmp spec:/rtems/task/val/smp
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationSmpOnly0
+ * @ingroup TestsuitesValidationSmpOnly0
  *
  * @brief This test case collection provides SMP-specific validation test cases
  *   for requirements of the @ref RTEMSAPIClassicTasks.
diff --git a/testsuites/validation/tc-task-start.c b/testsuites/validation/tc-task-start.c
index ffb0012439..f60a2525ba 100644
--- a/testsuites/validation/tc-task-start.c
+++ b/testsuites/validation/tc-task-start.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTaskReqStart
+ * @ingroup RtemsTaskReqStart
  */
 
 /*
@@ -60,9 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTaskReqStart spec:/rtems/task/req/start
+ * @defgroup RtemsTaskReqStart spec:/rtems/task/req/start
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-task-storage-size.c b/testsuites/validation/tc-task-storage-size.c
index 6ad8b72cbe..c53079c66d 100644
--- a/testsuites/validation/tc-task-storage-size.c
+++ b/testsuites/validation/tc-task-storage-size.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTaskReqStorageSize
+ * @ingroup RtemsTaskReqStorageSize
  */
 
 /*
@@ -59,10 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTaskReqStorageSize \
- *   spec:/rtems/task/req/storage-size
+ * @defgroup RtemsTaskReqStorageSize spec:/rtems/task/req/storage-size
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-task-suspend.c b/testsuites/validation/tc-task-suspend.c
index b56b420120..07a655cb0e 100644
--- a/testsuites/validation/tc-task-suspend.c
+++ b/testsuites/validation/tc-task-suspend.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTaskReqSuspend
+ * @ingroup RtemsTaskReqSuspend
  */
 
 /*
@@ -59,9 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTaskReqSuspend spec:/rtems/task/req/suspend
+ * @defgroup RtemsTaskReqSuspend spec:/rtems/task/req/suspend
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-task-wake-after.c b/testsuites/validation/tc-task-wake-after.c
index 8966a14648..5fc4403370 100644
--- a/testsuites/validation/tc-task-wake-after.c
+++ b/testsuites/validation/tc-task-wake-after.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTaskReqWakeAfter
+ * @ingroup RtemsTaskReqWakeAfter
  */
 
 /*
@@ -62,10 +62,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTaskReqWakeAfter spec:/rtems/task/req/wake-after
+ * @defgroup RtemsTaskReqWakeAfter spec:/rtems/task/req/wake-after
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
- * @ingroup RTEMSTestSuiteTestsuitesValidationOneCpu0
+ * @ingroup TestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationOneCpu0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-task-wake-when.c b/testsuites/validation/tc-task-wake-when.c
index 223fbfd55f..cdaa780971 100644
--- a/testsuites/validation/tc-task-wake-when.c
+++ b/testsuites/validation/tc-task-wake-when.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTaskReqWakeWhen
+ * @ingroup RtemsTaskReqWakeWhen
  */
 
 /*
@@ -62,9 +62,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTaskReqWakeWhen spec:/rtems/task/req/wake-when
+ * @defgroup RtemsTaskReqWakeWhen spec:/rtems/task/req/wake-when
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-task.c b/testsuites/validation/tc-task.c
index 11d37e7017..7001c9c04f 100644
--- a/testsuites/validation/tc-task.c
+++ b/testsuites/validation/tc-task.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTaskValTask
+ * @ingroup RtemsTaskValTask
  */
 
 /*
@@ -62,9 +62,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTaskValTask spec:/rtems/task/val/task
+ * @defgroup RtemsTaskValTask spec:/rtems/task/val/task
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief This test case collection provides validation test cases for
  *   requirements of the @ref RTEMSAPIClassicTasks.
diff --git a/testsuites/validation/tc-terminate.c b/testsuites/validation/tc-terminate.c
index 7eeaa9e3ea..3012c4c432 100644
--- a/testsuites/validation/tc-terminate.c
+++ b/testsuites/validation/tc-terminate.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreInterrValTerminate
+ * @ingroup ScoreInterrValTerminate
  */
 
 /*
@@ -67,10 +67,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreInterrValTerminate \
- *   spec:/score/interr/val/terminate
+ * @defgroup ScoreInterrValTerminate spec:/score/interr/val/terminate
  *
- * @ingroup RTEMSTestSuiteTestsuitesTerminate
+ * @ingroup TestsuitesTerminate
  *
  * @brief Tests system termination procedure.
  *
diff --git a/testsuites/validation/tc-thread-idle-body-no-return.c b/testsuites/validation/tc-thread-idle-body-no-return.c
index 5234a460f9..83cdb935ff 100644
--- a/testsuites/validation/tc-thread-idle-body-no-return.c
+++ b/testsuites/validation/tc-thread-idle-body-no-return.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreThreadValIdleBodyNoReturn
+ * @ingroup ScoreThreadValIdleBodyNoReturn
  */
 
 /*
@@ -59,10 +59,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreThreadValIdleBodyNoReturn \
+ * @defgroup ScoreThreadValIdleBodyNoReturn \
  *   spec:/score/thread/val/idle-body-no-return
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidation0
+ * @ingroup TestsuitesValidation0
  *
  * @brief Tests thread idle body behaviour.
  *
diff --git a/testsuites/validation/tc-timecounter-get-smp.c b/testsuites/validation/tc-timecounter-get-smp.c
index 520d532c7b..753ee1b2c5 100644
--- a/testsuites/validation/tc-timecounter-get-smp.c
+++ b/testsuites/validation/tc-timecounter-get-smp.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTimecounterValGetSmp
+ * @ingroup ScoreTimecounterValGetSmp
  */
 
 /*
@@ -63,10 +63,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreTimecounterValGetSmp \
- *   spec:/score/timecounter/val/get-smp
+ * @defgroup ScoreTimecounterValGetSmp spec:/score/timecounter/val/get-smp
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationTimecounterSmp0
+ * @ingroup TestsuitesValidationTimecounterSmp0
  *
  * @brief Tests directives to get a time value.
  *
diff --git a/testsuites/validation/tc-timecounter-get.c b/testsuites/validation/tc-timecounter-get.c
index 7ab746ab86..2d98b4b138 100644
--- a/testsuites/validation/tc-timecounter-get.c
+++ b/testsuites/validation/tc-timecounter-get.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTimecounterValGet
+ * @ingroup ScoreTimecounterValGet
  */
 
 /*
@@ -62,10 +62,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreTimecounterValGet \
- *   spec:/score/timecounter/val/get
+ * @defgroup ScoreTimecounterValGet spec:/score/timecounter/val/get
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationTimecounter1
+ * @ingroup TestsuitesValidationTimecounter1
  *
  * @brief Tests directives to get a time value.
  *
diff --git a/testsuites/validation/tc-timecounter-install.c b/testsuites/validation/tc-timecounter-install.c
index 3189f37a23..c5193e1104 100644
--- a/testsuites/validation/tc-timecounter-install.c
+++ b/testsuites/validation/tc-timecounter-install.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTimecounterValInstall
+ * @ingroup ScoreTimecounterValInstall
  */
 
 /*
@@ -62,10 +62,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreTimecounterValInstall \
- *   spec:/score/timecounter/val/install
+ * @defgroup ScoreTimecounterValInstall spec:/score/timecounter/val/install
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationTimecounter0
+ * @ingroup TestsuitesValidationTimecounter0
  *
  * @brief Tests timecounter installation related functions and directives of
  *   the Clock Manager.
diff --git a/testsuites/validation/tc-timer-cancel.c b/testsuites/validation/tc-timer-cancel.c
index 223848fdee..4b1db15f35 100644
--- a/testsuites/validation/tc-timer-cancel.c
+++ b/testsuites/validation/tc-timer-cancel.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTimerReqCancel
+ * @ingroup RtemsTimerReqCancel
  */
 
 /*
@@ -59,9 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTimerReqCancel spec:/rtems/timer/req/cancel
+ * @defgroup RtemsTimerReqCancel spec:/rtems/timer/req/cancel
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-timer-create.c b/testsuites/validation/tc-timer-create.c
index dea3a40175..9337141eed 100644
--- a/testsuites/validation/tc-timer-create.c
+++ b/testsuites/validation/tc-timer-create.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTimerReqCreate
+ * @ingroup RtemsTimerReqCreate
  */
 
 /*
@@ -60,9 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTimerReqCreate spec:/rtems/timer/req/create
+ * @defgroup RtemsTimerReqCreate spec:/rtems/timer/req/create
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-timer-delete.c b/testsuites/validation/tc-timer-delete.c
index 92032c80cf..b27cb95c76 100644
--- a/testsuites/validation/tc-timer-delete.c
+++ b/testsuites/validation/tc-timer-delete.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTimerReqDelete
+ * @ingroup RtemsTimerReqDelete
  */
 
 /*
@@ -58,9 +58,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTimerReqDelete spec:/rtems/timer/req/delete
+ * @defgroup RtemsTimerReqDelete spec:/rtems/timer/req/delete
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-timer-fire-after.c b/testsuites/validation/tc-timer-fire-after.c
index 980ecdde2d..9f98eab83c 100644
--- a/testsuites/validation/tc-timer-fire-after.c
+++ b/testsuites/validation/tc-timer-fire-after.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTimerReqFireAfter
+ * @ingroup RtemsTimerReqFireAfter
  */
 
 /*
@@ -59,10 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTimerReqFireAfter \
- *   spec:/rtems/timer/req/fire-after
+ * @defgroup RtemsTimerReqFireAfter spec:/rtems/timer/req/fire-after
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-timer-fire-when.c b/testsuites/validation/tc-timer-fire-when.c
index 8d5584ebf0..f2fc78f9da 100644
--- a/testsuites/validation/tc-timer-fire-when.c
+++ b/testsuites/validation/tc-timer-fire-when.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTimerReqFireWhen
+ * @ingroup RtemsTimerReqFireWhen
  */
 
 /*
@@ -59,9 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTimerReqFireWhen spec:/rtems/timer/req/fire-when
+ * @defgroup RtemsTimerReqFireWhen spec:/rtems/timer/req/fire-when
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-timer-ident.c b/testsuites/validation/tc-timer-ident.c
index bdee3d89d2..597e0fc917 100644
--- a/testsuites/validation/tc-timer-ident.c
+++ b/testsuites/validation/tc-timer-ident.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTimerValIdent
+ * @ingroup RtemsTimerValIdent
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTimerValIdent spec:/rtems/timer/val/ident
+ * @defgroup RtemsTimerValIdent spec:/rtems/timer/val/ident
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Test the rtems_timer_ident() directive.
  *
diff --git a/testsuites/validation/tc-timer-initiate-server.c b/testsuites/validation/tc-timer-initiate-server.c
index 89bb445a6f..e2789e2593 100644
--- a/testsuites/validation/tc-timer-initiate-server.c
+++ b/testsuites/validation/tc-timer-initiate-server.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTimerReqInitiateServer
+ * @ingroup RtemsTimerReqInitiateServer
  */
 
 /*
@@ -60,10 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTimerReqInitiateServer \
- *   spec:/rtems/timer/req/initiate-server
+ * @defgroup RtemsTimerReqInitiateServer spec:/rtems/timer/req/initiate-server
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-timer-reset.c b/testsuites/validation/tc-timer-reset.c
index 2b87717b43..96f88cee2e 100644
--- a/testsuites/validation/tc-timer-reset.c
+++ b/testsuites/validation/tc-timer-reset.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTimerReqReset
+ * @ingroup RtemsTimerReqReset
  */
 
 /*
@@ -59,9 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTimerReqReset spec:/rtems/timer/req/reset
+ * @defgroup RtemsTimerReqReset spec:/rtems/timer/req/reset
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-timer-server-fire-after.c b/testsuites/validation/tc-timer-server-fire-after.c
index 50e639e7c1..ddfacf7098 100644
--- a/testsuites/validation/tc-timer-server-fire-after.c
+++ b/testsuites/validation/tc-timer-server-fire-after.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTimerReqServerFireAfter
+ * @ingroup RtemsTimerReqServerFireAfter
  */
 
 /*
@@ -59,10 +59,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTimerReqServerFireAfter \
+ * @defgroup RtemsTimerReqServerFireAfter \
  *   spec:/rtems/timer/req/server-fire-after
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-timer-server-fire-when.c b/testsuites/validation/tc-timer-server-fire-when.c
index a918405058..530c3cbeb3 100644
--- a/testsuites/validation/tc-timer-server-fire-when.c
+++ b/testsuites/validation/tc-timer-server-fire-when.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTimerReqServerFireWhen
+ * @ingroup RtemsTimerReqServerFireWhen
  */
 
 /*
@@ -59,10 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTimerReqServerFireWhen \
- *   spec:/rtems/timer/req/server-fire-when
+ * @defgroup RtemsTimerReqServerFireWhen spec:/rtems/timer/req/server-fire-when
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-timer.c b/testsuites/validation/tc-timer.c
index a7a25222bb..0f00ed8b27 100644
--- a/testsuites/validation/tc-timer.c
+++ b/testsuites/validation/tc-timer.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTimerValTimer
+ * @ingroup RtemsTimerValTimer
  */
 
 /*
@@ -61,9 +61,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTimerValTimer spec:/rtems/timer/val/timer
+ * @defgroup RtemsTimerValTimer spec:/rtems/timer/val/timer
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Tests general timer behaviour.
  *
diff --git a/testsuites/validation/tc-type.c b/testsuites/validation/tc-type.c
index a19048746b..79ea7e03b9 100644
--- a/testsuites/validation/tc-type.c
+++ b/testsuites/validation/tc-type.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsTypeValType
+ * @ingroup RtemsTypeValType
  */
 
 /*
@@ -58,9 +58,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsTypeValType spec:/rtems/type/val/type
+ * @defgroup RtemsTypeValType spec:/rtems/type/val/type
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Tests some @ref RTEMSAPIClassicTypes interfaces.
  *
diff --git a/testsuites/validation/tc-userext-create.c b/testsuites/validation/tc-userext-create.c
index 0ffcd12972..382f3020d9 100644
--- a/testsuites/validation/tc-userext-create.c
+++ b/testsuites/validation/tc-userext-create.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsUserextReqCreate
+ * @ingroup RtemsUserextReqCreate
  */
 
 /*
@@ -60,9 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsUserextReqCreate spec:/rtems/userext/req/create
+ * @defgroup RtemsUserextReqCreate spec:/rtems/userext/req/create
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-userext-delete.c b/testsuites/validation/tc-userext-delete.c
index b264b34792..1bcb7a11fd 100644
--- a/testsuites/validation/tc-userext-delete.c
+++ b/testsuites/validation/tc-userext-delete.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsUserextReqDelete
+ * @ingroup RtemsUserextReqDelete
  */
 
 /*
@@ -58,9 +58,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsUserextReqDelete spec:/rtems/userext/req/delete
+ * @defgroup RtemsUserextReqDelete spec:/rtems/userext/req/delete
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tc-userext-ident.c b/testsuites/validation/tc-userext-ident.c
index 2ece528953..00c944b4ad 100644
--- a/testsuites/validation/tc-userext-ident.c
+++ b/testsuites/validation/tc-userext-ident.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsUserextValIdent
+ * @ingroup RtemsUserextValIdent
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsUserextValIdent spec:/rtems/userext/val/ident
+ * @defgroup RtemsUserextValIdent spec:/rtems/userext/val/ident
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Test the rtems_extension_ident() directive.
  *
diff --git a/testsuites/validation/tc-userext.c b/testsuites/validation/tc-userext.c
index 252946e026..d3046c81fb 100644
--- a/testsuites/validation/tc-userext.c
+++ b/testsuites/validation/tc-userext.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsUserextValUserext
+ * @ingroup RtemsUserextValUserext
  */
 
 /*
@@ -62,10 +62,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsUserextValUserext \
- *   spec:/rtems/userext/val/userext
+ * @defgroup RtemsUserextValUserext spec:/rtems/userext/val/userext
  *
- * @ingroup RTEMSTestSuiteTestsuitesUserext
+ * @ingroup TestsuitesUserext
  *
  * @brief Tests the thread user extensions.
  *
diff --git a/testsuites/validation/tr-event-constant.c b/testsuites/validation/tr-event-constant.c
index 6895fcc821..d44f434c40 100644
--- a/testsuites/validation/tr-event-constant.c
+++ b/testsuites/validation/tr-event-constant.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsEventValEventConstant
+ * @ingroup RtemsEventValEventConstant
  */
 
 /*
@@ -59,10 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsEventValEventConstant \
- *   spec:/rtems/event/val/event-constant
+ * @defgroup RtemsEventValEventConstant spec:/rtems/event/val/event-constant
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Tests an event constant and number of the Event Manager using the
  *   Classic and system event sets of the executing task.
diff --git a/testsuites/validation/tr-event-constant.h b/testsuites/validation/tr-event-constant.h
index b6484874d5..98cbd9af72 100644
--- a/testsuites/validation/tr-event-constant.h
+++ b/testsuites/validation/tr-event-constant.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsEventValEventConstant
+ * @ingroup RtemsEventValEventConstant
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseRtemsEventValEventConstant
+ * @addtogroup RtemsEventValEventConstant
  *
  * @{
  */
diff --git a/testsuites/validation/tr-event-send-receive.c b/testsuites/validation/tr-event-send-receive.c
index e7c48dae70..431ca2781e 100644
--- a/testsuites/validation/tr-event-send-receive.c
+++ b/testsuites/validation/tr-event-send-receive.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsEventReqSendReceive
+ * @ingroup RtemsEventReqSendReceive
  */
 
 /*
@@ -60,10 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsEventReqSendReceive \
- *   spec:/rtems/event/req/send-receive
+ * @defgroup RtemsEventReqSendReceive spec:/rtems/event/req/send-receive
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidation0
+ * @ingroup TestsuitesValidation0
  *
  * @{
  */
diff --git a/testsuites/validation/tr-event-send-receive.h b/testsuites/validation/tr-event-send-receive.h
index b246a815ed..652d5a558f 100644
--- a/testsuites/validation/tr-event-send-receive.h
+++ b/testsuites/validation/tr-event-send-receive.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsEventReqSendReceive
+ * @ingroup RtemsEventReqSendReceive
  */
 
 /*
@@ -59,7 +59,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseRtemsEventReqSendReceive
+ * @addtogroup RtemsEventReqSendReceive
  *
  * @{
  */
diff --git a/testsuites/validation/tr-fatal-boot-processor-not-assigned-to-scheduler.c b/testsuites/validation/tr-fatal-boot-processor-not-assigned-to-scheduler.c
index f7cf1e1eb8..29092a4402 100644
--- a/testsuites/validation/tr-fatal-boot-processor-not-assigned-to-scheduler.c
+++ b/testsuites/validation/tr-fatal-boot-processor-not-assigned-to-scheduler.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreSmpValFatalBootProcessorNotAssignedToScheduler
+ * @ingroup ScoreSmpValFatalBootProcessorNotAssignedToScheduler
  */
 
 /*
@@ -59,10 +59,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreSmpValFatalBootProcessorNotAssignedToScheduler \
+ * @defgroup ScoreSmpValFatalBootProcessorNotAssignedToScheduler \
  *   spec:/score/smp/val/fatal-boot-processor-not-assigned-to-scheduler
  *
- * @ingroup RTEMSTestSuiteTestsuitesFatalBootProcessorNotAssignedToScheduler
+ * @ingroup TestsuitesFatalBootProcessorNotAssignedToScheduler
  *
  * @brief Tests a fatal error.
  *
diff --git a/testsuites/validation/tr-fatal-boot-processor-not-assigned-to-scheduler.h b/testsuites/validation/tr-fatal-boot-processor-not-assigned-to-scheduler.h
index 3cf19f5322..470bf07c6f 100644
--- a/testsuites/validation/tr-fatal-boot-processor-not-assigned-to-scheduler.h
+++ b/testsuites/validation/tr-fatal-boot-processor-not-assigned-to-scheduler.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreSmpValFatalBootProcessorNotAssignedToScheduler
+ * @ingroup ScoreSmpValFatalBootProcessorNotAssignedToScheduler
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreSmpValFatalBootProcessorNotAssignedToScheduler
+ * @addtogroup ScoreSmpValFatalBootProcessorNotAssignedToScheduler
  *
  * @{
  */
diff --git a/testsuites/validation/tr-fatal-idle-thread-create-failed.c b/testsuites/validation/tr-fatal-idle-thread-create-failed.c
index 8c66f01c82..ad1e407969 100644
--- a/testsuites/validation/tr-fatal-idle-thread-create-failed.c
+++ b/testsuites/validation/tr-fatal-idle-thread-create-failed.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreThreadValFatalIdleThreadCreateFailed
+ * @ingroup ScoreThreadValFatalIdleThreadCreateFailed
  */
 
 /*
@@ -59,10 +59,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreThreadValFatalIdleThreadCreateFailed \
+ * @defgroup ScoreThreadValFatalIdleThreadCreateFailed \
  *   spec:/score/thread/val/fatal-idle-thread-create-failed
  *
- * @ingroup RTEMSTestSuiteTestsuitesFatalIdleThreadCreateFailed
+ * @ingroup TestsuitesFatalIdleThreadCreateFailed
  *
  * @brief Tests a fatal error caused by a failing task create extension.
  *
diff --git a/testsuites/validation/tr-fatal-idle-thread-create-failed.h b/testsuites/validation/tr-fatal-idle-thread-create-failed.h
index 15d4c9a086..cbf0e256b7 100644
--- a/testsuites/validation/tr-fatal-idle-thread-create-failed.h
+++ b/testsuites/validation/tr-fatal-idle-thread-create-failed.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreThreadValFatalIdleThreadCreateFailed
+ * @ingroup ScoreThreadValFatalIdleThreadCreateFailed
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreThreadValFatalIdleThreadCreateFailed
+ * @addtogroup ScoreThreadValFatalIdleThreadCreateFailed
  *
  * @{
  */
diff --git a/testsuites/validation/tr-fatal-idle-thread-stack-too-small.c b/testsuites/validation/tr-fatal-idle-thread-stack-too-small.c
index b5a191b0a2..618cf7df09 100644
--- a/testsuites/validation/tr-fatal-idle-thread-stack-too-small.c
+++ b/testsuites/validation/tr-fatal-idle-thread-stack-too-small.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreThreadValFatalIdleThreadStackTooSmall
+ * @ingroup ScoreThreadValFatalIdleThreadStackTooSmall
  */
 
 /*
@@ -59,10 +59,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreThreadValFatalIdleThreadStackTooSmall \
+ * @defgroup ScoreThreadValFatalIdleThreadStackTooSmall \
  *   spec:/score/thread/val/fatal-idle-thread-stack-too-small
  *
- * @ingroup RTEMSTestSuiteTestsuitesFatalIdleThreadStackTooSmall
+ * @ingroup TestsuitesFatalIdleThreadStackTooSmall
  *
  * @brief Tests a fatal error caused by a too small idle thread stack size.
  *
diff --git a/testsuites/validation/tr-fatal-idle-thread-stack-too-small.h b/testsuites/validation/tr-fatal-idle-thread-stack-too-small.h
index 4d7aac4598..3f8ebe440e 100644
--- a/testsuites/validation/tr-fatal-idle-thread-stack-too-small.h
+++ b/testsuites/validation/tr-fatal-idle-thread-stack-too-small.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreThreadValFatalIdleThreadStackTooSmall
+ * @ingroup ScoreThreadValFatalIdleThreadStackTooSmall
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreThreadValFatalIdleThreadStackTooSmall
+ * @addtogroup ScoreThreadValFatalIdleThreadStackTooSmall
  *
  * @{
  */
diff --git a/testsuites/validation/tr-fatal-init-task-construct-failed.c b/testsuites/validation/tr-fatal-init-task-construct-failed.c
index a7ee911f08..758cc708e4 100644
--- a/testsuites/validation/tr-fatal-init-task-construct-failed.c
+++ b/testsuites/validation/tr-fatal-init-task-construct-failed.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseAcfgValFatalInitTaskConstructFailed
+ * @ingroup AcfgValFatalInitTaskConstructFailed
  */
 
 /*
@@ -60,10 +60,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseAcfgValFatalInitTaskConstructFailed \
+ * @defgroup AcfgValFatalInitTaskConstructFailed \
  *   spec:/acfg/val/fatal-init-task-construct-failed
  *
- * @ingroup RTEMSTestSuiteTestsuitesFatalInitTaskConstructFailed
+ * @ingroup TestsuitesFatalInitTaskConstructFailed
  *
  * @brief Tests a fatal error caused by an invalid application configuration.
  *
diff --git a/testsuites/validation/tr-fatal-init-task-construct-failed.h b/testsuites/validation/tr-fatal-init-task-construct-failed.h
index 1685ed567f..8180b03227 100644
--- a/testsuites/validation/tr-fatal-init-task-construct-failed.h
+++ b/testsuites/validation/tr-fatal-init-task-construct-failed.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseAcfgValFatalInitTaskConstructFailed
+ * @ingroup AcfgValFatalInitTaskConstructFailed
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseAcfgValFatalInitTaskConstructFailed
+ * @addtogroup AcfgValFatalInitTaskConstructFailed
  *
  * @{
  */
diff --git a/testsuites/validation/tr-fatal-mandatory-processor-not-present.c b/testsuites/validation/tr-fatal-mandatory-processor-not-present.c
index 0f2435d0d5..4d04f1f5e6 100644
--- a/testsuites/validation/tr-fatal-mandatory-processor-not-present.c
+++ b/testsuites/validation/tr-fatal-mandatory-processor-not-present.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreSmpValFatalMandatoryProcessorNotPresent
+ * @ingroup ScoreSmpValFatalMandatoryProcessorNotPresent
  */
 
 /*
@@ -59,10 +59,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreSmpValFatalMandatoryProcessorNotPresent \
+ * @defgroup ScoreSmpValFatalMandatoryProcessorNotPresent \
  *   spec:/score/smp/val/fatal-mandatory-processor-not-present
  *
- * @ingroup RTEMSTestSuiteTestsuitesFatalMandatoryProcessorNotPresent
+ * @ingroup TestsuitesFatalMandatoryProcessorNotPresent
  *
  * @brief Tests a fatal error.
  *
diff --git a/testsuites/validation/tr-fatal-mandatory-processor-not-present.h b/testsuites/validation/tr-fatal-mandatory-processor-not-present.h
index fd41d1b961..42b479e312 100644
--- a/testsuites/validation/tr-fatal-mandatory-processor-not-present.h
+++ b/testsuites/validation/tr-fatal-mandatory-processor-not-present.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreSmpValFatalMandatoryProcessorNotPresent
+ * @ingroup ScoreSmpValFatalMandatoryProcessorNotPresent
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreSmpValFatalMandatoryProcessorNotPresent
+ * @addtogroup ScoreSmpValFatalMandatoryProcessorNotPresent
  *
  * @{
  */
diff --git a/testsuites/validation/tr-fatal-scheduler-requires-exactly-one-processor.c b/testsuites/validation/tr-fatal-scheduler-requires-exactly-one-processor.c
index aefe76bb31..4eec9258d5 100644
--- a/testsuites/validation/tr-fatal-scheduler-requires-exactly-one-processor.c
+++ b/testsuites/validation/tr-fatal-scheduler-requires-exactly-one-processor.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreSmpValFatalSchedulerRequiresExactlyOneProcessor
+ * @ingroup ScoreSmpValFatalSchedulerRequiresExactlyOneProcessor
  */
 
 /*
@@ -59,10 +59,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreSmpValFatalSchedulerRequiresExactlyOneProcessor \
+ * @defgroup ScoreSmpValFatalSchedulerRequiresExactlyOneProcessor \
  *   spec:/score/smp/val/fatal-scheduler-requires-exactly-one-processor
  *
- * @ingroup RTEMSTestSuiteTestsuitesFatalSchedulerRequiresExactlyOneProcessor
+ * @ingroup TestsuitesFatalSchedulerRequiresExactlyOneProcessor
  *
  * @brief Tests a fatal error.
  *
diff --git a/testsuites/validation/tr-fatal-scheduler-requires-exactly-one-processor.h b/testsuites/validation/tr-fatal-scheduler-requires-exactly-one-processor.h
index 2d0e3f32b2..a2b0c1a263 100644
--- a/testsuites/validation/tr-fatal-scheduler-requires-exactly-one-processor.h
+++ b/testsuites/validation/tr-fatal-scheduler-requires-exactly-one-processor.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreSmpValFatalSchedulerRequiresExactlyOneProcessor
+ * @ingroup ScoreSmpValFatalSchedulerRequiresExactlyOneProcessor
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreSmpValFatalSchedulerRequiresExactlyOneProcessor
+ * @addtogroup ScoreSmpValFatalSchedulerRequiresExactlyOneProcessor
  *
  * @{
  */
diff --git a/testsuites/validation/tr-fatal-smp.c b/testsuites/validation/tr-fatal-smp.c
index 425a95ade0..a8564e444e 100644
--- a/testsuites/validation/tr-fatal-smp.c
+++ b/testsuites/validation/tr-fatal-smp.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreSmpValFatal
+ * @ingroup ScoreSmpValFatal
  */
 
 /*
@@ -64,9 +64,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreSmpValFatal spec:/score/smp/val/fatal
+ * @defgroup ScoreSmpValFatal spec:/score/smp/val/fatal
  *
- * @ingroup RTEMSTestSuiteTestsuitesFatalSmp
+ * @ingroup TestsuitesFatalSmp
  *
  * @brief Tests four fatal errors.
  *
diff --git a/testsuites/validation/tr-fatal-smp.h b/testsuites/validation/tr-fatal-smp.h
index 5b36498d29..2f43b909ba 100644
--- a/testsuites/validation/tr-fatal-smp.h
+++ b/testsuites/validation/tr-fatal-smp.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreSmpValFatal
+ * @ingroup ScoreSmpValFatal
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreSmpValFatal
+ * @addtogroup ScoreSmpValFatal
  *
  * @{
  */
diff --git a/testsuites/validation/tr-fatal-start-of-mandatory-processor-failed.c b/testsuites/validation/tr-fatal-start-of-mandatory-processor-failed.c
index cc0de8c83c..9bf00b2736 100644
--- a/testsuites/validation/tr-fatal-start-of-mandatory-processor-failed.c
+++ b/testsuites/validation/tr-fatal-start-of-mandatory-processor-failed.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreSmpValFatalStartOfMandatoryProcessorFailed
+ * @ingroup ScoreSmpValFatalStartOfMandatoryProcessorFailed
  */
 
 /*
@@ -59,10 +59,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreSmpValFatalStartOfMandatoryProcessorFailed \
+ * @defgroup ScoreSmpValFatalStartOfMandatoryProcessorFailed \
  *   spec:/score/smp/val/fatal-start-of-mandatory-processor-failed
  *
- * @ingroup RTEMSTestSuiteTestsuitesFatalStartOfMandatoryProcessorFailed
+ * @ingroup TestsuitesFatalStartOfMandatoryProcessorFailed
  *
  * @brief Tests a fatal error.
  *
diff --git a/testsuites/validation/tr-fatal-start-of-mandatory-processor-failed.h b/testsuites/validation/tr-fatal-start-of-mandatory-processor-failed.h
index c80456bd77..5f89e4dd4a 100644
--- a/testsuites/validation/tr-fatal-start-of-mandatory-processor-failed.h
+++ b/testsuites/validation/tr-fatal-start-of-mandatory-processor-failed.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreSmpValFatalStartOfMandatoryProcessorFailed
+ * @ingroup ScoreSmpValFatalStartOfMandatoryProcessorFailed
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreSmpValFatalStartOfMandatoryProcessorFailed
+ * @addtogroup ScoreSmpValFatalStartOfMandatoryProcessorFailed
  *
  * @{
  */
diff --git a/testsuites/validation/tr-fatal-start-on-not-online-processor.c b/testsuites/validation/tr-fatal-start-on-not-online-processor.c
index 55081bc25d..255c06aa00 100644
--- a/testsuites/validation/tr-fatal-start-on-not-online-processor.c
+++ b/testsuites/validation/tr-fatal-start-on-not-online-processor.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreSmpValFatalStartOnNotOnlineProcessor
+ * @ingroup ScoreSmpValFatalStartOnNotOnlineProcessor
  */
 
 /*
@@ -59,10 +59,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreSmpValFatalStartOnNotOnlineProcessor \
+ * @defgroup ScoreSmpValFatalStartOnNotOnlineProcessor \
  *   spec:/score/smp/val/fatal-start-on-not-online-processor
  *
- * @ingroup RTEMSTestSuiteTestsuitesFatalStartOnNotOnlineProcessor
+ * @ingroup TestsuitesFatalStartOnNotOnlineProcessor
  *
  * @brief Tests a fatal error.
  *
diff --git a/testsuites/validation/tr-fatal-start-on-not-online-processor.h b/testsuites/validation/tr-fatal-start-on-not-online-processor.h
index 65a8a308f7..053c18f788 100644
--- a/testsuites/validation/tr-fatal-start-on-not-online-processor.h
+++ b/testsuites/validation/tr-fatal-start-on-not-online-processor.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreSmpValFatalStartOnNotOnlineProcessor
+ * @ingroup ScoreSmpValFatalStartOnNotOnlineProcessor
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreSmpValFatalStartOnNotOnlineProcessor
+ * @addtogroup ScoreSmpValFatalStartOnNotOnlineProcessor
  *
  * @{
  */
diff --git a/testsuites/validation/tr-fatal-too-large-tls-size.c b/testsuites/validation/tr-fatal-too-large-tls-size.c
index 12beeaef90..ea7f774b0e 100644
--- a/testsuites/validation/tr-fatal-too-large-tls-size.c
+++ b/testsuites/validation/tr-fatal-too-large-tls-size.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseAcfgValFatalTooLargeTlsSize
+ * @ingroup AcfgValFatalTooLargeTlsSize
  */
 
 /*
@@ -60,10 +60,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseAcfgValFatalTooLargeTlsSize \
+ * @defgroup AcfgValFatalTooLargeTlsSize \
  *   spec:/acfg/val/fatal-too-large-tls-size
  *
- * @ingroup RTEMSTestSuiteTestsuitesFatalTooLargeTlsSize
+ * @ingroup TestsuitesFatalTooLargeTlsSize
  *
  * @brief Tests a fatal error.
  *
diff --git a/testsuites/validation/tr-fatal-too-large-tls-size.h b/testsuites/validation/tr-fatal-too-large-tls-size.h
index 1b5c24e469..7f6e42fa94 100644
--- a/testsuites/validation/tr-fatal-too-large-tls-size.h
+++ b/testsuites/validation/tr-fatal-too-large-tls-size.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseAcfgValFatalTooLargeTlsSize
+ * @ingroup AcfgValFatalTooLargeTlsSize
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseAcfgValFatalTooLargeTlsSize
+ * @addtogroup AcfgValFatalTooLargeTlsSize
  *
  * @{
  */
diff --git a/testsuites/validation/tr-io-kernel.c b/testsuites/validation/tr-io-kernel.c
index 78fa415f0a..d68579c72f 100644
--- a/testsuites/validation/tr-io-kernel.c
+++ b/testsuites/validation/tr-io-kernel.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsIoValKernel
+ * @ingroup RtemsIoValKernel
  */
 
 /*
@@ -59,9 +59,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsIoValKernel spec:/rtems/io/val/kernel
+ * @defgroup RtemsIoValKernel spec:/rtems/io/val/kernel
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationIoKernel
+ * @ingroup TestsuitesValidationIoKernel
  *
  * @brief Tests the functions referenced by BSP_output_char and BSP_poll_char.
  *
diff --git a/testsuites/validation/tr-io-kernel.h b/testsuites/validation/tr-io-kernel.h
index 88b12a0645..baa6046e2e 100644
--- a/testsuites/validation/tr-io-kernel.h
+++ b/testsuites/validation/tr-io-kernel.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsIoValKernel
+ * @ingroup RtemsIoValKernel
  */
 
 /*
@@ -56,7 +56,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseRtemsIoValKernel
+ * @addtogroup RtemsIoValKernel
  *
  * @{
  */
diff --git a/testsuites/validation/tr-mtx-seize-try.c b/testsuites/validation/tr-mtx-seize-try.c
index 8279780bff..3d7660ca78 100644
--- a/testsuites/validation/tr-mtx-seize-try.c
+++ b/testsuites/validation/tr-mtx-seize-try.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreMtxReqSeizeTry
+ * @ingroup ScoreMtxReqSeizeTry
  */
 
 /*
@@ -61,9 +61,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreMtxReqSeizeTry spec:/score/mtx/req/seize-try
+ * @defgroup ScoreMtxReqSeizeTry spec:/score/mtx/req/seize-try
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tr-mtx-seize-try.h b/testsuites/validation/tr-mtx-seize-try.h
index 84e7cd6849..a147599251 100644
--- a/testsuites/validation/tr-mtx-seize-try.h
+++ b/testsuites/validation/tr-mtx-seize-try.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreMtxReqSeizeTry
+ * @ingroup ScoreMtxReqSeizeTry
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreMtxReqSeizeTry
+ * @addtogroup ScoreMtxReqSeizeTry
  *
  * @{
  */
diff --git a/testsuites/validation/tr-mtx-seize-wait.c b/testsuites/validation/tr-mtx-seize-wait.c
index 367ca0da32..50087de8e8 100644
--- a/testsuites/validation/tr-mtx-seize-wait.c
+++ b/testsuites/validation/tr-mtx-seize-wait.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreMtxReqSeizeWait
+ * @ingroup ScoreMtxReqSeizeWait
  */
 
 /*
@@ -63,9 +63,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreMtxReqSeizeWait spec:/score/mtx/req/seize-wait
+ * @defgroup ScoreMtxReqSeizeWait spec:/score/mtx/req/seize-wait
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tr-mtx-seize-wait.h b/testsuites/validation/tr-mtx-seize-wait.h
index 1ac532b1ce..48df0cf1de 100644
--- a/testsuites/validation/tr-mtx-seize-wait.h
+++ b/testsuites/validation/tr-mtx-seize-wait.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreMtxReqSeizeWait
+ * @ingroup ScoreMtxReqSeizeWait
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreMtxReqSeizeWait
+ * @addtogroup ScoreMtxReqSeizeWait
  *
  * @{
  */
diff --git a/testsuites/validation/tr-mtx-surrender.c b/testsuites/validation/tr-mtx-surrender.c
index 6e27ff2bc9..cabf5c16a5 100644
--- a/testsuites/validation/tr-mtx-surrender.c
+++ b/testsuites/validation/tr-mtx-surrender.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreMtxReqSurrender
+ * @ingroup ScoreMtxReqSurrender
  */
 
 /*
@@ -60,9 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreMtxReqSurrender spec:/score/mtx/req/surrender
+ * @defgroup ScoreMtxReqSurrender spec:/score/mtx/req/surrender
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tr-mtx-surrender.h b/testsuites/validation/tr-mtx-surrender.h
index 79b044d184..46cd5741fa 100644
--- a/testsuites/validation/tr-mtx-surrender.h
+++ b/testsuites/validation/tr-mtx-surrender.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreMtxReqSurrender
+ * @ingroup ScoreMtxReqSurrender
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreMtxReqSurrender
+ * @addtogroup ScoreMtxReqSurrender
  *
  * @{
  */
diff --git a/testsuites/validation/tr-object-ident-local.c b/testsuites/validation/tr-object-ident-local.c
index 1b3943fdb1..a33e6e9edf 100644
--- a/testsuites/validation/tr-object-ident-local.c
+++ b/testsuites/validation/tr-object-ident-local.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsReqIdentLocal
+ * @ingroup RtemsReqIdentLocal
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsReqIdentLocal spec:/rtems/req/ident-local
+ * @defgroup RtemsReqIdentLocal spec:/rtems/req/ident-local
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tr-object-ident-local.h b/testsuites/validation/tr-object-ident-local.h
index 83ad7e7416..9f76e5be32 100644
--- a/testsuites/validation/tr-object-ident-local.h
+++ b/testsuites/validation/tr-object-ident-local.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsReqIdentLocal
+ * @ingroup RtemsReqIdentLocal
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseRtemsReqIdentLocal
+ * @addtogroup RtemsReqIdentLocal
  *
  * @{
  */
diff --git a/testsuites/validation/tr-object-ident.c b/testsuites/validation/tr-object-ident.c
index 438c1f3333..eefd20aca4 100644
--- a/testsuites/validation/tr-object-ident.c
+++ b/testsuites/validation/tr-object-ident.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsReqIdent
+ * @ingroup RtemsReqIdent
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsReqIdent spec:/rtems/req/ident
+ * @defgroup RtemsReqIdent spec:/rtems/req/ident
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tr-object-ident.h b/testsuites/validation/tr-object-ident.h
index 7917562eab..c7a6bb6ed2 100644
--- a/testsuites/validation/tr-object-ident.h
+++ b/testsuites/validation/tr-object-ident.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsReqIdent
+ * @ingroup RtemsReqIdent
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseRtemsReqIdent
+ * @addtogroup RtemsReqIdent
  *
  * @{
  */
diff --git a/testsuites/validation/tr-sem-seize-try.c b/testsuites/validation/tr-sem-seize-try.c
index e723230288..fc258335c1 100644
--- a/testsuites/validation/tr-sem-seize-try.c
+++ b/testsuites/validation/tr-sem-seize-try.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreSemReqSeizeTry
+ * @ingroup ScoreSemReqSeizeTry
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreSemReqSeizeTry spec:/score/sem/req/seize-try
+ * @defgroup ScoreSemReqSeizeTry spec:/score/sem/req/seize-try
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tr-sem-seize-try.h b/testsuites/validation/tr-sem-seize-try.h
index 155bf59cf8..1ed52d502b 100644
--- a/testsuites/validation/tr-sem-seize-try.h
+++ b/testsuites/validation/tr-sem-seize-try.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreSemReqSeizeTry
+ * @ingroup ScoreSemReqSeizeTry
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreSemReqSeizeTry
+ * @addtogroup ScoreSemReqSeizeTry
  *
  * @{
  */
diff --git a/testsuites/validation/tr-sem-seize-wait.c b/testsuites/validation/tr-sem-seize-wait.c
index b4c4266103..18e05216e0 100644
--- a/testsuites/validation/tr-sem-seize-wait.c
+++ b/testsuites/validation/tr-sem-seize-wait.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreSemReqSeizeWait
+ * @ingroup ScoreSemReqSeizeWait
  */
 
 /*
@@ -61,9 +61,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreSemReqSeizeWait spec:/score/sem/req/seize-wait
+ * @defgroup ScoreSemReqSeizeWait spec:/score/sem/req/seize-wait
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tr-sem-seize-wait.h b/testsuites/validation/tr-sem-seize-wait.h
index 91d1790347..aeeb2d9b45 100644
--- a/testsuites/validation/tr-sem-seize-wait.h
+++ b/testsuites/validation/tr-sem-seize-wait.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreSemReqSeizeWait
+ * @ingroup ScoreSemReqSeizeWait
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreSemReqSeizeWait
+ * @addtogroup ScoreSemReqSeizeWait
  *
  * @{
  */
diff --git a/testsuites/validation/tr-sem-surrender.c b/testsuites/validation/tr-sem-surrender.c
index 8226093dda..1c50ced11b 100644
--- a/testsuites/validation/tr-sem-surrender.c
+++ b/testsuites/validation/tr-sem-surrender.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreSemReqSurrender
+ * @ingroup ScoreSemReqSurrender
  */
 
 /*
@@ -58,9 +58,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreSemReqSurrender spec:/score/sem/req/surrender
+ * @defgroup ScoreSemReqSurrender spec:/score/sem/req/surrender
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tr-sem-surrender.h b/testsuites/validation/tr-sem-surrender.h
index 06ab4c20c1..0bc35354f1 100644
--- a/testsuites/validation/tr-sem-surrender.h
+++ b/testsuites/validation/tr-sem-surrender.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreSemReqSurrender
+ * @ingroup ScoreSemReqSurrender
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreSemReqSurrender
+ * @addtogroup ScoreSemReqSurrender
  *
  * @{
  */
diff --git a/testsuites/validation/tr-signal-constant.c b/testsuites/validation/tr-signal-constant.c
index 323f977272..b96bb26891 100644
--- a/testsuites/validation/tr-signal-constant.c
+++ b/testsuites/validation/tr-signal-constant.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSignalValSignalConstant
+ * @ingroup RtemsSignalValSignalConstant
  */
 
 /*
@@ -59,10 +59,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseRtemsSignalValSignalConstant \
+ * @defgroup RtemsSignalValSignalConstant \
  *   spec:/rtems/signal/val/signal-constant
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @brief Tests a signal constant of the @ref RTEMSAPIClassicSignal using the
  *   signal set of the executing task.
diff --git a/testsuites/validation/tr-signal-constant.h b/testsuites/validation/tr-signal-constant.h
index 99b43f159b..68fc2696c4 100644
--- a/testsuites/validation/tr-signal-constant.h
+++ b/testsuites/validation/tr-signal-constant.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseRtemsSignalValSignalConstant
+ * @ingroup RtemsSignalValSignalConstant
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseRtemsSignalValSignalConstant
+ * @addtogroup RtemsSignalValSignalConstant
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-enqueue-ceiling.c b/testsuites/validation/tr-tq-enqueue-ceiling.c
index 5309b31260..4f5f888a8e 100644
--- a/testsuites/validation/tr-tq-enqueue-ceiling.c
+++ b/testsuites/validation/tr-tq-enqueue-ceiling.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqEnqueueCeiling
+ * @ingroup ScoreTqReqEnqueueCeiling
  */
 
 /*
@@ -57,10 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreTqReqEnqueueCeiling \
- *   spec:/score/tq/req/enqueue-ceiling
+ * @defgroup ScoreTqReqEnqueueCeiling spec:/score/tq/req/enqueue-ceiling
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-enqueue-ceiling.h b/testsuites/validation/tr-tq-enqueue-ceiling.h
index 3eca5033db..b7cef01815 100644
--- a/testsuites/validation/tr-tq-enqueue-ceiling.h
+++ b/testsuites/validation/tr-tq-enqueue-ceiling.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqEnqueueCeiling
+ * @ingroup ScoreTqReqEnqueueCeiling
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreTqReqEnqueueCeiling
+ * @addtogroup ScoreTqReqEnqueueCeiling
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-enqueue-deadlock.c b/testsuites/validation/tr-tq-enqueue-deadlock.c
index afe4ef864e..0f4bcc1243 100644
--- a/testsuites/validation/tr-tq-enqueue-deadlock.c
+++ b/testsuites/validation/tr-tq-enqueue-deadlock.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqEnqueueDeadlock
+ * @ingroup ScoreTqReqEnqueueDeadlock
  */
 
 /*
@@ -57,10 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreTqReqEnqueueDeadlock \
- *   spec:/score/tq/req/enqueue-deadlock
+ * @defgroup ScoreTqReqEnqueueDeadlock spec:/score/tq/req/enqueue-deadlock
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-enqueue-deadlock.h b/testsuites/validation/tr-tq-enqueue-deadlock.h
index be23bcf879..617d1489de 100644
--- a/testsuites/validation/tr-tq-enqueue-deadlock.h
+++ b/testsuites/validation/tr-tq-enqueue-deadlock.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqEnqueueDeadlock
+ * @ingroup ScoreTqReqEnqueueDeadlock
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreTqReqEnqueueDeadlock
+ * @addtogroup ScoreTqReqEnqueueDeadlock
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-enqueue-fifo.c b/testsuites/validation/tr-tq-enqueue-fifo.c
index b64a99c0d1..23912fef6c 100644
--- a/testsuites/validation/tr-tq-enqueue-fifo.c
+++ b/testsuites/validation/tr-tq-enqueue-fifo.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqEnqueueFifo
+ * @ingroup ScoreTqReqEnqueueFifo
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreTqReqEnqueueFifo spec:/score/tq/req/enqueue-fifo
+ * @defgroup ScoreTqReqEnqueueFifo spec:/score/tq/req/enqueue-fifo
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-enqueue-fifo.h b/testsuites/validation/tr-tq-enqueue-fifo.h
index 776cded8b9..8c9182632a 100644
--- a/testsuites/validation/tr-tq-enqueue-fifo.h
+++ b/testsuites/validation/tr-tq-enqueue-fifo.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqEnqueueFifo
+ * @ingroup ScoreTqReqEnqueueFifo
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreTqReqEnqueueFifo
+ * @addtogroup ScoreTqReqEnqueueFifo
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-enqueue-mrsp.c b/testsuites/validation/tr-tq-enqueue-mrsp.c
index d48455b2eb..e2eeb79140 100644
--- a/testsuites/validation/tr-tq-enqueue-mrsp.c
+++ b/testsuites/validation/tr-tq-enqueue-mrsp.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqEnqueueMrsp
+ * @ingroup ScoreTqReqEnqueueMrsp
  */
 
 /*
@@ -57,9 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreTqReqEnqueueMrsp spec:/score/tq/req/enqueue-mrsp
+ * @defgroup ScoreTqReqEnqueueMrsp spec:/score/tq/req/enqueue-mrsp
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-enqueue-mrsp.h b/testsuites/validation/tr-tq-enqueue-mrsp.h
index 98cb8b9883..734c2f8322 100644
--- a/testsuites/validation/tr-tq-enqueue-mrsp.h
+++ b/testsuites/validation/tr-tq-enqueue-mrsp.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqEnqueueMrsp
+ * @ingroup ScoreTqReqEnqueueMrsp
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreTqReqEnqueueMrsp
+ * @addtogroup ScoreTqReqEnqueueMrsp
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-enqueue-priority-inherit.c b/testsuites/validation/tr-tq-enqueue-priority-inherit.c
index fc9a75e4fa..fe58a24b52 100644
--- a/testsuites/validation/tr-tq-enqueue-priority-inherit.c
+++ b/testsuites/validation/tr-tq-enqueue-priority-inherit.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqEnqueuePriorityInherit
+ * @ingroup ScoreTqReqEnqueuePriorityInherit
  */
 
 /*
@@ -57,10 +57,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreTqReqEnqueuePriorityInherit \
+ * @defgroup ScoreTqReqEnqueuePriorityInherit \
  *   spec:/score/tq/req/enqueue-priority-inherit
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-enqueue-priority-inherit.h b/testsuites/validation/tr-tq-enqueue-priority-inherit.h
index 526766a981..0fe0b4d983 100644
--- a/testsuites/validation/tr-tq-enqueue-priority-inherit.h
+++ b/testsuites/validation/tr-tq-enqueue-priority-inherit.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqEnqueuePriorityInherit
+ * @ingroup ScoreTqReqEnqueuePriorityInherit
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreTqReqEnqueuePriorityInherit
+ * @addtogroup ScoreTqReqEnqueuePriorityInherit
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-enqueue-priority.c b/testsuites/validation/tr-tq-enqueue-priority.c
index 6487c13aa2..f467699269 100644
--- a/testsuites/validation/tr-tq-enqueue-priority.c
+++ b/testsuites/validation/tr-tq-enqueue-priority.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqEnqueuePriority
+ * @ingroup ScoreTqReqEnqueuePriority
  */
 
 /*
@@ -57,10 +57,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreTqReqEnqueuePriority \
- *   spec:/score/tq/req/enqueue-priority
+ * @defgroup ScoreTqReqEnqueuePriority spec:/score/tq/req/enqueue-priority
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-enqueue-priority.h b/testsuites/validation/tr-tq-enqueue-priority.h
index 97f5f883de..5c8b3e2639 100644
--- a/testsuites/validation/tr-tq-enqueue-priority.h
+++ b/testsuites/validation/tr-tq-enqueue-priority.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqEnqueuePriority
+ * @ingroup ScoreTqReqEnqueuePriority
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreTqReqEnqueuePriority
+ * @addtogroup ScoreTqReqEnqueuePriority
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-flush-fifo.c b/testsuites/validation/tr-tq-flush-fifo.c
index 2a52065fe8..11746c689d 100644
--- a/testsuites/validation/tr-tq-flush-fifo.c
+++ b/testsuites/validation/tr-tq-flush-fifo.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqFlushFifo
+ * @ingroup ScoreTqReqFlushFifo
  */
 
 /*
@@ -58,9 +58,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreTqReqFlushFifo spec:/score/tq/req/flush-fifo
+ * @defgroup ScoreTqReqFlushFifo spec:/score/tq/req/flush-fifo
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-flush-fifo.h b/testsuites/validation/tr-tq-flush-fifo.h
index 8e05972816..b04251dcf9 100644
--- a/testsuites/validation/tr-tq-flush-fifo.h
+++ b/testsuites/validation/tr-tq-flush-fifo.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqFlushFifo
+ * @ingroup ScoreTqReqFlushFifo
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreTqReqFlushFifo
+ * @addtogroup ScoreTqReqFlushFifo
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-flush-priority-inherit.c b/testsuites/validation/tr-tq-flush-priority-inherit.c
index 7c018496f0..b33d6f1a9b 100644
--- a/testsuites/validation/tr-tq-flush-priority-inherit.c
+++ b/testsuites/validation/tr-tq-flush-priority-inherit.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqFlushPriorityInherit
+ * @ingroup ScoreTqReqFlushPriorityInherit
  */
 
 /*
@@ -58,10 +58,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreTqReqFlushPriorityInherit \
+ * @defgroup ScoreTqReqFlushPriorityInherit \
  *   spec:/score/tq/req/flush-priority-inherit
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-flush-priority-inherit.h b/testsuites/validation/tr-tq-flush-priority-inherit.h
index 1b12f1afb0..08f51ce694 100644
--- a/testsuites/validation/tr-tq-flush-priority-inherit.h
+++ b/testsuites/validation/tr-tq-flush-priority-inherit.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqFlushPriorityInherit
+ * @ingroup ScoreTqReqFlushPriorityInherit
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreTqReqFlushPriorityInherit
+ * @addtogroup ScoreTqReqFlushPriorityInherit
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-flush-priority.c b/testsuites/validation/tr-tq-flush-priority.c
index 6d4d23b329..566731af08 100644
--- a/testsuites/validation/tr-tq-flush-priority.c
+++ b/testsuites/validation/tr-tq-flush-priority.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqFlushPriority
+ * @ingroup ScoreTqReqFlushPriority
  */
 
 /*
@@ -58,10 +58,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreTqReqFlushPriority \
- *   spec:/score/tq/req/flush-priority
+ * @defgroup ScoreTqReqFlushPriority spec:/score/tq/req/flush-priority
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-flush-priority.h b/testsuites/validation/tr-tq-flush-priority.h
index 72bc372ca1..4390c55368 100644
--- a/testsuites/validation/tr-tq-flush-priority.h
+++ b/testsuites/validation/tr-tq-flush-priority.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqFlushPriority
+ * @ingroup ScoreTqReqFlushPriority
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreTqReqFlushPriority
+ * @addtogroup ScoreTqReqFlushPriority
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-surrender-mrsp.c b/testsuites/validation/tr-tq-surrender-mrsp.c
index 156d4c4a5b..943dc63030 100644
--- a/testsuites/validation/tr-tq-surrender-mrsp.c
+++ b/testsuites/validation/tr-tq-surrender-mrsp.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqSurrenderMrsp
+ * @ingroup ScoreTqReqSurrenderMrsp
  */
 
 /*
@@ -60,10 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreTqReqSurrenderMrsp \
- *   spec:/score/tq/req/surrender-mrsp
+ * @defgroup ScoreTqReqSurrenderMrsp spec:/score/tq/req/surrender-mrsp
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-surrender-mrsp.h b/testsuites/validation/tr-tq-surrender-mrsp.h
index 66be73adbb..9272e4d610 100644
--- a/testsuites/validation/tr-tq-surrender-mrsp.h
+++ b/testsuites/validation/tr-tq-surrender-mrsp.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqSurrenderMrsp
+ * @ingroup ScoreTqReqSurrenderMrsp
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreTqReqSurrenderMrsp
+ * @addtogroup ScoreTqReqSurrenderMrsp
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-surrender-priority-inherit.c b/testsuites/validation/tr-tq-surrender-priority-inherit.c
index 75b93e40d2..ab059edc25 100644
--- a/testsuites/validation/tr-tq-surrender-priority-inherit.c
+++ b/testsuites/validation/tr-tq-surrender-priority-inherit.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqSurrenderPriorityInherit
+ * @ingroup ScoreTqReqSurrenderPriorityInherit
  */
 
 /*
@@ -61,10 +61,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreTqReqSurrenderPriorityInherit \
+ * @defgroup ScoreTqReqSurrenderPriorityInherit \
  *   spec:/score/tq/req/surrender-priority-inherit
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-surrender-priority-inherit.h b/testsuites/validation/tr-tq-surrender-priority-inherit.h
index b792de1b2e..f1e88270a3 100644
--- a/testsuites/validation/tr-tq-surrender-priority-inherit.h
+++ b/testsuites/validation/tr-tq-surrender-priority-inherit.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqSurrenderPriorityInherit
+ * @ingroup ScoreTqReqSurrenderPriorityInherit
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreTqReqSurrenderPriorityInherit
+ * @addtogroup ScoreTqReqSurrenderPriorityInherit
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-surrender.c b/testsuites/validation/tr-tq-surrender.c
index 60091c2d0c..80d6b31342 100644
--- a/testsuites/validation/tr-tq-surrender.c
+++ b/testsuites/validation/tr-tq-surrender.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqSurrender
+ * @ingroup ScoreTqReqSurrender
  */
 
 /*
@@ -61,9 +61,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreTqReqSurrender spec:/score/tq/req/surrender
+ * @defgroup ScoreTqReqSurrender spec:/score/tq/req/surrender
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-surrender.h b/testsuites/validation/tr-tq-surrender.h
index fd64bbfa02..e3f536a49a 100644
--- a/testsuites/validation/tr-tq-surrender.h
+++ b/testsuites/validation/tr-tq-surrender.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqSurrender
+ * @ingroup ScoreTqReqSurrender
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreTqReqSurrender
+ * @addtogroup ScoreTqReqSurrender
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-timeout-mrsp.c b/testsuites/validation/tr-tq-timeout-mrsp.c
index 2ee4960495..c50cf1a265 100644
--- a/testsuites/validation/tr-tq-timeout-mrsp.c
+++ b/testsuites/validation/tr-tq-timeout-mrsp.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqTimeoutMrsp
+ * @ingroup ScoreTqReqTimeoutMrsp
  */
 
 /*
@@ -61,9 +61,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreTqReqTimeoutMrsp spec:/score/tq/req/timeout-mrsp
+ * @defgroup ScoreTqReqTimeoutMrsp spec:/score/tq/req/timeout-mrsp
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-timeout-mrsp.h b/testsuites/validation/tr-tq-timeout-mrsp.h
index a08ef170c5..0f9ada8e50 100644
--- a/testsuites/validation/tr-tq-timeout-mrsp.h
+++ b/testsuites/validation/tr-tq-timeout-mrsp.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqTimeoutMrsp
+ * @ingroup ScoreTqReqTimeoutMrsp
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreTqReqTimeoutMrsp
+ * @addtogroup ScoreTqReqTimeoutMrsp
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-timeout-priority-inherit.c b/testsuites/validation/tr-tq-timeout-priority-inherit.c
index 6e744ba7d9..37ec962fde 100644
--- a/testsuites/validation/tr-tq-timeout-priority-inherit.c
+++ b/testsuites/validation/tr-tq-timeout-priority-inherit.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqTimeoutPriorityInherit
+ * @ingroup ScoreTqReqTimeoutPriorityInherit
  */
 
 /*
@@ -61,10 +61,10 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreTqReqTimeoutPriorityInherit \
+ * @defgroup ScoreTqReqTimeoutPriorityInherit \
  *   spec:/score/tq/req/timeout-priority-inherit
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-timeout-priority-inherit.h b/testsuites/validation/tr-tq-timeout-priority-inherit.h
index a75665f659..c058e51f79 100644
--- a/testsuites/validation/tr-tq-timeout-priority-inherit.h
+++ b/testsuites/validation/tr-tq-timeout-priority-inherit.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqTimeoutPriorityInherit
+ * @ingroup ScoreTqReqTimeoutPriorityInherit
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreTqReqTimeoutPriorityInherit
+ * @addtogroup ScoreTqReqTimeoutPriorityInherit
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-timeout.c b/testsuites/validation/tr-tq-timeout.c
index 5575abdd57..03d492c416 100644
--- a/testsuites/validation/tr-tq-timeout.c
+++ b/testsuites/validation/tr-tq-timeout.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqTimeout
+ * @ingroup ScoreTqReqTimeout
  */
 
 /*
@@ -60,9 +60,9 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestCaseScoreTqReqTimeout spec:/score/tq/req/timeout
+ * @defgroup ScoreTqReqTimeout spec:/score/tq/req/timeout
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  *
  * @{
  */
diff --git a/testsuites/validation/tr-tq-timeout.h b/testsuites/validation/tr-tq-timeout.h
index 487c32743d..9cc2be7c24 100644
--- a/testsuites/validation/tr-tq-timeout.h
+++ b/testsuites/validation/tr-tq-timeout.h
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestCaseScoreTqReqTimeout
+ * @ingroup ScoreTqReqTimeout
  */
 
 /*
@@ -58,7 +58,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSTestCaseScoreTqReqTimeout
+ * @addtogroup ScoreTqReqTimeout
  *
  * @{
  */
diff --git a/testsuites/validation/ts-fatal-boot-processor-not-assigned-to-scheduler.c b/testsuites/validation/ts-fatal-boot-processor-not-assigned-to-scheduler.c
index 1222b26b2e..dd1bae545c 100644
--- a/testsuites/validation/ts-fatal-boot-processor-not-assigned-to-scheduler.c
+++ b/testsuites/validation/ts-fatal-boot-processor-not-assigned-to-scheduler.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesFatalBootProcessorNotAssignedToScheduler
+ * @ingroup TestsuitesFatalBootProcessorNotAssignedToScheduler
  */
 
 /*
@@ -58,7 +58,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesFatalBootProcessorNotAssignedToScheduler \
+ * @defgroup TestsuitesFatalBootProcessorNotAssignedToScheduler \
  *   spec:/testsuites/fatal-boot-processor-not-assigned-to-scheduler
  *
  * @ingroup RTEMSTestSuites
@@ -69,7 +69,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "FatalBootProcessorNotAssignedToScheduler";
+const char rtems_test_name[] = "TestsuitesFatalBootProcessorNotAssignedToScheduler";
 
 #define FATAL_SYSINIT_RUN \
   ScoreSmpValFatalBootProcessorNotAssignedToScheduler_Run
diff --git a/testsuites/validation/ts-fatal-idle-thread-create-failed.c b/testsuites/validation/ts-fatal-idle-thread-create-failed.c
index 55173f21d1..d09a8aeaf9 100644
--- a/testsuites/validation/ts-fatal-idle-thread-create-failed.c
+++ b/testsuites/validation/ts-fatal-idle-thread-create-failed.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesFatalIdleThreadCreateFailed
+ * @ingroup TestsuitesFatalIdleThreadCreateFailed
  */
 
 /*
@@ -57,7 +57,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesFatalIdleThreadCreateFailed \
+ * @defgroup TestsuitesFatalIdleThreadCreateFailed \
  *   spec:/testsuites/fatal-idle-thread-create-failed
  *
  * @ingroup RTEMSTestSuites
@@ -68,7 +68,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "FatalIdleThreadCreateFailed";
+const char rtems_test_name[] = "TestsuitesFatalIdleThreadCreateFailed";
 
 static bool CreateTask( rtems_tcb *executing, rtems_tcb *created )
 {
diff --git a/testsuites/validation/ts-fatal-idle-thread-stack-too-small.c b/testsuites/validation/ts-fatal-idle-thread-stack-too-small.c
index 048f073338..f0689b286e 100644
--- a/testsuites/validation/ts-fatal-idle-thread-stack-too-small.c
+++ b/testsuites/validation/ts-fatal-idle-thread-stack-too-small.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesFatalIdleThreadStackTooSmall
+ * @ingroup TestsuitesFatalIdleThreadStackTooSmall
  */
 
 /*
@@ -57,7 +57,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesFatalIdleThreadStackTooSmall \
+ * @defgroup TestsuitesFatalIdleThreadStackTooSmall \
  *   spec:/testsuites/fatal-idle-thread-stack-too-small
  *
  * @ingroup RTEMSTestSuites
@@ -68,7 +68,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "FatalIdleThreadStackTooSmall";
+const char rtems_test_name[] = "TestsuitesFatalIdleThreadStackTooSmall";
 
 #define FATAL_SYSINIT_RUN ScoreThreadValFatalIdleThreadStackTooSmall_Run
 
diff --git a/testsuites/validation/ts-fatal-init-task-construct-failed.c b/testsuites/validation/ts-fatal-init-task-construct-failed.c
index 8efd2b32ce..c7ac50adc6 100644
--- a/testsuites/validation/ts-fatal-init-task-construct-failed.c
+++ b/testsuites/validation/ts-fatal-init-task-construct-failed.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesFatalInitTaskConstructFailed
+ * @ingroup TestsuitesFatalInitTaskConstructFailed
  */
 
 /*
@@ -57,7 +57,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesFatalInitTaskConstructFailed \
+ * @defgroup TestsuitesFatalInitTaskConstructFailed \
  *   spec:/testsuites/fatal-init-task-construct-failed
  *
  * @ingroup RTEMSTestSuites
@@ -68,7 +68,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "FatalInitTaskConstructFailed";
+const char rtems_test_name[] = "TestsuitesFatalInitTaskConstructFailed";
 
 #define FATAL_SYSINIT_RUN AcfgValFatalInitTaskConstructFailed_Run
 
diff --git a/testsuites/validation/ts-fatal-mandatory-processor-not-present.c b/testsuites/validation/ts-fatal-mandatory-processor-not-present.c
index 3645313755..c4a4f84b40 100644
--- a/testsuites/validation/ts-fatal-mandatory-processor-not-present.c
+++ b/testsuites/validation/ts-fatal-mandatory-processor-not-present.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesFatalMandatoryProcessorNotPresent
+ * @ingroup TestsuitesFatalMandatoryProcessorNotPresent
  */
 
 /*
@@ -58,7 +58,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesFatalMandatoryProcessorNotPresent \
+ * @defgroup TestsuitesFatalMandatoryProcessorNotPresent \
  *   spec:/testsuites/fatal-mandatory-processor-not-present
  *
  * @ingroup RTEMSTestSuites
@@ -69,7 +69,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "FatalMandatoryProcessorNotPresent";
+const char rtems_test_name[] = "TestsuitesFatalMandatoryProcessorNotPresent";
 
 #define FATAL_SYSINIT_RUN ScoreSmpValFatalMandatoryProcessorNotPresent_Run
 
diff --git a/testsuites/validation/ts-fatal-scheduler-requires-exactly-one-processor.c b/testsuites/validation/ts-fatal-scheduler-requires-exactly-one-processor.c
index d9eed5b092..590af0249f 100644
--- a/testsuites/validation/ts-fatal-scheduler-requires-exactly-one-processor.c
+++ b/testsuites/validation/ts-fatal-scheduler-requires-exactly-one-processor.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesFatalSchedulerRequiresExactlyOneProcessor
+ * @ingroup TestsuitesFatalSchedulerRequiresExactlyOneProcessor
  */
 
 /*
@@ -58,7 +58,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesFatalSchedulerRequiresExactlyOneProcessor \
+ * @defgroup TestsuitesFatalSchedulerRequiresExactlyOneProcessor \
  *   spec:/testsuites/fatal-scheduler-requires-exactly-one-processor
  *
  * @ingroup RTEMSTestSuites
@@ -69,7 +69,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "FatalSchedulerRequiresExactlyOneProcessor";
+const char rtems_test_name[] = "TestsuitesFatalSchedulerRequiresExactlyOneProcessor";
 
 #define FATAL_SYSINIT_RUN \
   ScoreSmpValFatalSchedulerRequiresExactlyOneProcessor_Run
diff --git a/testsuites/validation/ts-fatal-smp.c b/testsuites/validation/ts-fatal-smp.c
index c1c4844643..8f4c20b0d8 100644
--- a/testsuites/validation/ts-fatal-smp.c
+++ b/testsuites/validation/ts-fatal-smp.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesFatalSmp
+ * @ingroup TestsuitesFatalSmp
  */
 
 /*
@@ -58,7 +58,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesFatalSmp spec:/testsuites/fatal-smp
+ * @defgroup TestsuitesFatalSmp spec:/testsuites/fatal-smp
  *
  * @ingroup RTEMSTestSuites
  *
@@ -68,7 +68,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "FatalSmp";
+const char rtems_test_name[] = "TestsuitesFatalSmp";
 
 #define FATAL_SYSINIT_RUN ScoreSmpValFatal_Run
 
diff --git a/testsuites/validation/ts-fatal-start-of-mandatory-processor-failed.c b/testsuites/validation/ts-fatal-start-of-mandatory-processor-failed.c
index 76e96f50ef..b65afae5c2 100644
--- a/testsuites/validation/ts-fatal-start-of-mandatory-processor-failed.c
+++ b/testsuites/validation/ts-fatal-start-of-mandatory-processor-failed.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesFatalStartOfMandatoryProcessorFailed
+ * @ingroup TestsuitesFatalStartOfMandatoryProcessorFailed
  */
 
 /*
@@ -58,7 +58,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesFatalStartOfMandatoryProcessorFailed \
+ * @defgroup TestsuitesFatalStartOfMandatoryProcessorFailed \
  *   spec:/testsuites/fatal-start-of-mandatory-processor-failed
  *
  * @ingroup RTEMSTestSuites
@@ -69,7 +69,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "FatalStartOfMandatoryProcessorFailed";
+const char rtems_test_name[] = "TestsuitesFatalStartOfMandatoryProcessorFailed";
 
 #define FATAL_SYSINIT_RUN ScoreSmpValFatalStartOfMandatoryProcessorFailed_Run
 
diff --git a/testsuites/validation/ts-fatal-start-on-not-online-processor.c b/testsuites/validation/ts-fatal-start-on-not-online-processor.c
index 9cc981e381..1630952234 100644
--- a/testsuites/validation/ts-fatal-start-on-not-online-processor.c
+++ b/testsuites/validation/ts-fatal-start-on-not-online-processor.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesFatalStartOnNotOnlineProcessor
+ * @ingroup TestsuitesFatalStartOnNotOnlineProcessor
  */
 
 /*
@@ -58,7 +58,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesFatalStartOnNotOnlineProcessor \
+ * @defgroup TestsuitesFatalStartOnNotOnlineProcessor \
  *   spec:/testsuites/fatal-start-on-not-online-processor
  *
  * @ingroup RTEMSTestSuites
@@ -69,7 +69,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "FatalStartOnNotOnlineProcessor";
+const char rtems_test_name[] = "TestsuitesFatalStartOnNotOnlineProcessor";
 
 #define FATAL_SYSINIT_RUN ScoreSmpValFatalStartOnNotOnlineProcessor_Run
 
diff --git a/testsuites/validation/ts-fatal-too-large-tls-size.c b/testsuites/validation/ts-fatal-too-large-tls-size.c
index ba41390680..7b3e06f92a 100644
--- a/testsuites/validation/ts-fatal-too-large-tls-size.c
+++ b/testsuites/validation/ts-fatal-too-large-tls-size.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesFatalTooLargeTlsSize
+ * @ingroup TestsuitesFatalTooLargeTlsSize
  */
 
 /*
@@ -57,7 +57,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesFatalTooLargeTlsSize \
+ * @defgroup TestsuitesFatalTooLargeTlsSize \
  *   spec:/testsuites/fatal-too-large-tls-size
  *
  * @ingroup RTEMSTestSuites
@@ -68,7 +68,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "FatalTooLargeTlsSize";
+const char rtems_test_name[] = "TestsuitesFatalTooLargeTlsSize";
 
 #define FATAL_SYSINIT_RUN AcfgValFatalTooLargeTlsSize_Run
 
diff --git a/testsuites/validation/ts-performance-no-clock-0.c b/testsuites/validation/ts-performance-no-clock-0.c
index e43b3a6327..ecff6395ab 100644
--- a/testsuites/validation/ts-performance-no-clock-0.c
+++ b/testsuites/validation/ts-performance-no-clock-0.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesPerformanceNoClock0
+ * @ingroup TestsuitesPerformanceNoClock0
  */
 
 /*
@@ -57,7 +57,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesPerformanceNoClock0 \
+ * @defgroup TestsuitesPerformanceNoClock0 \
  *   spec:/testsuites/performance-no-clock-0
  *
  * @ingroup RTEMSTestSuites
@@ -71,7 +71,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "PerformanceNoClock0";
+const char rtems_test_name[] = "TestsuitesPerformanceNoClock0";
 
 #define CONFIGURE_MAXIMUM_PROCESSORS 4
 
diff --git a/testsuites/validation/ts-terminate.c b/testsuites/validation/ts-terminate.c
index 52676db6d9..95a6fed64c 100644
--- a/testsuites/validation/ts-terminate.c
+++ b/testsuites/validation/ts-terminate.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesTerminate
+ * @ingroup TestsuitesTerminate
  */
 
 /*
@@ -57,7 +57,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesTerminate spec:/testsuites/terminate
+ * @defgroup TestsuitesTerminate spec:/testsuites/terminate
  *
  * @ingroup RTEMSTestSuites
  *
@@ -67,7 +67,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "Terminate";
+const char rtems_test_name[] = "TestsuitesTerminate";
 
 #define CONFIGURE_MAXIMUM_PROCESSORS 2
 
diff --git a/testsuites/validation/ts-userext.c b/testsuites/validation/ts-userext.c
index 5d41f52093..7d2c190cb1 100644
--- a/testsuites/validation/ts-userext.c
+++ b/testsuites/validation/ts-userext.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesUserext
+ * @ingroup TestsuitesUserext
  */
 
 /*
@@ -57,7 +57,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesUserext spec:/testsuites/userext
+ * @defgroup TestsuitesUserext spec:/testsuites/userext
  *
  * @ingroup RTEMSTestSuites
  *
@@ -67,7 +67,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "Userext";
+const char rtems_test_name[] = "TestsuitesUserext";
 
 #define CONFIGURE_MAXIMUM_PROCESSORS 2
 
diff --git a/testsuites/validation/ts-validation-0.c b/testsuites/validation/ts-validation-0.c
index b80c09d47f..dda79c4427 100644
--- a/testsuites/validation/ts-validation-0.c
+++ b/testsuites/validation/ts-validation-0.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidation0
+ * @ingroup TestsuitesValidation0
  */
 
 /*
@@ -55,7 +55,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesValidation0 spec:/testsuites/validation-0
+ * @defgroup TestsuitesValidation0 spec:/testsuites/validation-0
  *
  * @ingroup RTEMSTestSuites
  *
@@ -68,7 +68,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "Validation0";
+const char rtems_test_name[] = "TestsuitesValidation0";
 
 #define CONFIGURE_MAXIMUM_PROCESSORS 5
 
diff --git a/testsuites/validation/ts-validation-1.c b/testsuites/validation/ts-validation-1.c
index 6f396dc873..f1a67e16a3 100644
--- a/testsuites/validation/ts-validation-1.c
+++ b/testsuites/validation/ts-validation-1.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidation1
+ * @ingroup TestsuitesValidation1
  */
 
 /*
@@ -55,7 +55,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesValidation1 spec:/testsuites/validation-1
+ * @defgroup TestsuitesValidation1 spec:/testsuites/validation-1
  *
  * @ingroup RTEMSTestSuites
  *
@@ -68,7 +68,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "Validation1";
+const char rtems_test_name[] = "TestsuitesValidation1";
 
 #define CONFIGURE_MAXIMUM_PROCESSORS 5
 
diff --git a/testsuites/validation/ts-validation-acfg-0.c b/testsuites/validation/ts-validation-acfg-0.c
index f0fd359007..9fe6793231 100644
--- a/testsuites/validation/ts-validation-acfg-0.c
+++ b/testsuites/validation/ts-validation-acfg-0.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationAcfg0
+ * @ingroup TestsuitesValidationAcfg0
  */
 
 /*
@@ -58,8 +58,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesValidationAcfg0 \
- *   spec:/testsuites/validation-acfg-0
+ * @defgroup TestsuitesValidationAcfg0 spec:/testsuites/validation-acfg-0
  *
  * @ingroup RTEMSTestSuites
  *
@@ -70,7 +69,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "ValidationAcfg0";
+const char rtems_test_name[] = "TestsuitesValidationAcfg0";
 
 #define CONFIGURE_IDLE_TASK_STORAGE_SIZE RTEMS_MINIMUM_STACK_SIZE
 
diff --git a/testsuites/validation/ts-validation-acfg-1.c b/testsuites/validation/ts-validation-acfg-1.c
index b12ccb928b..2696d789be 100644
--- a/testsuites/validation/ts-validation-acfg-1.c
+++ b/testsuites/validation/ts-validation-acfg-1.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationAcfg1
+ * @ingroup TestsuitesValidationAcfg1
  */
 
 /*
@@ -59,8 +59,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesValidationAcfg1 \
- *   spec:/testsuites/validation-acfg-1
+ * @defgroup TestsuitesValidationAcfg1 spec:/testsuites/validation-acfg-1
  *
  * @ingroup RTEMSTestSuites
  *
@@ -71,7 +70,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "ValidationAcfg1";
+const char rtems_test_name[] = "TestsuitesValidationAcfg1";
 
 static void FatalExtension(
   rtems_fatal_source source,
diff --git a/testsuites/validation/ts-validation-cache.c b/testsuites/validation/ts-validation-cache.c
index cbc6a8ddb9..352341ed80 100644
--- a/testsuites/validation/ts-validation-cache.c
+++ b/testsuites/validation/ts-validation-cache.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationCache
+ * @ingroup TestsuitesValidationCache
  */
 
 /*
@@ -55,8 +55,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesValidationCache \
- *   spec:/testsuites/validation-cache
+ * @defgroup TestsuitesValidationCache spec:/testsuites/validation-cache
  *
  * @ingroup RTEMSTestSuites
  *
@@ -69,7 +68,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "ValidationCache";
+const char rtems_test_name[] = "TestsuitesValidationCache";
 
 #define CONFIGURE_MAXIMUM_PROCESSORS 4
 
diff --git a/testsuites/validation/ts-validation-intr.c b/testsuites/validation/ts-validation-intr.c
index 1a79608f78..10bb19a840 100644
--- a/testsuites/validation/ts-validation-intr.c
+++ b/testsuites/validation/ts-validation-intr.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationIntr
+ * @ingroup TestsuitesValidationIntr
  */
 
 /*
@@ -55,8 +55,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesValidationIntr \
- *   spec:/testsuites/validation-intr
+ * @defgroup TestsuitesValidationIntr spec:/testsuites/validation-intr
  *
  * @ingroup RTEMSTestSuites
  *
@@ -70,7 +69,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "ValidationIntr";
+const char rtems_test_name[] = "TestsuitesValidationIntr";
 
 #define CONFIGURE_MAXIMUM_PROCESSORS 5
 
diff --git a/testsuites/validation/ts-validation-io-kernel.c b/testsuites/validation/ts-validation-io-kernel.c
index db44303890..84ba9ef441 100644
--- a/testsuites/validation/ts-validation-io-kernel.c
+++ b/testsuites/validation/ts-validation-io-kernel.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationIoKernel
+ * @ingroup TestsuitesValidationIoKernel
  */
 
 /*
@@ -62,8 +62,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesValidationIoKernel \
- *   spec:/testsuites/validation-io-kernel
+ * @defgroup TestsuitesValidationIoKernel spec:/testsuites/validation-io-kernel
  *
  * @ingroup RTEMSTestSuites
  *
@@ -74,7 +73,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "ValidationIoKernel";
+const char rtems_test_name[] = "TestsuitesValidationIoKernel";
 
 static char buffer[ 512 ];
 
diff --git a/testsuites/validation/ts-validation-no-clock-0.c b/testsuites/validation/ts-validation-no-clock-0.c
index 5ff630b6c3..820dadcd25 100644
--- a/testsuites/validation/ts-validation-no-clock-0.c
+++ b/testsuites/validation/ts-validation-no-clock-0.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNoClock0
+ * @ingroup TestsuitesValidationNoClock0
  */
 
 /*
@@ -55,7 +55,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesValidationNoClock0 \
+ * @defgroup TestsuitesValidationNoClock0 \
  *   spec:/testsuites/validation-no-clock-0
  *
  * @ingroup RTEMSTestSuites
@@ -70,7 +70,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "ValidationNoClock0";
+const char rtems_test_name[] = "TestsuitesValidationNoClock0";
 
 #define CONFIGURE_MAXIMUM_PROCESSORS 5
 
diff --git a/testsuites/validation/ts-validation-non-smp.c b/testsuites/validation/ts-validation-non-smp.c
index 163223f18b..9a4a9061ae 100644
--- a/testsuites/validation/ts-validation-non-smp.c
+++ b/testsuites/validation/ts-validation-non-smp.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationNonSmp
+ * @ingroup TestsuitesValidationNonSmp
  */
 
 /*
@@ -55,8 +55,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesValidationNonSmp \
- *   spec:/testsuites/validation-non-smp
+ * @defgroup TestsuitesValidationNonSmp spec:/testsuites/validation-non-smp
  *
  * @ingroup RTEMSTestSuites
  *
@@ -66,7 +65,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "ValidationNonSMP";
+const char rtems_test_name[] = "TestsuitesValidationNonSmp";
 
 #define CONFIGURE_MAXIMUM_PROCESSORS 1
 
diff --git a/testsuites/validation/ts-validation-one-cpu-0.c b/testsuites/validation/ts-validation-one-cpu-0.c
index d281b59d01..f45e8a4905 100644
--- a/testsuites/validation/ts-validation-one-cpu-0.c
+++ b/testsuites/validation/ts-validation-one-cpu-0.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationOneCpu0
+ * @ingroup TestsuitesValidationOneCpu0
  */
 
 /*
@@ -55,8 +55,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesValidationOneCpu0 \
- *   spec:/testsuites/validation-one-cpu-0
+ * @defgroup TestsuitesValidationOneCpu0 spec:/testsuites/validation-one-cpu-0
  *
  * @ingroup RTEMSTestSuites
  *
@@ -69,7 +68,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "ValidationOneCpu0";
+const char rtems_test_name[] = "TestsuitesValidationOneCpu0";
 
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 
diff --git a/testsuites/validation/ts-validation-one-cpu-1.c b/testsuites/validation/ts-validation-one-cpu-1.c
index 5c8a577c6b..39852cc510 100644
--- a/testsuites/validation/ts-validation-one-cpu-1.c
+++ b/testsuites/validation/ts-validation-one-cpu-1.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationOneCpu1
+ * @ingroup TestsuitesValidationOneCpu1
  */
 
 /*
@@ -57,8 +57,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesValidationOneCpu1 \
- *   spec:/testsuites/validation-one-cpu-1
+ * @defgroup TestsuitesValidationOneCpu1 spec:/testsuites/validation-one-cpu-1
  *
  * @ingroup RTEMSTestSuites
  *
@@ -71,7 +70,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "ValidationOneCpu1";
+const char rtems_test_name[] = "TestsuitesValidationOneCpu1";
 
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 
diff --git a/testsuites/validation/ts-validation-smp-one-cpu-0.c b/testsuites/validation/ts-validation-smp-one-cpu-0.c
index 88c2370d5c..a52477b507 100644
--- a/testsuites/validation/ts-validation-smp-one-cpu-0.c
+++ b/testsuites/validation/ts-validation-smp-one-cpu-0.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationSmpOneCpu0
+ * @ingroup TestsuitesValidationSmpOneCpu0
  */
 
 /*
@@ -55,7 +55,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesValidationSmpOneCpu0 \
+ * @defgroup TestsuitesValidationSmpOneCpu0 \
  *   spec:/testsuites/validation-smp-one-cpu-0
  *
  * @ingroup RTEMSTestSuites
@@ -67,7 +67,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "ValidationSmpOneCpu0";
+const char rtems_test_name[] = "TestsuitesValidationSmpOneCpu0";
 
 #define CONFIGURE_MAXIMUM_PROCESSORS 1
 
diff --git a/testsuites/validation/ts-validation-smp-only-0.c b/testsuites/validation/ts-validation-smp-only-0.c
index 9907365cd9..5f65ac7af1 100644
--- a/testsuites/validation/ts-validation-smp-only-0.c
+++ b/testsuites/validation/ts-validation-smp-only-0.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationSmpOnly0
+ * @ingroup TestsuitesValidationSmpOnly0
  */
 
 /*
@@ -55,7 +55,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesValidationSmpOnly0 \
+ * @defgroup TestsuitesValidationSmpOnly0 \
  *   spec:/testsuites/validation-smp-only-0
  *
  * @ingroup RTEMSTestSuites
@@ -69,7 +69,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "ValidationSMPOnly0";
+const char rtems_test_name[] = "TestsuitesValidationSmpOnly0";
 
 #define CONFIGURE_MAXIMUM_PROCESSORS 5
 
diff --git a/testsuites/validation/ts-validation-smp-only-2.c b/testsuites/validation/ts-validation-smp-only-2.c
index 74cf5e1db8..e8897adfaf 100644
--- a/testsuites/validation/ts-validation-smp-only-2.c
+++ b/testsuites/validation/ts-validation-smp-only-2.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationSmpOnly2
+ * @ingroup TestsuitesValidationSmpOnly2
  */
 
 /*
@@ -57,7 +57,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesValidationSmpOnly2 \
+ * @defgroup TestsuitesValidationSmpOnly2 \
  *   spec:/testsuites/validation-smp-only-2
  *
  * @ingroup RTEMSTestSuites
@@ -70,7 +70,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "ValidationSMPOnly2";
+const char rtems_test_name[] = "TestsuitesValidationSmpOnly2";
 
 bool __wrap__CPU_SMP_Start_processor( uint32_t cpu_index );
 
diff --git a/testsuites/validation/ts-validation-timecounter-0.c b/testsuites/validation/ts-validation-timecounter-0.c
index 9e4abeeab0..3ce34342fb 100644
--- a/testsuites/validation/ts-validation-timecounter-0.c
+++ b/testsuites/validation/ts-validation-timecounter-0.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationTimecounter0
+ * @ingroup TestsuitesValidationTimecounter0
  */
 
 /*
@@ -55,7 +55,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesValidationTimecounter0 \
+ * @defgroup TestsuitesValidationTimecounter0 \
  *   spec:/testsuites/validation-timecounter-0
  *
  * @ingroup RTEMSTestSuites
@@ -66,7 +66,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "ValidationTimecounter0";
+const char rtems_test_name[] = "TestsuitesValidationTimecounter0";
 
 #define CONFIGURE_MAXIMUM_PROCESSORS 1
 
diff --git a/testsuites/validation/ts-validation-timecounter-1.c b/testsuites/validation/ts-validation-timecounter-1.c
index ec0ff027ee..80440d2e07 100644
--- a/testsuites/validation/ts-validation-timecounter-1.c
+++ b/testsuites/validation/ts-validation-timecounter-1.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationTimecounter1
+ * @ingroup TestsuitesValidationTimecounter1
  */
 
 /*
@@ -55,7 +55,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesValidationTimecounter1 \
+ * @defgroup TestsuitesValidationTimecounter1 \
  *   spec:/testsuites/validation-timecounter-1
  *
  * @ingroup RTEMSTestSuites
@@ -66,7 +66,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "ValidationTimecounter1";
+const char rtems_test_name[] = "TestsuitesValidationTimecounter1";
 
 #define CONFIGURE_MAXIMUM_PROCESSORS 4
 
diff --git a/testsuites/validation/ts-validation-timecounter-smp-0.c b/testsuites/validation/ts-validation-timecounter-smp-0.c
index 6ae0311b59..3c2b3c218c 100644
--- a/testsuites/validation/ts-validation-timecounter-smp-0.c
+++ b/testsuites/validation/ts-validation-timecounter-smp-0.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationTimecounterSmp0
+ * @ingroup TestsuitesValidationTimecounterSmp0
  */
 
 /*
@@ -55,7 +55,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesValidationTimecounterSmp0 \
+ * @defgroup TestsuitesValidationTimecounterSmp0 \
  *   spec:/testsuites/validation-timecounter-smp-0
  *
  * @ingroup RTEMSTestSuites
@@ -66,7 +66,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "ValidationTimecounterSmp0";
+const char rtems_test_name[] = "TestsuitesValidationTimecounterSmp0";
 
 #define CONFIGURE_MAXIMUM_PROCESSORS 4
 
diff --git a/testsuites/validation/ts-validation-tls-0.c b/testsuites/validation/ts-validation-tls-0.c
index 09e4d2fd2b..463a460f2e 100644
--- a/testsuites/validation/ts-validation-tls-0.c
+++ b/testsuites/validation/ts-validation-tls-0.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationTls0
+ * @ingroup TestsuitesValidationTls0
  */
 
 /*
@@ -55,8 +55,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesValidationTls0 \
- *   spec:/testsuites/validation-tls-0
+ * @defgroup TestsuitesValidationTls0 spec:/testsuites/validation-tls-0
  *
  * @ingroup RTEMSTestSuites
  *
@@ -66,7 +65,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "ValidationTls0";
+const char rtems_test_name[] = "TestsuitesValidationTls0";
 
 #define MAX_TLS_SIZE 1024
 
diff --git a/testsuites/validation/ts-validation-tls-1.c b/testsuites/validation/ts-validation-tls-1.c
index d05f9e1d08..6a4dbf587b 100644
--- a/testsuites/validation/ts-validation-tls-1.c
+++ b/testsuites/validation/ts-validation-tls-1.c
@@ -3,7 +3,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestSuiteTestsuitesValidationTls1
+ * @ingroup TestsuitesValidationTls1
  */
 
 /*
@@ -55,8 +55,7 @@
 #include <rtems/test.h>
 
 /**
- * @defgroup RTEMSTestSuiteTestsuitesValidationTls1 \
- *   spec:/testsuites/validation-tls-1
+ * @defgroup TestsuitesValidationTls1 spec:/testsuites/validation-tls-1
  *
  * @ingroup RTEMSTestSuites
  *
@@ -66,7 +65,7 @@
  * @{
  */
 
-const char rtems_test_name[] = "ValidationTls1";
+const char rtems_test_name[] = "TestsuitesValidationTls1";
 
 #define CONFIGURE_IDLE_TASK_STORAGE_SIZE \
   ( RTEMS_MINIMUM_STACK_SIZE + 4096 )
-- 
2.35.3



More information about the devel mailing list