spec: Move application configuration items

176 files changed, 242 insertions, 242 deletions

diff --git a/spec/acfg/opt/appldisablefilesystem.yml b/spec/if/acfg/appl-disable-filesystem.yml
index 9f658e5f..f9ec07f3 100644
--- a/spec/acfg/opt/appldisablefilesystem.yml
+++ b/spec/if/acfg/appl-disable-filesystem.yml
@@ -14,7 +14,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_APPLICATION_DISABLE_FILESYSTEM
 notes: |
   Filesystems shall be initialized to support file descriptor based device
diff --git a/spec/acfg/opt/appldoesnotneedclockdriver.yml b/spec/if/acfg/appl-does-not-need-clock-driver.yml
index ab034f11..67a89324 100644
--- a/spec/acfg/opt/appldoesnotneedclockdriver.yml
+++ b/spec/if/acfg/appl-does-not-need-clock-driver.yml
@@ -13,7 +13,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../devdrv
+  uid: group-devdrv
 name: CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 notes: |
   This configuration parameter is intended to prevent the common user error
diff --git a/spec/acfg/opt/applextradrivers.yml b/spec/if/acfg/appl-extra-drivers.yml
index 82bba08f..e2d053f7 100644
--- a/spec/acfg/opt/applextradrivers.yml
+++ b/spec/if/acfg/appl-extra-drivers.yml
@@ -17,7 +17,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../devdrv
+  uid: group-devdrv
 name: CONFIGURE_APPLICATION_EXTRA_DRIVERS
 notes: |
   The value of this configuration option is placed after the entries of other
diff --git a/spec/acfg/opt/applneedsatadriver.yml b/spec/if/acfg/appl-needs-ata-driver.yml
index d8f12152..a7a3344c 100644
--- a/spec/acfg/opt/applneedsatadriver.yml
+++ b/spec/if/acfg/appl-needs-ata-driver.yml
@@ -10,7 +10,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../devdrv
+  uid: group-devdrv
 name: CONFIGURE_APPLICATION_NEEDS_ATA_DRIVER
 notes: |
   Most BSPs do not include support for an ATA Driver.
diff --git a/spec/acfg/opt/applneedsclockdriver.yml b/spec/if/acfg/appl-needs-clock-driver.yml
index f1c91548..c3993bcf 100644
--- a/spec/acfg/opt/applneedsclockdriver.yml
+++ b/spec/if/acfg/appl-needs-clock-driver.yml
@@ -10,7 +10,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../devdrv
+  uid: group-devdrv
 name: CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 notes: |
   The Clock Driver is responsible for providing a regular interrupt
diff --git a/spec/acfg/opt/applneedsconsoledriver.yml b/spec/if/acfg/appl-needs-console-driver.yml
index 0106dc85..6c0e8f06 100644
--- a/spec/acfg/opt/applneedsconsoledriver.yml
+++ b/spec/if/acfg/appl-needs-console-driver.yml
@@ -10,7 +10,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../devdrv
+  uid: group-devdrv
 name: CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 notes: |
   The Console Driver is responsible for providing the :file:`/dev/console`
diff --git a/spec/acfg/opt/applneedsframebufferdriver.yml b/spec/if/acfg/appl-needs-framebuffer-driver.yml
index bb1462ac..654b5a2d 100644
--- a/spec/acfg/opt/applneedsframebufferdriver.yml
+++ b/spec/if/acfg/appl-needs-framebuffer-driver.yml
@@ -10,7 +10,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../devdrv
+  uid: group-devdrv
 name: CONFIGURE_APPLICATION_NEEDS_FRAME_BUFFER_DRIVER
 notes: |
   Most BSPs do not include support for a Frame Buffer Driver. This is
diff --git a/spec/acfg/opt/applneedsidedriver.yml b/spec/if/acfg/appl-needs-ide-driver.yml
index 018ff408..17969fea 100644
--- a/spec/acfg/opt/applneedsidedriver.yml
+++ b/spec/if/acfg/appl-needs-ide-driver.yml
@@ -10,7 +10,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../devdrv
+  uid: group-devdrv
 name: CONFIGURE_APPLICATION_NEEDS_IDE_DRIVER
 notes: |
   Most BSPs do not include support for an IDE Driver.
diff --git a/spec/acfg/opt/applneedslibblock.yml b/spec/if/acfg/appl-needs-libblock.yml
index 99829043..dfbaa333 100644
--- a/spec/acfg/opt/applneedslibblock.yml
+++ b/spec/if/acfg/appl-needs-libblock.yml
@@ -10,7 +10,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../bdbuf
+  uid: group-bdbuf
 name: CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
 notes: |
   Each option of the Block Device Cache (bdbuf) configuration can be explicitly
diff --git a/spec/acfg/opt/applneedsnulldriver.yml b/spec/if/acfg/appl-needs-null-driver.yml
index 050d9159..b7f5722d 100644
--- a/spec/acfg/opt/applneedsnulldriver.yml
+++ b/spec/if/acfg/appl-needs-null-driver.yml
@@ -11,7 +11,7 @@ index-entries:
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../devdrv
+  uid: group-devdrv
 name: CONFIGURE_APPLICATION_NEEDS_NULL_DRIVER
 notes: |
   This device driver is supported by all BSPs.
diff --git a/spec/acfg/opt/applneedsrtcdriver.yml b/spec/if/acfg/appl-needs-rtc-driver.yml
index 88c2978e..bb0bfd3e 100644
--- a/spec/acfg/opt/applneedsrtcdriver.yml
+++ b/spec/if/acfg/appl-needs-rtc-driver.yml
@@ -10,7 +10,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../devdrv
+  uid: group-devdrv
 name: CONFIGURE_APPLICATION_NEEDS_RTC_DRIVER
 notes: |
   Most BSPs do not include support for a real-time clock (RTC). This is because
diff --git a/spec/acfg/opt/applneedssimpleconsoledriver.yml b/spec/if/acfg/appl-needs-simple-console-driver.yml
index 6a5bcbf3..37af5591 100644
--- a/spec/acfg/opt/applneedssimpleconsoledriver.yml
+++ b/spec/if/acfg/appl-needs-simple-console-driver.yml
@@ -10,7 +10,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../devdrv
+  uid: group-devdrv
 name: CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
 notes: |
   This device driver is responsible for providing the :file:`/dev/console`
diff --git a/spec/acfg/opt/applneedssimpletaskconsoledriver.yml b/spec/if/acfg/appl-needs-simple-task-console-driver.yml
index 14ccd6f6..15ad5efa 100644
--- a/spec/acfg/opt/applneedssimpletaskconsoledriver.yml
+++ b/spec/if/acfg/appl-needs-simple-task-console-driver.yml
@@ -10,7 +10,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../devdrv
+  uid: group-devdrv
 name: CONFIGURE_APPLICATION_NEEDS_SIMPLE_TASK_CONSOLE_DRIVER
 notes: |
   This device driver is responsible for providing the :file:`/dev/console`
diff --git a/spec/acfg/opt/applneedsstubdriver.yml b/spec/if/acfg/appl-needs-stub-driver.yml
index d665612b..36654cfe 100644
--- a/spec/acfg/opt/applneedsstubdriver.yml
+++ b/spec/if/acfg/appl-needs-stub-driver.yml
@@ -10,7 +10,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../devdrv
+  uid: group-devdrv
 name: CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER
 notes: |
   This device driver simply provides entry points that return successful and
diff --git a/spec/acfg/opt/applneedstimerdriver.yml b/spec/if/acfg/appl-needs-timer-driver.yml
index 1dc68de8..93ae9923 100644
--- a/spec/acfg/opt/applneedstimerdriver.yml
+++ b/spec/if/acfg/appl-needs-timer-driver.yml
@@ -10,7 +10,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../devdrv
+  uid: group-devdrv
 name: CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
 notes: |
   The Benchmark Timer Driver is intended for the benchmark tests of the RTEMS
diff --git a/spec/acfg/opt/applneedswatchdogdriver.yml b/spec/if/acfg/appl-needs-watchdog-driver.yml
index ef100c13..63053c98 100644
--- a/spec/acfg/opt/applneedswatchdogdriver.yml
+++ b/spec/if/acfg/appl-needs-watchdog-driver.yml
@@ -10,7 +10,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../devdrv
+  uid: group-devdrv
 name: CONFIGURE_APPLICATION_NEEDS_WATCHDOG_DRIVER
 notes: |
   Most BSPs do not include support for a watchdog device driver. This is
diff --git a/spec/acfg/opt/applneedszerodriver.yml b/spec/if/acfg/appl-needs-zero-driver.yml
index a51a8e35..d69f3489 100644
--- a/spec/acfg/opt/applneedszerodriver.yml
+++ b/spec/if/acfg/appl-needs-zero-driver.yml
@@ -11,7 +11,7 @@ index-entries:
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../devdrv
+  uid: group-devdrv
 name: CONFIGURE_APPLICATION_NEEDS_ZERO_DRIVER
 notes: |
   This device driver is supported by all BSPs.
diff --git a/spec/acfg/opt/applprerequisitedrivers.yml b/spec/if/acfg/appl-prerequisite-drivers.yml
index 17ece23c..ace0d734 100644
--- a/spec/acfg/opt/applprerequisitedrivers.yml
+++ b/spec/if/acfg/appl-prerequisite-drivers.yml
@@ -17,7 +17,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../devdrv
+  uid: group-devdrv
 name: CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS
 notes: |
   The value of this configuration option is placed after the entries defined by
diff --git a/spec/acfg/opt/atadrivertaskpriority.yml b/spec/if/acfg/ata-driver-task-priority.yml
index daf833b8..30cfb6fd 100644
--- a/spec/acfg/opt/atadrivertaskpriority.yml
+++ b/spec/if/acfg/ata-driver-task-priority.yml
@@ -11,9 +11,9 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../devdrv
+  uid: group-devdrv
 - role: constraint
-  uid: constraintprioclassic
+  uid: constraint-prioclassic
 name: CONFIGURE_ATA_DRIVER_TASK_PRIORITY
 notes: |
   This configuration option is only evaluated if the configuration option
diff --git a/spec/acfg/opt/bdbufbuffermaxsize.yml b/spec/if/acfg/bdbuf-buffer-max-size.yml
index bbe9f379..08ca7ff7 100644
--- a/spec/acfg/opt/bdbufbuffermaxsize.yml
+++ b/spec/if/acfg/bdbuf-buffer-max-size.yml
@@ -15,7 +15,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../bdbuf
+  uid: group-bdbuf
 name: CONFIGURE_BDBUF_BUFFER_MAX_SIZE
 notes: null
 text: ''
diff --git a/spec/acfg/opt/bdbufbufferminsize.yml b/spec/if/acfg/bdbuf-buffer-min-size.yml
index c411c34d..2839b596 100644
--- a/spec/acfg/opt/bdbufbufferminsize.yml
+++ b/spec/if/acfg/bdbuf-buffer-min-size.yml
@@ -14,7 +14,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../bdbuf
+  uid: group-bdbuf
 name: CONFIGURE_BDBUF_BUFFER_MIN_SIZE
 notes: null
 text: ''
diff --git a/spec/acfg/opt/bdbufcachememorysize.yml b/spec/if/acfg/bdbuf-cache-memory-size.yml
index 9bc5a027..4e02351c 100644
--- a/spec/acfg/opt/bdbufcachememorysize.yml
+++ b/spec/if/acfg/bdbuf-cache-memory-size.yml
@@ -14,7 +14,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../bdbuf
+  uid: group-bdbuf
 name: CONFIGURE_BDBUF_CACHE_MEMORY_SIZE
 notes: null
 text: ''
diff --git a/spec/acfg/opt/bdbufmaxreadaheadblocks.yml b/spec/if/acfg/bdbuf-max-read-ahead-blocks.yml
index 5bef08ca..9d9134d0 100644
--- a/spec/acfg/opt/bdbufmaxreadaheadblocks.yml
+++ b/spec/if/acfg/bdbuf-max-read-ahead-blocks.yml
@@ -14,7 +14,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../bdbuf
+  uid: group-bdbuf
 name: CONFIGURE_BDBUF_MAX_READ_AHEAD_BLOCKS
 notes: |
   A value of 0 disables the read-ahead task (default).  The read-ahead task
diff --git a/spec/acfg/opt/bdbufmaxwriteblocks.yml b/spec/if/acfg/bdbuf-max-write-blocks.yml
index 63187fb7..2fe9018c 100644
--- a/spec/acfg/opt/bdbufmaxwriteblocks.yml
+++ b/spec/if/acfg/bdbuf-max-write-blocks.yml
@@ -14,7 +14,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../bdbuf
+  uid: group-bdbuf
 name: CONFIGURE_BDBUF_MAX_WRITE_BLOCKS
 notes: null
 text: ''
diff --git a/spec/acfg/opt/bdbufreadaheadtaskpriority.yml b/spec/if/acfg/bdbuf-read-ahead-task-priority.yml
index 23d2927b..34ed8993 100644
--- a/spec/acfg/opt/bdbufreadaheadtaskpriority.yml
+++ b/spec/if/acfg/bdbuf-read-ahead-task-priority.yml
@@ -11,9 +11,9 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../bdbuf
+  uid: group-bdbuf
 - role: constraint
-  uid: constraintprioclassic
+  uid: constraint-prioclassic
 name: CONFIGURE_BDBUF_READ_AHEAD_TASK_PRIORITY
 notes: null
 text: ''
diff --git a/spec/acfg/opt/swapoutblockhold.yml b/spec/if/acfg/bdbuf-swapout-block-hold.yml
index b712e742..b4a54042 100644
--- a/spec/acfg/opt/swapoutblockhold.yml
+++ b/spec/if/acfg/bdbuf-swapout-block-hold.yml
@@ -14,7 +14,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../bdbuf
+  uid: group-bdbuf
 name: CONFIGURE_SWAPOUT_BLOCK_HOLD
 notes: null
 text: ''
diff --git a/spec/acfg/opt/swapoutswapperiod.yml b/spec/if/acfg/bdbuf-swapout-swap-period.yml
index 15701fe4..ee4c8dd5 100644
--- a/spec/acfg/opt/swapoutswapperiod.yml
+++ b/spec/if/acfg/bdbuf-swapout-swap-period.yml
@@ -14,7 +14,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../bdbuf
+  uid: group-bdbuf
 name: CONFIGURE_SWAPOUT_SWAP_PERIOD
 notes: null
 text: ''
diff --git a/spec/acfg/opt/swapouttaskpriority.yml b/spec/if/acfg/bdbuf-swapout-task-priority.yml
index 384085b5..82a5dd09 100644
--- a/spec/acfg/opt/swapouttaskpriority.yml
+++ b/spec/if/acfg/bdbuf-swapout-task-priority.yml
@@ -11,9 +11,9 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../bdbuf
+  uid: group-bdbuf
 - role: constraint
-  uid: constraintprioclassic
+  uid: constraint-prioclassic
 name: CONFIGURE_SWAPOUT_TASK_PRIORITY
 notes: null
 text: ''
diff --git a/spec/acfg/opt/swapoutworkertaskpriority.yml b/spec/if/acfg/bdbuf-swapout-worker-taskp-riority.yml
index e3a3d542..fa942af0 100644
--- a/spec/acfg/opt/swapoutworkertaskpriority.yml
+++ b/spec/if/acfg/bdbuf-swapout-worker-taskp-riority.yml
@@ -12,9 +12,9 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../bdbuf
+  uid: group-bdbuf
 - role: constraint
-  uid: constraintprioclassic
+  uid: constraint-prioclassic
 name: CONFIGURE_SWAPOUT_WORKER_TASK_PRIORITY
 notes: null
 text: ''
diff --git a/spec/acfg/opt/swapoutworkertasks.yml b/spec/if/acfg/bdbuf-swapout-worker-tasks.yml
index 02473525..6e0d7e1e 100644
--- a/spec/acfg/opt/swapoutworkertasks.yml
+++ b/spec/if/acfg/bdbuf-swapout-worker-tasks.yml
@@ -13,7 +13,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../bdbuf
+  uid: group-bdbuf
 name: CONFIGURE_SWAPOUT_WORKER_TASKS
 notes: null
 text: ''
diff --git a/spec/acfg/opt/bdbuftaskstacksize.yml b/spec/if/acfg/bdbuf-task-stack-size.yml
index 280a4fa6..f17f1f27 100644
--- a/spec/acfg/opt/bdbuftaskstacksize.yml
+++ b/spec/if/acfg/bdbuf-task-stack-size.yml
@@ -13,11 +13,11 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../bdbuf
+  uid: group-bdbuf
 - role: constraint
-  uid: constraintstackspace
+  uid: constraint-stackspace
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_BDBUF_TASK_STACK_SIZE
 notes: null
 text: ''
diff --git a/spec/acfg/opt/bspidletaskbody.yml b/spec/if/acfg/bsp-idle-task-body.yml
index 7923d679..3fa18bec 100644
--- a/spec/acfg/opt/bspidletaskbody.yml
+++ b/spec/if/acfg/bsp-idle-task-body.yml
@@ -23,7 +23,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../bsp
+  uid: group-bsp
 name: BSP_IDLE_TASK_BODY
 notes: |
   As it has knowledge of the specific CPU model, system controller logic, and
diff --git a/spec/acfg/opt/bspidletaskstacksize.yml b/spec/if/acfg/bsp-idle-task-stack-size.yml
index 317c171e..5a982222 100644
--- a/spec/acfg/opt/bspidletaskstacksize.yml
+++ b/spec/if/acfg/bsp-idle-task-stack-size.yml
@@ -19,11 +19,11 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../bsp
+  uid: group-bsp
 - role: constraint
-  uid: constraintidlestackarea
+  uid: constraint-idlestackarea
 - role: constraint
-  uid: constraintbspappmin
+  uid: constraint-bspappmin
 name: BSP_IDLE_TASK_STACK_SIZE
 notes: null
 text: ''
diff --git a/spec/acfg/opt/bspinitialextension.yml b/spec/if/acfg/bsp-initial-extension.yml
index 818a25dd..a24078b8 100644
--- a/spec/acfg/opt/bspinitialextension.yml
+++ b/spec/if/acfg/bsp-initial-extension.yml
@@ -23,7 +23,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../bsp
+  uid: group-bsp
 name: BSP_INITIAL_EXTENSION
 notes: |
   The value of this configuration option is placed after the entries of all
diff --git a/spec/acfg/opt/bspinterruptstacksize.yml b/spec/if/acfg/bsp-interrupt-stack-size.yml
index cce00d0d..c28fb731 100644
--- a/spec/acfg/opt/bspinterruptstacksize.yml
+++ b/spec/if/acfg/bsp-interrupt-stack-size.yml
@@ -19,13 +19,13 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../bsp
+  uid: group-bsp
 - role: constraint
-  uid: constraintisrstackalign
+  uid: constraint-isrstackalign
 - role: constraint
-  uid: constraintisrstackarea
+  uid: constraint-isrstackarea
 - role: constraint
-  uid: constraintbspappmin
+  uid: constraint-bspappmin
 name: BSP_INTERRUPT_STACK_SIZE
 notes: null
 text: ''
diff --git a/spec/acfg/opt/bspprerequisitedrivers.yml b/spec/if/acfg/bsp-prerequisite-drivers.yml
index 7ed73677..4f1e5ef6 100644
--- a/spec/acfg/opt/bspprerequisitedrivers.yml
+++ b/spec/if/acfg/bsp-prerequisite-drivers.yml
@@ -23,7 +23,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../bsp
+  uid: group-bsp
 name: CONFIGURE_BSP_PREREQUISITE_DRIVERS
 notes: |
   The value of this configuration option is placed before the entries of all
diff --git a/spec/acfg/opt/cbsmaximumservers.yml b/spec/if/acfg/cbs-max-servers.yml
index 8ceb6eed..63c30a81 100644
--- a/spec/acfg/opt/cbsmaximumservers.yml
+++ b/spec/if/acfg/cbs-max-servers.yml
@@ -14,9 +14,9 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../schedgeneral
+  uid: group-schedgeneral
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_CBS_MAXIMUM_SERVERS
 notes: |
   This configuration option is only evaluated if the configuration option
diff --git a/spec/acfg/opt/constraintbspappmin.yml b/spec/if/acfg/constraint-bspappmin.yml
index 0cebb9b6..0cebb9b6 100644
--- a/spec/acfg/opt/constraintbspappmin.yml
+++ b/spec/if/acfg/constraint-bspappmin.yml
diff --git a/spec/acfg/opt/constraintidlestackarea.yml b/spec/if/acfg/constraint-idlestackarea.yml
index aaf1f8b3..aaf1f8b3 100644
--- a/spec/acfg/opt/constraintidlestackarea.yml
+++ b/spec/if/acfg/constraint-idlestackarea.yml
diff --git a/spec/acfg/opt/constraintisrstackalign.yml b/spec/if/acfg/constraint-isrstackalign.yml
index 14189aa7..14189aa7 100644
--- a/spec/acfg/opt/constraintisrstackalign.yml
+++ b/spec/if/acfg/constraint-isrstackalign.yml
diff --git a/spec/acfg/opt/constraintisrstackarea.yml b/spec/if/acfg/constraint-isrstackarea.yml
index e096f008..e096f008 100644
--- a/spec/acfg/opt/constraintisrstackarea.yml
+++ b/spec/if/acfg/constraint-isrstackarea.yml
diff --git a/spec/acfg/opt/constraintmemsz.yml b/spec/if/acfg/constraint-memsz.yml
index b3a2204e..b3a2204e 100644
--- a/spec/acfg/opt/constraintmemsz.yml
+++ b/spec/if/acfg/constraint-memsz.yml
diff --git a/spec/acfg/opt/constraintposix.yml b/spec/if/acfg/constraint-posix.yml
index fa76c0a3..fa76c0a3 100644
--- a/spec/acfg/opt/constraintposix.yml
+++ b/spec/if/acfg/constraint-posix.yml
diff --git a/spec/acfg/opt/constraintprioclassic.yml b/spec/if/acfg/constraint-prioclassic.yml
index dead5852..dead5852 100644
--- a/spec/acfg/opt/constraintprioclassic.yml
+++ b/spec/if/acfg/constraint-prioclassic.yml
diff --git a/spec/acfg/opt/constraintstackspace.yml b/spec/if/acfg/constraint-stackspace.yml
index 4eec247d..4eec247d 100644
--- a/spec/acfg/opt/constraintstackspace.yml
+++ b/spec/if/acfg/constraint-stackspace.yml
diff --git a/spec/acfg/opt/constraintunlimited.yml b/spec/if/acfg/constraint-unlimited.yml
index 786fd53d..786fd53d 100644
--- a/spec/acfg/opt/constraintunlimited.yml
+++ b/spec/if/acfg/constraint-unlimited.yml
diff --git a/spec/acfg/opt/constraintwkspace.yml b/spec/if/acfg/constraint-wkspace.yml
index 0c87371a..0c87371a 100644
--- a/spec/acfg/opt/constraintwkspace.yml
+++ b/spec/if/acfg/constraint-wkspace.yml
diff --git a/spec/acfg/opt/dirtymemory.yml b/spec/if/acfg/dirty-memory.yml
index d73a06b3..59af9ec3 100644
--- a/spec/acfg/opt/dirtymemory.yml
+++ b/spec/if/acfg/dirty-memory.yml
@@ -11,7 +11,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../general
+  uid: group-general
 name: CONFIGURE_DIRTY_MEMORY
 notes: |
   Dirtying memory can add significantly to system initialization time.  It may
diff --git a/spec/acfg/opt/disablebspsettings.yml b/spec/if/acfg/disable-bsp-settings.yml
index 9787c6b0..9ca726de 100644
--- a/spec/acfg/opt/disablebspsettings.yml
+++ b/spec/if/acfg/disable-bsp-settings.yml
@@ -22,7 +22,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../bsp
+  uid: group-bsp
 name: CONFIGURE_DISABLE_BSP_SETTINGS
 notes: null
 text: ''
diff --git a/spec/acfg/opt/disablenewlibreentrancy.yml b/spec/if/acfg/disable-newlib-reentrancy.yml
index e9a787cc..b3390e7c 100644
--- a/spec/acfg/opt/disablenewlibreentrancy.yml
+++ b/spec/if/acfg/disable-newlib-reentrancy.yml
@@ -10,7 +10,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../general
+  uid: group-general
 name: CONFIGURE_DISABLE_NEWLIB_REENTRANCY
 notes: |
   You can enable this option to reduce the size of the :term:`TCB`.  Use this
diff --git a/spec/acfg/opt/executiveramsize.yml b/spec/if/acfg/executive-ram-size.yml
index 3ee9105d..fb7b3038 100644
--- a/spec/acfg/opt/executiveramsize.yml
+++ b/spec/if/acfg/executive-ram-size.yml
@@ -17,9 +17,9 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../general
+  uid: group-general
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_EXECUTIVE_RAM_SIZE
 notes: |
   This is an advanced configuration option.  Use it only if you know exactly
diff --git a/spec/acfg/opt/extrataskstacks.yml b/spec/if/acfg/extra-task-stacks.yml
index 6cce770e..c9d16774 100644
--- a/spec/acfg/opt/extrataskstacks.yml
+++ b/spec/if/acfg/extra-task-stacks.yml
@@ -15,9 +15,9 @@ index-entries:
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../general
+  uid: group-general
 - role: constraint
-  uid: constraintstackspace
+  uid: constraint-stackspace
 name: CONFIGURE_EXTRA_TASK_STACKS
 notes: |
   This parameter is very important.  If the application creates tasks with
diff --git a/spec/acfg/opt/filesystemall.yml b/spec/if/acfg/filesystem-all.yml
index 2a61ebe5..9e03e126 100644
--- a/spec/acfg/opt/filesystemall.yml
+++ b/spec/if/acfg/filesystem-all.yml
@@ -24,7 +24,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_FILESYSTEM_ALL
 notes: null
 text: ''
diff --git a/spec/acfg/opt/filesystemdosfs.yml b/spec/if/acfg/filesystem-dosfs.yml
index 4b56db72..d67b49f6 100644
--- a/spec/acfg/opt/filesystemdosfs.yml
+++ b/spec/if/acfg/filesystem-dosfs.yml
@@ -11,7 +11,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_FILESYSTEM_DOSFS
 notes: |
   This filesystem requires a Block Device Cache configuration, see
diff --git a/spec/acfg/opt/filesystemftpfs.yml b/spec/if/acfg/filesystem-ftpfs.yml
index 1ecc90a7..aca6c3f5 100644
--- a/spec/acfg/opt/filesystemftpfs.yml
+++ b/spec/if/acfg/filesystem-ftpfs.yml
@@ -11,7 +11,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_FILESYSTEM_FTPFS
 notes: null
 text: ''
diff --git a/spec/acfg/opt/filesystemimfs.yml b/spec/if/acfg/filesystem-imfs.yml
index 683459a6..dfeb3469 100644
--- a/spec/acfg/opt/filesystemimfs.yml
+++ b/spec/if/acfg/filesystem-imfs.yml
@@ -11,7 +11,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_FILESYSTEM_IMFS
 notes: |
   Applications will rarely need this configuration option.  This configuration
diff --git a/spec/acfg/opt/filesystemjffs2.yml b/spec/if/acfg/filesystem-jffs2.yml
index 55307bb0..ca9c5b01 100644
--- a/spec/acfg/opt/filesystemjffs2.yml
+++ b/spec/if/acfg/filesystem-jffs2.yml
@@ -11,7 +11,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_FILESYSTEM_JFFS2
 notes: null
 text: ''
diff --git a/spec/acfg/opt/filesystemnfs.yml b/spec/if/acfg/filesystem-nfs.yml
index 8a7167f9..a846229b 100644
--- a/spec/acfg/opt/filesystemnfs.yml
+++ b/spec/if/acfg/filesystem-nfs.yml
@@ -11,7 +11,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_FILESYSTEM_NFS
 notes: null
 text: ''
diff --git a/spec/acfg/opt/filesystemrfs.yml b/spec/if/acfg/filesystem-rfs.yml
index 105feab2..f2d5ba58 100644
--- a/spec/acfg/opt/filesystemrfs.yml
+++ b/spec/if/acfg/filesystem-rfs.yml
@@ -11,7 +11,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_FILESYSTEM_RFS
 notes: |
   This filesystem requires a Block Device Cache configuration, see
diff --git a/spec/acfg/opt/filesystemtftpfs.yml b/spec/if/acfg/filesystem-tftpfs.yml
index 80f2a557..9ab6d4d2 100644
--- a/spec/acfg/opt/filesystemtftpfs.yml
+++ b/spec/if/acfg/filesystem-tftpfs.yml
@@ -11,7 +11,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_FILESYSTEM_TFTPFS
 notes: null
 text: ''
diff --git a/spec/acfg/bdbuf.yml b/spec/if/acfg/group-bdbuf.yml
index 77810634..502e05e3 100644
--- a/spec/acfg/bdbuf.yml
+++ b/spec/if/acfg/group-bdbuf.yml
@@ -8,7 +8,7 @@ enabled-by: true
 interface-type: appl-config-group
 links:
 - role: requirement-refinement
-  uid: ../applconfig
+  uid: ../../applconfig
 name: Block Device Cache Configuration
 text: ''
 type: interface
diff --git a/spec/acfg/bsp.yml b/spec/if/acfg/group-bsp.yml
index 0bf7ac5c..623b2d04 100644
--- a/spec/acfg/bsp.yml
+++ b/spec/if/acfg/group-bsp.yml
@@ -10,7 +10,7 @@ enabled-by: true
 interface-type: appl-config-group
 links:
 - role: requirement-refinement
-  uid: ../applconfig
+  uid: ../../applconfig
 name: BSP Related Configuration Options
 text: ''
 type: interface
diff --git a/spec/acfg/classic.yml b/spec/if/acfg/group-classic.yml
index 43f9b634..cb718de0 100644
--- a/spec/acfg/classic.yml
+++ b/spec/if/acfg/group-classic.yml
@@ -7,7 +7,7 @@ enabled-by: true
 interface-type: appl-config-group
 links:
 - role: requirement-refinement
-  uid: ../applconfig
+  uid: ../../applconfig
 name: Classic API Configuration
 text: ''
 type: interface
diff --git a/spec/acfg/classicinit.yml b/spec/if/acfg/group-classicinit.yml
index e8d3a617..dc46849f 100644
--- a/spec/acfg/classicinit.yml
+++ b/spec/if/acfg/group-classicinit.yml
@@ -8,7 +8,7 @@ enabled-by: true
 interface-type: appl-config-group
 links:
 - role: requirement-refinement
-  uid: ../applconfig
+  uid: ../../applconfig
 name: Classic API Initialization Task Configuration
 text: ''
 type: interface
diff --git a/spec/acfg/devdrv.yml b/spec/if/acfg/group-devdrv.yml
index 451e1fb1..db54eb73 100644
--- a/spec/acfg/devdrv.yml
+++ b/spec/if/acfg/group-devdrv.yml
@@ -8,7 +8,7 @@ enabled-by: true
 interface-type: appl-config-group
 links:
 - role: requirement-refinement
-  uid: ../applconfig
+  uid: ../../applconfig
 name: Device Driver Configuration
 text: ''
 type: interface
diff --git a/spec/acfg/eventrecord.yml b/spec/if/acfg/group-eventrecord.yml
index 7427575c..29e4319d 100644
--- a/spec/acfg/eventrecord.yml
+++ b/spec/if/acfg/group-eventrecord.yml
@@ -7,7 +7,7 @@ enabled-by: true
 interface-type: appl-config-group
 links:
 - role: requirement-refinement
-  uid: ../applconfig
+  uid: ../../applconfig
 name: Event Recording Configuration
 text: ''
 type: interface
diff --git a/spec/acfg/filesystem.yml b/spec/if/acfg/group-filesystem.yml
index 32a3ee38..977641fa 100644
--- a/spec/acfg/filesystem.yml
+++ b/spec/if/acfg/group-filesystem.yml
@@ -47,7 +47,7 @@ enabled-by: true
 interface-type: appl-config-group
 links:
 - role: requirement-refinement
-  uid: ../applconfig
+  uid: ../../applconfig
 name: Filesystem Configuration
 text: ''
 type: interface
diff --git a/spec/acfg/general.yml b/spec/if/acfg/group-general.yml
index b4733766..86b37237 100644
--- a/spec/acfg/general.yml
+++ b/spec/if/acfg/group-general.yml
@@ -7,7 +7,7 @@ enabled-by: true
 interface-type: appl-config-group
 links:
 - role: requirement-refinement
-  uid: ../applconfig
+  uid: ../../applconfig
 name: General System Configuration
 text: ''
 type: interface
diff --git a/spec/acfg/idle.yml b/spec/if/acfg/group-idle.yml
index 5dd6b39f..4e9dc5f4 100644
--- a/spec/acfg/idle.yml
+++ b/spec/if/acfg/group-idle.yml
@@ -7,7 +7,7 @@ enabled-by: true
 interface-type: appl-config-group
 links:
 - role: requirement-refinement
-  uid: ../applconfig
+  uid: ../../applconfig
 name: Idle Task Configuration
 text: ''
 type: interface
diff --git a/spec/acfg/mpci.yml b/spec/if/acfg/group-mpci.yml
index df4c6c7c..238b898a 100644
--- a/spec/acfg/mpci.yml
+++ b/spec/if/acfg/group-mpci.yml
@@ -12,7 +12,7 @@ enabled-by: true
 interface-type: appl-config-group
 links:
 - role: requirement-refinement
-  uid: ../applconfig
+  uid: ../../applconfig
 name: Multiprocessing Configuration
 text: ''
 type: interface
diff --git a/spec/acfg/posix.yml b/spec/if/acfg/group-posix.yml
index 0da249e5..ff24c8de 100644
--- a/spec/acfg/posix.yml
+++ b/spec/if/acfg/group-posix.yml
@@ -10,7 +10,7 @@ enabled-by: true
 interface-type: appl-config-group
 links:
 - role: requirement-refinement
-  uid: ../applconfig
+  uid: ../../applconfig
 name: POSIX API Configuration
 text: ''
 type: interface
diff --git a/spec/acfg/posixinit.yml b/spec/if/acfg/group-posixinit.yml
index a9eeaa09..ff093c07 100644
--- a/spec/acfg/posixinit.yml
+++ b/spec/if/acfg/group-posixinit.yml
@@ -8,7 +8,7 @@ enabled-by: true
 interface-type: appl-config-group
 links:
 - role: requirement-refinement
-  uid: ../applconfig
+  uid: ../../applconfig
 name: POSIX Initialization Thread Configuration
 text: ''
 type: interface
diff --git a/spec/acfg/schedgeneral.yml b/spec/if/acfg/group-schedgeneral.yml
index 48a8e375..93429ed0 100644
--- a/spec/acfg/schedgeneral.yml
+++ b/spec/if/acfg/group-schedgeneral.yml
@@ -27,7 +27,7 @@ enabled-by: true
 interface-type: appl-config-group
 links:
 - role: requirement-refinement
-  uid: ../applconfig
+  uid: ../../applconfig
 name: General Scheduler Configuration
 text: ''
 type: interface
diff --git a/spec/acfg/stackalloc.yml b/spec/if/acfg/group-stackalloc.yml
index 45a7470b..e847fbbf 100644
--- a/spec/acfg/stackalloc.yml
+++ b/spec/if/acfg/group-stackalloc.yml
@@ -11,7 +11,7 @@ enabled-by: true
 interface-type: appl-config-group
 links:
 - role: requirement-refinement
-  uid: ../applconfig
+  uid: ../../applconfig
 name: Task Stack Allocator Configuration
 text: ''
 type: interface
diff --git a/spec/acfg/opt/idletaskbody.yml b/spec/if/acfg/idle-task-body.yml
index 09e64b28..a4221954 100644
--- a/spec/acfg/opt/idletaskbody.yml
+++ b/spec/if/acfg/idle-task-body.yml
@@ -17,7 +17,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../idle
+  uid: group-idle
 name: CONFIGURE_IDLE_TASK_BODY
 notes: |
   IDLE threads shall not block.  A blocking IDLE thread results in undefined
diff --git a/spec/acfg/opt/idletaskinitappl.yml b/spec/if/acfg/idle-task-init-appl.yml
index 0204b085..378fb73e 100644
--- a/spec/acfg/opt/idletaskinitappl.yml
+++ b/spec/if/acfg/idle-task-init-appl.yml
@@ -15,7 +15,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../idle
+  uid: group-idle
 name: CONFIGURE_IDLE_TASK_INITIALIZES_APPLICATION
 notes: |
   If you use this option be careful, the user IDLE task **cannot** block at all
diff --git a/spec/acfg/opt/idletaskstacksize.yml b/spec/if/acfg/idle-task-stack-size.yml
index a3922e91..a4137f5d 100644
--- a/spec/acfg/opt/idletaskstacksize.yml
+++ b/spec/if/acfg/idle-task-stack-size.yml
@@ -12,11 +12,11 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../idle
+  uid: group-idle
 - role: constraint
-  uid: constraintidlestackarea
+  uid: constraint-idlestackarea
 - role: constraint
-  uid: constraintbspappmin
+  uid: constraint-bspappmin
 name: CONFIGURE_IDLE_TASK_STACK_SIZE
 notes: |
   In SMP configurations, there is one IDLE task per configured processor, see
diff --git a/spec/acfg/opt/imfsdisablechmod.yml b/spec/if/acfg/imfs-disable-chmod.yml
index d860ba4c..88c80592 100644
--- a/spec/acfg/opt/imfsdisablechmod.yml
+++ b/spec/if/acfg/imfs-disable-chmod.yml
@@ -13,7 +13,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_IMFS_DISABLE_CHMOD
 notes: null
 text: ''
diff --git a/spec/acfg/opt/imfsdisablechown.yml b/spec/if/acfg/imfs-disable-chown.yml
index eba4a321..ae33bcf6 100644
--- a/spec/acfg/opt/imfsdisablechown.yml
+++ b/spec/if/acfg/imfs-disable-chown.yml
@@ -13,7 +13,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_IMFS_DISABLE_CHOWN
 notes: null
 text: ''
diff --git a/spec/acfg/opt/imfsdisablelink.yml b/spec/if/acfg/imfs-disable-link.yml
index 417eae55..130958e6 100644
--- a/spec/acfg/opt/imfsdisablelink.yml
+++ b/spec/if/acfg/imfs-disable-link.yml
@@ -13,7 +13,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_IMFS_DISABLE_LINK
 notes: null
 text: ''
diff --git a/spec/acfg/opt/imfsdisablemknoddevice.yml b/spec/if/acfg/imfs-disable-mknod-device.yml
index 410a30c4..332c16ab 100644
--- a/spec/acfg/opt/imfsdisablemknoddevice.yml
+++ b/spec/if/acfg/imfs-disable-mknod-device.yml
@@ -13,7 +13,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_IMFS_DISABLE_MKNOD_DEVICE
 notes: null
 text: ''
diff --git a/spec/acfg/opt/imfsdisablemknodfile.yml b/spec/if/acfg/imfs-disable-mknod-file.yml
index ac763508..952d7b77 100644
--- a/spec/acfg/opt/imfsdisablemknodfile.yml
+++ b/spec/if/acfg/imfs-disable-mknod-file.yml
@@ -13,7 +13,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_IMFS_DISABLE_MKNOD_FILE
 notes: null
 text: ''
diff --git a/spec/acfg/opt/imfsdisablemknod.yml b/spec/if/acfg/imfs-disable-mknod.yml
index 1d1dad6f..1bd389f3 100644
--- a/spec/acfg/opt/imfsdisablemknod.yml
+++ b/spec/if/acfg/imfs-disable-mknod.yml
@@ -13,7 +13,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_IMFS_DISABLE_MKNOD
 notes: null
 text: ''
diff --git a/spec/acfg/opt/imfsdisablemount.yml b/spec/if/acfg/imfs-disable-mount.yml
index 9e3a7a59..e434ff51 100644
--- a/spec/acfg/opt/imfsdisablemount.yml
+++ b/spec/if/acfg/imfs-disable-mount.yml
@@ -13,7 +13,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_IMFS_DISABLE_MOUNT
 notes: null
 text: ''
diff --git a/spec/acfg/opt/imfsdisablereaddir.yml b/spec/if/acfg/imfs-disable-readdir.yml
index 10c48d95..d3f8cc68 100644
--- a/spec/acfg/opt/imfsdisablereaddir.yml
+++ b/spec/if/acfg/imfs-disable-readdir.yml
@@ -14,7 +14,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_IMFS_DISABLE_READDIR
 notes: null
 text: ''
diff --git a/spec/acfg/opt/imfsdisablereadlink.yml b/spec/if/acfg/imfs-disable-readlink.yml
index becf39b1..5bfc00c4 100644
--- a/spec/acfg/opt/imfsdisablereadlink.yml
+++ b/spec/if/acfg/imfs-disable-readlink.yml
@@ -13,7 +13,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_IMFS_DISABLE_READLINK
 notes: null
 text: ''
diff --git a/spec/acfg/opt/imfsdisablerename.yml b/spec/if/acfg/imfs-disable-rename.yml
index 3e17a7c2..60a33fff 100644
--- a/spec/acfg/opt/imfsdisablerename.yml
+++ b/spec/if/acfg/imfs-disable-rename.yml
@@ -13,7 +13,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_IMFS_DISABLE_RENAME
 notes: null
 text: ''
diff --git a/spec/acfg/opt/imfsdisablermnod.yml b/spec/if/acfg/imfs-disable-rmnod.yml
index a3faa2d3..3686ab03 100644
--- a/spec/acfg/opt/imfsdisablermnod.yml
+++ b/spec/if/acfg/imfs-disable-rmnod.yml
@@ -13,7 +13,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_IMFS_DISABLE_RMNOD
 notes: null
 text: ''
diff --git a/spec/acfg/opt/imfsdisablesymlink.yml b/spec/if/acfg/imfs-disable-symlink.yml
index 689dcda9..d4b507db 100644
--- a/spec/acfg/opt/imfsdisablesymlink.yml
+++ b/spec/if/acfg/imfs-disable-symlink.yml
@@ -13,7 +13,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_IMFS_DISABLE_SYMLINK
 notes: null
 text: ''
diff --git a/spec/acfg/opt/imfsdisableunmount.yml b/spec/if/acfg/imfs-disable-unmount.yml
index e9bc8728..20cf5e15 100644
--- a/spec/acfg/opt/imfsdisableunmount.yml
+++ b/spec/if/acfg/imfs-disable-unmount.yml
@@ -13,7 +13,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_IMFS_DISABLE_UNMOUNT
 notes: null
 text: ''
diff --git a/spec/acfg/opt/imfsdisableutime.yml b/spec/if/acfg/imfs-disable-utime.yml
index 37dae4cd..49a13c28 100644
--- a/spec/acfg/opt/imfsdisableutime.yml
+++ b/spec/if/acfg/imfs-disable-utime.yml
@@ -13,7 +13,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_IMFS_DISABLE_UTIME
 notes: null
 text: ''
diff --git a/spec/acfg/opt/imfsenablemkfifo.yml b/spec/if/acfg/imfs-enable-mkfifo.yml
index b5319cf7..22aed1da 100644
--- a/spec/acfg/opt/imfsenablemkfifo.yml
+++ b/spec/if/acfg/imfs-enable-mkfifo.yml
@@ -13,7 +13,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_IMFS_ENABLE_MKFIFO
 notes: null
 text: ''
diff --git a/spec/acfg/opt/imfsmemfilebytesperblock.yml b/spec/if/acfg/imfs-memfile-bytes-per-block.yml
index 3187b1b2..7f7ed899 100644
--- a/spec/acfg/opt/imfsmemfilebytesperblock.yml
+++ b/spec/if/acfg/imfs-memfile-bytes-per-block.yml
@@ -19,7 +19,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_IMFS_MEMFILE_BYTES_PER_BLOCK
 notes: |
   The configured block size has two impacts. The first is the average amount of
diff --git a/spec/acfg/opt/inittaskarguments.yml b/spec/if/acfg/init-task-arguments.yml
index 0ddfb53e..f20f3187 100644
--- a/spec/acfg/opt/inittaskarguments.yml
+++ b/spec/if/acfg/init-task-arguments.yml
@@ -16,7 +16,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../classicinit
+  uid: group-classicinit
 name: CONFIGURE_INIT_TASK_ARGUMENTS
 notes: null
 text: ''
diff --git a/spec/acfg/opt/inittaskattributes.yml b/spec/if/acfg/init-task-attributes.yml
index 1fe7a91c..5bfa6aa2 100644
--- a/spec/acfg/opt/inittaskattributes.yml
+++ b/spec/if/acfg/init-task-attributes.yml
@@ -15,7 +15,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../classicinit
+  uid: group-classicinit
 name: CONFIGURE_INIT_TASK_ATTRIBUTES
 notes: null
 text: ''
diff --git a/spec/acfg/opt/inittaskentrypoint.yml b/spec/if/acfg/init-task-entrypoint.yml
index 74f29f7d..2b5813dc 100644
--- a/spec/acfg/opt/inittaskentrypoint.yml
+++ b/spec/if/acfg/init-task-entrypoint.yml
@@ -17,7 +17,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../classicinit
+  uid: group-classicinit
 name: CONFIGURE_INIT_TASK_ENTRY_POINT
 notes: |
   The application shall provide the function referenced by this configuration
diff --git a/spec/acfg/opt/inittaskinitialmodes.yml b/spec/if/acfg/init-task-initial-modes.yml
index 1af34050..3c1f99f3 100644
--- a/spec/acfg/opt/inittaskinitialmodes.yml
+++ b/spec/if/acfg/init-task-initial-modes.yml
@@ -17,7 +17,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../classicinit
+  uid: group-classicinit
 name: CONFIGURE_INIT_TASK_INITIAL_MODES
 notes: null
 text: ''
diff --git a/spec/acfg/opt/inittaskname.yml b/spec/if/acfg/init-task-name.yml
index f7ec1948..9ce6f52e 100644
--- a/spec/acfg/opt/inittaskname.yml
+++ b/spec/if/acfg/init-task-name.yml
@@ -17,7 +17,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../classicinit
+  uid: group-classicinit
 name: CONFIGURE_INIT_TASK_NAME
 notes: |
   Use :c:func:`rtems_build_name` to define the task name.
diff --git a/spec/acfg/opt/inittaskpriority.yml b/spec/if/acfg/init-task-priority.yml
index 4305665e..f5da6b4f 100644
--- a/spec/acfg/opt/inittaskpriority.yml
+++ b/spec/if/acfg/init-task-priority.yml
@@ -12,9 +12,9 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../classicinit
+  uid: group-classicinit
 - role: constraint
-  uid: constraintprioclassic
+  uid: constraint-prioclassic
 name: CONFIGURE_INIT_TASK_PRIORITY
 notes: null
 text: ''
diff --git a/spec/acfg/opt/inittaskstacksize.yml b/spec/if/acfg/init-task-stack-size.yml
index 06468cd6..fb3daa0a 100644
--- a/spec/acfg/opt/inittaskstacksize.yml
+++ b/spec/if/acfg/init-task-stack-size.yml
@@ -13,9 +13,9 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../classicinit
+  uid: group-classicinit
 - role: constraint
-  uid: constraintstackspace
+  uid: constraint-stackspace
 name: CONFIGURE_INIT_TASK_STACK_SIZE
 notes: null
 text: ''
diff --git a/spec/acfg/opt/initialextensions.yml b/spec/if/acfg/initial-extensions.yml
index 421c82c8..9d742c05 100644
--- a/spec/acfg/opt/initialextensions.yml
+++ b/spec/if/acfg/initial-extensions.yml
@@ -17,7 +17,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../general
+  uid: group-general
 name: CONFIGURE_INITIAL_EXTENSIONS
 notes: |
   The value of this configuration option is placed before the entries of
diff --git a/spec/acfg/opt/interruptstacksize.yml b/spec/if/acfg/interrupt-stack-size.yml
index fffbd959..b2986237 100644
--- a/spec/acfg/opt/interruptstacksize.yml
+++ b/spec/if/acfg/interrupt-stack-size.yml
@@ -15,13 +15,13 @@ index-entries:
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../general
+  uid: group-general
 - role: constraint
-  uid: constraintisrstackalign
+  uid: constraint-isrstackalign
 - role: constraint
-  uid: constraintisrstackarea
+  uid: constraint-isrstackarea
 - role: constraint
-  uid: constraintbspappmin
+  uid: constraint-bspappmin
 name: CONFIGURE_INTERRUPT_STACK_SIZE
 notes: |
   There is one interrupt stack available for each configured processor
diff --git a/spec/acfg/opt/mallocbspsupportssbrk.yml b/spec/if/acfg/malloc-bsp-supports-sbrk.yml
index 0d408368..8ffd6a31 100644
--- a/spec/acfg/opt/mallocbspsupportssbrk.yml
+++ b/spec/if/acfg/malloc-bsp-supports-sbrk.yml
@@ -18,7 +18,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../bsp
+  uid: group-bsp
 name: CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
 notes: |
   This option should not be defined by the application. Only the BSP knows how
diff --git a/spec/acfg/opt/mallocdirty.yml b/spec/if/acfg/malloc-dirty.yml
index db19cdd8..8840eff6 100644
--- a/spec/acfg/opt/mallocdirty.yml
+++ b/spec/if/acfg/malloc-dirty.yml
@@ -11,7 +11,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../general
+  uid: group-general
 name: CONFIGURE_MALLOC_DIRTY
 notes: |
   The dirtying performed by this option is carried out for each successful
diff --git a/spec/acfg/opt/maxbarriers.yml b/spec/if/acfg/max-barriers.yml
index 74dd5edc..77bc28e2 100644
--- a/spec/acfg/opt/maxbarriers.yml
+++ b/spec/if/acfg/max-barriers.yml
@@ -14,11 +14,11 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../classic
+  uid: group-classic
 - role: constraint
-  uid: constraintunlimited
+  uid: constraint-unlimited
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_MAXIMUM_BARRIERS
 notes: |
   This object class can be configured in unlimited allocation mode, see
diff --git a/spec/acfg/opt/maxdrivers.yml b/spec/if/acfg/max-drivers.yml
index 55df7791..fb2220ee 100644
--- a/spec/acfg/opt/maxdrivers.yml
+++ b/spec/if/acfg/max-drivers.yml
@@ -19,9 +19,9 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../devdrv
+  uid: group-devdrv
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_MAXIMUM_DRIVERS
 notes: |
   If the application will dynamically install device drivers, then this
diff --git a/spec/acfg/opt/maxfiledescriptors.yml b/spec/if/acfg/max-file-descriptors.yml
index 9159a8da..dd6baed7 100644
--- a/spec/acfg/opt/maxfiledescriptors.yml
+++ b/spec/if/acfg/max-file-descriptors.yml
@@ -15,9 +15,9 @@ index-entries:
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../general
+  uid: group-general
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_MAXIMUM_FILE_DESCRIPTORS
 notes: |
   The default value of three file descriptors allows RTEMS to support standard
diff --git a/spec/acfg/opt/maxmessagequeues.yml b/spec/if/acfg/max-message-queues.yml
index 8254aab4..e8963de9 100644
--- a/spec/acfg/opt/maxmessagequeues.yml
+++ b/spec/if/acfg/max-message-queues.yml
@@ -14,11 +14,11 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../classic
+  uid: group-classic
 - role: constraint
-  uid: constraintunlimited
+  uid: constraint-unlimited
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_MAXIMUM_MESSAGE_QUEUES
 notes: |
   This object class can be configured in unlimited allocation mode, see
diff --git a/spec/acfg/opt/maxpartitions.yml b/spec/if/acfg/max-partitions.yml
index bb6dc2d9..b6c088a6 100644
--- a/spec/acfg/opt/maxpartitions.yml
+++ b/spec/if/acfg/max-partitions.yml
@@ -14,11 +14,11 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../classic
+  uid: group-classic
 - role: constraint
-  uid: constraintunlimited
+  uid: constraint-unlimited
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_MAXIMUM_PARTITIONS
 notes: |
   This object class can be configured in unlimited allocation mode, see
diff --git a/spec/acfg/opt/maxperiods.yml b/spec/if/acfg/max-periods.yml
index 7cb77e99..694ab3c0 100644
--- a/spec/acfg/opt/maxperiods.yml
+++ b/spec/if/acfg/max-periods.yml
@@ -14,11 +14,11 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../classic
+  uid: group-classic
 - role: constraint
-  uid: constraintunlimited
+  uid: constraint-unlimited
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_MAXIMUM_PERIODS
 notes: |
   This object class can be configured in unlimited allocation mode, see
diff --git a/spec/acfg/opt/maxports.yml b/spec/if/acfg/max-ports.yml
index 76ff4bca..a1752318 100644
--- a/spec/acfg/opt/maxports.yml
+++ b/spec/if/acfg/max-ports.yml
@@ -14,11 +14,11 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../classic
+  uid: group-classic
 - role: constraint
-  uid: constraintunlimited
+  uid: constraint-unlimited
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_MAXIMUM_PORTS
 notes: |
   This object class can be configured in unlimited allocation mode, see
diff --git a/spec/acfg/opt/maxposixkeyvaluepairs.yml b/spec/if/acfg/max-posix-key-value-pairs.yml
index d5b0b822..694fbee0 100644
--- a/spec/acfg/opt/maxposixkeyvaluepairs.yml
+++ b/spec/if/acfg/max-posix-key-value-pairs.yml
@@ -18,11 +18,11 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../posix
+  uid: group-posix
 - role: constraint
-  uid: constraintunlimited
+  uid: constraint-unlimited
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_MAXIMUM_POSIX_KEY_VALUE_PAIRS
 notes: |
   This object class can be configured in unlimited allocation mode, see
diff --git a/spec/acfg/opt/maxposixkeys.yml b/spec/if/acfg/max-posix-keys.yml
index ddc078a7..5239647c 100644
--- a/spec/acfg/opt/maxposixkeys.yml
+++ b/spec/if/acfg/max-posix-keys.yml
@@ -14,11 +14,11 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../posix
+  uid: group-posix
 - role: constraint
-  uid: constraintunlimited
+  uid: constraint-unlimited
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_MAXIMUM_POSIX_KEYS
 notes: |
   This object class can be configured in unlimited allocation mode, see
diff --git a/spec/acfg/opt/maxposixmessagequeues.yml b/spec/if/acfg/max-posix-message-queues.yml
index c39db9f6..097871f8 100644
--- a/spec/acfg/opt/maxposixmessagequeues.yml
+++ b/spec/if/acfg/max-posix-message-queues.yml
@@ -14,13 +14,13 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../posix
+  uid: group-posix
 - role: constraint
-  uid: constraintunlimited
+  uid: constraint-unlimited
 - role: constraint
-  uid: constraintwkspace
+  uid: constraint-wkspace
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_MAXIMUM_POSIX_MESSAGE_QUEUES
 notes: |
   This object class can be configured in unlimited allocation mode, see
diff --git a/spec/acfg/opt/maxposixqueuedsignals.yml b/spec/if/acfg/max-posix-queued-signals.yml
index ba0e9468..541c8ffd 100644
--- a/spec/acfg/opt/maxposixqueuedsignals.yml
+++ b/spec/if/acfg/max-posix-queued-signals.yml
@@ -13,13 +13,13 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../posix
+  uid: group-posix
 - role: constraint
-  uid: constraintposix
+  uid: constraint-posix
 - role: constraint
-  uid: constraintwkspace
+  uid: constraint-wkspace
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS
 notes: |
   Unlimited objects are not available for queued signals.
diff --git a/spec/acfg/opt/maxposixsemaphores.yml b/spec/if/acfg/max-posix-semaphores.yml
index e0244016..5c313fee 100644
--- a/spec/acfg/opt/maxposixsemaphores.yml
+++ b/spec/if/acfg/max-posix-semaphores.yml
@@ -14,13 +14,13 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../posix
+  uid: group-posix
 - role: constraint
-  uid: constraintunlimited
+  uid: constraint-unlimited
 - role: constraint
-  uid: constraintwkspace
+  uid: constraint-wkspace
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_MAXIMUM_POSIX_SEMAPHORES
 notes: |
   This object class can be configured in unlimited allocation mode, see
diff --git a/spec/acfg/opt/maxposixshms.yml b/spec/if/acfg/max-posix-shms.yml
index 4e718cd5..d3f544a6 100644
--- a/spec/acfg/opt/maxposixshms.yml
+++ b/spec/if/acfg/max-posix-shms.yml
@@ -14,13 +14,13 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../posix
+  uid: group-posix
 - role: constraint
-  uid: constraintunlimited
+  uid: constraint-unlimited
 - role: constraint
-  uid: constraintwkspace
+  uid: constraint-wkspace
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_MAXIMUM_POSIX_SHMS
 notes: |
   This object class can be configured in unlimited allocation mode, see
diff --git a/spec/acfg/opt/maxposixthreads.yml b/spec/if/acfg/max-posix-threads.yml
index ab1cf7ab..0b314d5c 100644
--- a/spec/acfg/opt/maxposixthreads.yml
+++ b/spec/if/acfg/max-posix-threads.yml
@@ -14,11 +14,11 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../posix
+  uid: group-posix
 - role: constraint
-  uid: constraintstackspace
+  uid: constraint-stackspace
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_MAXIMUM_POSIX_THREADS
 notes: |
   This object class can be configured in unlimited allocation mode, see
diff --git a/spec/acfg/opt/maxposixtimers.yml b/spec/if/acfg/max-posix-timers.yml
index d3423bae..67b1056e 100644
--- a/spec/acfg/opt/maxposixtimers.yml
+++ b/spec/if/acfg/max-posix-timers.yml
@@ -14,13 +14,13 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../posix
+  uid: group-posix
 - role: constraint
-  uid: constraintposix
+  uid: constraint-posix
 - role: constraint
-  uid: constraintunlimited
+  uid: constraint-unlimited
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_MAXIMUM_POSIX_TIMERS
 notes: |
   This object class can be configured in unlimited allocation mode, see
diff --git a/spec/acfg/opt/maxpriority.yml b/spec/if/acfg/max-priority.yml
index 62d77bf6..9cd3f58a 100644
--- a/spec/acfg/opt/maxpriority.yml
+++ b/spec/if/acfg/max-priority.yml
@@ -35,7 +35,7 @@ index-entries:
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../schedgeneral
+  uid: group-schedgeneral
 name: CONFIGURE_MAXIMUM_PRIORITY
 notes: |
   The numerically greatest priority is the logically lowest priority in the
diff --git a/spec/acfg/opt/maxprocessors.yml b/spec/if/acfg/max-processors.yml
index 08129bf0..9341c97c 100644
--- a/spec/acfg/opt/maxprocessors.yml
+++ b/spec/if/acfg/max-processors.yml
@@ -17,7 +17,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../general
+  uid: group-general
 name: CONFIGURE_MAXIMUM_PROCESSORS
 notes: |
   If there are more processors available than configured, the rest will be
diff --git a/spec/acfg/opt/maxregions.yml b/spec/if/acfg/max-regions.yml
index 31c6f4c7..fe06f81f 100644
--- a/spec/acfg/opt/maxregions.yml
+++ b/spec/if/acfg/max-regions.yml
@@ -14,11 +14,11 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../classic
+  uid: group-classic
 - role: constraint
-  uid: constraintunlimited
+  uid: constraint-unlimited
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_MAXIMUM_REGIONS
 notes: |
   This object class can be configured in unlimited allocation mode, see
diff --git a/spec/acfg/opt/maxsemaphores.yml b/spec/if/acfg/max-semaphores.yml
index c7c0ff50..76798f34 100644
--- a/spec/acfg/opt/maxsemaphores.yml
+++ b/spec/if/acfg/max-semaphores.yml
@@ -14,11 +14,11 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../classic
+  uid: group-classic
 - role: constraint
-  uid: constraintunlimited
+  uid: constraint-unlimited
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_MAXIMUM_SEMAPHORES
 notes: |
   This object class can be configured in unlimited allocation mode, see
diff --git a/spec/acfg/opt/maxtasks.yml b/spec/if/acfg/max-tasks.yml
index bd48312f..45b00175 100644
--- a/spec/acfg/opt/maxtasks.yml
+++ b/spec/if/acfg/max-tasks.yml
@@ -14,13 +14,13 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../classic
+  uid: group-classic
 - role: constraint
-  uid: constraintunlimited
+  uid: constraint-unlimited
 - role: constraint
-  uid: constraintstackspace
+  uid: constraint-stackspace
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_MAXIMUM_TASKS
 notes: |
   This object class can be configured in unlimited allocation mode, see
diff --git a/spec/acfg/opt/maxthreadnamesize.yml b/spec/if/acfg/max-thread-name-size.yml
index d9328d22..e8f3c552 100644
--- a/spec/acfg/opt/maxthreadnamesize.yml
+++ b/spec/if/acfg/max-thread-name-size.yml
@@ -15,9 +15,9 @@ index-entries:
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../general
+  uid: group-general
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_MAXIMUM_THREAD_NAME_SIZE
 notes: |
   The default value was chosen for Linux compatibility, see
diff --git a/spec/acfg/opt/maxtimers.yml b/spec/if/acfg/max-timers.yml
index 82612892..0ecfe00f 100644
--- a/spec/acfg/opt/maxtimers.yml
+++ b/spec/if/acfg/max-timers.yml
@@ -14,11 +14,11 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../classic
+  uid: group-classic
 - role: constraint
-  uid: constraintunlimited
+  uid: constraint-unlimited
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_MAXIMUM_TIMERS
 notes: |
   This object class can be configured in unlimited allocation mode, see
diff --git a/spec/acfg/opt/maxuserextensions.yml b/spec/if/acfg/max-user-extensions.yml
index d3b244bd..c3b46807 100644
--- a/spec/acfg/opt/maxuserextensions.yml
+++ b/spec/if/acfg/max-user-extensions.yml
@@ -14,9 +14,9 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../classic
+  uid: group-classic
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_MAXIMUM_USER_EXTENSIONS
 notes: |
   This object class cannot be configured in unlimited allocation mode.
diff --git a/spec/acfg/opt/memoryoverhead.yml b/spec/if/acfg/memory-overhead.yml
index ab8996b9..a7a07757 100644
--- a/spec/acfg/opt/memoryoverhead.yml
+++ b/spec/if/acfg/memory-overhead.yml
@@ -14,11 +14,11 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../general
+  uid: group-general
 - role: constraint
-  uid: constraintwkspace
+  uid: constraint-wkspace
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_MEMORY_OVERHEAD
 notes: |
   This configuration option should only be used when it is suspected that a bug
diff --git a/spec/acfg/opt/messagebuffermemory.yml b/spec/if/acfg/message-buffer-memory.yml
index cf070a41..0f98d9d4 100644
--- a/spec/acfg/opt/messagebuffermemory.yml
+++ b/spec/if/acfg/message-buffer-memory.yml
@@ -16,11 +16,11 @@ index-entries:
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../general
+  uid: group-general
 - role: constraint
-  uid: constraintwkspace
+  uid: constraint-wkspace
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_MESSAGE_BUFFER_MEMORY
 notes: |
   The configuration options :ref:`CONFIGURE_MAXIMUM_MESSAGE_QUEUES` and
diff --git a/spec/acfg/opt/microsecondspertick.yml b/spec/if/acfg/microseconds-per-tick.yml
index 71689696..ee1480f1 100644
--- a/spec/acfg/opt/microsecondspertick.yml
+++ b/spec/if/acfg/microseconds-per-tick.yml
@@ -33,7 +33,7 @@ index-entries:
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../general
+  uid: group-general
 name: CONFIGURE_MICROSECONDS_PER_TICK
 notes: |
   This configuration option has no impact if the Clock Driver is not
diff --git a/spec/acfg/opt/minposixthreadstacksize.yml b/spec/if/acfg/min-posix-thread-stack-size.yml
index 8e1fbbd8..6a2e819f 100644
--- a/spec/acfg/opt/minposixthreadstacksize.yml
+++ b/spec/if/acfg/min-posix-thread-stack-size.yml
@@ -15,11 +15,11 @@ index-entries:
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../posix
+  uid: group-posix
 - role: constraint
-  uid: constraintbspappmin
+  uid: constraint-bspappmin
 - role: constraint
-  uid: constraintstackspace
+  uid: constraint-stackspace
 name: CONFIGURE_MINIMUM_POSIX_THREAD_STACK_SIZE
 notes: null
 text: ''
diff --git a/spec/acfg/opt/mintaskstacksize.yml b/spec/if/acfg/min-task-stack-size.yml
index 23980e50..b64b1ab4 100644
--- a/spec/acfg/opt/mintaskstacksize.yml
+++ b/spec/if/acfg/min-task-stack-size.yml
@@ -13,11 +13,11 @@ index-entries:
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../general
+  uid: group-general
 - role: constraint
-  uid: constraintbspappmin
+  uid: constraint-bspappmin
 - role: constraint
-  uid: constraintstackspace
+  uid: constraint-stackspace
 name: CONFIGURE_MINIMUM_TASK_STACK_SIZE
 notes: |
   Adjusting this parameter should be done with caution.  Examining the actual
diff --git a/spec/acfg/opt/mpappl.yml b/spec/if/acfg/mp-appl.yml
index bf88c1ae..2474a79b 100644
--- a/spec/acfg/opt/mpappl.yml
+++ b/spec/if/acfg/mp-appl.yml
@@ -14,7 +14,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../mpci
+  uid: group-mpci
 name: CONFIGURE_MP_APPLICATION
 notes: |
   This configuration option shall be undefined if the multiprocessing support
diff --git a/spec/acfg/opt/mpextraserverstack.yml b/spec/if/acfg/mp-extra-server-stack.yml
index 2f6a68bd..25f11bd8 100644
--- a/spec/acfg/opt/mpextraserverstack.yml
+++ b/spec/if/acfg/mp-extra-server-stack.yml
@@ -20,7 +20,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../mpci
+  uid: group-mpci
 name: CONFIGURE_EXTRA_MPCI_RECEIVE_SERVER_STACK
 notes: |
   This configuration option is only evaluated if
diff --git a/spec/acfg/opt/mpmaxglobalobjects.yml b/spec/if/acfg/mp-max-global-objects.yml
index 559125d5..f795d53a 100644
--- a/spec/acfg/opt/mpmaxglobalobjects.yml
+++ b/spec/if/acfg/mp-max-global-objects.yml
@@ -14,7 +14,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../mpci
+  uid: group-mpci
 name: CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS
 notes: |
   This value corresponds to the total number of objects which can be created
diff --git a/spec/acfg/opt/mpmaxnodes.yml b/spec/if/acfg/mp-max-nodes.yml
index a231a960..5342ea01 100644
--- a/spec/acfg/opt/mpmaxnodes.yml
+++ b/spec/if/acfg/mp-max-nodes.yml
@@ -14,7 +14,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../mpci
+  uid: group-mpci
 name: CONFIGURE_MP_MAXIMUM_NODES
 notes: |
   This configuration option is only evaluated if
diff --git a/spec/acfg/opt/mpmaxproxies.yml b/spec/if/acfg/mp-max-proxies.yml
index 4596be37..f20b5333 100644
--- a/spec/acfg/opt/mpmaxproxies.yml
+++ b/spec/if/acfg/mp-max-proxies.yml
@@ -15,7 +15,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../mpci
+  uid: group-mpci
 name: CONFIGURE_MP_MAXIMUM_PROXIES
 notes: |
   Since a proxy is used to represent a remote task/thread which is blocking
diff --git a/spec/acfg/opt/mpmpcitablepointer.yml b/spec/if/acfg/mp-mpci-table-pointer.yml
index 1b72e001..8d0f00cb 100644
--- a/spec/acfg/opt/mpmpcitablepointer.yml
+++ b/spec/if/acfg/mp-mpci-table-pointer.yml
@@ -16,7 +16,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../mpci
+  uid: group-mpci
 name: CONFIGURE_MP_MPCI_TABLE_POINTER
 notes: |
   RTEMS provides a Shared Memory MPCI Device Driver which can be used on any
diff --git a/spec/acfg/opt/mpnodenumber.yml b/spec/if/acfg/mp-node-number.yml
index ad55d8ee..1a51de4a 100644
--- a/spec/acfg/opt/mpnodenumber.yml
+++ b/spec/if/acfg/mp-node-number.yml
@@ -14,7 +14,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../mpci
+  uid: group-mpci
 name: CONFIGURE_MP_NODE_NUMBER
 notes: |
   In the RTEMS Multiprocessing Test Suite, the node number is derived from
diff --git a/spec/acfg/opt/posixinitthreadentrypoint.yml b/spec/if/acfg/posix-init-thread-entry-point.yml
index c17b2802..fca4e899 100644
--- a/spec/acfg/opt/posixinitthreadentrypoint.yml
+++ b/spec/if/acfg/posix-init-thread-entry-point.yml
@@ -16,7 +16,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../posixinit
+  uid: group-posixinit
 name: CONFIGURE_POSIX_INIT_THREAD_ENTRY_POINT
 notes: |
   The application shall provide the function referenced by this configuration
diff --git a/spec/acfg/opt/posixinitthreadstacksize.yml b/spec/if/acfg/posix-init-thread-stack-size.yml
index 06ff3e59..59a3ead4 100644
--- a/spec/acfg/opt/posixinitthreadstacksize.yml
+++ b/spec/if/acfg/posix-init-thread-stack-size.yml
@@ -13,9 +13,9 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../posixinit
+  uid: group-posixinit
 - role: constraint
-  uid: constraintstackspace
+  uid: constraint-stackspace
 name: CONFIGURE_POSIX_INIT_THREAD_STACK_SIZE
 notes: null
 text: ''
diff --git a/spec/acfg/opt/posixinitthreadtable.yml b/spec/if/acfg/posix-init-thread-table.yml
index 820ed2af..6a7d9250 100644
--- a/spec/acfg/opt/posixinitthreadtable.yml
+++ b/spec/if/acfg/posix-init-thread-table.yml
@@ -10,7 +10,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../posixinit
+  uid: group-posixinit
 name: CONFIGURE_POSIX_INIT_THREAD_TABLE
 notes: |
   The application shall define exactly one of the following configuration
diff --git a/spec/acfg/opt/recordextensionsenabled.yml b/spec/if/acfg/record-extensions-enabled.yml
index 6739a6e5..3486238b 100644
--- a/spec/acfg/opt/recordextensionsenabled.yml
+++ b/spec/if/acfg/record-extensions-enabled.yml
@@ -15,7 +15,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../eventrecord
+  uid: group-eventrecord
 name: CONFIGURE_RECORD_EXTENSIONS_ENABLED
 notes: |
   The record extensions capture thread create, start, restart, delete, switch,
diff --git a/spec/acfg/opt/recordfataldumpbase64zlib.yml b/spec/if/acfg/record-fatal-dump-base64-zlib.yml
index f67b55a5..731a6a72 100644
--- a/spec/acfg/opt/recordfataldumpbase64zlib.yml
+++ b/spec/if/acfg/record-fatal-dump-base64-zlib.yml
@@ -16,7 +16,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../eventrecord
+  uid: group-eventrecord
 name: CONFIGURE_RECORD_FATAL_DUMP_BASE64_ZLIB
 notes: |
   The zlib compression needs about 512KiB of RAM.  This extension can be used
diff --git a/spec/acfg/opt/recordfataldumpbase64.yml b/spec/if/acfg/record-fatal-dump-base64.yml
index 0fc87e72..14ab9517 100644
--- a/spec/acfg/opt/recordfataldumpbase64.yml
+++ b/spec/if/acfg/record-fatal-dump-base64.yml
@@ -18,7 +18,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../eventrecord
+  uid: group-eventrecord
 name: CONFIGURE_RECORD_FATAL_DUMP_BASE64
 notes: |
   This extension can be used to produce crash dumps.
diff --git a/spec/acfg/opt/recordperprocessoritems.yml b/spec/if/acfg/record-per-processor-items.yml
index c64f28d0..335c4fca 100644
--- a/spec/acfg/opt/recordperprocessoritems.yml
+++ b/spec/if/acfg/record-per-processor-items.yml
@@ -16,9 +16,9 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../eventrecord
+  uid: group-eventrecord
 - role: constraint
-  uid: constraintmemsz
+  uid: constraint-memsz
 name: CONFIGURE_RECORD_PER_PROCESSOR_ITEMS
 notes: |
   The event record buffers are statically allocated for each configured
diff --git a/spec/acfg/opt/rtemsinittaskstable.yml b/spec/if/acfg/rtems-init-tasks-table.yml
index e1eb8e74..24a35697 100644
--- a/spec/acfg/opt/rtemsinittaskstable.yml
+++ b/spec/if/acfg/rtems-init-tasks-table.yml
@@ -10,7 +10,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../classicinit
+  uid: group-classicinit
 name: CONFIGURE_RTEMS_INIT_TASKS_TABLE
 notes: |
   The application shall define exactly one of the following configuration
diff --git a/spec/acfg/opt/schedulerassignments.yml b/spec/if/acfg/scheduler-assignments.yml
index 22333f25..e678d6c3 100644
--- a/spec/acfg/opt/schedulerassignments.yml
+++ b/spec/if/acfg/scheduler-assignments.yml
@@ -25,7 +25,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../schedgeneral
+  uid: group-schedgeneral
 name: CONFIGURE_SCHEDULER_ASSIGNMENTS
 notes: |
   This configuration option is only evaluated in SMP configurations.
diff --git a/spec/acfg/opt/schedulercbs.yml b/spec/if/acfg/scheduler-cbs.yml
index 8c41a2d1..7431d659 100644
--- a/spec/acfg/opt/schedulercbs.yml
+++ b/spec/if/acfg/scheduler-cbs.yml
@@ -11,7 +11,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../schedgeneral
+  uid: group-schedgeneral
 name: CONFIGURE_SCHEDULER_CBS
 notes: |
   This scheduler configuration option is an advanced configuration option.
diff --git a/spec/acfg/opt/scheduleredfsmp.yml b/spec/if/acfg/scheduler-edf-smp.yml
index 893557e2..526b051c 100644
--- a/spec/acfg/opt/scheduleredfsmp.yml
+++ b/spec/if/acfg/scheduler-edf-smp.yml
@@ -11,7 +11,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../schedgeneral
+  uid: group-schedgeneral
 name: CONFIGURE_SCHEDULER_EDF_SMP
 notes: |
   This scheduler configuration option is an advanced configuration option.
diff --git a/spec/acfg/opt/scheduleredf.yml b/spec/if/acfg/scheduler-edf.yml
index 4e951b8b..36f89170 100644
--- a/spec/acfg/opt/scheduleredf.yml
+++ b/spec/if/acfg/scheduler-edf.yml
@@ -11,7 +11,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../schedgeneral
+  uid: group-schedgeneral
 name: CONFIGURE_SCHEDULER_EDF
 notes: |
   This scheduler configuration option is an advanced configuration option.
diff --git a/spec/acfg/opt/schedulername.yml b/spec/if/acfg/scheduler-name.yml
index ee6ef450..652fabe3 100644
--- a/spec/acfg/opt/schedulername.yml
+++ b/spec/if/acfg/scheduler-name.yml
@@ -33,7 +33,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../schedgeneral
+  uid: group-schedgeneral
 name: CONFIGURE_SCHEDULER_NAME
 notes: |
   This scheduler configuration option is an advanced configuration option.
diff --git a/spec/acfg/opt/schedulerpriorityaffinitysmp.yml b/spec/if/acfg/scheduler-priority-affinity-smp.yml
index 1bffc33e..5fce590c 100644
--- a/spec/acfg/opt/schedulerpriorityaffinitysmp.yml
+++ b/spec/if/acfg/scheduler-priority-affinity-smp.yml
@@ -11,7 +11,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../schedgeneral
+  uid: group-schedgeneral
 name: CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP
 notes: |
   This scheduler configuration option is an advanced configuration option.
diff --git a/spec/acfg/opt/schedulerprioritysmp.yml b/spec/if/acfg/scheduler-priority-smp.yml
index 4437e321..f23010bf 100644
--- a/spec/acfg/opt/schedulerprioritysmp.yml
+++ b/spec/if/acfg/scheduler-priority-smp.yml
@@ -11,7 +11,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../schedgeneral
+  uid: group-schedgeneral
 name: CONFIGURE_SCHEDULER_PRIORITY_SMP
 notes: |
   This scheduler configuration option is an advanced configuration option.
diff --git a/spec/acfg/opt/schedulerpriority.yml b/spec/if/acfg/scheduler-priority.yml
index 5194989b..4f991320 100644
--- a/spec/acfg/opt/schedulerpriority.yml
+++ b/spec/if/acfg/scheduler-priority.yml
@@ -12,7 +12,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../schedgeneral
+  uid: group-schedgeneral
 name: CONFIGURE_SCHEDULER_PRIORITY
 notes: |
   This scheduler configuration option is an advanced configuration option.
diff --git a/spec/acfg/opt/schedulersimplesmp.yml b/spec/if/acfg/scheduler-simple-smp.yml
index 475fe4c3..d3e0ac65 100644
--- a/spec/acfg/opt/schedulersimplesmp.yml
+++ b/spec/if/acfg/scheduler-simple-smp.yml
@@ -12,7 +12,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../schedgeneral
+  uid: group-schedgeneral
 name: CONFIGURE_SCHEDULER_SIMPLE_SMP
 notes: |
   This scheduler configuration option is an advanced configuration option.
diff --git a/spec/acfg/opt/schedulersimple.yml b/spec/if/acfg/scheduler-simple.yml
index 8bcad036..61e69517 100644
--- a/spec/acfg/opt/schedulersimple.yml
+++ b/spec/if/acfg/scheduler-simple.yml
@@ -11,7 +11,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../schedgeneral
+  uid: group-schedgeneral
 name: CONFIGURE_SCHEDULER_SIMPLE
 notes: |
   This scheduler configuration option is an advanced configuration option.
diff --git a/spec/acfg/opt/schedulerstrongapa.yml b/spec/if/acfg/scheduler-strong-apa.yml
index 79da3f2d..d4a98198 100644
--- a/spec/acfg/opt/schedulerstrongapa.yml
+++ b/spec/if/acfg/scheduler-strong-apa.yml
@@ -10,7 +10,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../schedgeneral
+  uid: group-schedgeneral
 name: CONFIGURE_SCHEDULER_STRONG_APA
 notes: |
   This scheduler configuration option is an advanced configuration option.
diff --git a/spec/acfg/opt/scheduleruser.yml b/spec/if/acfg/scheduler-user.yml
index b89ed608..b7967f1d 100644
--- a/spec/acfg/opt/scheduleruser.yml
+++ b/spec/if/acfg/scheduler-user.yml
@@ -11,7 +11,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../schedgeneral
+  uid: group-schedgeneral
 name: CONFIGURE_SCHEDULER_USER
 notes: |
   This scheduler configuration option is an advanced configuration option.
diff --git a/spec/acfg/opt/stackcheckerenabled.yml b/spec/if/acfg/stack-checker-enabled.yml
index c79bb811..ca0e55fc 100644
--- a/spec/acfg/opt/stackcheckerenabled.yml
+++ b/spec/if/acfg/stack-checker-enabled.yml
@@ -10,7 +10,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../general
+  uid: group-general
 name: CONFIGURE_STACK_CHECKER_ENABLED
 notes: |
   The stack checker performs run-time stack bounds checking.  This increases
diff --git a/spec/acfg/opt/taskstackallocatorinit.yml b/spec/if/acfg/task-stack-allocator-init.yml
index 88038ce5..139ecf27 100644
--- a/spec/acfg/opt/taskstackallocatorinit.yml
+++ b/spec/if/acfg/task-stack-allocator-init.yml
@@ -16,7 +16,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../stackalloc
+  uid: group-stackalloc
 name: CONFIGURE_TASK_STACK_ALLOCATOR_INIT
 notes: |
   A correctly configured system shall configure the following to be consistent:
diff --git a/spec/acfg/opt/taskstackallocator.yml b/spec/if/acfg/task-stack-allocator.yml
index f159990e..acedb118 100644
--- a/spec/acfg/opt/taskstackallocator.yml
+++ b/spec/if/acfg/task-stack-allocator.yml
@@ -19,7 +19,7 @@ index-entries:
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../stackalloc
+  uid: group-stackalloc
 name: CONFIGURE_TASK_STACK_ALLOCATOR
 notes: |
   A correctly configured system shall configure the following to be consistent:
diff --git a/spec/acfg/opt/taskstackdeallocator.yml b/spec/if/acfg/task-stack-deallocator.yml
index cd5febd5..50c21616 100644
--- a/spec/acfg/opt/taskstackdeallocator.yml
+++ b/spec/if/acfg/task-stack-deallocator.yml
@@ -19,7 +19,7 @@ index-entries:
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../stackalloc
+  uid: group-stackalloc
 name: CONFIGURE_TASK_STACK_DEALLOCATOR
 notes: |
   A correctly configured system shall configure the following to be consistent:
diff --git a/spec/acfg/opt/taskstackfromalloc.yml b/spec/if/acfg/task-stack-from-alloc.yml
index bd7d8faf..b9dc7390 100644
--- a/spec/acfg/opt/taskstackfromalloc.yml
+++ b/spec/if/acfg/task-stack-from-alloc.yml
@@ -21,7 +21,7 @@ index-entries:
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../stackalloc
+  uid: group-stackalloc
 name: CONFIGURE_TASK_STACK_FROM_ALLOCATOR
 notes: |
   This configuration option may be used if a custom task stack allocator is
diff --git a/spec/acfg/opt/taskstacknowkspace.yml b/spec/if/acfg/task-stack-no-workspace.yml
index 01f6e3f6..ab1c7693 100644
--- a/spec/acfg/opt/taskstacknowkspace.yml
+++ b/spec/if/acfg/task-stack-no-workspace.yml
@@ -10,7 +10,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../stackalloc
+  uid: group-stackalloc
 name: CONFIGURE_TASK_STACK_ALLOCATOR_AVOIDS_WORK_SPACE
 notes: |
   This configuration option may be used if a custom task stack allocator is
diff --git a/spec/acfg/opt/tickspertimeslice.yml b/spec/if/acfg/ticks-per-time-slice.yml
index 4af97fd0..24e5f0f8 100644
--- a/spec/acfg/opt/tickspertimeslice.yml
+++ b/spec/if/acfg/ticks-per-time-slice.yml
@@ -15,7 +15,7 @@ index-entries:
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../general
+  uid: group-general
 name: CONFIGURE_TICKS_PER_TIMESLICE
 notes: |
   This configuration option has no impact if the Clock Driver is not
diff --git a/spec/acfg/opt/unifiedworkareas.yml b/spec/if/acfg/unified-work-areas.yml
index 718e7797..1a99d8f1 100644
--- a/spec/acfg/opt/unifiedworkareas.yml
+++ b/spec/if/acfg/unified-work-areas.yml
@@ -17,7 +17,7 @@ index-entries:
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../general
+  uid: group-general
 name: CONFIGURE_UNIFIED_WORK_AREAS
 notes: |
   Having separate pools does have some advantages in the event a task blows a
diff --git a/spec/acfg/opt/unlimitedallocationsize.yml b/spec/if/acfg/unlimited-allocation-size.yml
index 3f24c4e4..d77027c1 100644
--- a/spec/acfg/opt/unlimitedallocationsize.yml
+++ b/spec/if/acfg/unlimited-allocation-size.yml
@@ -18,7 +18,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../general
+  uid: group-general
 name: CONFIGURE_UNLIMITED_ALLOCATION_SIZE
 notes: |
   By allowing users to declare all resources as being unlimited the user can
diff --git a/spec/acfg/opt/unlimitedobjects.yml b/spec/if/acfg/unlimited-objects.yml
index 4fac171c..74b0a1c5 100644
--- a/spec/acfg/opt/unlimitedobjects.yml
+++ b/spec/if/acfg/unlimited-objects.yml
@@ -10,7 +10,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../general
+  uid: group-general
 name: CONFIGURE_UNLIMITED_OBJECTS
 notes: |
   When using unlimited objects, it is common practice to also specify
diff --git a/spec/acfg/opt/usedevfsasbasefilesystem.yml b/spec/if/acfg/use-devfs-as-base-filesystem.yml
index 2b16a568..c6f25693 100644
--- a/spec/acfg/opt/usedevfsasbasefilesystem.yml
+++ b/spec/if/acfg/use-devfs-as-base-filesystem.yml
@@ -10,7 +10,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM
 notes: |
   In case this configuration option is defined, then the following
diff --git a/spec/acfg/opt/useminiimfsasbasefilesystem.yml b/spec/if/acfg/use-miniimfs-as-base-filesystem.yml
index 9cba255a..1d14e1b3 100644
--- a/spec/acfg/opt/useminiimfsasbasefilesystem.yml
+++ b/spec/if/acfg/use-miniimfs-as-base-filesystem.yml
@@ -10,7 +10,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../filesystem
+  uid: group-filesystem
 name: CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM
 notes: |
   In case this configuration option is defined, then the following
diff --git a/spec/acfg/opt/verbosesysteminit.yml b/spec/if/acfg/verbose-system-init.yml
index ad72c3df..f39cf1dd 100644
--- a/spec/acfg/opt/verbosesysteminit.yml
+++ b/spec/if/acfg/verbose-system-init.yml
@@ -10,7 +10,7 @@ index-entries: []
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../general
+  uid: group-general
 name: CONFIGURE_VERBOSE_SYSTEM_INITIALIZATION
 notes: |
   You may use this feature to debug system initialization issues.  The
diff --git a/spec/acfg/opt/zeroworkspaceautomatically.yml b/spec/if/acfg/zero-workspace-automatically.yml
index b505bd68..64acbcb7 100644
--- a/spec/acfg/opt/zeroworkspaceautomatically.yml
+++ b/spec/if/acfg/zero-workspace-automatically.yml
@@ -15,7 +15,7 @@ index-entries:
 interface-type: appl-config-option
 links:
 - role: appl-config-group-member
-  uid: ../general
+  uid: group-general
 name: CONFIGURE_ZERO_WORKSPACE_AUTOMATICALLY
 notes: |
   Zeroing memory can add significantly to the system initialization time. It is
diff --git a/spec/if/rtems/sem/create.yml b/spec/if/rtems/sem/create.yml
index d91eba5b..4aa50d33 100644
--- a/spec/if/rtems/sem/create.yml
+++ b/spec/if/rtems/sem/create.yml
@@ -120,7 +120,7 @@ notes: |
   system for insertion in the local copy of the global object table.
 
   The total number of global objects, including semaphores, is limited by the
-  ${/acfg/opt/mpmaxglobalobjects:/name} application configuration option.
+  ${/if/acfg/mp-max-global-objects:/name} application configuration option.
 
   It is not allowed to create an initially locked MrsP semaphore and the
   ${../status/invalid-number:/name} status code will be returned in SMP
@@ -173,7 +173,7 @@ return:
   - description: |
       There was no inactive semaphore object available to create a new
       semaphore.  The semaphore object maximum is defined by the
-      ${/acfg/opt/maxsemaphores:/name} application configuration option.
+      ${/if/acfg/max-semaphores:/name} application configuration option.
     value: ${../status/too-many:/name}
   - description: |
       In multiprocessing configurations, there was no inactive global object
diff --git a/spec/if/rtems/support/microseconds-to-ticks.yml b/spec/if/rtems/support/microseconds-to-ticks.yml
index 024656b1..10f11c8e 100644
--- a/spec/if/rtems/support/microseconds-to-ticks.yml
+++ b/spec/if/rtems/support/microseconds-to-ticks.yml
@@ -19,7 +19,7 @@ links:
 name: RTEMS_MICROSECONDS_TO_TICKS
 notes: |
   The number of clock ticks per second is defined by the
-  ${/acfg/opt/microsecondspertick:/name} application configuration option.
+  ${/if/acfg/microseconds-per-tick:/name} application configuration option.
 params:
 - description: is the microseconds value to convert to clock ticks.
   dir: null
diff --git a/spec/if/rtems/support/milliseconds-to-ticks.yml b/spec/if/rtems/support/milliseconds-to-ticks.yml
index c8c9cc13..26f5f8e6 100644
--- a/spec/if/rtems/support/milliseconds-to-ticks.yml
+++ b/spec/if/rtems/support/milliseconds-to-ticks.yml
@@ -19,7 +19,7 @@ links:
 name: RTEMS_MILLISECONDS_TO_TICKS
 notes: |
   The number of clock ticks per second is defined by the
-  ${/acfg/opt/microsecondspertick:/name} application configuration option.
+  ${/if/acfg/microseconds-per-tick:/name} application configuration option.
 params:
 - description: is the milliseconds value to convert to clock ticks.
   dir: null