Index: kernel/arch/sparc64/src/console.c
===================================================================
--- kernel/arch/sparc64/src/console.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/console.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/src/cpu/sun4u/cpu.c
===================================================================
--- kernel/arch/sparc64/src/cpu/sun4u/cpu.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/cpu/sun4u/cpu.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/src/cpu/sun4v/cpu.c
===================================================================
--- kernel/arch/sparc64/src/cpu/sun4v/cpu.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/cpu/sun4v/cpu.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/src/debug/stacktrace.c
===================================================================
--- kernel/arch/sparc64/src/debug/stacktrace.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/debug/stacktrace.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/src/drivers/kbd.c
===================================================================
--- kernel/arch/sparc64/src/drivers/kbd.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/drivers/kbd.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/src/drivers/niagara.c
===================================================================
--- kernel/arch/sparc64/src/drivers/niagara.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/drivers/niagara.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/src/drivers/pci.c
===================================================================
--- kernel/arch/sparc64/src/drivers/pci.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/drivers/pci.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/src/drivers/scr.c
===================================================================
--- kernel/arch/sparc64/src/drivers/scr.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/drivers/scr.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/src/drivers/tick.c
===================================================================
--- kernel/arch/sparc64/src/drivers/tick.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/drivers/tick.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/src/fpu_context.c
===================================================================
--- kernel/arch/sparc64/src/fpu_context.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/fpu_context.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/src/mm/page.c
===================================================================
--- kernel/arch/sparc64/src/mm/page.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/mm/page.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/src/mm/sun4u/as.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4u/as.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/mm/sun4u/as.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/src/mm/sun4u/frame.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4u/frame.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/mm/sun4u/frame.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/src/mm/sun4u/km.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4u/km.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/mm/sun4u/km.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/src/mm/sun4u/tlb.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4u/tlb.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/mm/sun4u/tlb.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/src/mm/sun4u/tsb.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4u/tsb.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/mm/sun4u/tsb.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/src/mm/sun4v/as.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4v/as.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/mm/sun4v/as.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/src/mm/sun4v/frame.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4v/frame.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/mm/sun4v/frame.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/src/mm/sun4v/km.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4v/km.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/mm/sun4v/km.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/src/mm/sun4v/tlb.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4v/tlb.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/mm/sun4v/tlb.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/src/mm/sun4v/tsb.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4v/tsb.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/mm/sun4v/tsb.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/src/proc/sun4u/scheduler.c
===================================================================
--- kernel/arch/sparc64/src/proc/sun4u/scheduler.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/proc/sun4u/scheduler.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64proc
+/** @addtogroup kernel_sparc64_proc
  * @{
  */
Index: kernel/arch/sparc64/src/proc/sun4v/scheduler.c
===================================================================
--- kernel/arch/sparc64/src/proc/sun4v/scheduler.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/proc/sun4v/scheduler.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64proc
+/** @addtogroup kernel_sparc64_proc
  * @{
  */
Index: kernel/arch/sparc64/src/proc/thread.c
===================================================================
--- kernel/arch/sparc64/src/proc/thread.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/proc/thread.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64proc
+/** @addtogroup kernel_sparc64_proc
  * @{
  */
Index: kernel/arch/sparc64/src/smp/sun4u/ipi.c
===================================================================
--- kernel/arch/sparc64/src/smp/sun4u/ipi.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/smp/sun4u/ipi.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/src/smp/sun4u/smp.c
===================================================================
--- kernel/arch/sparc64/src/smp/sun4u/smp.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/smp/sun4u/smp.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/src/smp/sun4u/smp_call.c
===================================================================
--- kernel/arch/sparc64/src/smp/sun4u/smp_call.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/smp/sun4u/smp_call.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/src/smp/sun4v/ipi.c
===================================================================
--- kernel/arch/sparc64/src/smp/sun4v/ipi.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/smp/sun4v/ipi.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/src/smp/sun4v/smp.c
===================================================================
--- kernel/arch/sparc64/src/smp/sun4v/smp.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/smp/sun4v/smp.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/src/sparc64.c
===================================================================
--- kernel/arch/sparc64/src/sparc64.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/sparc64.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/src/sun4u/sparc64.c
===================================================================
--- kernel/arch/sparc64/src/sun4u/sparc64.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/sun4u/sparc64.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/src/sun4v/md.c
===================================================================
--- kernel/arch/sparc64/src/sun4v/md.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/sun4v/md.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/src/sun4v/sparc64.c
===================================================================
--- kernel/arch/sparc64/src/sun4v/sparc64.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/sun4v/sparc64.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/src/trap/exception.c
===================================================================
--- kernel/arch/sparc64/src/trap/exception.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/trap/exception.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */
Index: kernel/arch/sparc64/src/trap/interrupt.c
===================================================================
--- kernel/arch/sparc64/src/trap/interrupt.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/trap/interrupt.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */
Index: kernel/arch/sparc64/src/trap/sun4u/interrupt.c
===================================================================
--- kernel/arch/sparc64/src/trap/sun4u/interrupt.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/trap/sun4u/interrupt.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */
Index: kernel/arch/sparc64/src/trap/sun4v/interrupt.c
===================================================================
--- kernel/arch/sparc64/src/trap/sun4v/interrupt.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/trap/sun4v/interrupt.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */
Index: kernel/arch/sparc64/src/trap/trap.c
===================================================================
--- kernel/arch/sparc64/src/trap/trap.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/sparc64/src/trap/trap.c	(revision 63c1dd5baed77410998be60405abb3b36a7a56b3)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */