Index: boot/arch/arm32/include/arch/asm.h
===================================================================
--- boot/arch/arm32/include/arch/asm.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ boot/arch/arm32/include/arch/asm.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32boot
+/** @addtogroup boot_arm32
  * @{
  */
Index: boot/arch/arm32/include/arch/main.h
===================================================================
--- boot/arch/arm32/include/arch/main.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ boot/arch/arm32/include/arch/main.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup arm32boot
+/** @addtogroup boot_arm32
  * @{
  */
Index: boot/arch/arm32/include/arch/mm.h
===================================================================
--- boot/arch/arm32/include/arch/mm.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ boot/arch/arm32/include/arch/mm.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup arm32boot
+/** @addtogroup boot_arm32
  * @{
  */
Index: boot/arch/arm32/include/arch/types.h
===================================================================
--- boot/arch/arm32/include/arch/types.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ boot/arch/arm32/include/arch/types.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32boot
+/** @addtogroup boot_arm32
  * @{
  */
Index: boot/arch/arm32/src/main.c
===================================================================
--- boot/arch/arm32/src/main.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ boot/arch/arm32/src/main.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32boot
+/** @addtogroup boot_arm32
  * @{
  */
Index: boot/arch/arm32/src/mm.c
===================================================================
--- boot/arch/arm32/src/mm.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ boot/arch/arm32/src/mm.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32boot
+/** @addtogroup boot_arm32
  * @{
  */
Index: boot/arch/arm32/src/putchar.c
===================================================================
--- boot/arch/arm32/src/putchar.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ boot/arch/arm32/src/putchar.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -29,5 +29,5 @@
  */
 
-/** @addtogroup arm32boot
+/** @addtogroup boot_arm32
  * @{
  */
Index: boot/doc/doxygroups.h
===================================================================
--- boot/doc/doxygroups.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ boot/doc/doxygroups.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -8,5 +8,5 @@
  */
 
-/**    @addtogroup arm32boot arm32
+/**    @addtogroup boot_arm32 arm32
  *     @ingroup boot
  */
Index: kernel/arch/abs32le/include/arch/arch.h
===================================================================
--- kernel/arch/abs32le/include/arch/arch.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/include/arch/arch.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32le
+/** @addtogroup kernel_abs32le
  * @{
  */
Index: kernel/arch/abs32le/include/arch/asm.h
===================================================================
--- kernel/arch/abs32le/include/arch/asm.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/include/arch/asm.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32le
+/** @addtogroup kernel_abs32le
  * @{
  */
Index: kernel/arch/abs32le/include/arch/context.h
===================================================================
--- kernel/arch/abs32le/include/arch/context.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/include/arch/context.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32le
+/** @addtogroup kernel_abs32le
  * @{
  */
Index: kernel/arch/abs32le/include/arch/context_offset.h
===================================================================
--- kernel/arch/abs32le/include/arch/context_offset.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/include/arch/context_offset.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32le
+/** @addtogroup kernel_abs32le
  * @{
  */
Index: kernel/arch/abs32le/include/arch/cpu.h
===================================================================
--- kernel/arch/abs32le/include/arch/cpu.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/include/arch/cpu.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32le
+/** @addtogroup kernel_abs32le
  * @{
  */
Index: kernel/arch/abs32le/include/arch/cycle.h
===================================================================
--- kernel/arch/abs32le/include/arch/cycle.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/include/arch/cycle.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32le
+/** @addtogroup kernel_abs32le
  * @{
  */
Index: kernel/arch/abs32le/include/arch/elf.h
===================================================================
--- kernel/arch/abs32le/include/arch/elf.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/include/arch/elf.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32le
+/** @addtogroup kernel_abs32le
  * @{
  */
Index: kernel/arch/abs32le/include/arch/faddr.h
===================================================================
--- kernel/arch/abs32le/include/arch/faddr.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/include/arch/faddr.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32le
+/** @addtogroup kernel_abs32le
  * @{
  */
Index: kernel/arch/abs32le/include/arch/fpu_context.h
===================================================================
--- kernel/arch/abs32le/include/arch/fpu_context.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/include/arch/fpu_context.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32le
+/** @addtogroup kernel_abs32le
  * @{
  */
Index: kernel/arch/abs32le/include/arch/interrupt.h
===================================================================
--- kernel/arch/abs32le/include/arch/interrupt.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/include/arch/interrupt.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32leinterrupt
+/** @addtogroup kernel_abs32le_interrupt
  * @{
  */
Index: kernel/arch/abs32le/include/arch/istate.h
===================================================================
--- kernel/arch/abs32le/include/arch/istate.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/include/arch/istate.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32leinterrupt
+/** @addtogroup kernel_abs32le_interrupt
  * @{
  */
Index: kernel/arch/abs32le/include/arch/mm/as.h
===================================================================
--- kernel/arch/abs32le/include/arch/mm/as.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/include/arch/mm/as.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32lemm
+/** @addtogroup kernel_abs32le_mm
  * @{
  */
Index: kernel/arch/abs32le/include/arch/mm/asid.h
===================================================================
--- kernel/arch/abs32le/include/arch/mm/asid.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/include/arch/mm/asid.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32lemm
+/** @addtogroup kernel_abs32le_mm
  * @{
  */
Index: kernel/arch/abs32le/include/arch/mm/frame.h
===================================================================
--- kernel/arch/abs32le/include/arch/mm/frame.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/include/arch/mm/frame.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32lemm
+/** @addtogroup kernel_abs32le_mm
  * @{
  */
Index: kernel/arch/abs32le/include/arch/mm/km.h
===================================================================
--- kernel/arch/abs32le/include/arch/mm/km.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/include/arch/mm/km.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32lemm
+/** @addtogroup kernel_abs32le_mm
  * @{
  */
Index: kernel/arch/abs32le/include/arch/mm/page.h
===================================================================
--- kernel/arch/abs32le/include/arch/mm/page.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/include/arch/mm/page.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32lemm
+/** @addtogroup kernel_abs32le_mm
  * @{
  */
Index: kernel/arch/abs32le/include/arch/mm/tlb.h
===================================================================
--- kernel/arch/abs32le/include/arch/mm/tlb.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/include/arch/mm/tlb.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32lemm
+/** @addtogroup kernel_abs32le_mm
  * @{
  */
Index: kernel/arch/abs32le/include/arch/proc/task.h
===================================================================
--- kernel/arch/abs32le/include/arch/proc/task.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/include/arch/proc/task.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32leproc
+/** @addtogroup kernel_abs32le_proc
  * @{
  */
Index: kernel/arch/abs32le/include/arch/proc/thread.h
===================================================================
--- kernel/arch/abs32le/include/arch/proc/thread.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/include/arch/proc/thread.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32leproc
+/** @addtogroup kernel_abs32le_proc
  * @{
  */
Index: kernel/arch/abs32le/include/arch/stack.h
===================================================================
--- kernel/arch/abs32le/include/arch/stack.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/include/arch/stack.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32le
+/** @addtogroup kernel_abs32le
  * @{
  */
Index: kernel/arch/abs32le/include/arch/types.h
===================================================================
--- kernel/arch/abs32le/include/arch/types.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/include/arch/types.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32le
+/** @addtogroup kernel_abs32le
  * @{
  */
Index: kernel/arch/abs32le/src/abs32le.c
===================================================================
--- kernel/arch/abs32le/src/abs32le.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/src/abs32le.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32le
+/** @addtogroup kernel_abs32le
  * @{
  */
Index: kernel/arch/abs32le/src/cpu/cpu.c
===================================================================
--- kernel/arch/abs32le/src/cpu/cpu.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/src/cpu/cpu.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32le
+/** @addtogroup kernel_abs32le
  * @{
  */
Index: kernel/arch/abs32le/src/debug/stacktrace.c
===================================================================
--- kernel/arch/abs32le/src/debug/stacktrace.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/src/debug/stacktrace.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32le
+/** @addtogroup kernel_abs32le
  * @{
  */
Index: kernel/arch/abs32le/src/mm/as.c
===================================================================
--- kernel/arch/abs32le/src/mm/as.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/src/mm/as.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32lemm
+/** @addtogroup kernel_abs32le_mm
  * @{
  */
Index: kernel/arch/abs32le/src/mm/frame.c
===================================================================
--- kernel/arch/abs32le/src/mm/frame.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/src/mm/frame.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32lemm
+/** @addtogroup kernel_abs32le_mm
  * @{
  */
Index: kernel/arch/abs32le/src/mm/km.c
===================================================================
--- kernel/arch/abs32le/src/mm/km.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/src/mm/km.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32lemm
+/** @addtogroup kernel_abs32le_mm
  * @{
  */
Index: kernel/arch/abs32le/src/mm/page.c
===================================================================
--- kernel/arch/abs32le/src/mm/page.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/src/mm/page.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32lemm
+/** @addtogroup kernel_abs32le_mm
  * @{
  */
Index: kernel/arch/abs32le/src/mm/tlb.c
===================================================================
--- kernel/arch/abs32le/src/mm/tlb.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/src/mm/tlb.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32lemm
+/** @addtogroup kernel_abs32le_mm
  * @{
  */
Index: kernel/arch/abs32le/src/proc/scheduler.c
===================================================================
--- kernel/arch/abs32le/src/proc/scheduler.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/src/proc/scheduler.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32leproc
+/** @addtogroup kernel_abs32le_proc
  * @{
  */
Index: kernel/arch/abs32le/src/proc/task.c
===================================================================
--- kernel/arch/abs32le/src/proc/task.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/src/proc/task.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32leproc
+/** @addtogroup kernel_abs32le_proc
  * @{
  */
Index: kernel/arch/abs32le/src/proc/thread.c
===================================================================
--- kernel/arch/abs32le/src/proc/thread.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/src/proc/thread.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32leproc
+/** @addtogroup kernel_abs32le_proc
  * @{
  */
Index: kernel/arch/abs32le/src/smp/ipi.c
===================================================================
--- kernel/arch/abs32le/src/smp/ipi.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/src/smp/ipi.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32le
+/** @addtogroup kernel_abs32le
  * @{
  */
Index: kernel/arch/abs32le/src/smp/smp.c
===================================================================
--- kernel/arch/abs32le/src/smp/smp.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/src/smp/smp.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32le
+/** @addtogroup kernel_abs32le
  * @{
  */
Index: kernel/arch/abs32le/src/smp/smp_call.c
===================================================================
--- kernel/arch/abs32le/src/smp/smp_call.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/src/smp/smp_call.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32le
+/** @addtogroup kernel_abs32le
  * @{
  */
Index: kernel/arch/abs32le/src/userspace.c
===================================================================
--- kernel/arch/abs32le/src/userspace.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/abs32le/src/userspace.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup abs32le
+/** @addtogroup kernel_abs32le
  * @{
  */
Index: kernel/arch/amd64/include/arch/arch.h
===================================================================
--- kernel/arch/amd64/include/arch/arch.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/arch.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */
Index: kernel/arch/amd64/include/arch/asm.h
===================================================================
--- kernel/arch/amd64/include/arch/asm.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/asm.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */
Index: kernel/arch/amd64/include/arch/boot/boot.h
===================================================================
--- kernel/arch/amd64/include/arch/boot/boot.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/boot/boot.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */
Index: kernel/arch/amd64/include/arch/context.h
===================================================================
--- kernel/arch/amd64/include/arch/context.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/context.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */
Index: kernel/arch/amd64/include/arch/cpu.h
===================================================================
--- kernel/arch/amd64/include/arch/cpu.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/cpu.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */
Index: kernel/arch/amd64/include/arch/cpuid.h
===================================================================
--- kernel/arch/amd64/include/arch/cpuid.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/cpuid.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */
Index: kernel/arch/amd64/include/arch/cycle.h
===================================================================
--- kernel/arch/amd64/include/arch/cycle.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/cycle.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */
Index: kernel/arch/amd64/include/arch/ddi/ddi.h
===================================================================
--- kernel/arch/amd64/include/arch/ddi/ddi.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/ddi/ddi.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64ddi
+/** @addtogroup kernel_amd64_ddi
  * @{
  */
Index: kernel/arch/amd64/include/arch/elf.h
===================================================================
--- kernel/arch/amd64/include/arch/elf.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/elf.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */
Index: kernel/arch/amd64/include/arch/faddr.h
===================================================================
--- kernel/arch/amd64/include/arch/faddr.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/faddr.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */
Index: kernel/arch/amd64/include/arch/interrupt.h
===================================================================
--- kernel/arch/amd64/include/arch/interrupt.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/interrupt.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64interrupt
+/** @addtogroup kernel_amd64_interrupt
  * @{
  */
Index: kernel/arch/amd64/include/arch/istate.h
===================================================================
--- kernel/arch/amd64/include/arch/istate.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/istate.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64interrupt
+/** @addtogroup kernel_amd64_interrupt
  * @{
  */
Index: kernel/arch/amd64/include/arch/kseg.h
===================================================================
--- kernel/arch/amd64/include/arch/kseg.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/kseg.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */
Index: kernel/arch/amd64/include/arch/mm/as.h
===================================================================
--- kernel/arch/amd64/include/arch/mm/as.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/mm/as.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64mm
+/** @addtogroup kernel_amd64_mm
  * @{
  */
Index: kernel/arch/amd64/include/arch/mm/frame.h
===================================================================
--- kernel/arch/amd64/include/arch/mm/frame.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/mm/frame.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64mm
+/** @addtogroup kernel_amd64_mm
  * @{
  */
Index: kernel/arch/amd64/include/arch/mm/km.h
===================================================================
--- kernel/arch/amd64/include/arch/mm/km.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/mm/km.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64mm
+/** @addtogroup kernel_amd64_mm
  * @{
  */
Index: kernel/arch/amd64/include/arch/mm/page.h
===================================================================
--- kernel/arch/amd64/include/arch/mm/page.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/mm/page.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64mm
+/** @addtogroup kernel_amd64_mm
  * @{
  */
Index: kernel/arch/amd64/include/arch/mm/ptl.h
===================================================================
--- kernel/arch/amd64/include/arch/mm/ptl.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/mm/ptl.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64mm
+/** @addtogroup kernel_amd64_mm
  * @{
  */
Index: kernel/arch/amd64/include/arch/mm/tlb.h
===================================================================
--- kernel/arch/amd64/include/arch/mm/tlb.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/mm/tlb.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64mm
+/** @addtogroup kernel_amd64_mm
  * @{
  */
Index: kernel/arch/amd64/include/arch/pm.h
===================================================================
--- kernel/arch/amd64/include/arch/pm.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/pm.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */
Index: kernel/arch/amd64/include/arch/proc/task.h
===================================================================
--- kernel/arch/amd64/include/arch/proc/task.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/proc/task.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64proc
+/** @addtogroup kernel_amd64_proc
  * @{
  */
Index: kernel/arch/amd64/include/arch/proc/thread.h
===================================================================
--- kernel/arch/amd64/include/arch/proc/thread.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/proc/thread.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64proc
+/** @addtogroup kernel_amd64_proc
  * @{
  */
Index: kernel/arch/amd64/include/arch/stack.h
===================================================================
--- kernel/arch/amd64/include/arch/stack.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/stack.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */
Index: kernel/arch/amd64/include/arch/syscall.h
===================================================================
--- kernel/arch/amd64/include/arch/syscall.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/syscall.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */
Index: kernel/arch/amd64/include/arch/types.h
===================================================================
--- kernel/arch/amd64/include/arch/types.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/types.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */
Index: kernel/arch/amd64/include/arch/vreg.h
===================================================================
--- kernel/arch/amd64/include/arch/vreg.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/include/arch/vreg.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */
Index: kernel/arch/amd64/src/amd64.c
===================================================================
--- kernel/arch/amd64/src/amd64.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/src/amd64.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */
Index: kernel/arch/amd64/src/boot/memmap.c
===================================================================
--- kernel/arch/amd64/src/boot/memmap.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/src/boot/memmap.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64mm
+/** @addtogroup kernel_amd64_mm
  * @{
  */
Index: kernel/arch/amd64/src/cpu/cpu.c
===================================================================
--- kernel/arch/amd64/src/cpu/cpu.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/src/cpu/cpu.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */
Index: kernel/arch/amd64/src/ddi/ddi.c
===================================================================
--- kernel/arch/amd64/src/ddi/ddi.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/src/ddi/ddi.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64ddi
+/** @addtogroup kernel_amd64_ddi
  * @{
  */
Index: kernel/arch/amd64/src/debug/stacktrace.c
===================================================================
--- kernel/arch/amd64/src/debug/stacktrace.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/src/debug/stacktrace.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */
Index: kernel/arch/amd64/src/fpu_context.c
===================================================================
--- kernel/arch/amd64/src/fpu_context.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/src/fpu_context.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */
Index: kernel/arch/amd64/src/interrupt.c
===================================================================
--- kernel/arch/amd64/src/interrupt.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/src/interrupt.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64interrupt
+/** @addtogroup kernel_amd64_interrupt
  * @{
  */
Index: kernel/arch/amd64/src/kseg.c
===================================================================
--- kernel/arch/amd64/src/kseg.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/src/kseg.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */
Index: kernel/arch/amd64/src/mm/km.c
===================================================================
--- kernel/arch/amd64/src/mm/km.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/src/mm/km.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64mm
+/** @addtogroup kernel_amd64_mm
  * @{
  */
Index: kernel/arch/amd64/src/mm/page.c
===================================================================
--- kernel/arch/amd64/src/mm/page.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/src/mm/page.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64mm
+/** @addtogroup kernel_amd64_mm
  * @{
  */
Index: kernel/arch/amd64/src/pm.c
===================================================================
--- kernel/arch/amd64/src/pm.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/src/pm.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */
Index: kernel/arch/amd64/src/proc/scheduler.c
===================================================================
--- kernel/arch/amd64/src/proc/scheduler.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/src/proc/scheduler.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64proc
+/** @addtogroup kernel_amd64_proc
  * @{
  */
Index: kernel/arch/amd64/src/proc/task.c
===================================================================
--- kernel/arch/amd64/src/proc/task.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/src/proc/task.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64proc
+/** @addtogroup kernel_amd64_proc
  * @{
  */
Index: kernel/arch/amd64/src/proc/thread.c
===================================================================
--- kernel/arch/amd64/src/proc/thread.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/src/proc/thread.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64proc
+/** @addtogroup kernel_amd64_proc
  * @{
  */
Index: kernel/arch/amd64/src/syscall.c
===================================================================
--- kernel/arch/amd64/src/syscall.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/src/syscall.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */
Index: kernel/arch/amd64/src/userspace.c
===================================================================
--- kernel/arch/amd64/src/userspace.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/src/userspace.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */
Index: kernel/arch/amd64/src/vreg.c
===================================================================
--- kernel/arch/amd64/src/vreg.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/amd64/src/vreg.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */
Index: kernel/arch/arm32/include/arch/arch.h
===================================================================
--- kernel/arch/arm32/include/arch/arch.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/arch.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/asm.h
===================================================================
--- kernel/arch/arm32/include/arch/asm.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/asm.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/asm/boot.h
===================================================================
--- kernel/arch/arm32/include/arch/asm/boot.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/asm/boot.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/barrier.h
===================================================================
--- kernel/arch/arm32/include/arch/barrier.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/barrier.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/cache.h
===================================================================
--- kernel/arch/arm32/include/arch/cache.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/cache.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/context.h
===================================================================
--- kernel/arch/arm32/include/arch/context.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/context.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/cp15.h
===================================================================
--- kernel/arch/arm32/include/arch/cp15.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/cp15.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/cpu.h
===================================================================
--- kernel/arch/arm32/include/arch/cpu.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/cpu.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/cycle.h
===================================================================
--- kernel/arch/arm32/include/arch/cycle.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/cycle.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/elf.h
===================================================================
--- kernel/arch/arm32/include/arch/elf.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/elf.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/exception.h
===================================================================
--- kernel/arch/arm32/include/arch/exception.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/exception.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/faddr.h
===================================================================
--- kernel/arch/arm32/include/arch/faddr.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/faddr.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/fpu_context.h
===================================================================
--- kernel/arch/arm32/include/arch/fpu_context.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/fpu_context.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/interrupt.h
===================================================================
--- kernel/arch/arm32/include/arch/interrupt.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/interrupt.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32interrupt
+/** @addtogroup kernel_arm32_interrupt
  * @{
  */
Index: kernel/arch/arm32/include/arch/istate.h
===================================================================
--- kernel/arch/arm32/include/arch/istate.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/istate.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup arm32interrupt
+/** @addtogroup kernel_arm32_interrupt
  * @{
  */
Index: kernel/arch/arm32/include/arch/mach/beagleboardxm/beagleboardxm.h
===================================================================
--- kernel/arch/arm32/include/arch/mach/beagleboardxm/beagleboardxm.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/mach/beagleboardxm/beagleboardxm.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup arm32beagleboardxm beagleboardxm
+/** @addtogroup kernel_arm32_beagleboardxm beagleboardxm
  *  @brief BeagleBoard-xM platform.
- *  @ingroup arm32
+ *  @ingroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/mach/beaglebone/beaglebone.h
===================================================================
--- kernel/arch/arm32/include/arch/mach/beaglebone/beaglebone.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/mach/beaglebone/beaglebone.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup arm32beaglebone beaglebone
+/** @addtogroup kernel_arm32_beaglebone beaglebone
  *  @brief BeagleBone platform.
- *  @ingroup arm32
+ *  @ingroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/mach/gta02/gta02.h
===================================================================
--- kernel/arch/arm32/include/arch/mach/gta02/gta02.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/mach/gta02/gta02.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,7 +27,7 @@
  */
 
-/** @addtogroup arm32gta02 GTA02
+/** @addtogroup kernel_arm32_gta02 GTA02
  *  @brief Openmoko GTA02 platform.
- *  @ingroup arm32
+ *  @ingroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/mach/integratorcp/integratorcp.h
===================================================================
--- kernel/arch/arm32/include/arch/mach/integratorcp/integratorcp.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/mach/integratorcp/integratorcp.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,7 +27,7 @@
  */
 
-/** @addtogroup arm32integratorcp
+/** @addtogroup kernel_arm32_integratorcp
  *  @brief Integratorcp machine specific parts.
- *  @ingroup arm32
+ *  @ingroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/mach/raspberrypi/raspberrypi.h
===================================================================
--- kernel/arch/arm32/include/arch/mach/raspberrypi/raspberrypi.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/mach/raspberrypi/raspberrypi.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,7 +27,7 @@
  */
 
-/** @addtogroup arm32raspberrypi raspberrypi
+/** @addtogroup kernel_arm32_raspberrypi raspberrypi
  *  @brief Raspberry Pi platform.
- *  @ingroup arm32
+ *  @ingroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/machine_func.h
===================================================================
--- kernel/arch/arm32/include/arch/machine_func.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/machine_func.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/mm/as.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/as.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/mm/as.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/include/arch/mm/asid.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/asid.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/mm/asid.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/include/arch/mm/frame.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/frame.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/mm/frame.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/include/arch/mm/km.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/km.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/mm/km.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/include/arch/mm/page.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/page.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/mm/page.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/include/arch/mm/page_armv4.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/page_armv4.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/mm/page_armv4.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/include/arch/mm/page_armv6.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/page_armv6.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/mm/page_armv6.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/include/arch/mm/page_fault.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/page_fault.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/mm/page_fault.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/include/arch/mm/tlb.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/tlb.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/mm/tlb.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/include/arch/proc/task.h
===================================================================
--- kernel/arch/arm32/include/arch/proc/task.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/proc/task.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32proc
+/** @addtogroup kernel_arm32_proc
  * @{
  */
Index: kernel/arch/arm32/include/arch/proc/thread.h
===================================================================
--- kernel/arch/arm32/include/arch/proc/thread.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/proc/thread.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32proc
+/** @addtogroup kernel_arm32_proc
  * @{
  */
Index: kernel/arch/arm32/include/arch/ras.h
===================================================================
--- kernel/arch/arm32/include/arch/ras.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/ras.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/regutils.h
===================================================================
--- kernel/arch/arm32/include/arch/regutils.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/regutils.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/security_ext.h
===================================================================
--- kernel/arch/arm32/include/arch/security_ext.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/security_ext.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/stack.h
===================================================================
--- kernel/arch/arm32/include/arch/stack.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/stack.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/types.h
===================================================================
--- kernel/arch/arm32/include/arch/types.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/include/arch/types.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/src/arm32.c
===================================================================
--- kernel/arch/arm32/src/arm32.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/src/arm32.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/src/atomic.c
===================================================================
--- kernel/arch/arm32/src/atomic.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/src/atomic.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/src/cpu/cpu.c
===================================================================
--- kernel/arch/arm32/src/cpu/cpu.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/src/cpu/cpu.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/src/debug/stacktrace.c
===================================================================
--- kernel/arch/arm32/src/debug/stacktrace.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/src/debug/stacktrace.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/src/exception.c
===================================================================
--- kernel/arch/arm32/src/exception.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/src/exception.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/src/fpu_context.c
===================================================================
--- kernel/arch/arm32/src/fpu_context.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/src/fpu_context.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/src/interrupt.c
===================================================================
--- kernel/arch/arm32/src/interrupt.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/src/interrupt.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c
===================================================================
--- kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -26,5 +26,5 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup arm32beagleboardxm
+/** @addtogroup kernel_arm32_beagleboardxm
  * @{
  */
Index: kernel/arch/arm32/src/mach/beaglebone/beaglebone.c
===================================================================
--- kernel/arch/arm32/src/mach/beaglebone/beaglebone.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/src/mach/beaglebone/beaglebone.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup arm32beaglebone
+/** @addtogroup kernel_arm32_beaglebone
  * @{
  */
Index: kernel/arch/arm32/src/mach/gta02/gta02.c
===================================================================
--- kernel/arch/arm32/src/mach/gta02/gta02.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/src/mach/gta02/gta02.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32gta02
+/** @addtogroup kernel_arm32_gta02
  * @{
  */
Index: kernel/arch/arm32/src/mach/integratorcp/integratorcp.c
===================================================================
--- kernel/arch/arm32/src/mach/integratorcp/integratorcp.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/src/mach/integratorcp/integratorcp.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32integratorcp
+/** @addtogroup kernel_arm32_integratorcp
  * @{
  */
Index: kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c
===================================================================
--- kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32raspberrypi
+/** @addtogroup kernel_arm32_raspberrypi
  * @{
  */
Index: kernel/arch/arm32/src/machine_func.c
===================================================================
--- kernel/arch/arm32/src/machine_func.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/src/machine_func.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/src/mm/as.c
===================================================================
--- kernel/arch/arm32/src/mm/as.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/src/mm/as.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/src/mm/frame.c
===================================================================
--- kernel/arch/arm32/src/mm/frame.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/src/mm/frame.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/src/mm/km.c
===================================================================
--- kernel/arch/arm32/src/mm/km.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/src/mm/km.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/src/mm/page.c
===================================================================
--- kernel/arch/arm32/src/mm/page.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/src/mm/page.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/src/mm/page_fault.c
===================================================================
--- kernel/arch/arm32/src/mm/page_fault.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/src/mm/page_fault.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/src/mm/tlb.c
===================================================================
--- kernel/arch/arm32/src/mm/tlb.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/src/mm/tlb.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/src/ras.c
===================================================================
--- kernel/arch/arm32/src/ras.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/src/ras.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/src/userspace.c
===================================================================
--- kernel/arch/arm32/src/userspace.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/arm32/src/userspace.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/ia32/include/arch/arch.h
===================================================================
--- kernel/arch/ia32/include/arch/arch.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/arch.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/include/arch/asm.h
===================================================================
--- kernel/arch/ia32/include/arch/asm.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/asm.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/include/arch/bios/bios.h
===================================================================
--- kernel/arch/ia32/include/arch/bios/bios.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/bios/bios.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/include/arch/boot/boot.h
===================================================================
--- kernel/arch/ia32/include/arch/boot/boot.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/boot/boot.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/include/arch/boot/memmap.h
===================================================================
--- kernel/arch/ia32/include/arch/boot/memmap.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/boot/memmap.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/include/arch/context.h
===================================================================
--- kernel/arch/ia32/include/arch/context.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/context.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/include/arch/cpu.h
===================================================================
--- kernel/arch/ia32/include/arch/cpu.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/cpu.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/include/arch/cpuid.h
===================================================================
--- kernel/arch/ia32/include/arch/cpuid.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/cpuid.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/include/arch/cycle.h
===================================================================
--- kernel/arch/ia32/include/arch/cycle.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/cycle.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/include/arch/ddi/ddi.h
===================================================================
--- kernel/arch/ia32/include/arch/ddi/ddi.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/ddi/ddi.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32ddi
+/** @addtogroup kernel_ia32_ddi
  * @{
  */
Index: kernel/arch/ia32/include/arch/drivers/i8254.h
===================================================================
--- kernel/arch/ia32/include/arch/drivers/i8254.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/drivers/i8254.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/include/arch/drivers/i8259.h
===================================================================
--- kernel/arch/ia32/include/arch/drivers/i8259.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/drivers/i8259.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/include/arch/elf.h
===================================================================
--- kernel/arch/ia32/include/arch/elf.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/elf.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/include/arch/faddr.h
===================================================================
--- kernel/arch/ia32/include/arch/faddr.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/faddr.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/include/arch/fpu_context.h
===================================================================
--- kernel/arch/ia32/include/arch/fpu_context.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/fpu_context.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/include/arch/interrupt.h
===================================================================
--- kernel/arch/ia32/include/arch/interrupt.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/interrupt.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32interrupt
+/** @addtogroup kernel_ia32_interrupt
  * @{
  */
Index: kernel/arch/ia32/include/arch/istate.h
===================================================================
--- kernel/arch/ia32/include/arch/istate.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/istate.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32interrupt
+/** @addtogroup kernel_ia32_interrupt
  * @{
  */
Index: kernel/arch/ia32/include/arch/mm/as.h
===================================================================
--- kernel/arch/ia32/include/arch/mm/as.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/mm/as.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32mm
+/** @addtogroup kernel_ia32_mm
  * @{
  */
Index: kernel/arch/ia32/include/arch/mm/asid.h
===================================================================
--- kernel/arch/ia32/include/arch/mm/asid.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/mm/asid.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,9 +27,9 @@
  */
 
-/** @addtogroup ia32mm
+/** @addtogroup kernel_ia32_mm
  * @{
  */
 /** @file
- * @ingroup ia32mm, amd64mm
+ * @ingroup kernel_ia32_mm, kernel_amd64_mm
  */
 
Index: kernel/arch/ia32/include/arch/mm/frame.h
===================================================================
--- kernel/arch/ia32/include/arch/mm/frame.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/mm/frame.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32mm
+/** @addtogroup kernel_ia32_mm
  * @{
  */
Index: kernel/arch/ia32/include/arch/mm/km.h
===================================================================
--- kernel/arch/ia32/include/arch/mm/km.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/mm/km.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32mm
+/** @addtogroup kernel_ia32_mm
  * @{
  */
Index: kernel/arch/ia32/include/arch/mm/page.h
===================================================================
--- kernel/arch/ia32/include/arch/mm/page.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/mm/page.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32mm
+/** @addtogroup kernel_ia32_mm
  * @{
  */
Index: kernel/arch/ia32/include/arch/mm/tlb.h
===================================================================
--- kernel/arch/ia32/include/arch/mm/tlb.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/mm/tlb.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32mm
+/** @addtogroup kernel_ia32_mm
  * @{
  */
Index: kernel/arch/ia32/include/arch/pm.h
===================================================================
--- kernel/arch/ia32/include/arch/pm.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/pm.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/include/arch/proc/task.h
===================================================================
--- kernel/arch/ia32/include/arch/proc/task.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/proc/task.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32proc
+/** @addtogroup kernel_ia32_proc
  * @{
  */
Index: kernel/arch/ia32/include/arch/proc/thread.h
===================================================================
--- kernel/arch/ia32/include/arch/proc/thread.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/proc/thread.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32proc
+/** @addtogroup kernel_ia32_proc
  * @{
  */
Index: kernel/arch/ia32/include/arch/smp/ap.h
===================================================================
--- kernel/arch/ia32/include/arch/smp/ap.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/smp/ap.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/include/arch/smp/apic.h
===================================================================
--- kernel/arch/ia32/include/arch/smp/apic.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/smp/apic.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/include/arch/smp/mps.h
===================================================================
--- kernel/arch/ia32/include/arch/smp/mps.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/smp/mps.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/include/arch/smp/smp.h
===================================================================
--- kernel/arch/ia32/include/arch/smp/smp.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/smp/smp.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/include/arch/stack.h
===================================================================
--- kernel/arch/ia32/include/arch/stack.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/stack.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/include/arch/types.h
===================================================================
--- kernel/arch/ia32/include/arch/types.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/types.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/include/arch/vreg.h
===================================================================
--- kernel/arch/ia32/include/arch/vreg.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/include/arch/vreg.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/src/bios/bios.c
===================================================================
--- kernel/arch/ia32/src/bios/bios.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/bios/bios.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/src/boot/memmap.c
===================================================================
--- kernel/arch/ia32/src/boot/memmap.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/boot/memmap.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32mm
+/** @addtogroup kernel_ia32_mm
  * @{
  */
Index: kernel/arch/ia32/src/cpu/cpu.c
===================================================================
--- kernel/arch/ia32/src/cpu/cpu.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/cpu/cpu.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/src/ddi/ddi.c
===================================================================
--- kernel/arch/ia32/src/ddi/ddi.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/ddi/ddi.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32ddi
+/** @addtogroup kernel_ia32_ddi
  * @{
  */
Index: kernel/arch/ia32/src/debug/stacktrace.c
===================================================================
--- kernel/arch/ia32/src/debug/stacktrace.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/debug/stacktrace.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/src/drivers/i8254.c
===================================================================
--- kernel/arch/ia32/src/drivers/i8254.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/drivers/i8254.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/src/drivers/i8259.c
===================================================================
--- kernel/arch/ia32/src/drivers/i8259.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/drivers/i8259.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/src/fpu_context.c
===================================================================
--- kernel/arch/ia32/src/fpu_context.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/fpu_context.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/src/ia32.c
===================================================================
--- kernel/arch/ia32/src/ia32.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/ia32.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -29,5 +29,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/src/interrupt.c
===================================================================
--- kernel/arch/ia32/src/interrupt.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/interrupt.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32interrupt
+/** @addtogroup kernel_ia32_interrupt
  * @{
  */
Index: kernel/arch/ia32/src/mm/as.c
===================================================================
--- kernel/arch/ia32/src/mm/as.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/mm/as.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,9 +27,9 @@
  */
 
-/** @addtogroup ia32mm
+/** @addtogroup kernel_ia32_mm
  * @{
  */
 /** @file
- * @ingroup ia32mm, amd64mm
+ * @ingroup kernel_ia32_mm, kernel_amd64_mm
  */
 
Index: kernel/arch/ia32/src/mm/frame.c
===================================================================
--- kernel/arch/ia32/src/mm/frame.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/mm/frame.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,9 +27,9 @@
  */
 
-/** @addtogroup ia32mm
+/** @addtogroup kernel_ia32_mm
  * @{
  */
 /** @file
- * @ingroup ia32mm, amd64mm
+ * @ingroup kernel_ia32_mm, kernel_amd64_mm
  */
 
Index: kernel/arch/ia32/src/mm/km.c
===================================================================
--- kernel/arch/ia32/src/mm/km.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/mm/km.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32mm
+/** @addtogroup kernel_ia32_mm
  * @{
  */
Index: kernel/arch/ia32/src/mm/page.c
===================================================================
--- kernel/arch/ia32/src/mm/page.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/mm/page.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32mm
+/** @addtogroup kernel_ia32_mm
  * @{
  */
Index: kernel/arch/ia32/src/mm/tlb.c
===================================================================
--- kernel/arch/ia32/src/mm/tlb.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/mm/tlb.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,9 +27,9 @@
  */
 
-/** @addtogroup ia32mm
+/** @addtogroup kernel_ia32_mm
  * @{
  */
 /** @file
- * @ingroup ia32mm, amd64mm
+ * @ingroup kernel_ia32_mm, kernel_amd64_mm
  */
 
Index: kernel/arch/ia32/src/pm.c
===================================================================
--- kernel/arch/ia32/src/pm.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/pm.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/src/proc/scheduler.c
===================================================================
--- kernel/arch/ia32/src/proc/scheduler.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/proc/scheduler.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32proc
+/** @addtogroup kernel_ia32_proc
  * @{
  */
Index: kernel/arch/ia32/src/proc/task.c
===================================================================
--- kernel/arch/ia32/src/proc/task.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/proc/task.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32proc
+/** @addtogroup kernel_ia32_proc
  * @{
  */
Index: kernel/arch/ia32/src/proc/thread.c
===================================================================
--- kernel/arch/ia32/src/proc/thread.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/proc/thread.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32proc
+/** @addtogroup kernel_ia32_proc
  * @{
  */
Index: kernel/arch/ia32/src/smp/apic.c
===================================================================
--- kernel/arch/ia32/src/smp/apic.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/smp/apic.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/src/smp/ipi.c
===================================================================
--- kernel/arch/ia32/src/smp/ipi.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/smp/ipi.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/src/smp/mps.c
===================================================================
--- kernel/arch/ia32/src/smp/mps.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/smp/mps.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/src/smp/smp.c
===================================================================
--- kernel/arch/ia32/src/smp/smp.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/smp/smp.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/src/smp/smp_call.c
===================================================================
--- kernel/arch/ia32/src/smp/smp_call.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/smp/smp_call.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/src/syscall.c
===================================================================
--- kernel/arch/ia32/src/syscall.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/syscall.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/src/userspace.c
===================================================================
--- kernel/arch/ia32/src/userspace.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/userspace.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia32/src/vreg.c
===================================================================
--- kernel/arch/ia32/src/vreg.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia32/src/vreg.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/arch/ia64/include/arch/arch.h
===================================================================
--- kernel/arch/ia64/include/arch/arch.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/arch.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/ia64/include/arch/asm.h
===================================================================
--- kernel/arch/ia64/include/arch/asm.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/asm.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/ia64/include/arch/barrier.h
===================================================================
--- kernel/arch/ia64/include/arch/barrier.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/barrier.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/ia64/include/arch/context.h
===================================================================
--- kernel/arch/ia64/include/arch/context.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/context.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/ia64/include/arch/cpu.h
===================================================================
--- kernel/arch/ia64/include/arch/cpu.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/cpu.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/ia64/include/arch/cycle.h
===================================================================
--- kernel/arch/ia64/include/arch/cycle.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/cycle.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/ia64/include/arch/drivers/it.h
===================================================================
--- kernel/arch/ia64/include/arch/drivers/it.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/drivers/it.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/ia64/include/arch/drivers/kbd.h
===================================================================
--- kernel/arch/ia64/include/arch/drivers/kbd.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/drivers/kbd.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/ia64/include/arch/drivers/ski.h
===================================================================
--- kernel/arch/ia64/include/arch/drivers/ski.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/drivers/ski.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/ia64/include/arch/elf.h
===================================================================
--- kernel/arch/ia64/include/arch/elf.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/elf.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/ia64/include/arch/faddr.h
===================================================================
--- kernel/arch/ia64/include/arch/faddr.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/faddr.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/ia64/include/arch/fpu_context.h
===================================================================
--- kernel/arch/ia64/include/arch/fpu_context.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/fpu_context.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/ia64/include/arch/interrupt.h
===================================================================
--- kernel/arch/ia64/include/arch/interrupt.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/interrupt.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64interrupt
+/** @addtogroup kernel_ia64_interrupt
  * @{
  */
Index: kernel/arch/ia64/include/arch/istate.h
===================================================================
--- kernel/arch/ia64/include/arch/istate.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/istate.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64interrupt
+/** @addtogroup kernel_ia64_interrupt
  * @{
  */
Index: kernel/arch/ia64/include/arch/legacyio.h
===================================================================
--- kernel/arch/ia64/include/arch/legacyio.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/legacyio.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/ia64/include/arch/mm/as.h
===================================================================
--- kernel/arch/ia64/include/arch/mm/as.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/mm/as.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64mm
+/** @addtogroup kernel_ia64_mm
  * @{
  */
Index: kernel/arch/ia64/include/arch/mm/asid.h
===================================================================
--- kernel/arch/ia64/include/arch/mm/asid.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/mm/asid.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64mm
+/** @addtogroup kernel_ia64_mm
  * @{
  */
Index: kernel/arch/ia64/include/arch/mm/frame.h
===================================================================
--- kernel/arch/ia64/include/arch/mm/frame.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/mm/frame.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64mm
+/** @addtogroup kernel_ia64_mm
  * @{
  */
Index: kernel/arch/ia64/include/arch/mm/km.h
===================================================================
--- kernel/arch/ia64/include/arch/mm/km.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/mm/km.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64mm
+/** @addtogroup kernel_ia64_mm
  * @{
  */
Index: kernel/arch/ia64/include/arch/mm/page.h
===================================================================
--- kernel/arch/ia64/include/arch/mm/page.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/mm/page.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup ia64mm
+/** @addtogroup kernel_ia64_mm
  * @{
  */
Index: kernel/arch/ia64/include/arch/mm/tlb.h
===================================================================
--- kernel/arch/ia64/include/arch/mm/tlb.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/mm/tlb.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64mm
+/** @addtogroup kernel_ia64_mm
  * @{
  */
Index: kernel/arch/ia64/include/arch/mm/vhpt.h
===================================================================
--- kernel/arch/ia64/include/arch/mm/vhpt.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/mm/vhpt.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64mm
+/** @addtogroup kernel_ia64_mm
  * @{
  */
Index: kernel/arch/ia64/include/arch/pal/pal.h
===================================================================
--- kernel/arch/ia64/include/arch/pal/pal.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/pal/pal.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/ia64/include/arch/proc/task.h
===================================================================
--- kernel/arch/ia64/include/arch/proc/task.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/proc/task.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64proc
+/** @addtogroup kernel_ia64_proc
  * @{
  */
Index: kernel/arch/ia64/include/arch/proc/thread.h
===================================================================
--- kernel/arch/ia64/include/arch/proc/thread.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/proc/thread.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64proc
+/** @addtogroup kernel_ia64_proc
  * @{
  */
Index: kernel/arch/ia64/include/arch/register.h
===================================================================
--- kernel/arch/ia64/include/arch/register.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/register.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/ia64/include/arch/stack.h
===================================================================
--- kernel/arch/ia64/include/arch/stack.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/stack.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/ia64/include/arch/types.h
===================================================================
--- kernel/arch/ia64/include/arch/types.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/include/arch/types.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/ia64/src/cpu/cpu.c
===================================================================
--- kernel/arch/ia64/src/cpu/cpu.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/src/cpu/cpu.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/ia64/src/ddi/ddi.c
===================================================================
--- kernel/arch/ia64/src/ddi/ddi.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/src/ddi/ddi.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup ia64ddi
+/** @addtogroup kernel_ia64_ddi
  * @{
  */
Index: kernel/arch/ia64/src/debug/stacktrace.c
===================================================================
--- kernel/arch/ia64/src/debug/stacktrace.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/src/debug/stacktrace.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/ia64/src/drivers/it.c
===================================================================
--- kernel/arch/ia64/src/drivers/it.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/src/drivers/it.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/ia64/src/drivers/ski.c
===================================================================
--- kernel/arch/ia64/src/drivers/ski.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/src/drivers/ski.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/ia64/src/fpu_context.c
===================================================================
--- kernel/arch/ia64/src/fpu_context.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/src/fpu_context.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/ia64/src/ia64.c
===================================================================
--- kernel/arch/ia64/src/ia64.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/src/ia64.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/ia64/src/interrupt.c
===================================================================
--- kernel/arch/ia64/src/interrupt.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/src/interrupt.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup ia64interrupt
+/** @addtogroup kernel_ia64_interrupt
  * @{
  */
Index: kernel/arch/ia64/src/mm/as.c
===================================================================
--- kernel/arch/ia64/src/mm/as.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/src/mm/as.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64mm
+/** @addtogroup kernel_ia64_mm
  * @{
  */
Index: kernel/arch/ia64/src/mm/frame.c
===================================================================
--- kernel/arch/ia64/src/mm/frame.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/src/mm/frame.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64mm
+/** @addtogroup kernel_ia64_mm
  * @{
  */
Index: kernel/arch/ia64/src/mm/km.c
===================================================================
--- kernel/arch/ia64/src/mm/km.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/src/mm/km.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64mm
+/** @addtogroup kernel_ia64_mm
  * @{
  */
Index: kernel/arch/ia64/src/mm/page.c
===================================================================
--- kernel/arch/ia64/src/mm/page.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/src/mm/page.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup ia64mm
+/** @addtogroup kernel_ia64_mm
  * @{
  */
Index: kernel/arch/ia64/src/mm/tlb.c
===================================================================
--- kernel/arch/ia64/src/mm/tlb.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/src/mm/tlb.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64mm
+/** @addtogroup kernel_ia64_mm
  * @{
  */
Index: kernel/arch/ia64/src/mm/vhpt.c
===================================================================
--- kernel/arch/ia64/src/mm/vhpt.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/src/mm/vhpt.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64mm
+/** @addtogroup kernel_ia64_mm
  * @{
  */
Index: kernel/arch/ia64/src/proc/scheduler.c
===================================================================
--- kernel/arch/ia64/src/proc/scheduler.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/src/proc/scheduler.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64proc
+/** @addtogroup kernel_ia64_proc
  * @{
  */
Index: kernel/arch/ia64/src/smp/smp.c
===================================================================
--- kernel/arch/ia64/src/smp/smp.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/src/smp/smp.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/ia64/src/smp/smp_call.c
===================================================================
--- kernel/arch/ia64/src/smp/smp_call.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ia64/src/smp/smp_call.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */
Index: kernel/arch/mips32/include/arch/arch.h
===================================================================
--- kernel/arch/mips32/include/arch/arch.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/arch.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/include/arch/asm.h
===================================================================
--- kernel/arch/mips32/include/arch/asm.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/asm.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/include/arch/asm/boot.h
===================================================================
--- kernel/arch/mips32/include/arch/asm/boot.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/asm/boot.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/include/arch/asm/regname.h
===================================================================
--- kernel/arch/mips32/include/arch/asm/regname.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/asm/regname.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/include/arch/cache.h
===================================================================
--- kernel/arch/mips32/include/arch/cache.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/cache.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/include/arch/context.h
===================================================================
--- kernel/arch/mips32/include/arch/context.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/context.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/include/arch/cp0.h
===================================================================
--- kernel/arch/mips32/include/arch/cp0.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/cp0.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/include/arch/cpu.h
===================================================================
--- kernel/arch/mips32/include/arch/cpu.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/cpu.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/include/arch/cycle.h
===================================================================
--- kernel/arch/mips32/include/arch/cycle.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/cycle.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/include/arch/debug.h
===================================================================
--- kernel/arch/mips32/include/arch/debug.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/debug.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32debug
+/** @addtogroup kernel_mips32_debug
  * @{
  */
Index: kernel/arch/mips32/include/arch/debugger.h
===================================================================
--- kernel/arch/mips32/include/arch/debugger.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/debugger.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32debug
+/** @addtogroup kernel_mips32_debug
  * @{
  */
Index: kernel/arch/mips32/include/arch/drivers/msim.h
===================================================================
--- kernel/arch/mips32/include/arch/drivers/msim.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/drivers/msim.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/include/arch/elf.h
===================================================================
--- kernel/arch/mips32/include/arch/elf.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/elf.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/include/arch/exception.h
===================================================================
--- kernel/arch/mips32/include/arch/exception.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/exception.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/include/arch/faddr.h
===================================================================
--- kernel/arch/mips32/include/arch/faddr.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/faddr.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/include/arch/fpu_context.h
===================================================================
--- kernel/arch/mips32/include/arch/fpu_context.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/fpu_context.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/include/arch/interrupt.h
===================================================================
--- kernel/arch/mips32/include/arch/interrupt.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/interrupt.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32interrupt
+/** @addtogroup kernel_mips32_interrupt
  * @{
  */
Index: kernel/arch/mips32/include/arch/istate.h
===================================================================
--- kernel/arch/mips32/include/arch/istate.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/istate.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32interrupt
+/** @addtogroup kernel_mips32_interrupt
  * @{
  */
Index: kernel/arch/mips32/include/arch/mach/malta/malta.h
===================================================================
--- kernel/arch/mips32/include/arch/mach/malta/malta.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/mach/malta/malta.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/include/arch/mach/msim/msim.h
===================================================================
--- kernel/arch/mips32/include/arch/mach/msim/msim.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/mach/msim/msim.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/include/arch/machine_func.h
===================================================================
--- kernel/arch/mips32/include/arch/machine_func.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/machine_func.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -29,5 +29,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/include/arch/mm/as.h
===================================================================
--- kernel/arch/mips32/include/arch/mm/as.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/mm/as.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32mm
+/** @addtogroup kernel_mips32_mm
  * @{
  */
Index: kernel/arch/mips32/include/arch/mm/asid.h
===================================================================
--- kernel/arch/mips32/include/arch/mm/asid.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/mm/asid.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32mm
+/** @addtogroup kernel_mips32_mm
  * @{
  */
Index: kernel/arch/mips32/include/arch/mm/frame.h
===================================================================
--- kernel/arch/mips32/include/arch/mm/frame.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/mm/frame.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32mm
+/** @addtogroup kernel_mips32_mm
  * @{
  */
Index: kernel/arch/mips32/include/arch/mm/km.h
===================================================================
--- kernel/arch/mips32/include/arch/mm/km.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/mm/km.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32mm
+/** @addtogroup kernel_mips32_mm
  * @{
  */
Index: kernel/arch/mips32/include/arch/mm/page.h
===================================================================
--- kernel/arch/mips32/include/arch/mm/page.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/mm/page.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32mm
+/** @addtogroup kernel_mips32_mm
  * @{
  */
Index: kernel/arch/mips32/include/arch/mm/tlb.h
===================================================================
--- kernel/arch/mips32/include/arch/mm/tlb.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/mm/tlb.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32mm
+/** @addtogroup kernel_mips32_mm
  * @{
  */
Index: kernel/arch/mips32/include/arch/proc/task.h
===================================================================
--- kernel/arch/mips32/include/arch/proc/task.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/proc/task.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32proc
+/** @addtogroup kernel_mips32_proc
  * @{
  */
Index: kernel/arch/mips32/include/arch/proc/thread.h
===================================================================
--- kernel/arch/mips32/include/arch/proc/thread.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/proc/thread.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32proc
+/** @addtogroup kernel_mips32_proc
  * @{
  */
Index: kernel/arch/mips32/include/arch/smp/dorder.h
===================================================================
--- kernel/arch/mips32/include/arch/smp/dorder.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/smp/dorder.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/include/arch/stack.h
===================================================================
--- kernel/arch/mips32/include/arch/stack.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/stack.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/include/arch/types.h
===================================================================
--- kernel/arch/mips32/include/arch/types.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/include/arch/types.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/src/cache.c
===================================================================
--- kernel/arch/mips32/src/cache.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/src/cache.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/src/cpu/cpu.c
===================================================================
--- kernel/arch/mips32/src/cpu/cpu.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/src/cpu/cpu.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/src/debug/stacktrace.c
===================================================================
--- kernel/arch/mips32/src/debug/stacktrace.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/src/debug/stacktrace.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/src/debugger.c
===================================================================
--- kernel/arch/mips32/src/debugger.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/src/debugger.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32debug
+/** @addtogroup kernel_mips32_debug
  * @{
  */
Index: kernel/arch/mips32/src/exception.c
===================================================================
--- kernel/arch/mips32/src/exception.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/src/exception.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/src/fpu_context.c
===================================================================
--- kernel/arch/mips32/src/fpu_context.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/src/fpu_context.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/src/interrupt.c
===================================================================
--- kernel/arch/mips32/src/interrupt.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/src/interrupt.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32interrupt
+/** @addtogroup kernel_mips32_interrupt
  * @{
  */
Index: kernel/arch/mips32/src/mach/malta/malta.c
===================================================================
--- kernel/arch/mips32/src/mach/malta/malta.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/src/mach/malta/malta.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/src/mach/msim/msim.c
===================================================================
--- kernel/arch/mips32/src/mach/msim/msim.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/src/mach/msim/msim.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/src/machine_func.c
===================================================================
--- kernel/arch/mips32/src/machine_func.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/src/machine_func.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/src/mips32.c
===================================================================
--- kernel/arch/mips32/src/mips32.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/src/mips32.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/src/mm/as.c
===================================================================
--- kernel/arch/mips32/src/mm/as.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/src/mm/as.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32mm
+/** @addtogroup kernel_mips32_mm
  * @{
  */
Index: kernel/arch/mips32/src/mm/frame.c
===================================================================
--- kernel/arch/mips32/src/mm/frame.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/src/mm/frame.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32mm
+/** @addtogroup kernel_mips32_mm
  * @{
  */
Index: kernel/arch/mips32/src/mm/km.c
===================================================================
--- kernel/arch/mips32/src/mm/km.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/src/mm/km.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32mm
+/** @addtogroup kernel_mips32_mm
  * @{
  */
Index: kernel/arch/mips32/src/mm/page.c
===================================================================
--- kernel/arch/mips32/src/mm/page.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/src/mm/page.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32mm
+/** @addtogroup kernel_mips32_mm
  * @{
  */
Index: kernel/arch/mips32/src/mm/tlb.c
===================================================================
--- kernel/arch/mips32/src/mm/tlb.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/src/mm/tlb.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32mm
+/** @addtogroup kernel_mips32_mm
  * @{
  */
Index: kernel/arch/mips32/src/smp/dorder.c
===================================================================
--- kernel/arch/mips32/src/smp/dorder.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/src/smp/dorder.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/src/smp/smp.c
===================================================================
--- kernel/arch/mips32/src/smp/smp.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/src/smp/smp.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/mips32/src/smp/smp_call.c
===================================================================
--- kernel/arch/mips32/src/smp/smp_call.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/mips32/src/smp/smp_call.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup kernel_mips32
  * @{
  */
Index: kernel/arch/ppc32/include/arch/arch.h
===================================================================
--- kernel/arch/ppc32/include/arch/arch.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/arch.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32
+/** @addtogroup kernel_ppc32
  * @{
  */
Index: kernel/arch/ppc32/include/arch/asm.h
===================================================================
--- kernel/arch/ppc32/include/arch/asm.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/asm.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32
+/** @addtogroup kernel_ppc32
  * @{
  */
Index: kernel/arch/ppc32/include/arch/asm/regname.h
===================================================================
--- kernel/arch/ppc32/include/arch/asm/regname.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/asm/regname.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32
+/** @addtogroup kernel_ppc32
  * @{
  */
Index: kernel/arch/ppc32/include/arch/boot/boot.h
===================================================================
--- kernel/arch/ppc32/include/arch/boot/boot.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/boot/boot.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32
+/** @addtogroup kernel_ppc32
  * @{
  */
Index: kernel/arch/ppc32/include/arch/context.h
===================================================================
--- kernel/arch/ppc32/include/arch/context.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/context.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32
+/** @addtogroup kernel_ppc32
  * @{
  */
Index: kernel/arch/ppc32/include/arch/cpu.h
===================================================================
--- kernel/arch/ppc32/include/arch/cpu.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/cpu.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32
+/** @addtogroup kernel_ppc32
  * @{
  */
Index: kernel/arch/ppc32/include/arch/cycle.h
===================================================================
--- kernel/arch/ppc32/include/arch/cycle.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/cycle.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32
+/** @addtogroup kernel_ppc32
  * @{
  */
Index: kernel/arch/ppc32/include/arch/drivers/pic.h
===================================================================
--- kernel/arch/ppc32/include/arch/drivers/pic.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/drivers/pic.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32
+/** @addtogroup kernel_ppc32
  * @{
  */
Index: kernel/arch/ppc32/include/arch/elf.h
===================================================================
--- kernel/arch/ppc32/include/arch/elf.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/elf.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32
+/** @addtogroup kernel_ppc32
  * @{
  */
Index: kernel/arch/ppc32/include/arch/faddr.h
===================================================================
--- kernel/arch/ppc32/include/arch/faddr.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/faddr.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32
+/** @addtogroup kernel_ppc32
  * @{
  */
Index: kernel/arch/ppc32/include/arch/fpu_context.h
===================================================================
--- kernel/arch/ppc32/include/arch/fpu_context.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/fpu_context.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32
+/** @addtogroup kernel_ppc32
  * @{
  */
Index: kernel/arch/ppc32/include/arch/interrupt.h
===================================================================
--- kernel/arch/ppc32/include/arch/interrupt.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/interrupt.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32interrupt
+/** @addtogroup kernel_ppc32_interrupt
  * @{
  */
Index: kernel/arch/ppc32/include/arch/istate.h
===================================================================
--- kernel/arch/ppc32/include/arch/istate.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/istate.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32
+/** @addtogroup kernel_ppc32
  * @{
  */
Index: kernel/arch/ppc32/include/arch/mm/as.h
===================================================================
--- kernel/arch/ppc32/include/arch/mm/as.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/mm/as.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32mm
+/** @addtogroup kernel_ppc32_mm
  * @{
  */
Index: kernel/arch/ppc32/include/arch/mm/asid.h
===================================================================
--- kernel/arch/ppc32/include/arch/mm/asid.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/mm/asid.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32mm
+/** @addtogroup kernel_ppc32_mm
  * @{
  */
Index: kernel/arch/ppc32/include/arch/mm/frame.h
===================================================================
--- kernel/arch/ppc32/include/arch/mm/frame.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/mm/frame.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32mm
+/** @addtogroup kernel_ppc32_mm
  * @{
  */
Index: kernel/arch/ppc32/include/arch/mm/km.h
===================================================================
--- kernel/arch/ppc32/include/arch/mm/km.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/mm/km.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32mm
+/** @addtogroup kernel_ppc32_mm
  * @{
  */
Index: kernel/arch/ppc32/include/arch/mm/page.h
===================================================================
--- kernel/arch/ppc32/include/arch/mm/page.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/mm/page.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32mm
+/** @addtogroup kernel_ppc32_mm
  * @{
  */
Index: kernel/arch/ppc32/include/arch/mm/pht.h
===================================================================
--- kernel/arch/ppc32/include/arch/mm/pht.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/mm/pht.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32mm
+/** @addtogroup kernel_ppc32_mm
  * @{
  */
Index: kernel/arch/ppc32/include/arch/mm/tlb.h
===================================================================
--- kernel/arch/ppc32/include/arch/mm/tlb.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/mm/tlb.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32mm
+/** @addtogroup kernel_ppc32_mm
  * @{
  */
Index: kernel/arch/ppc32/include/arch/msr.h
===================================================================
--- kernel/arch/ppc32/include/arch/msr.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/msr.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32
+/** @addtogroup kernel_ppc32
  * @{
  */
Index: kernel/arch/ppc32/include/arch/proc/task.h
===================================================================
--- kernel/arch/ppc32/include/arch/proc/task.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/proc/task.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32proc
+/** @addtogroup kernel_ppc32_proc
  * @{
  */
Index: kernel/arch/ppc32/include/arch/proc/thread.h
===================================================================
--- kernel/arch/ppc32/include/arch/proc/thread.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/proc/thread.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32proc
+/** @addtogroup kernel_ppc32_proc
  * @{
  */
Index: kernel/arch/ppc32/include/arch/stack.h
===================================================================
--- kernel/arch/ppc32/include/arch/stack.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/stack.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32
+/** @addtogroup kernel_ppc32
  * @{
  */
Index: kernel/arch/ppc32/include/arch/types.h
===================================================================
--- kernel/arch/ppc32/include/arch/types.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/include/arch/types.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32
+/** @addtogroup kernel_ppc32
  * @{
  */
Index: kernel/arch/ppc32/src/cpu/cpu.c
===================================================================
--- kernel/arch/ppc32/src/cpu/cpu.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/src/cpu/cpu.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32
+/** @addtogroup kernel_ppc32
  * @{
  */
Index: kernel/arch/ppc32/src/debug/stacktrace.c
===================================================================
--- kernel/arch/ppc32/src/debug/stacktrace.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/src/debug/stacktrace.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32
+/** @addtogroup kernel_ppc32
  * @{
  */
Index: kernel/arch/ppc32/src/drivers/pic.c
===================================================================
--- kernel/arch/ppc32/src/drivers/pic.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/src/drivers/pic.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32
+/** @addtogroup kernel_ppc32
  * @{
  */
Index: kernel/arch/ppc32/src/interrupt.c
===================================================================
--- kernel/arch/ppc32/src/interrupt.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/src/interrupt.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32interrupt
+/** @addtogroup kernel_ppc32_interrupt
  * @{
  */
Index: kernel/arch/ppc32/src/mm/as.c
===================================================================
--- kernel/arch/ppc32/src/mm/as.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/src/mm/as.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32mm
+/** @addtogroup kernel_ppc32_mm
  * @{
  */
Index: kernel/arch/ppc32/src/mm/frame.c
===================================================================
--- kernel/arch/ppc32/src/mm/frame.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/src/mm/frame.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32mm
+/** @addtogroup kernel_ppc32_mm
  * @{
  */
Index: kernel/arch/ppc32/src/mm/km.c
===================================================================
--- kernel/arch/ppc32/src/mm/km.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/src/mm/km.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32mm
+/** @addtogroup kernel_ppc32_mm
  * @{
  */
Index: kernel/arch/ppc32/src/mm/page.c
===================================================================
--- kernel/arch/ppc32/src/mm/page.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/src/mm/page.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32mm
+/** @addtogroup kernel_ppc32_mm
  * @{
  */
Index: kernel/arch/ppc32/src/mm/pht.c
===================================================================
--- kernel/arch/ppc32/src/mm/pht.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/src/mm/pht.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32mm
+/** @addtogroup kernel_ppc32_mm
  * @{
  */
Index: kernel/arch/ppc32/src/mm/tlb.c
===================================================================
--- kernel/arch/ppc32/src/mm/tlb.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/src/mm/tlb.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32mm
+/** @addtogroup kernel_ppc32_mm
  * @{
  */
Index: kernel/arch/ppc32/src/ppc32.c
===================================================================
--- kernel/arch/ppc32/src/ppc32.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/src/ppc32.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32
+/** @addtogroup kernel_ppc32
  * @{
  */
Index: kernel/arch/ppc32/src/proc/scheduler.c
===================================================================
--- kernel/arch/ppc32/src/proc/scheduler.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/ppc32/src/proc/scheduler.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32proc
+/** @addtogroup kernel_ppc32_proc
  * @{
  */
Index: kernel/arch/riscv64/include/arch/arch.h
===================================================================
--- kernel/arch/riscv64/include/arch/arch.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/include/arch/arch.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64
+/** @addtogroup kernel_riscv64
  * @{
  */
Index: kernel/arch/riscv64/include/arch/asm.h
===================================================================
--- kernel/arch/riscv64/include/arch/asm.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/include/arch/asm.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64
+/** @addtogroup kernel_riscv64
  * @{
  */
Index: kernel/arch/riscv64/include/arch/boot/boot.h
===================================================================
--- kernel/arch/riscv64/include/arch/boot/boot.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/include/arch/boot/boot.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64
+/** @addtogroup kernel_riscv64
  * @{
  */
Index: kernel/arch/riscv64/include/arch/context.h
===================================================================
--- kernel/arch/riscv64/include/arch/context.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/include/arch/context.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64
+/** @addtogroup kernel_riscv64
  * @{
  */
Index: kernel/arch/riscv64/include/arch/cpu.h
===================================================================
--- kernel/arch/riscv64/include/arch/cpu.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/include/arch/cpu.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64
+/** @addtogroup kernel_riscv64
  * @{
  */
Index: kernel/arch/riscv64/include/arch/cycle.h
===================================================================
--- kernel/arch/riscv64/include/arch/cycle.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/include/arch/cycle.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64
+/** @addtogroup kernel_riscv64
  * @{
  */
Index: kernel/arch/riscv64/include/arch/drivers/ucb.h
===================================================================
--- kernel/arch/riscv64/include/arch/drivers/ucb.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/include/arch/drivers/ucb.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64
+/** @addtogroup kernel_riscv64
  * @{
  */
Index: kernel/arch/riscv64/include/arch/elf.h
===================================================================
--- kernel/arch/riscv64/include/arch/elf.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/include/arch/elf.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64
+/** @addtogroup kernel_riscv64
  * @{
  */
Index: kernel/arch/riscv64/include/arch/faddr.h
===================================================================
--- kernel/arch/riscv64/include/arch/faddr.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/include/arch/faddr.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64
+/** @addtogroup kernel_riscv64
  * @{
  */
Index: kernel/arch/riscv64/include/arch/fpu_context.h
===================================================================
--- kernel/arch/riscv64/include/arch/fpu_context.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/include/arch/fpu_context.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64
+/** @addtogroup kernel_riscv64
  * @{
  */
Index: kernel/arch/riscv64/include/arch/interrupt.h
===================================================================
--- kernel/arch/riscv64/include/arch/interrupt.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/include/arch/interrupt.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64interrupt
+/** @addtogroup kernel_riscv64_interrupt
  * @{
  */
Index: kernel/arch/riscv64/include/arch/istate.h
===================================================================
--- kernel/arch/riscv64/include/arch/istate.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/include/arch/istate.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64interrupt
+/** @addtogroup kernel_riscv64_interrupt
  * @{
  */
Index: kernel/arch/riscv64/include/arch/mm/as.h
===================================================================
--- kernel/arch/riscv64/include/arch/mm/as.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/include/arch/mm/as.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64mm
+/** @addtogroup kernel_riscv64_mm
  * @{
  */
Index: kernel/arch/riscv64/include/arch/mm/asid.h
===================================================================
--- kernel/arch/riscv64/include/arch/mm/asid.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/include/arch/mm/asid.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64mm
+/** @addtogroup kernel_riscv64_mm
  * @{
  */
Index: kernel/arch/riscv64/include/arch/mm/frame.h
===================================================================
--- kernel/arch/riscv64/include/arch/mm/frame.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/include/arch/mm/frame.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64mm
+/** @addtogroup kernel_riscv64_mm
  * @{
  */
Index: kernel/arch/riscv64/include/arch/mm/km.h
===================================================================
--- kernel/arch/riscv64/include/arch/mm/km.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/include/arch/mm/km.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64mm
+/** @addtogroup kernel_riscv64_mm
  * @{
  */
Index: kernel/arch/riscv64/include/arch/mm/page.h
===================================================================
--- kernel/arch/riscv64/include/arch/mm/page.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/include/arch/mm/page.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64mm
+/** @addtogroup kernel_riscv64_mm
  * @{
  */
Index: kernel/arch/riscv64/include/arch/mm/tlb.h
===================================================================
--- kernel/arch/riscv64/include/arch/mm/tlb.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/include/arch/mm/tlb.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64mm
+/** @addtogroup kernel_riscv64_mm
  * @{
  */
Index: kernel/arch/riscv64/include/arch/proc/task.h
===================================================================
--- kernel/arch/riscv64/include/arch/proc/task.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/include/arch/proc/task.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64proc
+/** @addtogroup kernel_riscv64_proc
  * @{
  */
Index: kernel/arch/riscv64/include/arch/proc/thread.h
===================================================================
--- kernel/arch/riscv64/include/arch/proc/thread.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/include/arch/proc/thread.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64proc
+/** @addtogroup kernel_riscv64_proc
  * @{
  */
Index: kernel/arch/riscv64/include/arch/stack.h
===================================================================
--- kernel/arch/riscv64/include/arch/stack.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/include/arch/stack.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64
+/** @addtogroup kernel_riscv64
  * @{
  */
Index: kernel/arch/riscv64/include/arch/types.h
===================================================================
--- kernel/arch/riscv64/include/arch/types.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/include/arch/types.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64
+/** @addtogroup kernel_riscv64
  * @{
  */
Index: kernel/arch/riscv64/src/cpu/cpu.c
===================================================================
--- kernel/arch/riscv64/src/cpu/cpu.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/src/cpu/cpu.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64
+/** @addtogroup kernel_riscv64
  * @{
  */
Index: kernel/arch/riscv64/src/debug/stacktrace.c
===================================================================
--- kernel/arch/riscv64/src/debug/stacktrace.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/src/debug/stacktrace.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64
+/** @addtogroup kernel_riscv64
  * @{
  */
Index: kernel/arch/riscv64/src/mm/as.c
===================================================================
--- kernel/arch/riscv64/src/mm/as.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/src/mm/as.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64mm
+/** @addtogroup kernel_riscv64_mm
  * @{
  */
Index: kernel/arch/riscv64/src/mm/frame.c
===================================================================
--- kernel/arch/riscv64/src/mm/frame.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/src/mm/frame.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64mm
+/** @addtogroup kernel_riscv64_mm
  * @{
  */
Index: kernel/arch/riscv64/src/mm/km.c
===================================================================
--- kernel/arch/riscv64/src/mm/km.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/src/mm/km.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64mm
+/** @addtogroup kernel_riscv64_mm
  * @{
  */
Index: kernel/arch/riscv64/src/mm/page.c
===================================================================
--- kernel/arch/riscv64/src/mm/page.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/src/mm/page.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64mm
+/** @addtogroup kernel_riscv64_mm
  * @{
  */
Index: kernel/arch/riscv64/src/mm/tlb.c
===================================================================
--- kernel/arch/riscv64/src/mm/tlb.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/src/mm/tlb.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64mm
+/** @addtogroup kernel_riscv64_mm
  * @{
  */
Index: kernel/arch/riscv64/src/proc/scheduler.c
===================================================================
--- kernel/arch/riscv64/src/proc/scheduler.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/src/proc/scheduler.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64proc
+/** @addtogroup kernel_riscv64_proc
  * @{
  */
Index: kernel/arch/riscv64/src/proc/task.c
===================================================================
--- kernel/arch/riscv64/src/proc/task.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/src/proc/task.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64proc
+/** @addtogroup kernel_riscv64_proc
  * @{
  */
Index: kernel/arch/riscv64/src/proc/thread.c
===================================================================
--- kernel/arch/riscv64/src/proc/thread.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/src/proc/thread.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64proc
+/** @addtogroup kernel_riscv64_proc
  * @{
  */
Index: kernel/arch/riscv64/src/riscv64.c
===================================================================
--- kernel/arch/riscv64/src/riscv64.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/src/riscv64.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64
+/** @addtogroup kernel_riscv64
  * @{
  */
Index: kernel/arch/riscv64/src/userspace.c
===================================================================
--- kernel/arch/riscv64/src/userspace.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/riscv64/src/userspace.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64
+/** @addtogroup kernel_riscv64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/arch.h
===================================================================
--- kernel/arch/sparc64/include/arch/arch.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/arch.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/asm.h
===================================================================
--- kernel/arch/sparc64/include/arch/asm.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/asm.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/barrier.h
===================================================================
--- kernel/arch/sparc64/include/arch/barrier.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/barrier.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/boot/boot.h
===================================================================
--- kernel/arch/sparc64/include/arch/boot/boot.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/boot/boot.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/console.h
===================================================================
--- kernel/arch/sparc64/include/arch/console.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/console.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/context.h
===================================================================
--- kernel/arch/sparc64/include/arch/context.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/context.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/cpu.h
===================================================================
--- kernel/arch/sparc64/include/arch/cpu.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/cpu.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/cpu_family.h
===================================================================
--- kernel/arch/sparc64/include/arch/cpu_family.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/cpu_family.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/cpu_node.h
===================================================================
--- kernel/arch/sparc64/include/arch/cpu_node.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/cpu_node.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/cycle.h
===================================================================
--- kernel/arch/sparc64/include/arch/cycle.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/cycle.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/drivers/fb.h
===================================================================
--- kernel/arch/sparc64/include/arch/drivers/fb.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/drivers/fb.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/drivers/kbd.h
===================================================================
--- kernel/arch/sparc64/include/arch/drivers/kbd.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/drivers/kbd.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/drivers/niagara.h
===================================================================
--- kernel/arch/sparc64/include/arch/drivers/niagara.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/drivers/niagara.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/drivers/niagara_buf.h
===================================================================
--- kernel/arch/sparc64/include/arch/drivers/niagara_buf.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/drivers/niagara_buf.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/drivers/pci.h
===================================================================
--- kernel/arch/sparc64/include/arch/drivers/pci.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/drivers/pci.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/drivers/scr.h
===================================================================
--- kernel/arch/sparc64/include/arch/drivers/scr.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/drivers/scr.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/drivers/tick.h
===================================================================
--- kernel/arch/sparc64/include/arch/drivers/tick.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/drivers/tick.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/elf.h
===================================================================
--- kernel/arch/sparc64/include/arch/elf.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/elf.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/faddr.h
===================================================================
--- kernel/arch/sparc64/include/arch/faddr.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/faddr.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/fpu_context.h
===================================================================
--- kernel/arch/sparc64/include/arch/fpu_context.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/fpu_context.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/interrupt.h
===================================================================
--- kernel/arch/sparc64/include/arch/interrupt.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/interrupt.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64interrupt sparc64
+/** @addtogroup kernel_sparc64_interrupt sparc64
  * @ingroup interrupt
  * @{
Index: kernel/arch/sparc64/include/arch/istate.h
===================================================================
--- kernel/arch/sparc64/include/arch/istate.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/istate.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64interrupt sparc64
+/** @addtogroup kernel_sparc64_interrupt sparc64
  * @ingroup interrupt
  * @{
Index: kernel/arch/sparc64/include/arch/mm/as.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/as.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/as.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/asid.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/asid.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/asid.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/cache_spec.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/cache_spec.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/cache_spec.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/frame.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/frame.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/frame.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/km.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/km.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/km.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/mmu.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/mmu.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/mmu.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/page.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/page.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/page.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/pagesize.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/pagesize.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/pagesize.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/sun4u/as.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4u/as.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/sun4u/as.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/sun4u/frame.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4u/frame.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/sun4u/frame.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/sun4u/km.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4u/km.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/sun4u/km.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/sun4u/mmu.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4u/mmu.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/sun4u/mmu.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/sun4u/tlb.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4u/tlb.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/sun4u/tlb.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/sun4u/tsb.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4u/tsb.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/sun4u/tsb.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/sun4u/tte.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4u/tte.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/sun4u/tte.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/sun4v/as.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4v/as.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/sun4v/as.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/sun4v/frame.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4v/frame.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/sun4v/frame.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/sun4v/km.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4v/km.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/sun4v/km.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/sun4v/mmu.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4v/mmu.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/sun4v/mmu.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/sun4v/page.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4v/page.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/sun4v/page.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/sun4v/tlb.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4v/tlb.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/sun4v/tlb.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/sun4v/tsb.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4v/tsb.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/sun4v/tsb.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/sun4v/tte.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4v/tte.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/sun4v/tte.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/tlb.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/tlb.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/tlb.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/tsb.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/tsb.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/tsb.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/mm/tte.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/tte.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/mm/tte.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup kernel_sparc64_mm
  * @{
  */
Index: kernel/arch/sparc64/include/arch/proc/task.h
===================================================================
--- kernel/arch/sparc64/include/arch/proc/task.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/proc/task.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64proc
+/** @addtogroup kernel_sparc64_proc
  * @{
  */
Index: kernel/arch/sparc64/include/arch/proc/thread.h
===================================================================
--- kernel/arch/sparc64/include/arch/proc/thread.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/proc/thread.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64proc
+/** @addtogroup kernel_sparc64_proc
  * @{
  */
Index: kernel/arch/sparc64/include/arch/regdef.h
===================================================================
--- kernel/arch/sparc64/include/arch/regdef.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/regdef.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/register.h
===================================================================
--- kernel/arch/sparc64/include/arch/register.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/register.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/smp/sun4u/ipi.h
===================================================================
--- kernel/arch/sparc64/include/arch/smp/sun4u/ipi.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/smp/sun4u/ipi.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/smp/sun4v/smp.h
===================================================================
--- kernel/arch/sparc64/include/arch/smp/sun4v/smp.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/smp/sun4v/smp.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/sparc64.h
===================================================================
--- kernel/arch/sparc64/include/arch/sparc64.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/sparc64.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/stack.h
===================================================================
--- kernel/arch/sparc64/include/arch/stack.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/stack.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/sun4u/arch.h
===================================================================
--- kernel/arch/sparc64/include/arch/sun4u/arch.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/sun4u/arch.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/sun4u/asm.h
===================================================================
--- kernel/arch/sparc64/include/arch/sun4u/asm.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/sun4u/asm.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/sun4u/cpu.h
===================================================================
--- kernel/arch/sparc64/include/arch/sun4u/cpu.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/sun4u/cpu.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/sun4v/arch.h
===================================================================
--- kernel/arch/sparc64/include/arch/sun4v/arch.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/sun4v/arch.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/sun4v/asm.h
===================================================================
--- kernel/arch/sparc64/include/arch/sun4v/asm.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/sun4v/asm.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/sun4v/cpu.h
===================================================================
--- kernel/arch/sparc64/include/arch/sun4v/cpu.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/sun4v/cpu.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/sun4v/hypercall.h
===================================================================
--- kernel/arch/sparc64/include/arch/sun4v/hypercall.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/sun4v/hypercall.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/sun4v/ipi.h
===================================================================
--- kernel/arch/sparc64/include/arch/sun4v/ipi.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/sun4v/ipi.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/sun4v/md.h
===================================================================
--- kernel/arch/sparc64/include/arch/sun4v/md.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/sun4v/md.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/sun4v/regdef.h
===================================================================
--- kernel/arch/sparc64/include/arch/sun4v/regdef.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/sun4v/regdef.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/sun4v/register.h
===================================================================
--- kernel/arch/sparc64/include/arch/sun4v/register.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/sun4v/register.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/include/arch/trap/exception.h
===================================================================
--- kernel/arch/sparc64/include/arch/trap/exception.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/trap/exception.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */
Index: kernel/arch/sparc64/include/arch/trap/interrupt.h
===================================================================
--- kernel/arch/sparc64/include/arch/trap/interrupt.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/trap/interrupt.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */
Index: kernel/arch/sparc64/include/arch/trap/mmu.h
===================================================================
--- kernel/arch/sparc64/include/arch/trap/mmu.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/trap/mmu.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */
Index: kernel/arch/sparc64/include/arch/trap/regwin.S
===================================================================
--- kernel/arch/sparc64/include/arch/trap/regwin.S	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/trap/regwin.S	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */
Index: kernel/arch/sparc64/include/arch/trap/regwin.h
===================================================================
--- kernel/arch/sparc64/include/arch/trap/regwin.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/trap/regwin.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */
Index: kernel/arch/sparc64/include/arch/trap/sun4u/interrupt.h
===================================================================
--- kernel/arch/sparc64/include/arch/trap/sun4u/interrupt.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/trap/sun4u/interrupt.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */
Index: kernel/arch/sparc64/include/arch/trap/sun4u/mmu.S
===================================================================
--- kernel/arch/sparc64/include/arch/trap/sun4u/mmu.S	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/trap/sun4u/mmu.S	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */
Index: kernel/arch/sparc64/include/arch/trap/sun4u/mmu.h
===================================================================
--- kernel/arch/sparc64/include/arch/trap/sun4u/mmu.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/trap/sun4u/mmu.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */
Index: kernel/arch/sparc64/include/arch/trap/sun4u/regwin.S
===================================================================
--- kernel/arch/sparc64/include/arch/trap/sun4u/regwin.S	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/trap/sun4u/regwin.S	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */
Index: kernel/arch/sparc64/include/arch/trap/sun4u/regwin.h
===================================================================
--- kernel/arch/sparc64/include/arch/trap/sun4u/regwin.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/trap/sun4u/regwin.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */
Index: kernel/arch/sparc64/include/arch/trap/sun4v/interrupt.h
===================================================================
--- kernel/arch/sparc64/include/arch/trap/sun4v/interrupt.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/trap/sun4v/interrupt.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */
Index: kernel/arch/sparc64/include/arch/trap/sun4v/mmu.S
===================================================================
--- kernel/arch/sparc64/include/arch/trap/sun4v/mmu.S	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/trap/sun4v/mmu.S	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */
Index: kernel/arch/sparc64/include/arch/trap/sun4v/mmu.h
===================================================================
--- kernel/arch/sparc64/include/arch/trap/sun4v/mmu.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/trap/sun4v/mmu.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */
Index: kernel/arch/sparc64/include/arch/trap/sun4v/regwin.S
===================================================================
--- kernel/arch/sparc64/include/arch/trap/sun4v/regwin.S	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/trap/sun4v/regwin.S	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */
Index: kernel/arch/sparc64/include/arch/trap/sun4v/regwin.h
===================================================================
--- kernel/arch/sparc64/include/arch/trap/sun4v/regwin.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/trap/sun4v/regwin.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */
Index: kernel/arch/sparc64/include/arch/trap/syscall.h
===================================================================
--- kernel/arch/sparc64/include/arch/trap/syscall.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/trap/syscall.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */
Index: kernel/arch/sparc64/include/arch/trap/trap.h
===================================================================
--- kernel/arch/sparc64/include/arch/trap/trap.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/trap/trap.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */
Index: kernel/arch/sparc64/include/arch/trap/trap_table.S
===================================================================
--- kernel/arch/sparc64/include/arch/trap/trap_table.S	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/trap/trap_table.S	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */
Index: kernel/arch/sparc64/include/arch/trap/trap_table.h
===================================================================
--- kernel/arch/sparc64/include/arch/trap/trap_table.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/trap/trap_table.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */
Index: kernel/arch/sparc64/include/arch/types.h
===================================================================
--- kernel/arch/sparc64/include/arch/types.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/include/arch/types.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/src/console.c
===================================================================
--- kernel/arch/sparc64/src/console.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/console.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/cpu/sun4u/cpu.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/cpu/sun4v/cpu.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/debug/stacktrace.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/drivers/kbd.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/drivers/niagara.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/drivers/pci.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/drivers/scr.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/drivers/tick.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/fpu_context.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/mm/page.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/mm/sun4u/as.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/mm/sun4u/frame.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/mm/sun4u/km.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/mm/sun4u/tlb.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/mm/sun4u/tsb.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/mm/sun4v/as.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/mm/sun4v/frame.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/mm/sun4v/km.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/mm/sun4v/tlb.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/mm/sun4v/tsb.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/proc/sun4u/scheduler.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/proc/sun4v/scheduler.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/proc/thread.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/smp/sun4u/ipi.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/smp/sun4u/smp.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/smp/sun4u/smp_call.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/smp/sun4v/ipi.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/smp/sun4v/smp.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup kernel_sparc64
  * @{
  */
Index: kernel/arch/sparc64/src/sparc64.c
===================================================================
--- kernel/arch/sparc64/src/sparc64.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/sparc64.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/sun4u/sparc64.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/sun4v/md.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/sun4v/sparc64.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/trap/exception.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/trap/interrupt.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/trap/sun4u/interrupt.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/trap/sun4v/interrupt.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -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 f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/arch/sparc64/src/trap/trap.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64interrupt
+/** @addtogroup kernel_sparc64_interrupt
  * @{
  */
Index: kernel/doc/doxygroups.h
===================================================================
--- kernel/doc/doxygroups.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/doc/doxygroups.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -31,61 +31,61 @@
 /**
  *     @cond abs32le
- *     @defgroup abs32leproc abs32le
- *     @ingroup proc
- *     @endcond
- */
-
-/**
- *     @cond amd64
- *     @defgroup amd64proc amd64
- *     @ingroup proc
- *     @endcond
- */
-
-/**
- *     @cond arm32
- *     @defgroup arm32proc arm32
- *     @ingroup proc
- *     @endcond
- */
-
-/**
- *     @cond ia32
- *     @defgroup ia32proc ia32
- *     @ingroup proc
- *     @endcond
- */
-
-/**
- *     @cond ia64
- *     @defgroup ia64proc ia64
- *     @ingroup proc
- *     @endcond
- */
-
-/**
- *     @cond mips32
- *     @defgroup mips32proc mips32
- *     @ingroup proc
- *     @endcond
- */
-
-/**
- *     @cond ppc32
- *     @defgroup ppc32proc ppc32
- *     @ingroup proc
- *     @endcond
- */
-
-/**
- *     @cond riscv64
- *     @defgroup riscv64proc riscv64
- *     @ingroup proc
- *     @endcond
- */
-
-/**
- *     @cond sparc64
- *     @defgroup sparc64proc sparc64
+ *     @defgroup kernel_abs32le_proc abs32le
+ *     @ingroup proc
+ *     @endcond
+ */
+
+/**
+ *     @cond amd64
+ *     @defgroup kernel_amd64_proc amd64
+ *     @ingroup proc
+ *     @endcond
+ */
+
+/**
+ *     @cond arm32
+ *     @defgroup kernel_arm32_proc arm32
+ *     @ingroup proc
+ *     @endcond
+ */
+
+/**
+ *     @cond ia32
+ *     @defgroup kernel_ia32_proc ia32
+ *     @ingroup proc
+ *     @endcond
+ */
+
+/**
+ *     @cond ia64
+ *     @defgroup kernel_ia64_proc ia64
+ *     @ingroup proc
+ *     @endcond
+ */
+
+/**
+ *     @cond mips32
+ *     @defgroup kernel_mips32_proc mips32
+ *     @ingroup proc
+ *     @endcond
+ */
+
+/**
+ *     @cond ppc32
+ *     @defgroup kernel_ppc32_proc ppc32
+ *     @ingroup proc
+ *     @endcond
+ */
+
+/**
+ *     @cond riscv64
+ *     @defgroup kernel_riscv64_proc riscv64
+ *     @ingroup proc
+ *     @endcond
+ */
+
+/**
+ *     @cond sparc64
+ *     @defgroup kernel_sparc64_proc sparc64
  *     @ingroup proc
  *     @endcond
@@ -112,61 +112,61 @@
 /**
  *     @cond abs32le
- *     @defgroup abs32lemm abs32le
- *     @ingroup mm
- *     @endcond
- */
-
-/**
- *     @cond amd64
- *     @defgroup amd64mm amd64
- *     @ingroup mm
- *     @endcond
- */
-
-/**
- *     @cond arm32
- *     @defgroup arm32mm arm32
- *     @ingroup mm
- *     @endcond
- */
-
-/**
- *     @cond ia32
- *     @defgroup ia32mm ia32
- *     @ingroup mm
- *     @endcond
- */
-
-/**
- *     @cond ia64
- *     @defgroup ia64mm ia64
- *     @ingroup mm
- *     @endcond
- */
-
-/**
- *     @cond mips32
- *     @defgroup mips32mm mips32
- *     @ingroup mm
- *     @endcond
- */
-
-/**
- *     @cond ppc32
- *     @defgroup ppc32mm ppc32
- *     @ingroup mm
- *     @endcond
- */
-
-/**
- *     @cond riscv64
- *     @defgroup riscv64mm riscv64
- *     @ingroup mm
- *     @endcond
- */
-
-/**
- *     @cond sparc64
- *     @defgroup sparc64mm sparc64
+ *     @defgroup kernel_abs32le_mm abs32le
+ *     @ingroup mm
+ *     @endcond
+ */
+
+/**
+ *     @cond amd64
+ *     @defgroup kernel_amd64_mm amd64
+ *     @ingroup mm
+ *     @endcond
+ */
+
+/**
+ *     @cond arm32
+ *     @defgroup kernel_arm32_mm arm32
+ *     @ingroup mm
+ *     @endcond
+ */
+
+/**
+ *     @cond ia32
+ *     @defgroup kernel_ia32_mm ia32
+ *     @ingroup mm
+ *     @endcond
+ */
+
+/**
+ *     @cond ia64
+ *     @defgroup kernel_ia64_mm ia64
+ *     @ingroup mm
+ *     @endcond
+ */
+
+/**
+ *     @cond mips32
+ *     @defgroup kernel_mips32_mm mips32
+ *     @ingroup mm
+ *     @endcond
+ */
+
+/**
+ *     @cond ppc32
+ *     @defgroup kernel_ppc32_mm ppc32
+ *     @ingroup mm
+ *     @endcond
+ */
+
+/**
+ *     @cond riscv64
+ *     @defgroup kernel_riscv64_mm riscv64
+ *     @ingroup mm
+ *     @endcond
+ */
+
+/**
+ *     @cond sparc64
+ *     @defgroup kernel_sparc64_mm sparc64
  *     @ingroup mm
  *     @endcond
@@ -193,61 +193,61 @@
 /**
  *     @cond abs32le
- *     @defgroup abs32leddi abs32le
- *     @ingroup ddi
- *     @endcond
- */
-
-/**
- *     @cond amd64
- *     @defgroup amd64ddi amd64
- *     @ingroup ddi
- *     @endcond
- */
-
-/**
- *     @cond arm32
- *     @defgroup arm32ddi arm32
- *     @ingroup ddi
- *     @endcond
- */
-
-/**
- *     @cond ia32
- *     @defgroup ia32ddi ia32
- *     @ingroup ddi
- *     @endcond
- */
-
-/**
- *     @cond ia64
- *     @defgroup ia64ddi ia64
- *     @ingroup ddi
- *     @endcond
- */
-
-/**
- *     @cond mips32
- *     @defgroup mips32ddi mips32
- *     @ingroup ddi
- *     @endcond
- */
-
-/**
- *     @cond ppc32
- *     @defgroup ppc32ddi ppc32
- *     @ingroup ddi
- *     @endcond
- */
-
-/**
- *     @cond riscv64
- *     @defgroup riscv64ddi riscv64
- *     @ingroup ddi
- *     @endcond
- */
-
-/**
- *     @cond sparc64
- *     @defgroup sparc64ddi sparc64
+ *     @defgroup kernel_abs32le_ddi abs32le
+ *     @ingroup ddi
+ *     @endcond
+ */
+
+/**
+ *     @cond amd64
+ *     @defgroup kernel_amd64_ddi amd64
+ *     @ingroup ddi
+ *     @endcond
+ */
+
+/**
+ *     @cond arm32
+ *     @defgroup kernel_arm32_ddi arm32
+ *     @ingroup ddi
+ *     @endcond
+ */
+
+/**
+ *     @cond ia32
+ *     @defgroup kernel_ia32_ddi ia32
+ *     @ingroup ddi
+ *     @endcond
+ */
+
+/**
+ *     @cond ia64
+ *     @defgroup kernel_ia64_ddi ia64
+ *     @ingroup ddi
+ *     @endcond
+ */
+
+/**
+ *     @cond mips32
+ *     @defgroup kernel_mips32_ddi mips32
+ *     @ingroup ddi
+ *     @endcond
+ */
+
+/**
+ *     @cond ppc32
+ *     @defgroup kernel_ppc32_ddi ppc32
+ *     @ingroup ddi
+ *     @endcond
+ */
+
+/**
+ *     @cond riscv64
+ *     @defgroup kernel_riscv64_ddi riscv64
+ *     @ingroup ddi
+ *     @endcond
+ */
+
+/**
+ *     @cond sparc64
+ *     @defgroup kernel_sparc64_ddi sparc64
  *     @ingroup ddi
  *     @endcond
@@ -265,61 +265,61 @@
 /**
  *     @cond abs32le
- *     @defgroup abs32ledebug abs32le
- *     @ingroup debug
- *     @endcond
- */
-
-/**
- *     @cond amd64
- *     @defgroup amd64debug ia32/amd64
- *     @ingroup debug
- *     @endcond
- */
-
-/**
- *     @cond arm32
- *     @defgroup arm32debug arm32
- *     @ingroup debug
- *     @endcond
- */
-
-/**
- *     @cond ia32
- *     @defgroup amd64debug ia32/amd64
- *     @ingroup debug
- *     @endcond
- */
-
-/**
- *     @cond ia64
- *     @defgroup ia64debug ia64
- *     @ingroup debug
- *     @endcond
- */
-
-/**
- *     @cond mips32
- *     @defgroup mips32debug mips32
- *     @ingroup debug
- *     @endcond
- */
-
-/**
- *     @cond ppc32
- *     @defgroup ppc32debug ppc32
- *     @ingroup debug
- *     @endcond
- */
-
-/**
- *     @cond riscv64
- *     @defgroup riscv64debug riscv64
- *     @ingroup debug
- *     @endcond
- */
-
-/**
- *     @cond sparc64
- *     @defgroup sparc64debug sparc64
+ *     @defgroup kernel_abs32le_debug abs32le
+ *     @ingroup debug
+ *     @endcond
+ */
+
+/**
+ *     @cond amd64
+ *     @defgroup kernel_amd64_debug ia32/amd64
+ *     @ingroup debug
+ *     @endcond
+ */
+
+/**
+ *     @cond arm32
+ *     @defgroup kernel_arm32_debug arm32
+ *     @ingroup debug
+ *     @endcond
+ */
+
+/**
+ *     @cond ia32
+ *     @defgroup kernel_amd64_debug ia32/amd64
+ *     @ingroup debug
+ *     @endcond
+ */
+
+/**
+ *     @cond ia64
+ *     @defgroup kernel_ia64_debug ia64
+ *     @ingroup debug
+ *     @endcond
+ */
+
+/**
+ *     @cond mips32
+ *     @defgroup kernel_mips32_debug mips32
+ *     @ingroup debug
+ *     @endcond
+ */
+
+/**
+ *     @cond ppc32
+ *     @defgroup kernel_ppc32_debug ppc32
+ *     @ingroup debug
+ *     @endcond
+ */
+
+/**
+ *     @cond riscv64
+ *     @defgroup kernel_riscv64_debug riscv64
+ *     @ingroup debug
+ *     @endcond
+ */
+
+/**
+ *     @cond sparc64
+ *     @defgroup kernel_sparc64_debug sparc64
  *     @ingroup debug
  *     @endcond
@@ -336,61 +336,61 @@
 /**
  *     @cond abs32le
- *     @defgroup abs32leinterrupt abs32le
- *     @ingroup interrupt
- *     @endcond
- */
-
-/**
- *     @cond amd64
- *     @defgroup amd64interrupt amd64
- *     @ingroup interrupt
- *     @endcond
- */
-
-/**
- *     @cond arm32
- *     @defgroup arm32interrupt arm32
- *     @ingroup interrupt
- *     @endcond
- */
-
-/**
- *     @cond ia32
- *     @defgroup ia32interrupt ia32
- *     @ingroup interrupt
- *     @endcond
- */
-
-/**
- *     @cond ia64
- *     @defgroup ia64interrupt ia64
- *     @ingroup interrupt
- *     @endcond
- */
-
-/**
- *     @cond mips32
- *     @defgroup mips32interrupt mips32
- *     @ingroup interrupt
- *     @endcond
- */
-
-/**
- *     @cond ppc32
- *     @defgroup ppc32interrupt ppc32
- *     @ingroup interrupt
- *     @endcond
- */
-
-/**
- *     @cond riscv64
- *     @defgroup riscv64interrupt riscv64
- *     @ingroup interrupt
- *     @endcond
- */
-
-/**
- *     @cond sparc64
- *     @defgroup sparc64interrupt sparc64
+ *     @defgroup kernel_abs32le_interrupt abs32le
+ *     @ingroup interrupt
+ *     @endcond
+ */
+
+/**
+ *     @cond amd64
+ *     @defgroup kernel_amd64_interrupt amd64
+ *     @ingroup interrupt
+ *     @endcond
+ */
+
+/**
+ *     @cond arm32
+ *     @defgroup kernel_arm32_interrupt arm32
+ *     @ingroup interrupt
+ *     @endcond
+ */
+
+/**
+ *     @cond ia32
+ *     @defgroup kernel_ia32_interrupt ia32
+ *     @ingroup interrupt
+ *     @endcond
+ */
+
+/**
+ *     @cond ia64
+ *     @defgroup kernel_ia64_interrupt ia64
+ *     @ingroup interrupt
+ *     @endcond
+ */
+
+/**
+ *     @cond mips32
+ *     @defgroup kernel_mips32_interrupt mips32
+ *     @ingroup interrupt
+ *     @endcond
+ */
+
+/**
+ *     @cond ppc32
+ *     @defgroup kernel_ppc32_interrupt ppc32
+ *     @ingroup interrupt
+ *     @endcond
+ */
+
+/**
+ *     @cond riscv64
+ *     @defgroup kernel_riscv64_interrupt riscv64
+ *     @ingroup interrupt
+ *     @endcond
+ */
+
+/**
+ *     @cond sparc64
+ *     @defgroup kernel_sparc64_interrupt sparc64
  *     @ingroup interrupt
  *     @endcond
@@ -413,62 +413,62 @@
 /**
  *     @cond abs32le
- *     @defgroup abs32le abs32le
- *     @ingroup others
- *     @endcond
- */
-
-/**
- *     @cond amd64
- *     @defgroup amd64 amd64
- *     @ingroup others
- *     @endcond
- */
-
-/**
- *     @cond arm32
- *     @defgroup arm32 arm32
- *     @ingroup others
- *     @endcond
- */
-
-/**
- *     @cond ia32
- *     @defgroup ia32 ia32
- *     @ingroup others
- *     @endcond
- */
-
-/**
- *     @cond ia64
- *     @defgroup ia64 ia64
- *     @ingroup others
- *     @endcond
- */
-
-/**
- *     @cond mips32
- *     @defgroup mips32 mips32
- *     @ingroup others
- *     @endcond
- */
-
-/**
- *     @cond ppc32
- *     @defgroup ppc32 ppc32
- *     @ingroup others
- *     @endcond
- */
-
-/**
- *     @cond riscv64
- *     @defgroup riscv64 riscv64
- *     @ingroup others
- *     @endcond
- */
-
-/**
- *     @cond sparc64
- *     @defgroup sparc64 sparc64
- *     @ingroup others
- *     @endcond
- */
+ *     @defgroup kernel_abs32le abs32le
+ *     @ingroup others
+ *     @endcond
+ */
+
+/**
+ *     @cond amd64
+ *     @defgroup kernel_amd64 amd64
+ *     @ingroup others
+ *     @endcond
+ */
+
+/**
+ *     @cond arm32
+ *     @defgroup kernel_arm32 arm32
+ *     @ingroup others
+ *     @endcond
+ */
+
+/**
+ *     @cond ia32
+ *     @defgroup kernel_ia32 ia32
+ *     @ingroup others
+ *     @endcond
+ */
+
+/**
+ *     @cond ia64
+ *     @defgroup kernel_ia64 ia64
+ *     @ingroup others
+ *     @endcond
+ */
+
+/**
+ *     @cond mips32
+ *     @defgroup kernel_mips32 mips32
+ *     @ingroup others
+ *     @endcond
+ */
+
+/**
+ *     @cond ppc32
+ *     @defgroup kernel_ppc32 ppc32
+ *     @ingroup others
+ *     @endcond
+ */
+
+/**
+ *     @cond riscv64
+ *     @defgroup kernel_riscv64 riscv64
+ *     @ingroup others
+ *     @endcond
+ */
+
+/**
+ *     @cond sparc64
+ *     @defgroup kernel_sparc64 sparc64
+ *     @ingroup others
+ *     @endcond
+ */
Index: kernel/genarch/include/genarch/drivers/legacy/ia32/io.h
===================================================================
--- kernel/genarch/include/genarch/drivers/legacy/ia32/io.h	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/genarch/include/genarch/drivers/legacy/ia32/io.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */
Index: kernel/genarch/src/ddi/ddi-bitmap.c
===================================================================
--- kernel/genarch/src/ddi/ddi-bitmap.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ kernel/genarch/src/ddi/ddi-bitmap.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64ddi
+/** @addtogroup kernel_amd64_ddi
  * @{
  */
Index: uspace/lib/c/arch/sparc64/src/stacktrace.c
===================================================================
--- uspace/lib/c/arch/sparc64/src/stacktrace.c	(revision f0f87879a2e9616ccbf28e95d70d5e6ec25cf738)
+++ uspace/lib/c/arch/sparc64/src/stacktrace.c	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup libc
  * @{
  */