Index: kernel/arch/arm32/src/arm32.c
===================================================================
--- kernel/arch/arm32/src/arm32.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/src/arm32.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/src/atomic.c
===================================================================
--- kernel/arch/arm32/src/atomic.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/src/atomic.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/src/cpu/cpu.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/src/debug/stacktrace.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/src/exception.c
===================================================================
--- kernel/arch/arm32/src/exception.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/src/exception.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/src/fpu_context.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/src/interrupt.c
===================================================================
--- kernel/arch/arm32/src/interrupt.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/src/interrupt.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/src/mach/beaglebone/beaglebone.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/src/mach/gta02/gta02.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/src/mach/integratorcp/integratorcp.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/src/machine_func.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/src/mm/as.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/src/mm/frame.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/src/mm/km.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/src/mm/page.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/src/mm/page_fault.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -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 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/src/mm/tlb.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/src/ras.c
===================================================================
--- kernel/arch/arm32/src/ras.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/src/ras.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/src/userspace.c
===================================================================
--- kernel/arch/arm32/src/userspace.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/src/userspace.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */