[rtems commit] doxygen: Rename Score* groups in RTEMSScore*

Sebastian Huber sebh at rtems.org
Thu Apr 4 07:19:09 UTC 2019


Module:    rtems
Branch:    master
Commit:    4c20da4be441c519074df7d488d1e54354dac85b
Changeset: http://git.rtems.org/rtems/commit/?id=4c20da4be441c519074df7d488d1e54354dac85b

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Thu Apr  4 09:18:11 2019 +0200

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 ++--
 cpukit/sapi/src/rbtreefind.c                              |  2 +-
 cpukit/score/cpu/i386/include/rtems/score/cpu.h           |  2 +-
 cpukit/score/src/apimutexisowner.c                        |  2 +-
 cpukit/score/src/apimutexlock.c                           |  2 +-
 cpukit/score/src/apimutexunlock.c                         |  2 +-
 cpukit/score/src/chain.c                                  |  2 +-
 cpukit/score/src/corebarrier.c                            |  2 +-
 cpukit/score/src/corebarrierrelease.c                     |  2 +-
 cpukit/score/src/corebarrierwait.c                        |  2 +-
 cpukit/score/src/coremsg.c                                |  2 +-
 cpukit/score/src/coremsgbroadcast.c                       |  2 +-
 cpukit/score/src/coremsgclose.c                           |  2 +-
 cpukit/score/src/coremsgflush.c                           |  2 +-
 cpukit/score/src/coremsgflushwait.c                       |  2 +-
 cpukit/score/src/coremsginsert.c                          |  2 +-
 cpukit/score/src/coremsgseize.c                           |  2 +-
 cpukit/score/src/coremsgsubmit.c                          |  2 +-
 cpukit/score/src/coremutexseize.c                         |  2 +-
 cpukit/score/src/corerwlock.c                             |  2 +-
 cpukit/score/src/corerwlockobtainread.c                   |  2 +-
 cpukit/score/src/corerwlockobtainwrite.c                  |  2 +-
 cpukit/score/src/corerwlockrelease.c                      |  2 +-
 cpukit/score/src/coresem.c                                |  2 +-
 cpukit/score/src/coretod.c                                |  2 +-
 cpukit/score/src/coretodadjust.c                          |  2 +-
 cpukit/score/src/coretodset.c                             |  2 +-
 cpukit/score/src/coretodtickspersec.c                     |  2 +-
 cpukit/score/src/freechain.c                              |  2 +-
 cpukit/score/src/heap.c                                   |  2 +-
 cpukit/score/src/heapallocate.c                           |  2 +-
 cpukit/score/src/heapextend.c                             |  2 +-
 cpukit/score/src/heapfree.c                               |  2 +-
 cpukit/score/src/heapgetfreeinfo.c                        |  2 +-
 cpukit/score/src/heapgetinfo.c                            |  2 +-
 cpukit/score/src/heapgreedy.c                             |  2 +-
 cpukit/score/src/heapiterate.c                            |  2 +-
 cpukit/score/src/heapnoextend.c                           |  2 +-
 cpukit/score/src/heapresizeblock.c                        |  2 +-
 cpukit/score/src/heapsizeofuserarea.c                     |  2 +-
 cpukit/score/src/heapwalk.c                               |  2 +-
 cpukit/score/src/interr.c                                 |  2 +-
 cpukit/score/src/isr.c                                    |  2 +-
 cpukit/score/src/isrisinprogress.c                        |  2 +-
 cpukit/score/src/iterateoverthreads.c                     |  2 +-
 cpukit/score/src/log2table.c                              |  2 +-
 cpukit/score/src/mpci.c                                   |  2 +-
 cpukit/score/src/objectallocate.c                         |  2 +-
 cpukit/score/src/objectapimaximumclass.c                  |  2 +-
 cpukit/score/src/objectclose.c                            |  2 +-
 cpukit/score/src/objectextendinformation.c                |  2 +-
 cpukit/score/src/objectfree.c                             |  2 +-
 cpukit/score/src/objectgetinfo.c                          |  2 +-
 cpukit/score/src/objectgetinfoid.c                        |  2 +-
 cpukit/score/src/objectgetlocal.c                         |  2 +-
 cpukit/score/src/objectgetnameasstring.c                  |  2 +-
 cpukit/score/src/objectgetnext.c                          |  2 +-
 cpukit/score/src/objectgetnoprotection.c                  |  2 +-
 cpukit/score/src/objectidtoname.c                         |  2 +-
 cpukit/score/src/objectinitializeinformation.c            |  2 +-
 cpukit/score/src/objectmp.c                               |  2 +-
 cpukit/score/src/objectnamespaceremove.c                  |  2 +-
 cpukit/score/src/objectnametoid.c                         |  2 +-
 cpukit/score/src/objectnametoidstring.c                   |  2 +-
 cpukit/score/src/objectsetname.c                          |  2 +-
 cpukit/score/src/pheapallocate.c                          |  2 +-
 cpukit/score/src/pheapextend.c                            |  2 +-
 cpukit/score/src/pheapfree.c                              |  2 +-
 cpukit/score/src/pheapgetblocksize.c                      |  2 +-
 cpukit/score/src/pheapgetfreeinfo.c                       |  2 +-
 cpukit/score/src/pheapgetinfo.c                           |  2 +-
 cpukit/score/src/pheapgetsize.c                           |  2 +-
 cpukit/score/src/pheapinit.c                              |  2 +-
 cpukit/score/src/pheapiterate.c                           |  2 +-
 cpukit/score/src/pheapresizeblock.c                       |  2 +-
 cpukit/score/src/pheapwalk.c                              |  2 +-
 cpukit/score/src/processormaskcopy.c                      |  2 +-
 cpukit/score/src/rbtreeiterate.c                          |  2 +-
 cpukit/score/src/rbtreenext.c                             |  2 +-
 cpukit/score/src/rbtreepostorder.c                        |  2 +-
 cpukit/score/src/rbtreereplace.c                          |  2 +-
 cpukit/score/src/scheduler.c                              |  2 +-
 cpukit/score/src/schedulercbs.c                           |  2 +-
 cpukit/score/src/schedulercbsattachthread.c               |  2 +-
 cpukit/score/src/schedulercbscleanup.c                    |  2 +-
 cpukit/score/src/schedulercbscreateserver.c               |  2 +-
 cpukit/score/src/schedulercbsdestroyserver.c              |  2 +-
 cpukit/score/src/schedulercbsdetachthread.c               |  2 +-
 cpukit/score/src/schedulercbsgetapprovedbudget.c          |  2 +-
 cpukit/score/src/schedulercbsgetexecutiontime.c           |  2 +-
 cpukit/score/src/schedulercbsgetparameters.c              |  2 +-
 cpukit/score/src/schedulercbsgetremainingbudget.c         |  2 +-
 cpukit/score/src/schedulercbsgetserverid.c                |  2 +-
 cpukit/score/src/schedulercbsnodeinit.c                   |  2 +-
 cpukit/score/src/schedulercbsreleasejob.c                 |  2 +-
 cpukit/score/src/schedulercbssetparameters.c              |  2 +-
 cpukit/score/src/schedulercbsunblock.c                    |  2 +-
 cpukit/score/src/schedulerdefaultnodedestroy.c            |  2 +-
 cpukit/score/src/schedulerdefaultnodeinit.c               |  2 +-
 cpukit/score/src/schedulerdefaultreleasejob.c             |  2 +-
 cpukit/score/src/schedulerdefaultsetaffinity.c            |  2 +-
 cpukit/score/src/schedulerdefaulttick.c                   |  2 +-
 cpukit/score/src/scheduleredf.c                           |  2 +-
 cpukit/score/src/scheduleredfblock.c                      |  2 +-
 cpukit/score/src/scheduleredfchangepriority.c             |  2 +-
 cpukit/score/src/scheduleredfnodeinit.c                   |  2 +-
 cpukit/score/src/scheduleredfreleasejob.c                 |  2 +-
 cpukit/score/src/scheduleredfschedule.c                   |  2 +-
 cpukit/score/src/scheduleredfsmp.c                        |  2 +-
 cpukit/score/src/scheduleredfunblock.c                    |  2 +-
 cpukit/score/src/scheduleredfyield.c                      |  2 +-
 cpukit/score/src/schedulerpriority.c                      |  2 +-
 cpukit/score/src/schedulerpriorityaffinitysmp.c           |  2 +-
 cpukit/score/src/schedulerpriorityblock.c                 |  2 +-
 cpukit/score/src/schedulerprioritychangepriority.c        |  2 +-
 cpukit/score/src/schedulerpriorityschedule.c              |  2 +-
 cpukit/score/src/schedulerprioritysmp.c                   |  2 +-
 cpukit/score/src/schedulerpriorityunblock.c               |  2 +-
 cpukit/score/src/schedulerpriorityyield.c                 |  2 +-
 cpukit/score/src/schedulersimple.c                        |  2 +-
 cpukit/score/src/schedulersimpleblock.c                   |  2 +-
 cpukit/score/src/schedulersimplechangepriority.c          |  2 +-
 cpukit/score/src/schedulersimpleschedule.c                |  2 +-
 cpukit/score/src/schedulersimplesmp.c                     |  2 +-
 cpukit/score/src/schedulersimpleunblock.c                 |  2 +-
 cpukit/score/src/schedulersimpleyield.c                   |  2 +-
 cpukit/score/src/schedulerstrongapa.c                     |  2 +-
 cpukit/score/src/smp.c                                    |  2 +-
 cpukit/score/src/thread.c                                 |  2 +-
 cpukit/score/src/threadchangepriority.c                   |  2 +-
 cpukit/score/src/threadclearstate.c                       |  2 +-
 cpukit/score/src/threadcreateidle.c                       |  2 +-
 cpukit/score/src/threaddispatch.c                         |  2 +-
 cpukit/score/src/threadget.c                              |  2 +-
 cpukit/score/src/threadhandler.c                          |  2 +-
 cpukit/score/src/threadinitialize.c                       |  2 +-
 cpukit/score/src/threadloadenv.c                          |  2 +-
 cpukit/score/src/threadmp.c                               |  2 +-
 cpukit/score/src/threadq.c                                |  2 +-
 cpukit/score/src/threadqenqueue.c                         |  2 +-
 cpukit/score/src/threadqfirst.c                           |  2 +-
 cpukit/score/src/threadqflush.c                           |  2 +-
 cpukit/score/src/threadrestart.c                          |  2 +-
 cpukit/score/src/threadsetstate.c                         |  2 +-
 cpukit/score/src/threadstackallocate.c                    |  2 +-
 cpukit/score/src/threadstackfree.c                        |  2 +-
 cpukit/score/src/threadstart.c                            |  2 +-
 cpukit/score/src/threadstartmultitasking.c                |  2 +-
 cpukit/score/src/threadtimeout.c                          |  2 +-
 cpukit/score/src/threadyield.c                            |  2 +-
 cpukit/score/src/userext.c                                |  2 +-
 cpukit/score/src/userextaddset.c                          |  2 +-
 cpukit/score/src/userextiterate.c                         |  2 +-
 cpukit/score/src/userextremoveset.c                       |  2 +-
 cpukit/score/src/watchdoginsert.c                         |  2 +-
 cpukit/score/src/watchdogremove.c                         |  2 +-
 cpukit/score/src/watchdogtickssinceboot.c                 |  2 +-
 cpukit/score/src/wkspace.c                                |  2 +-
 cpukit/score/src/wkstringduplicate.c                      |  2 +-
 254 files changed, 360 insertions(+), 360 deletions(-)

diff --git a/cpukit/include/rtems/score/address.h b/cpukit/include/rtems/score/address.h
index 28502e25..5fc5976 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 f43edf2..a5aa2bf 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 5269269..f7d8b99 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 e484681..770865b 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 e358262..0c905d5 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 1c32ecc..0b9c193 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 3175755..1b23d96 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 8647bd9..02f9501 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 785c772..73872cb 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 d5d6365..48061e6 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 90bf9d8..e2dd14b 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 e33e330..bb90797 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 fd1f27c..447eafb 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 78fafca6..85cff55 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 3c376c9..508879d 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 4df7b6c..b44daf5 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 00f77e6..661a213 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 6282178..6b1a154 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 a9d75e7..c7c80a0 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 a8948ed..12da2de 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 1f84387..078cc69 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 16f3907..109b2a5 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 0d6f2a2..d29fc7f 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 aadce02..9340706 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 8e13e27..b1aea62 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 c20b45c..2c04b28 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 eb03a1d..4565e81 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 74d7e3d..12bda1b 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 85cbff7..4d67b27 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 b9c7441..da3cee3 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 eb21382..3f3e1b8 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 5280898..f6ece16 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 c5a315e..9c8b9ce 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 d52b83f..c32d885 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 f3afe1c..eee3189 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 b9f23ac..26ae8c6 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 7a8ddba..a5df551 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 ac769c1..b6b566d 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 82c92eb..58e168d 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 a06aa2a..ce87e99 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 5f9f2c2..83aa334 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 a08fa36..aa5d48b 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 c01a893..b63c5cb 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 bf92e29..a6d1a05 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 c36353c..6e87dbc 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 2b5ffb9..757c6ae 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 ed75979..d4a9ae2 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 c3849e8..b38651c 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 f6bd7d8..fa0be25 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 72c906e..961fa97 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 fda043e..6ad6157 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 ad14607..c0cf475 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 e8ee528..2dea33e 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 354065f..bf1d411 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 7d579f1..ced6ce6 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 17d6e55..28f5939 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 2801055..3f67e13 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 3891839..8667e03 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 d9b4c1d..647d4af 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 0bd899a..afc504b 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 0abe82b..0f4805d 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 bc11319..902c53c 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 469025e..cc682a4 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 fddf7bb..a8bdc91 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 0e61683..117b78c 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 096f8ba..1c37db4 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 5a1ad23..977f807 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 5daaee9..f65595a 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 c434b15..951f4f4 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 e04c405..e8d0fb7 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 62be3ea..3f80a1e 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 4c62234..a7cea81 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 68aa1d6..76fa270 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 db462fb..292cae8 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 0e01927..15820a0 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 061d7cb..79853b8 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 f5d5c48..89c737c 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 d3e69ed..2232d57 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 bcc71f7..257f9be 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 c0a1177..a63cc62 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 789184c..21d0a46 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 9d688ee..a719ab0 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 a48ac70..ac09d9b 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 a453aad..cefe508 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 002584d..2645c51 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 644e54e..9ae0953 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 edc12e1..4173b91 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 216b795..aec795c 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 100ae21..7b7a2eb 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 6c5aae7..b781773 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 9db87ad..5f7d6fa 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 5a02406..1e711f2 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 8a69a28..a51bf41 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 551a10d..e88ccb0 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 9999774..27faca7 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 723145a..c728591 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
  */
 /**@{*/
 
diff --git a/cpukit/sapi/src/rbtreefind.c b/cpukit/sapi/src/rbtreefind.c
index d3f67a6..1e4d445 100644
--- a/cpukit/sapi/src/rbtreefind.c
+++ b/cpukit/sapi/src/rbtreefind.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief Find the control structure of the tree containing the given node
- * @ingroup Scorertems_rbtree
+ * @ingroup RTEMSScorertems_rbtree
  */
 
 /*
diff --git a/cpukit/score/cpu/i386/include/rtems/score/cpu.h b/cpukit/score/cpu/i386/include/rtems/score/cpu.h
index 19562e7..5d14455 100644
--- a/cpukit/score/cpu/i386/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/i386/include/rtems/score/cpu.h
@@ -34,7 +34,7 @@ extern "C" {
 #include <rtems/score/i386.h>
     
 /**
- * @defgroup ScoreCPUi386 i386 Specific Support
+ * @defgroup RTEMSScoreCPUi386 i386 Specific Support
  *
  * @ingroup RTEMSScoreCPUi386
  *
diff --git a/cpukit/score/src/apimutexisowner.c b/cpukit/score/src/apimutexisowner.c
index 3c6f2a1..f67517d 100644
--- a/cpukit/score/src/apimutexisowner.c
+++ b/cpukit/score/src/apimutexisowner.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreAPIMutex
+ * @ingroup RTEMSScoreAPIMutex
  */
 
 /*
diff --git a/cpukit/score/src/apimutexlock.c b/cpukit/score/src/apimutexlock.c
index 46a48a3..51454ef 100644
--- a/cpukit/score/src/apimutexlock.c
+++ b/cpukit/score/src/apimutexlock.c
@@ -3,7 +3,7 @@
  *
  * @brief Acquires the specified API mutex.
  *
- * @ingroup ScoreAPIMutex
+ * @ingroup RTEMSScoreAPIMutex
  */
 
 /*
diff --git a/cpukit/score/src/apimutexunlock.c b/cpukit/score/src/apimutexunlock.c
index b4a5592..2e7395c 100644
--- a/cpukit/score/src/apimutexunlock.c
+++ b/cpukit/score/src/apimutexunlock.c
@@ -3,7 +3,7 @@
  *
  * @brief Releases the Specified API Mutex
  *
- * @ingroup ScoreAPIMutex
+ * @ingroup RTEMSScoreAPIMutex
  */
 
 /*
diff --git a/cpukit/score/src/chain.c b/cpukit/score/src/chain.c
index 7f7af71..b7c04a0 100644
--- a/cpukit/score/src/chain.c
+++ b/cpukit/score/src/chain.c
@@ -3,7 +3,7 @@
  *
  * @brief Initialize a Chain Header
  *
- * @ingroup ScoreChain
+ * @ingroup RTEMSScoreChain
  */
 
 /*
diff --git a/cpukit/score/src/corebarrier.c b/cpukit/score/src/corebarrier.c
index 98dfd0b..15c6053 100644
--- a/cpukit/score/src/corebarrier.c
+++ b/cpukit/score/src/corebarrier.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Initialize CORE Barrier
- *  @ingroup ScoreBarrier
+ *  @ingroup RTEMSScoreBarrier
  */
 
 /*
diff --git a/cpukit/score/src/corebarrierrelease.c b/cpukit/score/src/corebarrierrelease.c
index 8a23856..3ef3dea 100644
--- a/cpukit/score/src/corebarrierrelease.c
+++ b/cpukit/score/src/corebarrierrelease.c
@@ -3,7 +3,7 @@
  *
  * @brief Manually releases the Barrier
  *
- * @ingroup ScoreBarrier
+ * @ingroup RTEMSScoreBarrier
  */
 
 /*
diff --git a/cpukit/score/src/corebarrierwait.c b/cpukit/score/src/corebarrierwait.c
index 08acce9..b410dc0 100644
--- a/cpukit/score/src/corebarrierwait.c
+++ b/cpukit/score/src/corebarrierwait.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Wait For The Barrier
- *  @ingroup ScoreBarrier
+ *  @ingroup RTEMSScoreBarrier
  */
 
 /*
diff --git a/cpukit/score/src/coremsg.c b/cpukit/score/src/coremsg.c
index 1dbadc2..8404054 100644
--- a/cpukit/score/src/coremsg.c
+++ b/cpukit/score/src/coremsg.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Initialize a Message Queue
- *  @ingroup ScoreMessageQueue
+ *  @ingroup RTEMSScoreMessageQueue
  */
 
 /*
diff --git a/cpukit/score/src/coremsgbroadcast.c b/cpukit/score/src/coremsgbroadcast.c
index ed92dbc..aeb1b37 100644
--- a/cpukit/score/src/coremsgbroadcast.c
+++ b/cpukit/score/src/coremsgbroadcast.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Broadcast a Message to the Message Queue
- *  @ingroup ScoreMessageQueue
+ *  @ingroup RTEMSScoreMessageQueue
  */
 
 /*
diff --git a/cpukit/score/src/coremsgclose.c b/cpukit/score/src/coremsgclose.c
index f8a53a2..616d73c 100644
--- a/cpukit/score/src/coremsgclose.c
+++ b/cpukit/score/src/coremsgclose.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Close a Message Queue
- *  @ingroup ScoreMessageQueue
+ *  @ingroup RTEMSScoreMessageQueue
  */
 
 /*
diff --git a/cpukit/score/src/coremsgflush.c b/cpukit/score/src/coremsgflush.c
index e5b51f9..c73d8a9 100644
--- a/cpukit/score/src/coremsgflush.c
+++ b/cpukit/score/src/coremsgflush.c
@@ -3,7 +3,7 @@
  *
  * @brief Flush Messages Routine
  *
- * @ingroup ScoreMessageQueue
+ * @ingroup RTEMSScoreMessageQueue
  */
 
 /*
diff --git a/cpukit/score/src/coremsgflushwait.c b/cpukit/score/src/coremsgflushwait.c
index a53f922..f309f8e 100644
--- a/cpukit/score/src/coremsgflushwait.c
+++ b/cpukit/score/src/coremsgflushwait.c
@@ -3,7 +3,7 @@
  *
  * @brief Flush Waiting Threads.
  *
- * @ingroup ScoreMessageQueue
+ * @ingroup RTEMSScoreMessageQueue
  */
 
 /*
diff --git a/cpukit/score/src/coremsginsert.c b/cpukit/score/src/coremsginsert.c
index a9aa1e5..c254a0d 100644
--- a/cpukit/score/src/coremsginsert.c
+++ b/cpukit/score/src/coremsginsert.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief Insert a Message into the Message Queue
- * @ingroup ScoreMessageQueue
+ * @ingroup RTEMSScoreMessageQueue
  */
 
 /*
diff --git a/cpukit/score/src/coremsgseize.c b/cpukit/score/src/coremsgseize.c
index 7e7cb8f..0efc63a 100644
--- a/cpukit/score/src/coremsgseize.c
+++ b/cpukit/score/src/coremsgseize.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Seize a Message from the Message Queue
- *  @ingroup ScoreMessageQueue
+ *  @ingroup RTEMSScoreMessageQueue
  */
 
 /*
diff --git a/cpukit/score/src/coremsgsubmit.c b/cpukit/score/src/coremsgsubmit.c
index 49c9025..86c35d2 100644
--- a/cpukit/score/src/coremsgsubmit.c
+++ b/cpukit/score/src/coremsgsubmit.c
@@ -3,7 +3,7 @@
  *
  * @brief CORE Message Queue Submit
  *
- * @ingroup ScoreMessageQueue
+ * @ingroup RTEMSScoreMessageQueue
  */
 
 /*
diff --git a/cpukit/score/src/coremutexseize.c b/cpukit/score/src/coremutexseize.c
index e074585..1fd7a11 100644
--- a/cpukit/score/src/coremutexseize.c
+++ b/cpukit/score/src/coremutexseize.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Seize Mutex with Blocking
- *  @ingroup ScoreMutex
+ *  @ingroup RTEMSScoreMutex
  */
 
 /*
diff --git a/cpukit/score/src/corerwlock.c b/cpukit/score/src/corerwlock.c
index 9ebb796..19739e1 100644
--- a/cpukit/score/src/corerwlock.c
+++ b/cpukit/score/src/corerwlock.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief
- * @ingroup ScoreRWLock
+ * @ingroup RTEMSScoreRWLock
  */
 
 /*
diff --git a/cpukit/score/src/corerwlockobtainread.c b/cpukit/score/src/corerwlockobtainread.c
index 19685b9..5d097a8 100644
--- a/cpukit/score/src/corerwlockobtainread.c
+++ b/cpukit/score/src/corerwlockobtainread.c
@@ -2,7 +2,7 @@
  * @file
  * 
  * @brief Obtain RWLock for reading
- * @ingroup ScoreRWLock
+ * @ingroup RTEMSScoreRWLock
  */
 
 /*
diff --git a/cpukit/score/src/corerwlockobtainwrite.c b/cpukit/score/src/corerwlockobtainwrite.c
index 7b29616..6d2e6a2 100644
--- a/cpukit/score/src/corerwlockobtainwrite.c
+++ b/cpukit/score/src/corerwlockobtainwrite.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief RWLock Obtain for Writing
- * @ingroup ScoreRWLock
+ * @ingroup RTEMSScoreRWLock
  */
 
 /*
diff --git a/cpukit/score/src/corerwlockrelease.c b/cpukit/score/src/corerwlockrelease.c
index 772d16d..c3c6cb9 100644
--- a/cpukit/score/src/corerwlockrelease.c
+++ b/cpukit/score/src/corerwlockrelease.c
@@ -3,7 +3,7 @@
  *
  * @brief Releases the RWLock
  *
- * @ingroup ScoreRWLock
+ * @ingroup RTEMSScoreRWLock
  */
 
 /*
diff --git a/cpukit/score/src/coresem.c b/cpukit/score/src/coresem.c
index f896644..9cb1a73 100644
--- a/cpukit/score/src/coresem.c
+++ b/cpukit/score/src/coresem.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Core Semaphore Initialize
- *  @ingroup ScoreSemaphore
+ *  @ingroup RTEMSScoreSemaphore
  */
 
 /*
diff --git a/cpukit/score/src/coretod.c b/cpukit/score/src/coretod.c
index cd8428c..f19cff2 100644
--- a/cpukit/score/src/coretod.c
+++ b/cpukit/score/src/coretod.c
@@ -3,7 +3,7 @@
  *
  * @brief Initializes the Time of Day Handler
  *
- * @ingroup ScoreTOD
+ * @ingroup RTEMSScoreTOD
  */
 
 /*  COPYRIGHT (c) 1989-2014.
diff --git a/cpukit/score/src/coretodadjust.c b/cpukit/score/src/coretodadjust.c
index f493a40..accb99b 100644
--- a/cpukit/score/src/coretodadjust.c
+++ b/cpukit/score/src/coretodadjust.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief Adjust the Time of Time
- * @ingroup ScoreTOD
+ * @ingroup RTEMSScoreTOD
  */
 
 /*
diff --git a/cpukit/score/src/coretodset.c b/cpukit/score/src/coretodset.c
index 020b887..f348596 100644
--- a/cpukit/score/src/coretodset.c
+++ b/cpukit/score/src/coretodset.c
@@ -3,7 +3,7 @@
  *
  * @brief Set Time of Day Given a Timestamp
  *
- * @ingroup ScoreTOD
+ * @ingroup RTEMSScoreTOD
  */
 
 /*  COPYRIGHT (c) 1989-2007.
diff --git a/cpukit/score/src/coretodtickspersec.c b/cpukit/score/src/coretodtickspersec.c
index cfe53ce..7fb52fc 100644
--- a/cpukit/score/src/coretodtickspersec.c
+++ b/cpukit/score/src/coretodtickspersec.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief Convert Ticks To Seconds
- * @ingroup ScoreTOD
+ * @ingroup RTEMSScoreTOD
  */
 
 /*  COPYRIGHT (c) 1989-2014.
diff --git a/cpukit/score/src/freechain.c b/cpukit/score/src/freechain.c
index 57ba293..f7da122 100644
--- a/cpukit/score/src/freechain.c
+++ b/cpukit/score/src/freechain.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreFreechain
+ * @ingroup RTEMSScoreFreechain
  *
  * @brief Freechain Handler Implementation
  */
diff --git a/cpukit/score/src/heap.c b/cpukit/score/src/heap.c
index 402f631..3719441 100644
--- a/cpukit/score/src/heap.c
+++ b/cpukit/score/src/heap.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
  *
  * @brief Heap Handler implementation.
  */
diff --git a/cpukit/score/src/heapallocate.c b/cpukit/score/src/heapallocate.c
index e1ea68e..3984881 100644
--- a/cpukit/score/src/heapallocate.c
+++ b/cpukit/score/src/heapallocate.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
  *
  * @brief Heap Handler implementation.
  */
diff --git a/cpukit/score/src/heapextend.c b/cpukit/score/src/heapextend.c
index 6dde6b2..3e77924 100644
--- a/cpukit/score/src/heapextend.c
+++ b/cpukit/score/src/heapextend.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
  *
  * @brief Heap Handler implementation.
  */
diff --git a/cpukit/score/src/heapfree.c b/cpukit/score/src/heapfree.c
index 13bf5ee..04994c5 100644
--- a/cpukit/score/src/heapfree.c
+++ b/cpukit/score/src/heapfree.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
  *
  * @brief Heap Handler implementation.
  */
diff --git a/cpukit/score/src/heapgetfreeinfo.c b/cpukit/score/src/heapgetfreeinfo.c
index b0480b8..ab7ef71 100644
--- a/cpukit/score/src/heapgetfreeinfo.c
+++ b/cpukit/score/src/heapgetfreeinfo.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
  *
  * @brief Heap Handler implementation.
  */
diff --git a/cpukit/score/src/heapgetinfo.c b/cpukit/score/src/heapgetinfo.c
index 36afe95..241934f 100644
--- a/cpukit/score/src/heapgetinfo.c
+++ b/cpukit/score/src/heapgetinfo.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
  *
  * @brief Heap Handler implementation.
  */
diff --git a/cpukit/score/src/heapgreedy.c b/cpukit/score/src/heapgreedy.c
index 615d3066..faf12fb 100644
--- a/cpukit/score/src/heapgreedy.c
+++ b/cpukit/score/src/heapgreedy.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
  *
  * @brief Heap Handler API.
  */
diff --git a/cpukit/score/src/heapiterate.c b/cpukit/score/src/heapiterate.c
index 38e8d68..de6bbb1 100644
--- a/cpukit/score/src/heapiterate.c
+++ b/cpukit/score/src/heapiterate.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
  *
  * @brief _Heap_Iterate() implementation.
  */
diff --git a/cpukit/score/src/heapnoextend.c b/cpukit/score/src/heapnoextend.c
index d961c5a..3be7e37 100644
--- a/cpukit/score/src/heapnoextend.c
+++ b/cpukit/score/src/heapnoextend.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
  *
  * @brief Heap Handler implementation.
  */
diff --git a/cpukit/score/src/heapresizeblock.c b/cpukit/score/src/heapresizeblock.c
index 79d13a1..bef2527 100644
--- a/cpukit/score/src/heapresizeblock.c
+++ b/cpukit/score/src/heapresizeblock.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
  *
  * @brief Heap Handler implementation.
  */
diff --git a/cpukit/score/src/heapsizeofuserarea.c b/cpukit/score/src/heapsizeofuserarea.c
index d0d0303..b9b75a2 100644
--- a/cpukit/score/src/heapsizeofuserarea.c
+++ b/cpukit/score/src/heapsizeofuserarea.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
  *
  * @brief Heap Handler implementation.
  */
diff --git a/cpukit/score/src/heapwalk.c b/cpukit/score/src/heapwalk.c
index f1ac20d..b935179 100644
--- a/cpukit/score/src/heapwalk.c
+++ b/cpukit/score/src/heapwalk.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreHeap
+ * @ingroup RTEMSScoreHeap
  *
  * @brief Heap Handler implementation.
  */
diff --git a/cpukit/score/src/interr.c b/cpukit/score/src/interr.c
index 3a74f95..7ccd3de 100644
--- a/cpukit/score/src/interr.c
+++ b/cpukit/score/src/interr.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief Initiates system termination
- * @ingroup ScoreIntErr
+ * @ingroup RTEMSScoreIntErr
  */
 
 /*
diff --git a/cpukit/score/src/isr.c b/cpukit/score/src/isr.c
index 4a7bc5f..436055d 100644
--- a/cpukit/score/src/isr.c
+++ b/cpukit/score/src/isr.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Initialize the ISR handler
- *  @ingroup ScoreISR
+ *  @ingroup RTEMSScoreISR
  */
 
 /*
diff --git a/cpukit/score/src/isrisinprogress.c b/cpukit/score/src/isrisinprogress.c
index e2f210a..267136d 100644
--- a/cpukit/score/src/isrisinprogress.c
+++ b/cpukit/score/src/isrisinprogress.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreISR
+ * @ingroup RTEMSScoreISR
  *
  * @brief ISR Is In Progress Default Implementation
  */
diff --git a/cpukit/score/src/iterateoverthreads.c b/cpukit/score/src/iterateoverthreads.c
index e829fc9..0fdcee4 100644
--- a/cpukit/score/src/iterateoverthreads.c
+++ b/cpukit/score/src/iterateoverthreads.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Iterates Over All Threads
- *  @ingroup ScoreThread
+ *  @ingroup RTEMSScoreThread
  */
 
 /*
diff --git a/cpukit/score/src/log2table.c b/cpukit/score/src/log2table.c
index 19a9c8a..ae63d3e 100644
--- a/cpukit/score/src/log2table.c
+++ b/cpukit/score/src/log2table.c
@@ -3,7 +3,7 @@
  *
  * @brief Priority Bit Map Implementation
  *
- * @ingroup ScorePriorityBitmap
+ * @ingroup RTEMSScorePriorityBitmap
  */
 
 /*
diff --git a/cpukit/score/src/mpci.c b/cpukit/score/src/mpci.c
index 9b09caa..f488325 100644
--- a/cpukit/score/src/mpci.c
+++ b/cpukit/score/src/mpci.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief Multiprocessing Communications Interface (MPCI) Handler
- * @ingroup ScoreMPCI
+ * @ingroup RTEMSScoreMPCI
  */
 
 /*
diff --git a/cpukit/score/src/objectallocate.c b/cpukit/score/src/objectallocate.c
index ad73884..ac7579d 100644
--- a/cpukit/score/src/objectallocate.c
+++ b/cpukit/score/src/objectallocate.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Allocate Object
- *  @ingroup ScoreObject
+ *  @ingroup RTEMSScoreObject
  */
 
 /*
diff --git a/cpukit/score/src/objectapimaximumclass.c b/cpukit/score/src/objectapimaximumclass.c
index dc6b6c4..0fb87ab 100644
--- a/cpukit/score/src/objectapimaximumclass.c
+++ b/cpukit/score/src/objectapimaximumclass.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Object API Maximum Class
- *  @ingroup ScoreObject
+ *  @ingroup RTEMSScoreObject
  */
 
 /*
diff --git a/cpukit/score/src/objectclose.c b/cpukit/score/src/objectclose.c
index e5ee4b5..05ac7f4 100644
--- a/cpukit/score/src/objectclose.c
+++ b/cpukit/score/src/objectclose.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Close Object
- *  @ingroup ScoreObject
+ *  @ingroup RTEMSScoreObject
  */
 
 /*
diff --git a/cpukit/score/src/objectextendinformation.c b/cpukit/score/src/objectextendinformation.c
index b26f591..688d0f9 100644
--- a/cpukit/score/src/objectextendinformation.c
+++ b/cpukit/score/src/objectextendinformation.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief Extend Set of Objects
- * @ingroup ScoreObject
+ * @ingroup RTEMSScoreObject
  */
 
 /*
diff --git a/cpukit/score/src/objectfree.c b/cpukit/score/src/objectfree.c
index c9af8ba..af71245 100644
--- a/cpukit/score/src/objectfree.c
+++ b/cpukit/score/src/objectfree.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Free Object
- *  @ingroup ScoreObject
+ *  @ingroup RTEMSScoreObject
  */
 
 /*
diff --git a/cpukit/score/src/objectgetinfo.c b/cpukit/score/src/objectgetinfo.c
index c927d1c..b0ca7e2 100644
--- a/cpukit/score/src/objectgetinfo.c
+++ b/cpukit/score/src/objectgetinfo.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Get Object Information
- *  @ingroup ScoreObject
+ *  @ingroup RTEMSScoreObject
  */
 
 /*
diff --git a/cpukit/score/src/objectgetinfoid.c b/cpukit/score/src/objectgetinfoid.c
index 415bfc2..99243cc 100644
--- a/cpukit/score/src/objectgetinfoid.c
+++ b/cpukit/score/src/objectgetinfoid.c
@@ -3,7 +3,7 @@
  *
  * @brief Get Information of an Object from an ID
  *
- * @ingroup Score
+ * @ingroup RTEMSScore
  */
 
 /*
diff --git a/cpukit/score/src/objectgetlocal.c b/cpukit/score/src/objectgetlocal.c
index e8a109f..64215ea 100644
--- a/cpukit/score/src/objectgetlocal.c
+++ b/cpukit/score/src/objectgetlocal.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Object Get Local
- *  @ingroup ScoreObject
+ *  @ingroup RTEMSScoreObject
  */
 
 /*
diff --git a/cpukit/score/src/objectgetnameasstring.c b/cpukit/score/src/objectgetnameasstring.c
index 8453340..dc0ec93 100644
--- a/cpukit/score/src/objectgetnameasstring.c
+++ b/cpukit/score/src/objectgetnameasstring.c
@@ -3,7 +3,7 @@
  *
  * @brief Extracts a Node from a Chain
  *
- * @ingroup Score
+ * @ingroup RTEMSScore
  */
 
 /*
diff --git a/cpukit/score/src/objectgetnext.c b/cpukit/score/src/objectgetnext.c
index 156bee7..25640d1 100644
--- a/cpukit/score/src/objectgetnext.c
+++ b/cpukit/score/src/objectgetnext.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief Get Pointer to Next Object that is Active
- * @ingroup ScoreObject
+ * @ingroup RTEMSScoreObject
  */
 
 /*
diff --git a/cpukit/score/src/objectgetnoprotection.c b/cpukit/score/src/objectgetnoprotection.c
index e5045b2..71ce1f5 100644
--- a/cpukit/score/src/objectgetnoprotection.c
+++ b/cpukit/score/src/objectgetnoprotection.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief  Get Object without Dispatching Protection
- *  @ingroup ScoreObject
+ *  @ingroup RTEMSScoreObject
  */
 
 /*
diff --git a/cpukit/score/src/objectidtoname.c b/cpukit/score/src/objectidtoname.c
index 6394816..c4ecc3c 100644
--- a/cpukit/score/src/objectidtoname.c
+++ b/cpukit/score/src/objectidtoname.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Object id to name
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  */
 
 /*
diff --git a/cpukit/score/src/objectinitializeinformation.c b/cpukit/score/src/objectinitializeinformation.c
index 39d836d..54920b5 100644
--- a/cpukit/score/src/objectinitializeinformation.c
+++ b/cpukit/score/src/objectinitializeinformation.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief Initialize Object Information
- * @ingroup ScoreObject
+ * @ingroup RTEMSScoreObject
  */
 
 /*
diff --git a/cpukit/score/src/objectmp.c b/cpukit/score/src/objectmp.c
index 75a0fdb..74ed220 100644
--- a/cpukit/score/src/objectmp.c
+++ b/cpukit/score/src/objectmp.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Objects MP Support
- *  @ingroup ScoreObjectMP
+ *  @ingroup RTEMSScoreObjectMP
  */
 
 /*
diff --git a/cpukit/score/src/objectnamespaceremove.c b/cpukit/score/src/objectnamespaceremove.c
index 122ed86..3260311 100644
--- a/cpukit/score/src/objectnamespaceremove.c
+++ b/cpukit/score/src/objectnamespaceremove.c
@@ -3,7 +3,7 @@
  *
  * @brief Removes Object from Namespace
  *
- * @ingroup Score
+ * @ingroup RTEMSScore
  */
 
 /*
diff --git a/cpukit/score/src/objectnametoid.c b/cpukit/score/src/objectnametoid.c
index 6a89b87..8603819 100644
--- a/cpukit/score/src/objectnametoid.c
+++ b/cpukit/score/src/objectnametoid.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Object Name To Id
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  */
 
 /*
diff --git a/cpukit/score/src/objectnametoidstring.c b/cpukit/score/src/objectnametoidstring.c
index d357339..cd29548 100644
--- a/cpukit/score/src/objectnametoidstring.c
+++ b/cpukit/score/src/objectnametoidstring.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief Object ID to Name
- * @ingroup ScoreObject
+ * @ingroup RTEMSScoreObject
  */
 
 /*
diff --git a/cpukit/score/src/objectsetname.c b/cpukit/score/src/objectsetname.c
index 32197a3..30b640e 100644
--- a/cpukit/score/src/objectsetname.c
+++ b/cpukit/score/src/objectsetname.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief Set Objects Name
- * @ingroup ScoreObject
+ * @ingroup RTEMSScoreObject
  */
 
 /*
diff --git a/cpukit/score/src/pheapallocate.c b/cpukit/score/src/pheapallocate.c
index 00c3865..2ceb275 100644
--- a/cpukit/score/src/pheapallocate.c
+++ b/cpukit/score/src/pheapallocate.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreProtHeap
+ * @ingroup RTEMSScoreProtHeap
  *
  * @brief Protected Heap Handler implementation.
  */
diff --git a/cpukit/score/src/pheapextend.c b/cpukit/score/src/pheapextend.c
index 118a9e6..b6054aa 100644
--- a/cpukit/score/src/pheapextend.c
+++ b/cpukit/score/src/pheapextend.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreProtHeap
+ * @ingroup RTEMSScoreProtHeap
  *
  * @brief Protected Heap Handler implementation.
  */
diff --git a/cpukit/score/src/pheapfree.c b/cpukit/score/src/pheapfree.c
index f1c1776..cce9868 100644
--- a/cpukit/score/src/pheapfree.c
+++ b/cpukit/score/src/pheapfree.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreProtHeap
+ * @ingroup RTEMSScoreProtHeap
  *
  * @brief Protected Heap Handler implementation.
  */
diff --git a/cpukit/score/src/pheapgetblocksize.c b/cpukit/score/src/pheapgetblocksize.c
index 85a5e9c..6281720 100644
--- a/cpukit/score/src/pheapgetblocksize.c
+++ b/cpukit/score/src/pheapgetblocksize.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreProtHeap
+ * @ingroup RTEMSScoreProtHeap
  *
  * @brief Protected Heap Handler implementation.
  */
diff --git a/cpukit/score/src/pheapgetfreeinfo.c b/cpukit/score/src/pheapgetfreeinfo.c
index 326b577..4c226f7 100644
--- a/cpukit/score/src/pheapgetfreeinfo.c
+++ b/cpukit/score/src/pheapgetfreeinfo.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreProtHeap
+ * @ingroup RTEMSScoreProtHeap
  *
  * @brief Protected Heap Handler implementation.
  */
diff --git a/cpukit/score/src/pheapgetinfo.c b/cpukit/score/src/pheapgetinfo.c
index 27dea96..0fff3ff 100644
--- a/cpukit/score/src/pheapgetinfo.c
+++ b/cpukit/score/src/pheapgetinfo.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreProtHeap
+ * @ingroup RTEMSScoreProtHeap
  *
  * @brief Protected Heap Handler implementation.
  */
diff --git a/cpukit/score/src/pheapgetsize.c b/cpukit/score/src/pheapgetsize.c
index d60986b..d1318cb 100644
--- a/cpukit/score/src/pheapgetsize.c
+++ b/cpukit/score/src/pheapgetsize.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreProtHeap
+ * @ingroup RTEMSScoreProtHeap
  *
  * @brief Protected Heap Handler implementation.
  */
diff --git a/cpukit/score/src/pheapinit.c b/cpukit/score/src/pheapinit.c
index e5a6596..03e5477 100644
--- a/cpukit/score/src/pheapinit.c
+++ b/cpukit/score/src/pheapinit.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreProtHeap
+ * @ingroup RTEMSScoreProtHeap
  *
  * @brief Protected Heap Handler implementation.
  */
diff --git a/cpukit/score/src/pheapiterate.c b/cpukit/score/src/pheapiterate.c
index 9b6d945..924667c 100644
--- a/cpukit/score/src/pheapiterate.c
+++ b/cpukit/score/src/pheapiterate.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreProtHeap
+ * @ingroup RTEMSScoreProtHeap
  *
  * @brief _Heap_Iterate() implementation.
  */
diff --git a/cpukit/score/src/pheapresizeblock.c b/cpukit/score/src/pheapresizeblock.c
index de8b5b9..da60b7d 100644
--- a/cpukit/score/src/pheapresizeblock.c
+++ b/cpukit/score/src/pheapresizeblock.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreProtHeap
+ * @ingroup RTEMSScoreProtHeap
  *
  * @brief Protected Heap Handler implementation.
  */
diff --git a/cpukit/score/src/pheapwalk.c b/cpukit/score/src/pheapwalk.c
index 5605470..f15070c 100644
--- a/cpukit/score/src/pheapwalk.c
+++ b/cpukit/score/src/pheapwalk.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreProtHeap
+ * @ingroup RTEMSScoreProtHeap
  *
  * @brief Protected Heap Handler implementation.
  */
diff --git a/cpukit/score/src/processormaskcopy.c b/cpukit/score/src/processormaskcopy.c
index 677c886..d10eeec 100644
--- a/cpukit/score/src/processormaskcopy.c
+++ b/cpukit/score/src/processormaskcopy.c
@@ -3,7 +3,7 @@
  *
  * @brief Processor Mask Implementation
  *
- * @ingroup ScoreProcessorMask
+ * @ingroup RTEMSScoreProcessorMask
  */
 
 /*
diff --git a/cpukit/score/src/rbtreeiterate.c b/cpukit/score/src/rbtreeiterate.c
index 46a0e43..e642c7b 100644
--- a/cpukit/score/src/rbtreeiterate.c
+++ b/cpukit/score/src/rbtreeiterate.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreRBTree
+ * @ingroup RTEMSScoreRBTree
  *
  * @brief _RBTree_Iterate() implementation.
  */
diff --git a/cpukit/score/src/rbtreenext.c b/cpukit/score/src/rbtreenext.c
index 7096b4b..4783ea1 100644
--- a/cpukit/score/src/rbtreenext.c
+++ b/cpukit/score/src/rbtreenext.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreRBTree
+ * @ingroup RTEMSScoreRBTree
  *
  * @brief _RBTree_Next() and _RBTree_Next() implementation.
  */
diff --git a/cpukit/score/src/rbtreepostorder.c b/cpukit/score/src/rbtreepostorder.c
index 26555c8..acbf541 100644
--- a/cpukit/score/src/rbtreepostorder.c
+++ b/cpukit/score/src/rbtreepostorder.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreRBTree
+ * @ingroup RTEMSScoreRBTree
  *
  * @brief _RBTree_Postorder_first() and _RBTree_Postorder_next()
  * implementation.
diff --git a/cpukit/score/src/rbtreereplace.c b/cpukit/score/src/rbtreereplace.c
index 7a54000..975d539 100644
--- a/cpukit/score/src/rbtreereplace.c
+++ b/cpukit/score/src/rbtreereplace.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreRBTree
+ * @ingroup RTEMSScoreRBTree
  *
  * @brief _RBTree_Replace_node() implementation.
  */
diff --git a/cpukit/score/src/scheduler.c b/cpukit/score/src/scheduler.c
index e5b9688..db2c435 100644
--- a/cpukit/score/src/scheduler.c
+++ b/cpukit/score/src/scheduler.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief Scheduler Initialize
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulercbs.c b/cpukit/score/src/schedulercbs.c
index f114d4f..d4001d8 100644
--- a/cpukit/score/src/schedulercbs.c
+++ b/cpukit/score/src/schedulercbs.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief CBS Scheduler Budget Handler
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulercbsattachthread.c b/cpukit/score/src/schedulercbsattachthread.c
index faabbbb..4193882 100644
--- a/cpukit/score/src/schedulercbsattachthread.c
+++ b/cpukit/score/src/schedulercbsattachthread.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Attach Scheduler CBS Thread
- *  @ingroup ScoreScheduler
+ *  @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulercbscleanup.c b/cpukit/score/src/schedulercbscleanup.c
index 01dd0d8..cd6e138 100644
--- a/cpukit/score/src/schedulercbscleanup.c
+++ b/cpukit/score/src/schedulercbscleanup.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Scheduler CBS Cleanup
- *  @ingroup ScoreScheduler
+ *  @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulercbscreateserver.c b/cpukit/score/src/schedulercbscreateserver.c
index 9d1cc0b..15262cf 100644
--- a/cpukit/score/src/schedulercbscreateserver.c
+++ b/cpukit/score/src/schedulercbscreateserver.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Scheduler CBS Create Server
- *  @ingroup ScoreScheduler
+ *  @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulercbsdestroyserver.c b/cpukit/score/src/schedulercbsdestroyserver.c
index 2407a48..5121e3a 100644
--- a/cpukit/score/src/schedulercbsdestroyserver.c
+++ b/cpukit/score/src/schedulercbsdestroyserver.c
@@ -3,7 +3,7 @@
  *
  * @brief Scheduler CBS Destroy Server
  *
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulercbsdetachthread.c b/cpukit/score/src/schedulercbsdetachthread.c
index 6df0f2d..c840c8b 100644
--- a/cpukit/score/src/schedulercbsdetachthread.c
+++ b/cpukit/score/src/schedulercbsdetachthread.c
@@ -3,7 +3,7 @@
  *
  * @brief Detach from the CBS Server
  *
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulercbsgetapprovedbudget.c b/cpukit/score/src/schedulercbsgetapprovedbudget.c
index 1377ea0..e72ef3b 100644
--- a/cpukit/score/src/schedulercbsgetapprovedbudget.c
+++ b/cpukit/score/src/schedulercbsgetapprovedbudget.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Scheduler CBS Get Approved Budget
- *  @ingroup ScoreScheduler
+ *  @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulercbsgetexecutiontime.c b/cpukit/score/src/schedulercbsgetexecutiontime.c
index 608560b..b18ce9a 100644
--- a/cpukit/score/src/schedulercbsgetexecutiontime.c
+++ b/cpukit/score/src/schedulercbsgetexecutiontime.c
@@ -3,7 +3,7 @@
  *
  * @brief Get Thread Execution Info
  *
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulercbsgetparameters.c b/cpukit/score/src/schedulercbsgetparameters.c
index f4adae3..1abe5d9 100644
--- a/cpukit/score/src/schedulercbsgetparameters.c
+++ b/cpukit/score/src/schedulercbsgetparameters.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief _Scheduler_CBS_Get_parameters
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulercbsgetremainingbudget.c b/cpukit/score/src/schedulercbsgetremainingbudget.c
index 46049bf..d556f33 100644
--- a/cpukit/score/src/schedulercbsgetremainingbudget.c
+++ b/cpukit/score/src/schedulercbsgetremainingbudget.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Scheduler CBS Get Remaining Budget
- *  @ingroup ScoreScheduler
+ *  @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulercbsgetserverid.c b/cpukit/score/src/schedulercbsgetserverid.c
index 8ceff89..276c08f 100644
--- a/cpukit/score/src/schedulercbsgetserverid.c
+++ b/cpukit/score/src/schedulercbsgetserverid.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Scheduler CBS Get Server id
- *  @ingroup ScoreScheduler
+ *  @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulercbsnodeinit.c b/cpukit/score/src/schedulercbsnodeinit.c
index 89b6f8e..08f63a1 100644
--- a/cpukit/score/src/schedulercbsnodeinit.c
+++ b/cpukit/score/src/schedulercbsnodeinit.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Scheduler CBS Allocate
- *  @ingroup ScoreScheduler
+ *  @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulercbsreleasejob.c b/cpukit/score/src/schedulercbsreleasejob.c
index 186f95c..3ac07eb 100644
--- a/cpukit/score/src/schedulercbsreleasejob.c
+++ b/cpukit/score/src/schedulercbsreleasejob.c
@@ -3,7 +3,7 @@
  *
  * @brief Scheduler CBS Release Job
  *
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulercbssetparameters.c b/cpukit/score/src/schedulercbssetparameters.c
index 04682a0..0b8b664 100644
--- a/cpukit/score/src/schedulercbssetparameters.c
+++ b/cpukit/score/src/schedulercbssetparameters.c
@@ -3,7 +3,7 @@
  *
  * @brief Set Parameters for CBS Scheduling
  *
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulercbsunblock.c b/cpukit/score/src/schedulercbsunblock.c
index 9b7a0ca..4d751f9 100644
--- a/cpukit/score/src/schedulercbsunblock.c
+++ b/cpukit/score/src/schedulercbsunblock.c
@@ -3,7 +3,7 @@
  *
  * @brief Unblocks a Thread from the Queue
  *
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulerdefaultnodedestroy.c b/cpukit/score/src/schedulerdefaultnodedestroy.c
index 537c824..ae1ba24 100644
--- a/cpukit/score/src/schedulerdefaultnodedestroy.c
+++ b/cpukit/score/src/schedulerdefaultnodedestroy.c
@@ -3,7 +3,7 @@
  *
  * @brief Scheduler Default Node Destruction Operation
  *
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulerdefaultnodeinit.c b/cpukit/score/src/schedulerdefaultnodeinit.c
index 53aed52..de12bab 100644
--- a/cpukit/score/src/schedulerdefaultnodeinit.c
+++ b/cpukit/score/src/schedulerdefaultnodeinit.c
@@ -3,7 +3,7 @@
  *
  * @brief Scheduler Default Node Initialization Operation
  *
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulerdefaultreleasejob.c b/cpukit/score/src/schedulerdefaultreleasejob.c
index 490d58b..52c1942 100644
--- a/cpukit/score/src/schedulerdefaultreleasejob.c
+++ b/cpukit/score/src/schedulerdefaultreleasejob.c
@@ -3,7 +3,7 @@
  *
  * @brief Default Scheduler Release Job Operation
  *
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulerdefaultsetaffinity.c b/cpukit/score/src/schedulerdefaultsetaffinity.c
index bd8fc95..ad7fc0d 100644
--- a/cpukit/score/src/schedulerdefaultsetaffinity.c
+++ b/cpukit/score/src/schedulerdefaultsetaffinity.c
@@ -3,7 +3,7 @@
  *
  * @brief Scheduler Default Set Affinity Operation
  *
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulerdefaulttick.c b/cpukit/score/src/schedulerdefaulttick.c
index 19acd3b..21ae594 100644
--- a/cpukit/score/src/schedulerdefaulttick.c
+++ b/cpukit/score/src/schedulerdefaulttick.c
@@ -3,7 +3,7 @@
  *
  * @brief Default Scheduler At Tick Handler
  *
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/scheduleredf.c b/cpukit/score/src/scheduleredf.c
index 21bbe24..99592c1 100644
--- a/cpukit/score/src/scheduleredf.c
+++ b/cpukit/score/src/scheduleredf.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief Scheduler EDF Initialize and Support
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/scheduleredfblock.c b/cpukit/score/src/scheduleredfblock.c
index 1269e8e..47e815e 100644
--- a/cpukit/score/src/scheduleredfblock.c
+++ b/cpukit/score/src/scheduleredfblock.c
@@ -3,7 +3,7 @@
  *
  * @brief Removes the Thread from Ready Queue
  *
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/scheduleredfchangepriority.c b/cpukit/score/src/scheduleredfchangepriority.c
index d3d1f94..9cd4a3c 100644
--- a/cpukit/score/src/scheduleredfchangepriority.c
+++ b/cpukit/score/src/scheduleredfchangepriority.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Scheduler EDF Extract
- *  @ingroup ScoreScheduler
+ *  @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/scheduleredfnodeinit.c b/cpukit/score/src/scheduleredfnodeinit.c
index 94f8fac..f448c87 100644
--- a/cpukit/score/src/scheduleredfnodeinit.c
+++ b/cpukit/score/src/scheduleredfnodeinit.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Scheduler EDF Allocate
- *  @ingroup ScoreScheduler
+ *  @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/scheduleredfreleasejob.c b/cpukit/score/src/scheduleredfreleasejob.c
index f95e8bd..6f9667d 100644
--- a/cpukit/score/src/scheduleredfreleasejob.c
+++ b/cpukit/score/src/scheduleredfreleasejob.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief Scheduler EDF Release Job
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/scheduleredfschedule.c b/cpukit/score/src/scheduleredfschedule.c
index 7840eed..0b30b67 100644
--- a/cpukit/score/src/scheduleredfschedule.c
+++ b/cpukit/score/src/scheduleredfschedule.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Scheduler EDF Allocate
- *  @ingroup ScoreScheduler
+ *  @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/scheduleredfsmp.c b/cpukit/score/src/scheduleredfsmp.c
index 62ddbda..e6bf648 100644
--- a/cpukit/score/src/scheduleredfsmp.c
+++ b/cpukit/score/src/scheduleredfsmp.c
@@ -3,7 +3,7 @@
  *
  * @brief EDF SMP Scheduler Implementation
  *
- * @ingroup ScoreSchedulerSMPEDF
+ * @ingroup RTEMSScoreSchedulerSMPEDF
  */
 
 /*
diff --git a/cpukit/score/src/scheduleredfunblock.c b/cpukit/score/src/scheduleredfunblock.c
index 91295f5..05fce9d 100644
--- a/cpukit/score/src/scheduleredfunblock.c
+++ b/cpukit/score/src/scheduleredfunblock.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief Scheduler EDF Unblock
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/scheduleredfyield.c b/cpukit/score/src/scheduleredfyield.c
index 4adb4f5..116e525 100644
--- a/cpukit/score/src/scheduleredfyield.c
+++ b/cpukit/score/src/scheduleredfyield.c
@@ -3,7 +3,7 @@
  *
  * @brief Scheduler EDF Yield
  *
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulerpriority.c b/cpukit/score/src/schedulerpriority.c
index 5ac16a4..f94d82e 100644
--- a/cpukit/score/src/schedulerpriority.c
+++ b/cpukit/score/src/schedulerpriority.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Initialize Scheduler Priority
- *  @ingroup ScoreScheduler
+ *  @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulerpriorityaffinitysmp.c b/cpukit/score/src/schedulerpriorityaffinitysmp.c
index a821065..f4f302f 100644
--- a/cpukit/score/src/schedulerpriorityaffinitysmp.c
+++ b/cpukit/score/src/schedulerpriorityaffinitysmp.c
@@ -3,7 +3,7 @@
  *
  * @brief Deterministic Priority Affinity SMP Scheduler Implementation
  *
- * @ingroup ScoreSchedulerPriorityAffinitySMP
+ * @ingroup RTEMSScoreSchedulerPriorityAffinitySMP
  */
 
 /*
diff --git a/cpukit/score/src/schedulerpriorityblock.c b/cpukit/score/src/schedulerpriorityblock.c
index 611c4cd..c192122 100644
--- a/cpukit/score/src/schedulerpriorityblock.c
+++ b/cpukit/score/src/schedulerpriorityblock.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief Scheduler Priority Block
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulerprioritychangepriority.c b/cpukit/score/src/schedulerprioritychangepriority.c
index 6af475a..247d1b2 100644
--- a/cpukit/score/src/schedulerprioritychangepriority.c
+++ b/cpukit/score/src/schedulerprioritychangepriority.c
@@ -3,7 +3,7 @@
  *
  * @brief Removes Thread from Thread Queue
  *
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulerpriorityschedule.c b/cpukit/score/src/schedulerpriorityschedule.c
index ffc1351..c2ea834 100644
--- a/cpukit/score/src/schedulerpriorityschedule.c
+++ b/cpukit/score/src/schedulerpriorityschedule.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief Priority Scheduler Schedule Method
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
  
 /*
diff --git a/cpukit/score/src/schedulerprioritysmp.c b/cpukit/score/src/schedulerprioritysmp.c
index 6479563..207dd3c 100644
--- a/cpukit/score/src/schedulerprioritysmp.c
+++ b/cpukit/score/src/schedulerprioritysmp.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreSchedulerPrioritySMP
+ * @ingroup RTEMSScoreSchedulerPrioritySMP
  *
  * @brief Deterministic Priority SMP Scheduler Implementation
  */
diff --git a/cpukit/score/src/schedulerpriorityunblock.c b/cpukit/score/src/schedulerpriorityunblock.c
index 784bc58..80fef57 100644
--- a/cpukit/score/src/schedulerpriorityunblock.c
+++ b/cpukit/score/src/schedulerpriorityunblock.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Scheduler Priority Unblock
- *  @ingroup ScoreScheduler
+ *  @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulerpriorityyield.c b/cpukit/score/src/schedulerpriorityyield.c
index c12b759..796e9ac 100644
--- a/cpukit/score/src/schedulerpriorityyield.c
+++ b/cpukit/score/src/schedulerpriorityyield.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Scheduler Priority Yield
- *  @ingroup ScoreScheduler
+ *  @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulersimple.c b/cpukit/score/src/schedulersimple.c
index 38fb194..3caa016 100644
--- a/cpukit/score/src/schedulersimple.c
+++ b/cpukit/score/src/schedulersimple.c
@@ -3,7 +3,7 @@
  *
  * @brief Scheduler Simple Functions
  *
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulersimpleblock.c b/cpukit/score/src/schedulersimpleblock.c
index 2fd50b7..3631034 100644
--- a/cpukit/score/src/schedulersimpleblock.c
+++ b/cpukit/score/src/schedulersimpleblock.c
@@ -3,7 +3,7 @@
  *
  * @brief Simple Scheduler Block a Thread
  *
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulersimplechangepriority.c b/cpukit/score/src/schedulersimplechangepriority.c
index c2c60a5..01e35da 100644
--- a/cpukit/score/src/schedulersimplechangepriority.c
+++ b/cpukit/score/src/schedulersimplechangepriority.c
@@ -3,7 +3,7 @@
  *
  * @brief Removes a Thread from the Simple Queue
  *
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulersimpleschedule.c b/cpukit/score/src/schedulersimpleschedule.c
index fcc1398..34e1faf 100644
--- a/cpukit/score/src/schedulersimpleschedule.c
+++ b/cpukit/score/src/schedulersimpleschedule.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief Simple Schedule Determine Heir
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulersimplesmp.c b/cpukit/score/src/schedulersimplesmp.c
index e0f56ff..4730c64 100644
--- a/cpukit/score/src/schedulersimplesmp.c
+++ b/cpukit/score/src/schedulersimplesmp.c
@@ -3,7 +3,7 @@
  *
  * @brief Simple SMP Scheduler Implementation
  *
- * @ingroup ScoreSchedulerSMPSimple
+ * @ingroup RTEMSScoreSchedulerSMPSimple
  */
 
 /*
diff --git a/cpukit/score/src/schedulersimpleunblock.c b/cpukit/score/src/schedulersimpleunblock.c
index 3c99add..4e5b798 100644
--- a/cpukit/score/src/schedulersimpleunblock.c
+++ b/cpukit/score/src/schedulersimpleunblock.c
@@ -2,7 +2,7 @@
  * @file
  * 
  * @brief Scheduler Simple Handler / Unblock
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulersimpleyield.c b/cpukit/score/src/schedulersimpleyield.c
index 95f9cd3..1bd7a01 100644
--- a/cpukit/score/src/schedulersimpleyield.c
+++ b/cpukit/score/src/schedulersimpleyield.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief Simple Schedule Yield CPU
- * @ingroup ScoreScheduler
+ * @ingroup RTEMSScoreScheduler
  */
 
 /*
diff --git a/cpukit/score/src/schedulerstrongapa.c b/cpukit/score/src/schedulerstrongapa.c
index 865c118..906cc83 100644
--- a/cpukit/score/src/schedulerstrongapa.c
+++ b/cpukit/score/src/schedulerstrongapa.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreSchedulerStrongAPA
+ * @ingroup RTEMSScoreSchedulerStrongAPA
  *
  * @brief Strong APA Scheduler Implementation
  */
diff --git a/cpukit/score/src/smp.c b/cpukit/score/src/smp.c
index 1c7eb6d..7864640 100644
--- a/cpukit/score/src/smp.c
+++ b/cpukit/score/src/smp.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief SMP Support
- *  @ingroup Score
+ *  @ingroup RTEMSScore
  */
 
 /*
diff --git a/cpukit/score/src/thread.c b/cpukit/score/src/thread.c
index 822fb7c..812d929 100644
--- a/cpukit/score/src/thread.c
+++ b/cpukit/score/src/thread.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Initialize Thread Handler
- *  @ingroup ScoreThread
+ *  @ingroup RTEMSScoreThread
  */
 
 /*
diff --git a/cpukit/score/src/threadchangepriority.c b/cpukit/score/src/threadchangepriority.c
index 102c9d1..71a01e0 100644
--- a/cpukit/score/src/threadchangepriority.c
+++ b/cpukit/score/src/threadchangepriority.c
@@ -3,7 +3,7 @@
  *
  * @brief Changes the Priority of a Thread
  *
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
  */
 
 /*
diff --git a/cpukit/score/src/threadclearstate.c b/cpukit/score/src/threadclearstate.c
index a67850e..90ce0e8 100644
--- a/cpukit/score/src/threadclearstate.c
+++ b/cpukit/score/src/threadclearstate.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Clear Thread state
- *  @ingroup ScoreThread
+ *  @ingroup RTEMSScoreThread
  */
 
 /*
diff --git a/cpukit/score/src/threadcreateidle.c b/cpukit/score/src/threadcreateidle.c
index cdb2b1e..eaf5d50 100644
--- a/cpukit/score/src/threadcreateidle.c
+++ b/cpukit/score/src/threadcreateidle.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Create Idle Thread
- *  @ingroup ScoreThread
+ *  @ingroup RTEMSScoreThread
  */
 
 /*
diff --git a/cpukit/score/src/threaddispatch.c b/cpukit/score/src/threaddispatch.c
index fc6a172..55dc437 100644
--- a/cpukit/score/src/threaddispatch.c
+++ b/cpukit/score/src/threaddispatch.c
@@ -2,7 +2,7 @@
  * @file
  * 
  * @brief Dispatch Thread
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
  */
 
 /*
diff --git a/cpukit/score/src/threadget.c b/cpukit/score/src/threadget.c
index f363f9f..f453c30 100644
--- a/cpukit/score/src/threadget.c
+++ b/cpukit/score/src/threadget.c
@@ -3,7 +3,7 @@
  *
  * @brief Maps Thread IDs to TCB Pointer
  *
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
  */
 
 /*
diff --git a/cpukit/score/src/threadhandler.c b/cpukit/score/src/threadhandler.c
index 097c8e1..6ddb303 100644
--- a/cpukit/score/src/threadhandler.c
+++ b/cpukit/score/src/threadhandler.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Thread Handler
- *  @ingroup ScoreThread
+ *  @ingroup RTEMSScoreThread
  */
 
 /*
diff --git a/cpukit/score/src/threadinitialize.c b/cpukit/score/src/threadinitialize.c
index e2bb694..83c689e 100644
--- a/cpukit/score/src/threadinitialize.c
+++ b/cpukit/score/src/threadinitialize.c
@@ -3,7 +3,7 @@
  *
  *  @brief Initialize Thread
  *
- *  @ingroup ScoreThread
+ *  @ingroup RTEMSScoreThread
  */
 /*
  *  COPYRIGHT (c) 1989-2014.
diff --git a/cpukit/score/src/threadloadenv.c b/cpukit/score/src/threadloadenv.c
index 22606dd..828e8ec 100644
--- a/cpukit/score/src/threadloadenv.c
+++ b/cpukit/score/src/threadloadenv.c
@@ -3,7 +3,7 @@
  *
  * @brief Initializes Enviroment for A Thread
  *
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
  */
 
 /*
diff --git a/cpukit/score/src/threadmp.c b/cpukit/score/src/threadmp.c
index 006d0f5..e0c9da1 100644
--- a/cpukit/score/src/threadmp.c
+++ b/cpukit/score/src/threadmp.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Distributed MP Support
- *  @ingroup ScoreThreadMP
+ *  @ingroup RTEMSScoreThreadMP
  */
 
 /*
diff --git a/cpukit/score/src/threadq.c b/cpukit/score/src/threadq.c
index 8991a3a..4483c9e 100644
--- a/cpukit/score/src/threadq.c
+++ b/cpukit/score/src/threadq.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Thread Queue Initialize
- *  @ingroup ScoreThreadQ
+ *  @ingroup RTEMSScoreThreadQ
  */
 
 /*
diff --git a/cpukit/score/src/threadqenqueue.c b/cpukit/score/src/threadqenqueue.c
index f62ec29..d2e8c48 100644
--- a/cpukit/score/src/threadqenqueue.c
+++ b/cpukit/score/src/threadqenqueue.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief Thread Queue Operations
- * @ingroup ScoreThreadQ
+ * @ingroup RTEMSScoreThreadQ
  */
 
 /*
diff --git a/cpukit/score/src/threadqfirst.c b/cpukit/score/src/threadqfirst.c
index 0828c1f..e68fb9f 100644
--- a/cpukit/score/src/threadqfirst.c
+++ b/cpukit/score/src/threadqfirst.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Thread Queue First
- *  @ingroup ScoreThreadQ
+ *  @ingroup RTEMSScoreThreadQ
  */
 
 /*
diff --git a/cpukit/score/src/threadqflush.c b/cpukit/score/src/threadqflush.c
index 4310e06..af48d54 100644
--- a/cpukit/score/src/threadqflush.c
+++ b/cpukit/score/src/threadqflush.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief Thread Queue Flush
- * @ingroup ScoreThreadQ
+ * @ingroup RTEMSScoreThreadQ
  */
 
 /*
diff --git a/cpukit/score/src/threadrestart.c b/cpukit/score/src/threadrestart.c
index bcd900a..83aef28 100644
--- a/cpukit/score/src/threadrestart.c
+++ b/cpukit/score/src/threadrestart.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief Restart Thread 
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
  */
 
 /*
diff --git a/cpukit/score/src/threadsetstate.c b/cpukit/score/src/threadsetstate.c
index c863d17..763c283 100644
--- a/cpukit/score/src/threadsetstate.c
+++ b/cpukit/score/src/threadsetstate.c
@@ -3,7 +3,7 @@
  *
  * @brief Sets States for a Thread
  *
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
  */
 
 /*
diff --git a/cpukit/score/src/threadstackallocate.c b/cpukit/score/src/threadstackallocate.c
index 1d4d2c9..fd89d7f 100644
--- a/cpukit/score/src/threadstackallocate.c
+++ b/cpukit/score/src/threadstackallocate.c
@@ -2,7 +2,7 @@
  * @file
  * 
  * @brief Stack Allocate Helper
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
  */
 
 
diff --git a/cpukit/score/src/threadstackfree.c b/cpukit/score/src/threadstackfree.c
index 37c20f7..312a10c 100644
--- a/cpukit/score/src/threadstackfree.c
+++ b/cpukit/score/src/threadstackfree.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Deallocate Thread Stack
- *  @ingroup ScoreThread
+ *  @ingroup RTEMSScoreThread
  */
 
 /*
diff --git a/cpukit/score/src/threadstart.c b/cpukit/score/src/threadstart.c
index 676e34d..9e9ea1c 100644
--- a/cpukit/score/src/threadstart.c
+++ b/cpukit/score/src/threadstart.c
@@ -3,7 +3,7 @@
  *
  * @brief Initializes Thread and Executes it
  *
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
  */
 
 /*
diff --git a/cpukit/score/src/threadstartmultitasking.c b/cpukit/score/src/threadstartmultitasking.c
index 291e42c..67bbba4 100644
--- a/cpukit/score/src/threadstartmultitasking.c
+++ b/cpukit/score/src/threadstartmultitasking.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Start Thread Multitasking
- *  @ingroup ScoreThread
+ *  @ingroup RTEMSScoreThread
  */
 
 /*
diff --git a/cpukit/score/src/threadtimeout.c b/cpukit/score/src/threadtimeout.c
index 8ea5a65..61e8659 100644
--- a/cpukit/score/src/threadtimeout.c
+++ b/cpukit/score/src/threadtimeout.c
@@ -3,7 +3,7 @@
  *
  * @brief Thread Wait Timeout
  *
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
  */
 
 /*
diff --git a/cpukit/score/src/threadyield.c b/cpukit/score/src/threadyield.c
index cfd8118..462f04f 100644
--- a/cpukit/score/src/threadyield.c
+++ b/cpukit/score/src/threadyield.c
@@ -3,7 +3,7 @@
  *
  * @brief Thread Yield
  *
- * @ingroup ScoreThread
+ * @ingroup RTEMSScoreThread
  */
 
 /*
diff --git a/cpukit/score/src/userext.c b/cpukit/score/src/userext.c
index 4a667de..a2e70dc 100644
--- a/cpukit/score/src/userext.c
+++ b/cpukit/score/src/userext.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreUserExt
+ * @ingroup RTEMSScoreUserExt
  *
  * @brief User Extension Handler implementation.
  */
diff --git a/cpukit/score/src/userextaddset.c b/cpukit/score/src/userextaddset.c
index ea2d214..585712e 100644
--- a/cpukit/score/src/userextaddset.c
+++ b/cpukit/score/src/userextaddset.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreUserExt
+ * @ingroup RTEMSScoreUserExt
  *
  * @brief User Extension Handler implementation.
  */
diff --git a/cpukit/score/src/userextiterate.c b/cpukit/score/src/userextiterate.c
index 04fe278..0bd3226 100644
--- a/cpukit/score/src/userextiterate.c
+++ b/cpukit/score/src/userextiterate.c
@@ -3,7 +3,7 @@
  *
  * @brief User Extension Iteration Helpers
  *
- * @ingroup ScoreUserExt
+ * @ingroup RTEMSScoreUserExt
  */
 
 /*
diff --git a/cpukit/score/src/userextremoveset.c b/cpukit/score/src/userextremoveset.c
index b25cc34..adaf049 100644
--- a/cpukit/score/src/userextremoveset.c
+++ b/cpukit/score/src/userextremoveset.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup ScoreUserExt
+ * @ingroup RTEMSScoreUserExt
  *
  * @brief User Extension Handler implementation.
  */
diff --git a/cpukit/score/src/watchdoginsert.c b/cpukit/score/src/watchdoginsert.c
index b9f5eb8..c6dbed2 100644
--- a/cpukit/score/src/watchdoginsert.c
+++ b/cpukit/score/src/watchdoginsert.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief Watchdog Insert
- * @ingroup ScoreWatchdog
+ * @ingroup RTEMSScoreWatchdog
  */
 
 /*
diff --git a/cpukit/score/src/watchdogremove.c b/cpukit/score/src/watchdogremove.c
index 2605a67..cda4a62 100644
--- a/cpukit/score/src/watchdogremove.c
+++ b/cpukit/score/src/watchdogremove.c
@@ -2,7 +2,7 @@
  * @file
  *
  * @brief Remove Watchdog
- * @ingroup ScoreWatchdog
+ * @ingroup RTEMSScoreWatchdog
  */
 
 /*
diff --git a/cpukit/score/src/watchdogtickssinceboot.c b/cpukit/score/src/watchdogtickssinceboot.c
index 0857d0e..b255c4e 100644
--- a/cpukit/score/src/watchdogtickssinceboot.c
+++ b/cpukit/score/src/watchdogtickssinceboot.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Watchdog Ticks Since Boot
- *  @ingroup ScoreWatchdog
+ *  @ingroup RTEMSScoreWatchdog
  */
 
 /*
diff --git a/cpukit/score/src/wkspace.c b/cpukit/score/src/wkspace.c
index 9f91ac5..bafc0db 100644
--- a/cpukit/score/src/wkspace.c
+++ b/cpukit/score/src/wkspace.c
@@ -2,7 +2,7 @@
  *  @file
  *
  *  @brief Workspace Handler Support
- *  @ingroup ScoreWorkspace
+ *  @ingroup RTEMSScoreWorkspace
  */
 
 /*
diff --git a/cpukit/score/src/wkstringduplicate.c b/cpukit/score/src/wkstringduplicate.c
index ff6f973..8fc1c97 100644
--- a/cpukit/score/src/wkstringduplicate.c
+++ b/cpukit/score/src/wkstringduplicate.c
@@ -3,7 +3,7 @@
  *
  * @brief Duplicates String with Memory from the Workspace
  *
- * @ingroup ScoreWorkspace
+ * @ingroup RTEMSScoreWorkspace
  */
 
 /*




More information about the vc mailing list