From 4c20da4be441c519074df7d488d1e54354dac85b Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Thu, 4 Apr 2019 09:18:11 +0200
Subject: doxygen: Rename Score* groups in RTEMSScore*

Update #3706
---
 cpukit/include/rtems/score/address.h                      |  4 ++--
 cpukit/include/rtems/score/apimutex.h                     | 10 +++++-----
 cpukit/include/rtems/score/atomic.h                       |  6 +++---
 cpukit/include/rtems/score/basedefs.h                     |  6 +++---
 cpukit/include/rtems/score/chain.h                        |  6 +++---
 cpukit/include/rtems/score/chainimpl.h                    |  2 +-
 cpukit/include/rtems/score/context.h                      |  4 ++--
 cpukit/include/rtems/score/copyrt.h                       |  2 +-
 cpukit/include/rtems/score/corebarrier.h                  |  4 ++--
 cpukit/include/rtems/score/corebarrierimpl.h              |  2 +-
 cpukit/include/rtems/score/coremsg.h                      |  4 ++--
 cpukit/include/rtems/score/coremsgimpl.h                  |  2 +-
 cpukit/include/rtems/score/coremutex.h                    |  4 ++--
 cpukit/include/rtems/score/coremuteximpl.h                |  4 ++--
 cpukit/include/rtems/score/corerwlockimpl.h               |  4 ++--
 cpukit/include/rtems/score/coresem.h                      |  4 ++--
 cpukit/include/rtems/score/coresemimpl.h                  |  2 +-
 cpukit/include/rtems/score/freechain.h                    |  6 +++---
 cpukit/include/rtems/score/heap.h                         |  6 +++---
 cpukit/include/rtems/score/heapimpl.h                     |  4 ++--
 cpukit/include/rtems/score/heapinfo.h                     |  4 ++--
 cpukit/include/rtems/score/interr.h                       |  4 ++--
 cpukit/include/rtems/score/isr.h                          |  4 ++--
 cpukit/include/rtems/score/isrlevel.h                     |  2 +-
 cpukit/include/rtems/score/isrlock.h                      |  6 +++---
 cpukit/include/rtems/score/mpci.h                         |  6 +++---
 cpukit/include/rtems/score/mpciimpl.h                     |  4 ++--
 cpukit/include/rtems/score/mppkt.h                        |  4 ++--
 cpukit/include/rtems/score/mrsp.h                         |  4 ++--
 cpukit/include/rtems/score/mrspimpl.h                     |  2 +-
 cpukit/include/rtems/score/object.h                       |  8 ++++----
 cpukit/include/rtems/score/objectdata.h                   |  4 ++--
 cpukit/include/rtems/score/objectimpl.h                   |  2 +-
 cpukit/include/rtems/score/objectmp.h                     |  4 ++--
 cpukit/include/rtems/score/onceimpl.h                     |  6 +++---
 cpukit/include/rtems/score/percpu.h                       |  2 +-
 cpukit/include/rtems/score/priority.h                     |  4 ++--
 cpukit/include/rtems/score/prioritybitmap.h               |  4 ++--
 cpukit/include/rtems/score/prioritybitmapimpl.h           |  2 +-
 cpukit/include/rtems/score/processormask.h                |  6 +++---
 cpukit/include/rtems/score/profiling.h                    |  6 +++---
 cpukit/include/rtems/score/protectedheap.h                |  6 +++---
 cpukit/include/rtems/score/rbtree.h                       |  4 ++--
 cpukit/include/rtems/score/rbtreeimpl.h                   |  2 +-
 cpukit/include/rtems/score/scheduler.h                    |  4 ++--
 cpukit/include/rtems/score/schedulercbs.h                 |  4 ++--
 cpukit/include/rtems/score/schedulercbsimpl.h             |  4 ++--
 cpukit/include/rtems/score/scheduleredf.h                 |  4 ++--
 cpukit/include/rtems/score/scheduleredfimpl.h             |  4 ++--
 cpukit/include/rtems/score/scheduleredfsmp.h              |  6 +++---
 cpukit/include/rtems/score/schedulerimpl.h                |  2 +-
 cpukit/include/rtems/score/schedulerpriority.h            |  4 ++--
 cpukit/include/rtems/score/schedulerpriorityaffinitysmp.h |  6 +++---
 cpukit/include/rtems/score/schedulerpriorityimpl.h        |  2 +-
 cpukit/include/rtems/score/schedulerprioritysmp.h         |  6 +++---
 cpukit/include/rtems/score/schedulerprioritysmpimpl.h     |  4 ++--
 cpukit/include/rtems/score/schedulersimple.h              |  4 ++--
 cpukit/include/rtems/score/schedulersimpleimpl.h          |  2 +-
 cpukit/include/rtems/score/schedulersimplesmp.h           |  6 +++---
 cpukit/include/rtems/score/schedulersmp.h                 |  6 +++---
 cpukit/include/rtems/score/schedulersmpimpl.h             |  4 ++--
 cpukit/include/rtems/score/schedulerstrongapa.h           |  6 +++---
 cpukit/include/rtems/score/smp.h                          |  6 +++---
 cpukit/include/rtems/score/smpbarrier.h                   |  6 +++---
 cpukit/include/rtems/score/smpimpl.h                      |  4 ++--
 cpukit/include/rtems/score/smplock.h                      |  6 +++---
 cpukit/include/rtems/score/smplockmcs.h                   |  4 ++--
 cpukit/include/rtems/score/smplockseq.h                   |  4 ++--
 cpukit/include/rtems/score/smplockstats.h                 |  4 ++--
 cpukit/include/rtems/score/smplockticket.h                |  4 ++--
 cpukit/include/rtems/score/stack.h                        |  4 ++--
 cpukit/include/rtems/score/stackimpl.h                    |  2 +-
 cpukit/include/rtems/score/states.h                       |  4 ++--
 cpukit/include/rtems/score/statesimpl.h                   |  2 +-
 cpukit/include/rtems/score/sysstate.h                     |  6 +++---
 cpukit/include/rtems/score/thread.h                       |  4 ++--
 cpukit/include/rtems/score/threaddispatch.h               |  2 +-
 cpukit/include/rtems/score/threadimpl.h                   |  2 +-
 cpukit/include/rtems/score/threadmp.h                     |  4 ++--
 cpukit/include/rtems/score/threadq.h                      |  4 ++--
 cpukit/include/rtems/score/threadqimpl.h                  |  2 +-
 cpukit/include/rtems/score/timecounter.h                  |  6 +++---
 cpukit/include/rtems/score/timecounterimpl.h              |  4 ++--
 cpukit/include/rtems/score/timespec.h                     |  2 +-
 cpukit/include/rtems/score/timestamp.h                    |  2 +-
 cpukit/include/rtems/score/tls.h                          |  6 +++---
 cpukit/include/rtems/score/todimpl.h                      |  8 ++++----
 cpukit/include/rtems/score/userext.h                      |  6 +++---
 cpukit/include/rtems/score/userextdata.h                  |  4 ++--
 cpukit/include/rtems/score/userextimpl.h                  |  4 ++--
 cpukit/include/rtems/score/watchdog.h                     |  6 +++---
 cpukit/include/rtems/score/watchdogimpl.h                 |  2 +-
 cpukit/include/rtems/score/watchdogticks.h                |  4 ++--
 cpukit/include/rtems/score/wkspace.h                      |  4 ++--
 cpukit/include/rtems/seterr.h                             |  4 ++--
 cpukit/include/rtems/system.h                             |  4 ++--
 96 files changed, 202 insertions(+), 202 deletions(-)

(limited to 'cpukit/include/rtems')

diff --git a/cpukit/include/rtems/score/address.h b/cpukit/include/rtems/score/address.h
index 28502e25e4..5fc5976599 100644
--- a/cpukit/include/rtems/score/address.h
+++ b/cpukit/include/rtems/score/address.h
@@ -26,9 +26,9 @@ extern "C" {
 #endif
 
 /**
- *  @defgroup ScoreAddress Address Handler
+ *  @defgroup RTEMSScoreAddress Address Handler
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  This handler encapsulates functionality which abstracts address
  *  manipulation in a portable manner.
diff --git a/cpukit/include/rtems/score/apimutex.h b/cpukit/include/rtems/score/apimutex.h
index f43edf23f4..a5aa2bf3c5 100644
--- a/cpukit/include/rtems/score/apimutex.h
+++ b/cpukit/include/rtems/score/apimutex.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreAPIMutex
+ * @ingroup RTEMSScoreAPIMutex
  *
  * @brief API Mutex Handler API
  */
@@ -23,9 +23,9 @@
 #include <sys/lock.h>
 
 /**
- * @defgroup ScoreAPIMutex API Mutex Handler
+ * @defgroup RTEMSScoreAPIMutex API Mutex Handler
  *
- * @ingroup Score
+ * @ingroup RTEMSScore
  *
  * @brief Provides routines to ensure mutual exclusion on API level.
  */
@@ -81,9 +81,9 @@ bool _API_Mutex_Is_owner( const API_Mutex_Control *mutex );
 /** @} */
 
 /**
- * @defgroup ScoreAllocatorMutex RTEMS Allocator Mutex
+ * @defgroup RTEMSScoreAllocatorMutex RTEMS Allocator Mutex
  *
- * @ingroup ScoreAPIMutex
+ * @ingroup RTEMSScoreAPIMutex
  *
  * @brief Protection for all memory allocations and deallocations in RTEMS.
  *
diff --git a/cpukit/include/rtems/score/atomic.h b/cpukit/include/rtems/score/atomic.h
index 526926926f..f7d8b99af4 100644
--- a/cpukit/include/rtems/score/atomic.h
+++ b/cpukit/include/rtems/score/atomic.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreAtomic
+ * @ingroup RTEMSScoreAtomic
  *
  * @brief Atomic Operations API
  */
@@ -20,9 +20,9 @@
 #include <rtems/score/cpuatomic.h>
 
 /**
- * @defgroup ScoreAtomic Atomic Operations
+ * @defgroup RTEMSScoreAtomic Atomic Operations
  *
- * @ingroup Score
+ * @ingroup RTEMSScore
  *
  * @brief Support for atomic operations.
  *
diff --git a/cpukit/include/rtems/score/basedefs.h b/cpukit/include/rtems/score/basedefs.h
index e4846816f4..770865bb80 100644
--- a/cpukit/include/rtems/score/basedefs.h
+++ b/cpukit/include/rtems/score/basedefs.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup Score
+ * @ingroup RTEMSScore
  *
  * @brief Basic Definitions
  */
@@ -21,9 +21,9 @@
 #define _RTEMS_BASEDEFS_H
 
 /**
- *  @defgroup ScoreBaseDefs Basic Definitions
+ *  @defgroup RTEMSScoreBaseDefs Basic Definitions
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  */
 /**@{*/
 
diff --git a/cpukit/include/rtems/score/chain.h b/cpukit/include/rtems/score/chain.h
index e358262e6e..0c905d5016 100644
--- a/cpukit/include/rtems/score/chain.h
+++ b/cpukit/include/rtems/score/chain.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreChain
+ * @ingroup RTEMSScoreChain
  *
  * @brief Chain Handler API
  */
@@ -25,9 +25,9 @@ extern "C" {
 #endif
 
 /**
- *  @defgroup ScoreChain Chain Handler
+ *  @defgroup RTEMSScoreChain Chain Handler
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  The Chain Handler is used to manage sets of entities.  This handler
  *  provides two data structures.  The Chain Node data structure is included
diff --git a/cpukit/include/rtems/score/chainimpl.h b/cpukit/include/rtems/score/chainimpl.h
index 1c32ecc530..0b9c193044 100644
--- a/cpukit/include/rtems/score/chainimpl.h
+++ b/cpukit/include/rtems/score/chainimpl.h
@@ -26,7 +26,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup ScoreChain
+ * @addtogroup RTEMSScoreChain
  */
 /**@{**/
 
diff --git a/cpukit/include/rtems/score/context.h b/cpukit/include/rtems/score/context.h
index 317575538a..1b23d9682a 100644
--- a/cpukit/include/rtems/score/context.h
+++ b/cpukit/include/rtems/score/context.h
@@ -19,9 +19,9 @@
 #define _RTEMS_SCORE_CONTEXT_H
 
 /**
- *  @defgroup ScoreContext Context Handler
+ *  @defgroup RTEMSScoreContext Context Handler
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  This handler encapsulates functionality which abstracts thread context
  *  management in a portable manner.
diff --git a/cpukit/include/rtems/score/copyrt.h b/cpukit/include/rtems/score/copyrt.h
index 8647bd9d0d..02f95010ae 100644
--- a/cpukit/include/rtems/score/copyrt.h
+++ b/cpukit/include/rtems/score/copyrt.h
@@ -22,7 +22,7 @@
 /**
  *  @defgroup SuperCoreCopyright RTEMS Copyright Notice
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  */
 /**@{*/
 
diff --git a/cpukit/include/rtems/score/corebarrier.h b/cpukit/include/rtems/score/corebarrier.h
index 785c7729a3..73872cbfa8 100644
--- a/cpukit/include/rtems/score/corebarrier.h
+++ b/cpukit/include/rtems/score/corebarrier.h
@@ -26,9 +26,9 @@ extern "C" {
 #endif
 
 /**
- *  @defgroup ScoreBarrier Barrier Handler
+ *  @defgroup RTEMSScoreBarrier Barrier Handler
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  This handler encapsulates functionality which provides the foundation
  *  Barrier services used in all of the APIs supported by RTEMS.
diff --git a/cpukit/include/rtems/score/corebarrierimpl.h b/cpukit/include/rtems/score/corebarrierimpl.h
index d5d63659d0..48061e6fe8 100644
--- a/cpukit/include/rtems/score/corebarrierimpl.h
+++ b/cpukit/include/rtems/score/corebarrierimpl.h
@@ -28,7 +28,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup ScoreBarrier
+ * @addtogroup RTEMSScoreBarrier
  */
 /**@{**/
 
diff --git a/cpukit/include/rtems/score/coremsg.h b/cpukit/include/rtems/score/coremsg.h
index 90bf9d8a9e..e2dd14bd24 100644
--- a/cpukit/include/rtems/score/coremsg.h
+++ b/cpukit/include/rtems/score/coremsg.h
@@ -29,9 +29,9 @@ extern "C" {
 #endif
 
 /**
- *  @defgroup ScoreMessageQueue Message Queue Handler
+ *  @defgroup RTEMSScoreMessageQueue Message Queue Handler
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  This handler encapsulates functionality which provides the foundation
  *  Message Queue services used in all of the APIs supported by RTEMS.
diff --git a/cpukit/include/rtems/score/coremsgimpl.h b/cpukit/include/rtems/score/coremsgimpl.h
index e33e3308b2..bb90797e96 100644
--- a/cpukit/include/rtems/score/coremsgimpl.h
+++ b/cpukit/include/rtems/score/coremsgimpl.h
@@ -33,7 +33,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup ScoreMessageQueue
+ * @addtogroup RTEMSScoreMessageQueue
  */
 /**@{**/
 
diff --git a/cpukit/include/rtems/score/coremutex.h b/cpukit/include/rtems/score/coremutex.h
index fd1f27c697..447eafb913 100644
--- a/cpukit/include/rtems/score/coremutex.h
+++ b/cpukit/include/rtems/score/coremutex.h
@@ -34,9 +34,9 @@ extern "C" {
 #endif
 
 /**
- *  @defgroup ScoreMutex Mutex Handler
+ *  @defgroup RTEMSScoreMutex Mutex Handler
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  This handler encapsulates functionality which provides the foundation
  *  Mutex services used in all of the APIs supported by RTEMS.
diff --git a/cpukit/include/rtems/score/coremuteximpl.h b/cpukit/include/rtems/score/coremuteximpl.h
index 78fafca6e1..85cff5510f 100644
--- a/cpukit/include/rtems/score/coremuteximpl.h
+++ b/cpukit/include/rtems/score/coremuteximpl.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreMutex
+ * @ingroup RTEMSScoreMutex
  *
  * @brief CORE Mutex Implementation
  */
@@ -30,7 +30,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup ScoreMutex
+ * @addtogroup RTEMSScoreMutex
  */
 /**@{**/
 
diff --git a/cpukit/include/rtems/score/corerwlockimpl.h b/cpukit/include/rtems/score/corerwlockimpl.h
index 3c376c9793..508879d022 100644
--- a/cpukit/include/rtems/score/corerwlockimpl.h
+++ b/cpukit/include/rtems/score/corerwlockimpl.h
@@ -26,9 +26,9 @@
 #include <rtems/score/watchdog.h>
 
 /**
- * @defgroup ScoreRWLock ScoreRWLock
+ * @defgroup RTEMSScoreRWLock ScoreRWLock
  * 
- * @ingroup Score
+ * @ingroup RTEMSScore
  * 
  * @brief ScoreRWLock
  */
diff --git a/cpukit/include/rtems/score/coresem.h b/cpukit/include/rtems/score/coresem.h
index 4df7b6c49a..b44daf56aa 100644
--- a/cpukit/include/rtems/score/coresem.h
+++ b/cpukit/include/rtems/score/coresem.h
@@ -28,9 +28,9 @@ extern "C" {
 #endif
 
 /**
- *  @defgroup ScoreSemaphore Semaphore Handler
+ *  @defgroup RTEMSScoreSemaphore Semaphore Handler
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  This handler encapsulates functionality which provides the foundation
  *  Semaphore services used in all of the APIs supported by RTEMS.
diff --git a/cpukit/include/rtems/score/coresemimpl.h b/cpukit/include/rtems/score/coresemimpl.h
index 00f77e61dd..661a213f85 100644
--- a/cpukit/include/rtems/score/coresemimpl.h
+++ b/cpukit/include/rtems/score/coresemimpl.h
@@ -32,7 +32,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup ScoreSemaphore
+ * @addtogroup RTEMSScoreSemaphore
  */
 /**@{**/
 
diff --git a/cpukit/include/rtems/score/freechain.h b/cpukit/include/rtems/score/freechain.h
index 6282178347..6b1a15476c 100644
--- a/cpukit/include/rtems/score/freechain.h
+++ b/cpukit/include/rtems/score/freechain.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreFreechain
+ * @ingroup RTEMSScoreFreechain
  *
  * @brief Freechain Handler API
  */
@@ -24,9 +24,9 @@ extern "C" {
 #endif
 
 /**
- * @defgroup ScoreFreechain Freechain Handler
+ * @defgroup RTEMSScoreFreechain Freechain Handler
  *
- * @ingroup Score
+ * @ingroup RTEMSScore
  *
  * The Freechain Handler is used to manage a chain of nodes, of which size can
  * automatically increase when there is no free node left. This handler
diff --git a/cpukit/include/rtems/score/heap.h b/cpukit/include/rtems/score/heap.h
index a9d75e7a86..c7c80a07d5 100644
--- a/cpukit/include/rtems/score/heap.h
+++ b/cpukit/include/rtems/score/heap.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
  *
  * @brief Heap Handler API
  */
@@ -30,9 +30,9 @@ extern "C" {
 #endif
 
 /**
- * @defgroup ScoreHeap Heap Handler
+ * @defgroup RTEMSScoreHeap Heap Handler
  *
- * @ingroup Score
+ * @ingroup RTEMSScore
  *
  * @brief The Heap Handler provides a heap.
  *
diff --git a/cpukit/include/rtems/score/heapimpl.h b/cpukit/include/rtems/score/heapimpl.h
index a8948edd6f..12da2defea 100644
--- a/cpukit/include/rtems/score/heapimpl.h
+++ b/cpukit/include/rtems/score/heapimpl.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
  *
  * @brief Heap Handler Implementation
  */
@@ -25,7 +25,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup ScoreHeap
+ * @addtogroup RTEMSScoreHeap
  */
 /**@{**/
 
diff --git a/cpukit/include/rtems/score/heapinfo.h b/cpukit/include/rtems/score/heapinfo.h
index 1f84387304..078cc69364 100644
--- a/cpukit/include/rtems/score/heapinfo.h
+++ b/cpukit/include/rtems/score/heapinfo.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
  *
  * @brief Heap Handler Information API
  */
@@ -25,7 +25,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup ScoreHeap
+ * @addtogroup RTEMSScoreHeap
  *
  * @{
  */
diff --git a/cpukit/include/rtems/score/interr.h b/cpukit/include/rtems/score/interr.h
index 16f3907b05..109b2a519b 100644
--- a/cpukit/include/rtems/score/interr.h
+++ b/cpukit/include/rtems/score/interr.h
@@ -22,9 +22,9 @@
 #include <rtems/score/cpu.h>
 
 /**
- *  @defgroup ScoreIntErr Internal Error Handler
+ *  @defgroup RTEMSScoreIntErr Internal Error Handler
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  This handler encapsulates functionality which provides the foundation
  *  Semaphore services used in all of the APIs supported by RTEMS.
diff --git a/cpukit/include/rtems/score/isr.h b/cpukit/include/rtems/score/isr.h
index 0d6f2a21ee..d29fc7f147 100644
--- a/cpukit/include/rtems/score/isr.h
+++ b/cpukit/include/rtems/score/isr.h
@@ -24,9 +24,9 @@
 #include <rtems/score/isrlevel.h>
 
 /**
- *  @defgroup ScoreISR ISR Handler
+ *  @defgroup RTEMSScoreISR ISR Handler
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  This handler encapsulates functionality which provides the foundation
  *  ISR services used in all of the APIs supported by RTEMS.
diff --git a/cpukit/include/rtems/score/isrlevel.h b/cpukit/include/rtems/score/isrlevel.h
index aadce022e6..9340706f22 100644
--- a/cpukit/include/rtems/score/isrlevel.h
+++ b/cpukit/include/rtems/score/isrlevel.h
@@ -27,7 +27,7 @@ extern "C" {
 #endif
 
 /**
- *  @addtogroup ScoreISR ISR Handler
+ *  @addtogroup RTEMSScoreISR ISR Handler
  */
 /** @{ */
 
diff --git a/cpukit/include/rtems/score/isrlock.h b/cpukit/include/rtems/score/isrlock.h
index 8e13e27eff..b1aea62bf0 100644
--- a/cpukit/include/rtems/score/isrlock.h
+++ b/cpukit/include/rtems/score/isrlock.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreISRLocks
+ * @ingroup RTEMSScoreISRLocks
  *
  * @brief ISR Locks
  */
@@ -31,9 +31,9 @@ extern "C" {
 #endif
 
 /**
- * @defgroup ScoreISRLocks ISR Locks
+ * @defgroup RTEMSScoreISRLocks ISR Locks
  *
- * @ingroup ScoreISR
+ * @ingroup RTEMSScoreISR
  *
  * @brief Low-level lock to protect critical sections accessed by threads and
  * interrupt service routines.
diff --git a/cpukit/include/rtems/score/mpci.h b/cpukit/include/rtems/score/mpci.h
index c20b45c3e1..2c04b288f9 100644
--- a/cpukit/include/rtems/score/mpci.h
+++ b/cpukit/include/rtems/score/mpci.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreMPCI
+ * @ingroup RTEMSScoreMPCI
  *
  * @brief MPCI Layer API
  */
@@ -28,9 +28,9 @@ extern "C" {
 #endif
 
 /**
- *  @defgroup ScoreMPCI MPCI Handler
+ *  @defgroup RTEMSScoreMPCI MPCI Handler
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  The MPCI Handler encapsulates functionality which is related to the
  *  generation, receipt, and processing of remote operations in a
diff --git a/cpukit/include/rtems/score/mpciimpl.h b/cpukit/include/rtems/score/mpciimpl.h
index eb03a1d7b3..4565e81eac 100644
--- a/cpukit/include/rtems/score/mpciimpl.h
+++ b/cpukit/include/rtems/score/mpciimpl.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreMPCI
+ * @ingroup RTEMSScoreMPCI
  *
  * @brief MPCI Layer Implementation
  */
@@ -26,7 +26,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup ScoreMPCI
+ * @addtogroup RTEMSScoreMPCI
  *
  * @{
  */
diff --git a/cpukit/include/rtems/score/mppkt.h b/cpukit/include/rtems/score/mppkt.h
index 74d7e3d55b..12bda1b8ca 100644
--- a/cpukit/include/rtems/score/mppkt.h
+++ b/cpukit/include/rtems/score/mppkt.h
@@ -31,9 +31,9 @@ extern "C" {
 #endif
 
 /**
- *  @defgroup ScoreMPPacket MP Packet Handler
+ *  @defgroup RTEMSScoreMPPacket MP Packet Handler
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  This handler encapsulates the primary definition of MPCI packets.  This
  *  handler defines the part of the packet that is common to all remote
diff --git a/cpukit/include/rtems/score/mrsp.h b/cpukit/include/rtems/score/mrsp.h
index 85cbff784f..4d67b272dd 100644
--- a/cpukit/include/rtems/score/mrsp.h
+++ b/cpukit/include/rtems/score/mrsp.h
@@ -26,9 +26,9 @@ extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @defgroup ScoreMRSP Multiprocessor Resource Sharing Protocol Handler
+ * @defgroup RTEMSScoreMRSP Multiprocessor Resource Sharing Protocol Handler
  *
- * @ingroup Score
+ * @ingroup RTEMSScore
  *
  * @brief Multiprocessor Resource Sharing Protocol (MrsP).
  *
diff --git a/cpukit/include/rtems/score/mrspimpl.h b/cpukit/include/rtems/score/mrspimpl.h
index b9c7441401..da3cee3e16 100644
--- a/cpukit/include/rtems/score/mrspimpl.h
+++ b/cpukit/include/rtems/score/mrspimpl.h
@@ -30,7 +30,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @addtogroup ScoreMRSP
+ * @addtogroup RTEMSScoreMRSP
  *
  * @{
  */
diff --git a/cpukit/include/rtems/score/object.h b/cpukit/include/rtems/score/object.h
index eb21382c16..3f3e1b84dd 100644
--- a/cpukit/include/rtems/score/object.h
+++ b/cpukit/include/rtems/score/object.h
@@ -28,7 +28,7 @@ extern "C" {
 #endif
 
 /**
- * @defgroup Score SuperCore
+ * @defgroup RTEMSScore SuperCore
  *
  * @ingroup RTEMSInternal
  *
@@ -39,16 +39,16 @@ extern "C" {
 /**
  * @defgroup RTEMSScoreCPU CPU Architecture Support
  *
- * @ingroup Score
+ * @ingroup RTEMSScore
  *
  * @brief Provides CPU architecture dependent services.
  */
 /**@{*/
 
 /**
- *  @defgroup ScoreObject Object Handler
+ *  @defgroup RTEMSScoreObject Object Handler
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  */
 /**@{*/
 
diff --git a/cpukit/include/rtems/score/objectdata.h b/cpukit/include/rtems/score/objectdata.h
index 528089892d..f6ece16c0e 100644
--- a/cpukit/include/rtems/score/objectdata.h
+++ b/cpukit/include/rtems/score/objectdata.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreObject
+ * @ingroup RTEMSScoreObject
  *
  * @brief Object Handler Data Structures
  */
@@ -27,7 +27,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup ScoreObject
+ * @addtogroup RTEMSScoreObject
  *
  * @{
  */
diff --git a/cpukit/include/rtems/score/objectimpl.h b/cpukit/include/rtems/score/objectimpl.h
index c5a315e57f..9c8b9ce626 100644
--- a/cpukit/include/rtems/score/objectimpl.h
+++ b/cpukit/include/rtems/score/objectimpl.h
@@ -29,7 +29,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup ScoreObject
+ * @addtogroup RTEMSScoreObject
  *
  * @{
  */
diff --git a/cpukit/include/rtems/score/objectmp.h b/cpukit/include/rtems/score/objectmp.h
index d52b83fdff..c32d88545b 100644
--- a/cpukit/include/rtems/score/objectmp.h
+++ b/cpukit/include/rtems/score/objectmp.h
@@ -30,9 +30,9 @@ extern "C" {
 #endif
 
 /**
- *  @defgroup ScoreObjectMP Object Handler Multiprocessing Support
+ *  @defgroup RTEMSScoreObjectMP Object Handler Multiprocessing Support
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  This handler encapsulates functionality which is used to manage
  *  objects which have been declared to be globally visible.  This handler
diff --git a/cpukit/include/rtems/score/onceimpl.h b/cpukit/include/rtems/score/onceimpl.h
index f3afe1cd13..eee318982f 100644
--- a/cpukit/include/rtems/score/onceimpl.h
+++ b/cpukit/include/rtems/score/onceimpl.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreOnce
+ * @ingroup RTEMSScoreOnce
  *
  * @brief Once API
  */
@@ -30,9 +30,9 @@ extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @defgroup ScoreOnce Once Functions.
+ * @defgroup RTEMSScoreOnce Once Functions.
  *
- * @ingroup Score
+ * @ingroup RTEMSScore
  *
  * @brief The _Once() function for pthread_once() and rtems_gxx_once().
  *
diff --git a/cpukit/include/rtems/score/percpu.h b/cpukit/include/rtems/score/percpu.h
index b9f23ac394..26ae8c68d0 100644
--- a/cpukit/include/rtems/score/percpu.h
+++ b/cpukit/include/rtems/score/percpu.h
@@ -78,7 +78,7 @@ struct Scheduler_Context;
 /**
  *  @defgroup PerCPU RTEMS Per CPU Information
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  This defines the per CPU state information required by RTEMS
  *  and the BSP.  In an SMP configuration, there will be multiple
diff --git a/cpukit/include/rtems/score/priority.h b/cpukit/include/rtems/score/priority.h
index 7a8ddba763..a5df551209 100644
--- a/cpukit/include/rtems/score/priority.h
+++ b/cpukit/include/rtems/score/priority.h
@@ -29,9 +29,9 @@ extern "C" {
 #endif
 
 /**
- * @defgroup ScorePriority Priority Handler
+ * @defgroup RTEMSScorePriority Priority Handler
  *
- * @ingroup Score
+ * @ingroup RTEMSScore
  *
  * This handler encapsulates functionality which is used to manage thread
  * priorities.  The actual priority of a thread is an aggregation of priority
diff --git a/cpukit/include/rtems/score/prioritybitmap.h b/cpukit/include/rtems/score/prioritybitmap.h
index ac769c1ea4..b6b566dfa9 100644
--- a/cpukit/include/rtems/score/prioritybitmap.h
+++ b/cpukit/include/rtems/score/prioritybitmap.h
@@ -26,9 +26,9 @@ extern "C" {
 #endif
 
 /**
- *  @defgroup ScorePriorityBitmap Bitmap Priority Thread Routines
+ *  @defgroup RTEMSScorePriorityBitmap Bitmap Priority Thread Routines
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  */
 /**@{*/
 
diff --git a/cpukit/include/rtems/score/prioritybitmapimpl.h b/cpukit/include/rtems/score/prioritybitmapimpl.h
index 82c92eb5d6..58e168dbb0 100644
--- a/cpukit/include/rtems/score/prioritybitmapimpl.h
+++ b/cpukit/include/rtems/score/prioritybitmapimpl.h
@@ -28,7 +28,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup ScorePriority
+ * @addtogroup RTEMSScorePriority
  */
 /**@{**/
 
diff --git a/cpukit/include/rtems/score/processormask.h b/cpukit/include/rtems/score/processormask.h
index a06aa2a56b..ce87e9926b 100644
--- a/cpukit/include/rtems/score/processormask.h
+++ b/cpukit/include/rtems/score/processormask.h
@@ -3,7 +3,7 @@
  *
  * @brief Processor Mask API
  *
- * @ingroup ScoreProcessorMask
+ * @ingroup RTEMSScoreProcessorMask
  */
 
 /*
@@ -34,9 +34,9 @@ extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @defgroup ScoreProcessorMask Processor Mask
+ * @defgroup RTEMSScoreProcessorMask Processor Mask
  *
- * @ingroup Score
+ * @ingroup RTEMSScore
  *
  * The processor mask provides a bit map large enough to provide one bit for
  * each processor in the system.  It is a fixed size internal data type
diff --git a/cpukit/include/rtems/score/profiling.h b/cpukit/include/rtems/score/profiling.h
index 5f9f2c2a50..83aa3345a5 100644
--- a/cpukit/include/rtems/score/profiling.h
+++ b/cpukit/include/rtems/score/profiling.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreProfiling
+ * @ingroup RTEMSScoreProfiling
  *
  * @brief Profiling Support API
  */
@@ -31,9 +31,9 @@ extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @defgroup ScoreProfiling Profiling Support
+ * @defgroup RTEMSScoreProfiling Profiling Support
  * 
- * @ingroup Score
+ * @ingroup RTEMSScore
  *
  * @brief Profiling support.
  *
diff --git a/cpukit/include/rtems/score/protectedheap.h b/cpukit/include/rtems/score/protectedheap.h
index a08fa36cf3..aa5d48b5fa 100644
--- a/cpukit/include/rtems/score/protectedheap.h
+++ b/cpukit/include/rtems/score/protectedheap.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreProtHeap
+ * @ingroup RTEMSScoreProtHeap
  *
  * @brief Protected Heap Handler API
  */
@@ -26,9 +26,9 @@ extern "C" {
 #endif
 
 /**
- * @defgroup ScoreProtHeap Protected Heap Handler
+ * @defgroup RTEMSScoreProtHeap Protected Heap Handler
  *
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
  *
  * @brief Provides protected heap services.
  *
diff --git a/cpukit/include/rtems/score/rbtree.h b/cpukit/include/rtems/score/rbtree.h
index c01a893b6e..b63c5cb4c2 100644
--- a/cpukit/include/rtems/score/rbtree.h
+++ b/cpukit/include/rtems/score/rbtree.h
@@ -27,9 +27,9 @@ extern "C" {
 #endif
 
 /**
- *  @defgroup ScoreRBTree Red-Black Tree Handler
+ *  @defgroup RTEMSScoreRBTree Red-Black Tree Handler
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  The Red-Black Tree Handler is used to manage sets of entities.  This handler
  *  provides two data structures.  The rbtree Node data structure is included
diff --git a/cpukit/include/rtems/score/rbtreeimpl.h b/cpukit/include/rtems/score/rbtreeimpl.h
index bf92e29228..a6d1a059da 100644
--- a/cpukit/include/rtems/score/rbtreeimpl.h
+++ b/cpukit/include/rtems/score/rbtreeimpl.h
@@ -29,7 +29,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup ScoreRBTree
+ * @addtogroup RTEMSScoreRBTree
  */
 /**@{**/
 
diff --git a/cpukit/include/rtems/score/scheduler.h b/cpukit/include/rtems/score/scheduler.h
index c36353cf6b..6e87dbc5e3 100644
--- a/cpukit/include/rtems/score/scheduler.h
+++ b/cpukit/include/rtems/score/scheduler.h
@@ -28,9 +28,9 @@ extern "C" {
 struct Per_CPU_Control;
 
 /**
- *  @defgroup ScoreScheduler Scheduler Handler
+ *  @defgroup RTEMSScoreScheduler Scheduler Handler
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  This handler encapsulates functionality related to managing sets of threads
  *  that are ready for execution.
diff --git a/cpukit/include/rtems/score/schedulercbs.h b/cpukit/include/rtems/score/schedulercbs.h
index 2b5ffb94aa..757c6ae6d8 100644
--- a/cpukit/include/rtems/score/schedulercbs.h
+++ b/cpukit/include/rtems/score/schedulercbs.h
@@ -33,9 +33,9 @@ extern "C" {
 #endif
 
 /**
- *  @defgroup ScoreSchedulerCBS CBS Scheduler
+ *  @defgroup RTEMSScoreSchedulerCBS CBS Scheduler
  *
- *  @ingroup ScoreScheduler
+ *  @ingroup RTEMSScoreScheduler
  */
 /**@{*/
 
diff --git a/cpukit/include/rtems/score/schedulercbsimpl.h b/cpukit/include/rtems/score/schedulercbsimpl.h
index ed75979f75..d4a9ae2ba2 100644
--- a/cpukit/include/rtems/score/schedulercbsimpl.h
+++ b/cpukit/include/rtems/score/schedulercbsimpl.h
@@ -3,7 +3,7 @@
  *
  * @brief CBS Scheduler Implementation
  *
- * @ingroup ScoreSchedulerCBS
+ * @ingroup RTEMSScoreSchedulerCBS
  */
 
 /*
@@ -31,7 +31,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @addtogroup ScoreSchedulerCBS
+ * @addtogroup RTEMSScoreSchedulerCBS
  *
  * @{
  */
diff --git a/cpukit/include/rtems/score/scheduleredf.h b/cpukit/include/rtems/score/scheduleredf.h
index c3849e825e..b38651cd80 100644
--- a/cpukit/include/rtems/score/scheduleredf.h
+++ b/cpukit/include/rtems/score/scheduleredf.h
@@ -31,9 +31,9 @@ extern "C" {
 #endif
 
 /**
- *  @defgroup ScoreSchedulerEDF EDF Scheduler
+ *  @defgroup RTEMSScoreSchedulerEDF EDF Scheduler
  *
- *  @ingroup ScoreScheduler
+ *  @ingroup RTEMSScoreScheduler
  */
 /**@{*/
 
diff --git a/cpukit/include/rtems/score/scheduleredfimpl.h b/cpukit/include/rtems/score/scheduleredfimpl.h
index f6bd7d8384..fa0be25db8 100644
--- a/cpukit/include/rtems/score/scheduleredfimpl.h
+++ b/cpukit/include/rtems/score/scheduleredfimpl.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreSchedulerEDF
+ * @ingroup RTEMSScoreSchedulerEDF
  *
  * @brief EDF Scheduler Implementation
  */
@@ -26,7 +26,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup ScoreSchedulerEDF
+ * @addtogroup RTEMSScoreSchedulerEDF
  *
  * @{
  */
diff --git a/cpukit/include/rtems/score/scheduleredfsmp.h b/cpukit/include/rtems/score/scheduleredfsmp.h
index 72c906eefe..961fa97f5f 100644
--- a/cpukit/include/rtems/score/scheduleredfsmp.h
+++ b/cpukit/include/rtems/score/scheduleredfsmp.h
@@ -3,7 +3,7 @@
  *
  * @brief EDF SMP Scheduler API
  *
- * @ingroup ScoreSchedulerSMPEDF
+ * @ingroup RTEMSScoreSchedulerSMPEDF
  */
 
 /*
@@ -26,9 +26,9 @@ extern "C" {
 #endif
 
 /**
- * @defgroup ScoreSchedulerSMPEDF EDF Priority SMP Scheduler
+ * @defgroup RTEMSScoreSchedulerSMPEDF EDF Priority SMP Scheduler
  *
- * @ingroup ScoreSchedulerSMP
+ * @ingroup RTEMSScoreSchedulerSMP
  *
  * @{
  */
diff --git a/cpukit/include/rtems/score/schedulerimpl.h b/cpukit/include/rtems/score/schedulerimpl.h
index fda043ea5a..6ad6157926 100644
--- a/cpukit/include/rtems/score/schedulerimpl.h
+++ b/cpukit/include/rtems/score/schedulerimpl.h
@@ -32,7 +32,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup ScoreScheduler
+ * @addtogroup RTEMSScoreScheduler
  */
 /**@{**/
 
diff --git a/cpukit/include/rtems/score/schedulerpriority.h b/cpukit/include/rtems/score/schedulerpriority.h
index ad146076e5..c0cf47561a 100644
--- a/cpukit/include/rtems/score/schedulerpriority.h
+++ b/cpukit/include/rtems/score/schedulerpriority.h
@@ -28,9 +28,9 @@ extern "C" {
 #endif
 
 /**
- * @defgroup ScoreSchedulerDPS Deterministic Priority Scheduler
+ * @defgroup RTEMSScoreSchedulerDPS Deterministic Priority Scheduler
  *
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 /**@{*/
 
diff --git a/cpukit/include/rtems/score/schedulerpriorityaffinitysmp.h b/cpukit/include/rtems/score/schedulerpriorityaffinitysmp.h
index e8ee528c90..2dea33ed56 100644
--- a/cpukit/include/rtems/score/schedulerpriorityaffinitysmp.h
+++ b/cpukit/include/rtems/score/schedulerpriorityaffinitysmp.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreSchedulerPriorityAffinitySMP
+ * @ingroup RTEMSScoreSchedulerPriorityAffinitySMP
  *
  * @brief Deterministic Priority Affinity SMP Scheduler API
  */
@@ -30,9 +30,9 @@ extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @defgroup ScoreSchedulerPriorityAffinitySMP Deterministic Priority Affinity SMP Scheduler
+ * @defgroup RTEMSScoreSchedulerPriorityAffinitySMP Deterministic Priority Affinity SMP Scheduler
  *
- * @ingroup ScoreSchedulerPrioritySMP
+ * @ingroup RTEMSScoreSchedulerPrioritySMP
  *
  * This is an extension of the Deterministic Priority SMP Scheduler. which
  * is an implementation of the global fixed priority scheduler (G-FP). 
diff --git a/cpukit/include/rtems/score/schedulerpriorityimpl.h b/cpukit/include/rtems/score/schedulerpriorityimpl.h
index 354065fac4..bf1d411502 100644
--- a/cpukit/include/rtems/score/schedulerpriorityimpl.h
+++ b/cpukit/include/rtems/score/schedulerpriorityimpl.h
@@ -31,7 +31,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup ScoreSchedulerDPS
+ * @addtogroup RTEMSScoreSchedulerDPS
  */
 /**@{**/
 
diff --git a/cpukit/include/rtems/score/schedulerprioritysmp.h b/cpukit/include/rtems/score/schedulerprioritysmp.h
index 7d579f1846..ced6ce6651 100644
--- a/cpukit/include/rtems/score/schedulerprioritysmp.h
+++ b/cpukit/include/rtems/score/schedulerprioritysmp.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreSchedulerPrioritySMP
+ * @ingroup RTEMSScoreSchedulerPrioritySMP
  *
  * @brief Deterministic Priority SMP Scheduler API
  */
@@ -32,9 +32,9 @@ extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @defgroup ScoreSchedulerPrioritySMP Deterministic Priority SMP Scheduler
+ * @defgroup RTEMSScoreSchedulerPrioritySMP Deterministic Priority SMP Scheduler
  *
- * @ingroup ScoreSchedulerSMP
+ * @ingroup RTEMSScoreSchedulerSMP
  *
  * This is an implementation of the global fixed priority scheduler (G-FP).  It
  * uses one ready chain per priority to ensure constant time insert operations.
diff --git a/cpukit/include/rtems/score/schedulerprioritysmpimpl.h b/cpukit/include/rtems/score/schedulerprioritysmpimpl.h
index 17d6e552f3..28f59396ff 100644
--- a/cpukit/include/rtems/score/schedulerprioritysmpimpl.h
+++ b/cpukit/include/rtems/score/schedulerprioritysmpimpl.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreSchedulerPrioritySMP
+ * @ingroup RTEMSScoreSchedulerPrioritySMP
  *
  * @brief Deterministic Priority SMP Scheduler API
  */
@@ -33,7 +33,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @ingroup ScoreSchedulerPrioritySMP
+ * @ingroup RTEMSScoreSchedulerPrioritySMP
  * @{
  */
 
diff --git a/cpukit/include/rtems/score/schedulersimple.h b/cpukit/include/rtems/score/schedulersimple.h
index 280105568f..3f67e138af 100644
--- a/cpukit/include/rtems/score/schedulersimple.h
+++ b/cpukit/include/rtems/score/schedulersimple.h
@@ -26,9 +26,9 @@ extern "C" {
 #endif
 
 /**
- *  @defgroup ScoreSchedulerSimple Simple Priority Scheduler
+ *  @defgroup RTEMSScoreSchedulerSimple Simple Priority Scheduler
  *
- *  @ingroup ScoreScheduler
+ *  @ingroup RTEMSScoreScheduler
  */
 /**@{*/
 
diff --git a/cpukit/include/rtems/score/schedulersimpleimpl.h b/cpukit/include/rtems/score/schedulersimpleimpl.h
index 3891839281..8667e039bd 100644
--- a/cpukit/include/rtems/score/schedulersimpleimpl.h
+++ b/cpukit/include/rtems/score/schedulersimpleimpl.h
@@ -28,7 +28,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup ScoreSchedulerSimple
+ * @addtogroup RTEMSScoreSchedulerSimple
  */
 /**@{**/
 
diff --git a/cpukit/include/rtems/score/schedulersimplesmp.h b/cpukit/include/rtems/score/schedulersimplesmp.h
index d9b4c1d46c..647d4af9d3 100644
--- a/cpukit/include/rtems/score/schedulersimplesmp.h
+++ b/cpukit/include/rtems/score/schedulersimplesmp.h
@@ -3,7 +3,7 @@
  *
  * @brief Simple SMP Scheduler API
  *
- * @ingroup ScoreSchedulerSMPSimple
+ * @ingroup RTEMSScoreSchedulerSMPSimple
  */
 
 /*
@@ -28,9 +28,9 @@ extern "C" {
 #include <rtems/score/schedulersmp.h>
 
 /**
- * @defgroup ScoreSchedulerSMPSimple Simple Priority SMP Scheduler
+ * @defgroup RTEMSScoreSchedulerSMPSimple Simple Priority SMP Scheduler
  *
- * @ingroup ScoreSchedulerSMP
+ * @ingroup RTEMSScoreSchedulerSMP
  *
  * The Simple Priority SMP Scheduler allocates a processor for the processor
  * count highest priority ready threads.  The thread priority and position in
diff --git a/cpukit/include/rtems/score/schedulersmp.h b/cpukit/include/rtems/score/schedulersmp.h
index 0bd899a6a6..afc504bb83 100644
--- a/cpukit/include/rtems/score/schedulersmp.h
+++ b/cpukit/include/rtems/score/schedulersmp.h
@@ -3,7 +3,7 @@
  *
  * @brief SMP Scheduler API
  *
- * @ingroup ScoreSchedulerSMP
+ * @ingroup RTEMSScoreSchedulerSMP
  */
 
 /*
@@ -31,9 +31,9 @@ extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @defgroup ScoreSchedulerSMP SMP Scheduler
+ * @defgroup RTEMSScoreSchedulerSMP SMP Scheduler
  *
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  *
  * @{
  */
diff --git a/cpukit/include/rtems/score/schedulersmpimpl.h b/cpukit/include/rtems/score/schedulersmpimpl.h
index 0abe82b1f0..0f4805d7f5 100644
--- a/cpukit/include/rtems/score/schedulersmpimpl.h
+++ b/cpukit/include/rtems/score/schedulersmpimpl.h
@@ -3,7 +3,7 @@
  *
  * @brief SMP Scheduler Implementation
  *
- * @ingroup ScoreSchedulerSMP
+ * @ingroup RTEMSScoreSchedulerSMP
  */
 
 /*
@@ -34,7 +34,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @addtogroup ScoreSchedulerSMP
+ * @addtogroup RTEMSScoreSchedulerSMP
  *
  * The scheduler nodes can be in four states
  * - @ref SCHEDULER_SMP_NODE_BLOCKED,
diff --git a/cpukit/include/rtems/score/schedulerstrongapa.h b/cpukit/include/rtems/score/schedulerstrongapa.h
index bc113197e7..902c53c095 100644
--- a/cpukit/include/rtems/score/schedulerstrongapa.h
+++ b/cpukit/include/rtems/score/schedulerstrongapa.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreSchedulerStrongAPA
+ * @ingroup RTEMSScoreSchedulerStrongAPA
  *
  * @brief Strong APA Scheduler API
  */
@@ -32,9 +32,9 @@ extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @defgroup ScoreSchedulerStrongAPA Strong APA Scheduler
+ * @defgroup RTEMSScoreSchedulerStrongAPA Strong APA Scheduler
  *
- * @ingroup ScoreSchedulerSMP
+ * @ingroup RTEMSScoreSchedulerSMP
  *
  * This is an implementation of the global fixed priority scheduler (G-FP).  It
  * uses one ready chain per priority to ensure constant time insert operations.
diff --git a/cpukit/include/rtems/score/smp.h b/cpukit/include/rtems/score/smp.h
index 469025e5dc..cc682a4823 100644
--- a/cpukit/include/rtems/score/smp.h
+++ b/cpukit/include/rtems/score/smp.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreSMP
+ * @ingroup RTEMSScoreSMP
  *
  * @brief SuperCore SMP Support API
  */
@@ -25,9 +25,9 @@ extern "C" {
 #endif
 
 /**
- * @defgroup ScoreSMP SMP Support
+ * @defgroup RTEMSScoreSMP SMP Support
  *
- * @ingroup Score
+ * @ingroup RTEMSScore
  *
  * This defines the interface of the SuperCore SMP support.
  *
diff --git a/cpukit/include/rtems/score/smpbarrier.h b/cpukit/include/rtems/score/smpbarrier.h
index fddf7bb1cd..a8bdc91c31 100644
--- a/cpukit/include/rtems/score/smpbarrier.h
+++ b/cpukit/include/rtems/score/smpbarrier.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreSMPBarrier
+ * @ingroup RTEMSScoreSMPBarrier
  *
  * @brief SMP Barrier API
  */
@@ -31,9 +31,9 @@ extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @defgroup ScoreSMPBarrier SMP Barriers
+ * @defgroup RTEMSScoreSMPBarrier SMP Barriers
  *
- * @ingroup Score
+ * @ingroup RTEMSScore
  *
  * @brief The SMP barrier provides barrier synchronization for SMP systems at
  * the lowest level.
diff --git a/cpukit/include/rtems/score/smpimpl.h b/cpukit/include/rtems/score/smpimpl.h
index 0e6168362c..117b78cb74 100644
--- a/cpukit/include/rtems/score/smpimpl.h
+++ b/cpukit/include/rtems/score/smpimpl.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreSMPImpl
+ * @ingroup RTEMSScoreSMPImpl
  *
  * @brief SuperCore SMP Implementation
  */
@@ -29,7 +29,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup ScoreSMP
+ * @addtogroup RTEMSScoreSMP
  *
  * This defines the interface of the SuperCore SMP support.
  *
diff --git a/cpukit/include/rtems/score/smplock.h b/cpukit/include/rtems/score/smplock.h
index 096f8ba0c4..1c37db465b 100644
--- a/cpukit/include/rtems/score/smplock.h
+++ b/cpukit/include/rtems/score/smplock.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreSMPLock
+ * @ingroup RTEMSScoreSMPLock
  *
  * @brief SMP Lock API
  */
@@ -23,9 +23,9 @@
 #include <rtems/score/cpuopts.h>
 
 /**
- * @defgroup ScoreSMPLock SMP Locks
+ * @defgroup RTEMSScoreSMPLock SMP Locks
  *
- * @ingroup Score
+ * @ingroup RTEMSScore
  *
  * @brief The SMP lock provides mutual exclusion for SMP systems at the lowest
  * level.
diff --git a/cpukit/include/rtems/score/smplockmcs.h b/cpukit/include/rtems/score/smplockmcs.h
index 5a1ad23dc9..977f807fe8 100644
--- a/cpukit/include/rtems/score/smplockmcs.h
+++ b/cpukit/include/rtems/score/smplockmcs.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreSMPLock
+ * @ingroup RTEMSScoreSMPLock
  *
  * @brief SMP Lock API
  */
@@ -29,7 +29,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @addtogroup ScoreSMPLock
+ * @addtogroup RTEMSScoreSMPLock
  *
  * @{
  */
diff --git a/cpukit/include/rtems/score/smplockseq.h b/cpukit/include/rtems/score/smplockseq.h
index 5daaee9c6e..f65595a10b 100644
--- a/cpukit/include/rtems/score/smplockseq.h
+++ b/cpukit/include/rtems/score/smplockseq.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreSMPLock
+ * @ingroup RTEMSScoreSMPLock
  *
  * @brief SMP Lock API
  */
@@ -29,7 +29,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @addtogroup ScoreSMPLock
+ * @addtogroup RTEMSScoreSMPLock
  *
  * @{
  */
diff --git a/cpukit/include/rtems/score/smplockstats.h b/cpukit/include/rtems/score/smplockstats.h
index c434b15cb2..951f4f42fa 100644
--- a/cpukit/include/rtems/score/smplockstats.h
+++ b/cpukit/include/rtems/score/smplockstats.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreSMPLock
+ * @ingroup RTEMSScoreSMPLock
  *
  * @brief SMP Lock API
  */
@@ -28,7 +28,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @addtogroup ScoreSMPLock
+ * @addtogroup RTEMSScoreSMPLock
  *
  * @{
  */
diff --git a/cpukit/include/rtems/score/smplockticket.h b/cpukit/include/rtems/score/smplockticket.h
index e04c4056a5..e8d0fb7ef9 100644
--- a/cpukit/include/rtems/score/smplockticket.h
+++ b/cpukit/include/rtems/score/smplockticket.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreSMPLock
+ * @ingroup RTEMSScoreSMPLock
  *
  * @brief SMP Lock API
  */
@@ -29,7 +29,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @addtogroup ScoreSMPLock
+ * @addtogroup RTEMSScoreSMPLock
  *
  * @{
  */
diff --git a/cpukit/include/rtems/score/stack.h b/cpukit/include/rtems/score/stack.h
index 62be3ea5ef..3f80a1e12c 100644
--- a/cpukit/include/rtems/score/stack.h
+++ b/cpukit/include/rtems/score/stack.h
@@ -27,9 +27,9 @@ extern "C" {
 #endif
 
 /**
- *  @defgroup ScoreStack Stack Handler
+ *  @defgroup RTEMSScoreStack Stack Handler
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  This handler encapsulates functionality which is used in the management
  *  of thread stacks.
diff --git a/cpukit/include/rtems/score/stackimpl.h b/cpukit/include/rtems/score/stackimpl.h
index 4c622345ff..a7cea81e52 100644
--- a/cpukit/include/rtems/score/stackimpl.h
+++ b/cpukit/include/rtems/score/stackimpl.h
@@ -26,7 +26,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup ScoreStack
+ * @addtogroup RTEMSScoreStack
  */
 /**@{**/
 
diff --git a/cpukit/include/rtems/score/states.h b/cpukit/include/rtems/score/states.h
index 68aa1d699f..76fa270073 100644
--- a/cpukit/include/rtems/score/states.h
+++ b/cpukit/include/rtems/score/states.h
@@ -25,9 +25,9 @@ extern "C" {
 #endif
 
 /**
- *  @defgroup ScoreStates SuperCore Thread States
+ *  @defgroup RTEMSScoreStates SuperCore Thread States
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  This handler encapsulates functionality which relates to the management of
  *  the state bitmap associated with each thread.
diff --git a/cpukit/include/rtems/score/statesimpl.h b/cpukit/include/rtems/score/statesimpl.h
index db462fbb9a..292cae874a 100644
--- a/cpukit/include/rtems/score/statesimpl.h
+++ b/cpukit/include/rtems/score/statesimpl.h
@@ -27,7 +27,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup ScoreStates
+ * @addtogroup RTEMSScoreStates
  */
 /**@{**/
 
diff --git a/cpukit/include/rtems/score/sysstate.h b/cpukit/include/rtems/score/sysstate.h
index 0e01927d9a..15820a0d3e 100644
--- a/cpukit/include/rtems/score/sysstate.h
+++ b/cpukit/include/rtems/score/sysstate.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreSysState
+ * @ingroup RTEMSScoreSysState
  *
  * @brief System State Handler API
  */
@@ -25,9 +25,9 @@ extern "C" {
 #endif
 
 /**
- * @defgroup ScoreSysState System State Handler
+ * @defgroup RTEMSScoreSysState System State Handler
  *
- * @ingroup Score
+ * @ingroup RTEMSScore
  *
  * @brief Management of the internal system state of RTEMS.
  */
diff --git a/cpukit/include/rtems/score/thread.h b/cpukit/include/rtems/score/thread.h
index 061d7cb14f..79853b8d79 100644
--- a/cpukit/include/rtems/score/thread.h
+++ b/cpukit/include/rtems/score/thread.h
@@ -54,9 +54,9 @@ extern "C" {
 #endif
 
 /**
- *  @defgroup ScoreThread Thread Handler
+ *  @defgroup RTEMSScoreThread Thread Handler
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  This handler encapsulates functionality related to the management of
  *  threads.  This includes the creation, deletion, and scheduling of threads.
diff --git a/cpukit/include/rtems/score/threaddispatch.h b/cpukit/include/rtems/score/threaddispatch.h
index f5d5c48035..89c737c057 100644
--- a/cpukit/include/rtems/score/threaddispatch.h
+++ b/cpukit/include/rtems/score/threaddispatch.h
@@ -23,7 +23,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @addtogroup ScoreThread
+ * @addtogroup RTEMSScoreThread
  *
  * @{
  */
diff --git a/cpukit/include/rtems/score/threadimpl.h b/cpukit/include/rtems/score/threadimpl.h
index d3e69ed91c..2232d57dd0 100644
--- a/cpukit/include/rtems/score/threadimpl.h
+++ b/cpukit/include/rtems/score/threadimpl.h
@@ -42,7 +42,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup ScoreThread
+ * @addtogroup RTEMSScoreThread
  */
 /**@{**/
 
diff --git a/cpukit/include/rtems/score/threadmp.h b/cpukit/include/rtems/score/threadmp.h
index bcc71f7b88..257f9beeec 100644
--- a/cpukit/include/rtems/score/threadmp.h
+++ b/cpukit/include/rtems/score/threadmp.h
@@ -30,9 +30,9 @@ extern "C" {
 #endif
 
 /**
- *  @defgroup ScoreThreadMP Thread Handler Multiprocessing Support
+ *  @defgroup RTEMSScoreThreadMP Thread Handler Multiprocessing Support
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  This handler encapsulates functionality which is related to managing
  *  threads in a multiprocessor system configuration.  This handler must
diff --git a/cpukit/include/rtems/score/threadq.h b/cpukit/include/rtems/score/threadq.h
index c0a11770fb..a63cc62151 100644
--- a/cpukit/include/rtems/score/threadq.h
+++ b/cpukit/include/rtems/score/threadq.h
@@ -36,9 +36,9 @@ struct Per_CPU_Control;
 struct Scheduler_Node;
 
 /**
- *  @defgroup ScoreThreadQueue Thread Queue Handler
+ *  @defgroup RTEMSScoreThreadQueue Thread Queue Handler
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  This handler provides the capability to have threads block in
  *  ordered sets. The sets may be ordered using the FIFO or priority
diff --git a/cpukit/include/rtems/score/threadqimpl.h b/cpukit/include/rtems/score/threadqimpl.h
index 789184c0dd..21d0a46517 100644
--- a/cpukit/include/rtems/score/threadqimpl.h
+++ b/cpukit/include/rtems/score/threadqimpl.h
@@ -37,7 +37,7 @@ extern "C" {
 #endif
 
 /**
- *  @addtogroup ScoreThreadQueue
+ *  @addtogroup RTEMSScoreThreadQueue
  */
 /**@{*/
 
diff --git a/cpukit/include/rtems/score/timecounter.h b/cpukit/include/rtems/score/timecounter.h
index 9d688eebe8..a719ab0fa8 100644
--- a/cpukit/include/rtems/score/timecounter.h
+++ b/cpukit/include/rtems/score/timecounter.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreTimecounter
+ * @ingroup RTEMSScoreTimecounter
  *
  * @brief Timecounter API
  */
@@ -34,9 +34,9 @@ extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @defgroup ScoreTimecounter Timecounter Handler
+ * @defgroup RTEMSScoreTimecounter Timecounter Handler
  *
- * @ingroup Score
+ * @ingroup RTEMSScore
  *
  * @{
  */
diff --git a/cpukit/include/rtems/score/timecounterimpl.h b/cpukit/include/rtems/score/timecounterimpl.h
index a48ac70683..ac09d9b1a6 100644
--- a/cpukit/include/rtems/score/timecounterimpl.h
+++ b/cpukit/include/rtems/score/timecounterimpl.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreTimecounter
+ * @ingroup RTEMSScoreTimecounter
  *
  * @brief Timecounter Implementation
  */
@@ -31,7 +31,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @addtogroup ScoreTimecounter
+ * @addtogroup RTEMSScoreTimecounter
  *
  * @{
  */
diff --git a/cpukit/include/rtems/score/timespec.h b/cpukit/include/rtems/score/timespec.h
index a453aadf5e..cefe508285 100644
--- a/cpukit/include/rtems/score/timespec.h
+++ b/cpukit/include/rtems/score/timespec.h
@@ -19,7 +19,7 @@
 /**
  *  @defgroup Timespec Helpers
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  This handler encapsulates functionality related to manipulating
  *  POSIX struct timespecs.
diff --git a/cpukit/include/rtems/score/timestamp.h b/cpukit/include/rtems/score/timestamp.h
index 002584d3d8..2645c51a11 100644
--- a/cpukit/include/rtems/score/timestamp.h
+++ b/cpukit/include/rtems/score/timestamp.h
@@ -21,7 +21,7 @@
 /**
  *  @defgroup SuperCoreTimeStamp Score Timestamp
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  This handler encapsulates functionality related to manipulating
  *  SuperCore Timestamps.  SuperCore Timestamps may be used to
diff --git a/cpukit/include/rtems/score/tls.h b/cpukit/include/rtems/score/tls.h
index 644e54e6f7..9ae0953935 100644
--- a/cpukit/include/rtems/score/tls.h
+++ b/cpukit/include/rtems/score/tls.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreTLS
+ * @ingroup RTEMSScoreTLS
  *
  * @brief Thread-Local Storage (TLS)
  */
@@ -32,9 +32,9 @@ extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @defgroup ScoreTLS Thread-Local Storage (TLS)
+ * @defgroup RTEMSScoreTLS Thread-Local Storage (TLS)
  *
- * @ingroup Score
+ * @ingroup RTEMSScore
  *
  * @brief Thread-local storage (TLS) support.
  *
diff --git a/cpukit/include/rtems/score/todimpl.h b/cpukit/include/rtems/score/todimpl.h
index edc12e1fda..4173b91d89 100644
--- a/cpukit/include/rtems/score/todimpl.h
+++ b/cpukit/include/rtems/score/todimpl.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreTOD
+ * @ingroup RTEMSScoreTOD
  *
  * @brief Time of Day Handler API
  */
@@ -30,9 +30,9 @@ extern "C" {
 #endif
 
 /**
- *  @defgroup ScoreTOD Time of Day Handler
+ *  @defgroup RTEMSScoreTOD Time of Day Handler
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  The following constants are related to the time of day and are
  *  independent of RTEMS.
@@ -118,7 +118,7 @@ extern "C" {
 #define TOD_BASE_YEAR 1988
 
 /**
- *  @addtogroup ScoreTOD
+ *  @addtogroup RTEMSScoreTOD
  *
  *  This handler encapsulates functionality used to manage time of day.
  */
diff --git a/cpukit/include/rtems/score/userext.h b/cpukit/include/rtems/score/userext.h
index 216b795f86..aec795cd57 100644
--- a/cpukit/include/rtems/score/userext.h
+++ b/cpukit/include/rtems/score/userext.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreUserExt
+ * @ingroup RTEMSScoreUserExt
  *
  * @brief User Extension Handler API
  */
@@ -29,9 +29,9 @@ struct _Thread_Control;
 typedef void User_extensions_routine RTEMS_DEPRECATED;
 
 /**
- * @defgroup ScoreUserExt User Extension Handler
+ * @defgroup RTEMSScoreUserExt User Extension Handler
  *
- * @ingroup Score
+ * @ingroup RTEMSScore
  *
  * @brief The User Extension Handler provides invocation of application
  * dependent routines at critical points in the life of each thread and the
diff --git a/cpukit/include/rtems/score/userextdata.h b/cpukit/include/rtems/score/userextdata.h
index 100ae21647..7b7a2eb95f 100644
--- a/cpukit/include/rtems/score/userextdata.h
+++ b/cpukit/include/rtems/score/userextdata.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreUserExt
+ * @ingroup RTEMSScoreUserExt
  *
  * @brief User Extension Handler Data Structures
  */
@@ -26,7 +26,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup ScoreUserExt
+ * @addtogroup RTEMSScoreUserExt
  *
  * @{
  */
diff --git a/cpukit/include/rtems/score/userextimpl.h b/cpukit/include/rtems/score/userextimpl.h
index 6c5aae7640..b781773863 100644
--- a/cpukit/include/rtems/score/userextimpl.h
+++ b/cpukit/include/rtems/score/userextimpl.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreUserExt
+ * @ingroup RTEMSScoreUserExt
  *
  * @brief User Extension Handler API
  */
@@ -29,7 +29,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup ScoreUserExt
+ * @addtogroup RTEMSScoreUserExt
  */
 /** @{ **/
 
diff --git a/cpukit/include/rtems/score/watchdog.h b/cpukit/include/rtems/score/watchdog.h
index 9db87adae8..5f7d6fa3f3 100644
--- a/cpukit/include/rtems/score/watchdog.h
+++ b/cpukit/include/rtems/score/watchdog.h
@@ -1,7 +1,7 @@
 /**
  *  @file
  *
- *  @ingroup ScoreWatchdog
+ *  @ingroup RTEMSScoreWatchdog
  *
  *  @brief Constants and Structures Associated with Watchdog Timers
  *
@@ -33,9 +33,9 @@ extern "C" {
 #endif
 
 /**
- *  @defgroup ScoreWatchdog Watchdog Handler
+ *  @defgroup RTEMSScoreWatchdog Watchdog Handler
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  This handler encapsulates functionality related to the scheduling of
  *  watchdog functions to be called at specific times in the future.
diff --git a/cpukit/include/rtems/score/watchdogimpl.h b/cpukit/include/rtems/score/watchdogimpl.h
index 5a024069ca..1e711f28b6 100644
--- a/cpukit/include/rtems/score/watchdogimpl.h
+++ b/cpukit/include/rtems/score/watchdogimpl.h
@@ -34,7 +34,7 @@ extern "C" {
 #endif
 
 /**
- *  @addtogroup ScoreWatchdog
+ *  @addtogroup RTEMSScoreWatchdog
  *  @{
  */
 
diff --git a/cpukit/include/rtems/score/watchdogticks.h b/cpukit/include/rtems/score/watchdogticks.h
index 8a69a288fc..a51bf41952 100644
--- a/cpukit/include/rtems/score/watchdogticks.h
+++ b/cpukit/include/rtems/score/watchdogticks.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreWatchdog
+ * @ingroup RTEMSScoreWatchdog
  */
 
 /*
@@ -23,7 +23,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup ScoreWatchdog
+ * @addtogroup RTEMSScoreWatchdog
  *
  * @{
  */
diff --git a/cpukit/include/rtems/score/wkspace.h b/cpukit/include/rtems/score/wkspace.h
index 551a10d50d..e88ccb0548 100644
--- a/cpukit/include/rtems/score/wkspace.h
+++ b/cpukit/include/rtems/score/wkspace.h
@@ -28,9 +28,9 @@ extern "C" {
 #endif
 
 /**
- *  @defgroup ScoreWorkspace Workspace Handler
+ *  @defgroup RTEMSScoreWorkspace Workspace Handler
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  *  This handler encapsulates functionality related to the management of
  *  the RTEMS Executive Workspace.
diff --git a/cpukit/include/rtems/seterr.h b/cpukit/include/rtems/seterr.h
index 99997745b6..27faca7694 100644
--- a/cpukit/include/rtems/seterr.h
+++ b/cpukit/include/rtems/seterr.h
@@ -20,9 +20,9 @@
 #define _RTEMS_SETERR_H
 
 /**
- *  @defgroup ScoreSetErr Set Errno
+ *  @defgroup RTEMSScoreSetErr Set Errno
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  *
  */
 /**@{*/
diff --git a/cpukit/include/rtems/system.h b/cpukit/include/rtems/system.h
index 723145ac9c..c72859195c 100644
--- a/cpukit/include/rtems/system.h
+++ b/cpukit/include/rtems/system.h
@@ -23,9 +23,9 @@
 #include <rtems/score/cpu.h>
 
 /**
- *  @defgroup ScoreSystem System Information
+ *  @defgroup RTEMSScoreSystem System Information
  *
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  */
 /**@{*/
 
-- 
cgit v1.2.3