Index: kernel/arch/riscv64/include/arch/arch.h
===================================================================
--- kernel/arch/riscv64/include/arch/arch.h	(revision 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ kernel/arch/riscv64/include/arch/arch.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ kernel/arch/riscv64/include/arch/asm.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ kernel/arch/riscv64/include/arch/boot/boot.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ kernel/arch/riscv64/include/arch/context.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ kernel/arch/riscv64/include/arch/cpu.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ kernel/arch/riscv64/include/arch/cycle.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ kernel/arch/riscv64/include/arch/drivers/ucb.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ kernel/arch/riscv64/include/arch/elf.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ kernel/arch/riscv64/include/arch/faddr.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ kernel/arch/riscv64/include/arch/fpu_context.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ kernel/arch/riscv64/include/arch/interrupt.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ kernel/arch/riscv64/include/arch/istate.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ kernel/arch/riscv64/include/arch/mm/as.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ kernel/arch/riscv64/include/arch/mm/asid.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ kernel/arch/riscv64/include/arch/mm/frame.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ kernel/arch/riscv64/include/arch/mm/km.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ kernel/arch/riscv64/include/arch/mm/page.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ kernel/arch/riscv64/include/arch/mm/tlb.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ kernel/arch/riscv64/include/arch/proc/task.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ kernel/arch/riscv64/include/arch/proc/thread.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ kernel/arch/riscv64/include/arch/stack.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -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 10d65d70906a865fb116576edc88e47ab61a5fb4)
+++ kernel/arch/riscv64/include/arch/types.h	(revision 63a045c41ff533abb66be65fc068415be77ad7df)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup riscv64
+/** @addtogroup kernel_riscv64
  * @{
  */