Index: kernel/arch/arm32/include/arch/arch.h
===================================================================
--- kernel/arch/arm32/include/arch/arch.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/arch.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/asm.h
===================================================================
--- kernel/arch/arm32/include/arch/asm.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/asm.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/asm/boot.h
===================================================================
--- kernel/arch/arm32/include/arch/asm/boot.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/asm/boot.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/barrier.h
===================================================================
--- kernel/arch/arm32/include/arch/barrier.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/barrier.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/cache.h
===================================================================
--- kernel/arch/arm32/include/arch/cache.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/cache.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/context.h
===================================================================
--- kernel/arch/arm32/include/arch/context.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/context.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/cp15.h
===================================================================
--- kernel/arch/arm32/include/arch/cp15.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/cp15.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/cpu.h
===================================================================
--- kernel/arch/arm32/include/arch/cpu.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/cpu.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/cycle.h
===================================================================
--- kernel/arch/arm32/include/arch/cycle.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/cycle.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/elf.h
===================================================================
--- kernel/arch/arm32/include/arch/elf.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/elf.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/exception.h
===================================================================
--- kernel/arch/arm32/include/arch/exception.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/exception.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/faddr.h
===================================================================
--- kernel/arch/arm32/include/arch/faddr.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/faddr.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/fpu_context.h
===================================================================
--- kernel/arch/arm32/include/arch/fpu_context.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/fpu_context.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/interrupt.h
===================================================================
--- kernel/arch/arm32/include/arch/interrupt.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/interrupt.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32interrupt
+/** @addtogroup kernel_arm32_interrupt
  * @{
  */
Index: kernel/arch/arm32/include/arch/istate.h
===================================================================
--- kernel/arch/arm32/include/arch/istate.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/istate.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup arm32interrupt
+/** @addtogroup kernel_arm32_interrupt
  * @{
  */
Index: kernel/arch/arm32/include/arch/mach/beagleboardxm/beagleboardxm.h
===================================================================
--- kernel/arch/arm32/include/arch/mach/beagleboardxm/beagleboardxm.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/mach/beagleboardxm/beagleboardxm.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup arm32beagleboardxm beagleboardxm
+/** @addtogroup kernel_arm32_beagleboardxm beagleboardxm
  *  @brief BeagleBoard-xM platform.
- *  @ingroup arm32
+ *  @ingroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/mach/beaglebone/beaglebone.h
===================================================================
--- kernel/arch/arm32/include/arch/mach/beaglebone/beaglebone.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/mach/beaglebone/beaglebone.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup arm32beaglebone beaglebone
+/** @addtogroup kernel_arm32_beaglebone beaglebone
  *  @brief BeagleBone platform.
- *  @ingroup arm32
+ *  @ingroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/mach/gta02/gta02.h
===================================================================
--- kernel/arch/arm32/include/arch/mach/gta02/gta02.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/mach/gta02/gta02.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,7 +27,7 @@
  */
 
-/** @addtogroup arm32gta02 GTA02
+/** @addtogroup kernel_arm32_gta02 GTA02
  *  @brief Openmoko GTA02 platform.
- *  @ingroup arm32
+ *  @ingroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/mach/integratorcp/integratorcp.h
===================================================================
--- kernel/arch/arm32/include/arch/mach/integratorcp/integratorcp.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/mach/integratorcp/integratorcp.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,7 +27,7 @@
  */
 
-/** @addtogroup arm32integratorcp
+/** @addtogroup kernel_arm32_integratorcp
  *  @brief Integratorcp machine specific parts.
- *  @ingroup arm32
+ *  @ingroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/mach/raspberrypi/raspberrypi.h
===================================================================
--- kernel/arch/arm32/include/arch/mach/raspberrypi/raspberrypi.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/mach/raspberrypi/raspberrypi.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,7 +27,7 @@
  */
 
-/** @addtogroup arm32raspberrypi raspberrypi
+/** @addtogroup kernel_arm32_raspberrypi raspberrypi
  *  @brief Raspberry Pi platform.
- *  @ingroup arm32
+ *  @ingroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/machine_func.h
===================================================================
--- kernel/arch/arm32/include/arch/machine_func.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/machine_func.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/mm/as.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/as.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/mm/as.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/include/arch/mm/asid.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/asid.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/mm/asid.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/include/arch/mm/frame.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/frame.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/mm/frame.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/include/arch/mm/km.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/km.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/mm/km.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/include/arch/mm/page.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/page.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/mm/page.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/include/arch/mm/page_armv4.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/page_armv4.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/mm/page_armv4.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/include/arch/mm/page_armv6.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/page_armv6.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/mm/page_armv6.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/include/arch/mm/page_fault.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/page_fault.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/mm/page_fault.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/include/arch/mm/tlb.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/tlb.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/mm/tlb.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32mm
+/** @addtogroup kernel_arm32_mm
  * @{
  */
Index: kernel/arch/arm32/include/arch/proc/task.h
===================================================================
--- kernel/arch/arm32/include/arch/proc/task.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/proc/task.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32proc
+/** @addtogroup kernel_arm32_proc
  * @{
  */
Index: kernel/arch/arm32/include/arch/proc/thread.h
===================================================================
--- kernel/arch/arm32/include/arch/proc/thread.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/proc/thread.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32proc
+/** @addtogroup kernel_arm32_proc
  * @{
  */
Index: kernel/arch/arm32/include/arch/ras.h
===================================================================
--- kernel/arch/arm32/include/arch/ras.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/ras.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/regutils.h
===================================================================
--- kernel/arch/arm32/include/arch/regutils.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/regutils.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/security_ext.h
===================================================================
--- kernel/arch/arm32/include/arch/security_ext.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/security_ext.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/stack.h
===================================================================
--- kernel/arch/arm32/include/arch/stack.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/stack.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */
Index: kernel/arch/arm32/include/arch/types.h
===================================================================
--- kernel/arch/arm32/include/arch/types.h	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ kernel/arch/arm32/include/arch/types.h	(revision 0bd66f54becee36742328f6280b521150f597f1a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup kernel_arm32
  * @{
  */