Index: kernel/arch/ia32/include/arch/arch.h
===================================================================
--- kernel/arch/ia32/include/arch/arch.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/arch.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/asm.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/bios/bios.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/boot/boot.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/boot/memmap.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/context.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/cpu.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/cpuid.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/cycle.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/ddi/ddi.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/drivers/i8254.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/drivers/i8259.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/elf.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/faddr.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/fpu_context.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/interrupt.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/istate.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/mm/as.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/mm/asid.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/mm/frame.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/mm/km.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/mm/page.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/mm/tlb.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/pm.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/proc/task.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/proc/thread.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/smp/ap.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/smp/apic.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/smp/mps.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/smp/smp.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/stack.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/types.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/ia32/include/arch/vreg.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup kernel_ia32
  * @{
  */