Index: kernel/arch/amd64/include/arch/arch.h
===================================================================
--- kernel/arch/amd64/include/arch/arch.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/arch.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/asm.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/boot/boot.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/context.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/cpu.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/cpuid.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/cycle.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/ddi/ddi.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/elf.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/faddr.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/interrupt.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/istate.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/kseg.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/mm/as.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/mm/frame.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/mm/km.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/mm/page.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/mm/ptl.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/mm/tlb.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/pm.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/proc/task.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/proc/thread.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/stack.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/syscall.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/types.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/amd64/include/arch/vreg.h	(revision d09eeb202ad93fe26cbffc80003adecf3fb32a5f)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup kernel_amd64
  * @{
  */