Index: kernel/arch/ia64/include/arch/arch.h
===================================================================
--- kernel/arch/ia64/include/arch/arch.h	(revision 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ 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 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ kernel/arch/ia64/include/arch/types.h	(revision c5429fedb8216659204bbbdba42d7f5a845e4dda)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup kernel_ia64
  * @{
  */