Index: uspace/drv/bus/adb/cuda_adb/cuda_adb.c
===================================================================
--- uspace/drv/bus/adb/cuda_adb/cuda_adb.c	(revision 1938b38120879a10d12c80cb608572f7059304f5)
+++ uspace/drv/bus/adb/cuda_adb/cuda_adb.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup genarch
+/** @addtogroup uspace_drv_cuda_adb
  * @{
  */
Index: uspace/drv/bus/adb/cuda_adb/cuda_adb.h
===================================================================
--- uspace/drv/bus/adb/cuda_adb/cuda_adb.h	(revision 1938b38120879a10d12c80cb608572f7059304f5)
+++ uspace/drv/bus/adb/cuda_adb/cuda_adb.h	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup genarch
+/** @addtogroup uspace_drv_cuda_adb
  * @{
  */
Index: uspace/drv/bus/adb/cuda_adb/cuda_hw.h
===================================================================
--- uspace/drv/bus/adb/cuda_adb/cuda_hw.h	(revision 1938b38120879a10d12c80cb608572f7059304f5)
+++ uspace/drv/bus/adb/cuda_adb/cuda_hw.h	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup genarch
+/** @addtogroup uspace_drv_cuda_adb
  * @{
  */
Index: uspace/drv/bus/adb/cuda_adb/doc/doxygroups.h
===================================================================
--- uspace/drv/bus/adb/cuda_adb/doc/doxygroups.h	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
+++ uspace/drv/bus/adb/cuda_adb/doc/doxygroups.h	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -0,0 +1,4 @@
+/** @addtogroup uspace_drv_cuda_adb cuda_adb
+ * @brief VIA-CUDA Apple Desktop Bus driver
+ * @ingroup drvs
+ */
Index: uspace/drv/bus/adb/cuda_adb/main.c
===================================================================
--- uspace/drv/bus/adb/cuda_adb/main.c	(revision 1938b38120879a10d12c80cb608572f7059304f5)
+++ uspace/drv/bus/adb/cuda_adb/main.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup genarch
+/** @addtogroup uspace_drv_cuda_adb
  * @{
  */
Index: uspace/drv/char/msim-con/doc/doxygroups.h
===================================================================
--- uspace/drv/char/msim-con/doc/doxygroups.h	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
+++ uspace/drv/char/msim-con/doc/doxygroups.h	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -0,0 +1,4 @@
+/** @addtogroup uspace_drv_msim_con msim-con
+ * @brief MSIM console driver
+ * @ingroup drvs
+ */
Index: uspace/drv/char/msim-con/main.c
===================================================================
--- uspace/drv/char/msim-con/main.c	(revision 1938b38120879a10d12c80cb608572f7059304f5)
+++ uspace/drv/char/msim-con/main.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup genarch
+/** @addtogroup uspace_drv_msim_con
  * @{
  */
Index: uspace/drv/char/msim-con/msim-con.h
===================================================================
--- uspace/drv/char/msim-con/msim-con.h	(revision 1938b38120879a10d12c80cb608572f7059304f5)
+++ uspace/drv/char/msim-con/msim-con.h	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup genarch
+/** @addtogroup uspace_drv_msim_con
  * @{
  */
Index: uspace/drv/char/ski-con/doc/doxygroups.h
===================================================================
--- uspace/drv/char/ski-con/doc/doxygroups.h	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
+++ uspace/drv/char/ski-con/doc/doxygroups.h	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -0,0 +1,4 @@
+/** @addtogroup uspace_drv_ski_con ski-con
+ * @brief Ski console driver
+ * @ingroup drvs
+ */
Index: uspace/drv/char/ski-con/main.c
===================================================================
--- uspace/drv/char/ski-con/main.c	(revision 1938b38120879a10d12c80cb608572f7059304f5)
+++ uspace/drv/char/ski-con/main.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup genarch
+/** @addtogroup uspace_drv_ski_con
  * @{
  */
Index: uspace/drv/char/ski-con/ski-con.h
===================================================================
--- uspace/drv/char/ski-con/ski-con.h	(revision 1938b38120879a10d12c80cb608572f7059304f5)
+++ uspace/drv/char/ski-con/ski-con.h	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup genarch
+/** @addtogroup uspace_drv_ski_con
  * @{
  */
Index: uspace/drv/char/sun4v-con/doc/doxygroups.h
===================================================================
--- uspace/drv/char/sun4v-con/doc/doxygroups.h	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
+++ uspace/drv/char/sun4v-con/doc/doxygroups.h	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -0,0 +1,4 @@
+/** @addtogroup uspace_drv_sun4v_con sun4v-con
+ * @brief sun4v console driver⏎
+ * @ingroup drvs
+ */
Index: uspace/drv/char/sun4v-con/main.c
===================================================================
--- uspace/drv/char/sun4v-con/main.c	(revision 1938b38120879a10d12c80cb608572f7059304f5)
+++ uspace/drv/char/sun4v-con/main.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -27,5 +27,8 @@
  */
 
-/** @file Sun4v console driver
+/**
+ * @addtogroup uspace_drv_sun4v_con
+ * @file Sun4v console driver
+ * @{
  */
 
Index: uspace/drv/char/sun4v-con/sun4v-con.h
===================================================================
--- uspace/drv/char/sun4v-con/sun4v-con.h	(revision 1938b38120879a10d12c80cb608572f7059304f5)
+++ uspace/drv/char/sun4v-con/sun4v-con.h	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup genarch
+/** @addtogroup uspace_drv_sun4v_con
  * @{
  */
Index: uspace/drv/hid/adb-kbd/doc/doxygroups.h
===================================================================
--- uspace/drv/hid/adb-kbd/doc/doxygroups.h	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
+++ uspace/drv/hid/adb-kbd/doc/doxygroups.h	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -0,0 +1,4 @@
+/** @addtogroup uspace_drv_adb_kbd adb-kbd
+ * @brief ADB keyboard port driver
+ * @ingroup drvs
+ */
Index: uspace/drv/hid/adb-kbd/main.c
===================================================================
--- uspace/drv/hid/adb-kbd/main.c	(revision 1938b38120879a10d12c80cb608572f7059304f5)
+++ uspace/drv/hid/adb-kbd/main.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup genarch
+/** @addtogroup uspace_drv_adb_kbd
  * @{
  */
Index: uspace/drv/hid/adb-mouse/doc/doxygroups.h
===================================================================
--- uspace/drv/hid/adb-mouse/doc/doxygroups.h	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
+++ uspace/drv/hid/adb-mouse/doc/doxygroups.h	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -0,0 +1,4 @@
+/** @addtogroup uspace_drv_adb_mouse adb-mouse
+ * @brief ADB mouse driver
+ * @ingroup drvs
+ */
Index: uspace/drv/hid/adb-mouse/main.c
===================================================================
--- uspace/drv/hid/adb-mouse/main.c	(revision 1938b38120879a10d12c80cb608572f7059304f5)
+++ uspace/drv/hid/adb-mouse/main.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -27,8 +27,8 @@
  */
 
-/** @addtogroup genarch
+/** @addtogroup uspace_drv_adb_mouse
  * @{
  */
-/** @file ADB keyboard driver
+/** @file ADB mouse driver
  */
 
Index: uspace/drv/intctl/apic/apic.c
===================================================================
--- uspace/drv/intctl/apic/apic.c	(revision 1938b38120879a10d12c80cb608572f7059304f5)
+++ uspace/drv/intctl/apic/apic.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup apic
+/** @addtogroup uspace_drv_apic
  * @{
  */
Index: uspace/drv/intctl/apic/apic.h
===================================================================
--- uspace/drv/intctl/apic/apic.h	(revision 1938b38120879a10d12c80cb608572f7059304f5)
+++ uspace/drv/intctl/apic/apic.h	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup genarch
+/** @addtogroup uspace_drv_apic
  * @{
  */
Index: uspace/drv/intctl/apic/doc/doxygroups.h
===================================================================
--- uspace/drv/intctl/apic/doc/doxygroups.h	(revision 1938b38120879a10d12c80cb608572f7059304f5)
+++ uspace/drv/intctl/apic/doc/doxygroups.h	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -1,3 +1,3 @@
-/** @addtogroup apic apic
+/** @addtogroup uspace_drv_apic apic
  * @brief APIC interrupt controller driver
  * @ingroup drvs
Index: uspace/drv/intctl/apic/main.c
===================================================================
--- uspace/drv/intctl/apic/main.c	(revision 1938b38120879a10d12c80cb608572f7059304f5)
+++ uspace/drv/intctl/apic/main.c	(revision df8eababb31187582db57d47cd83f7ecfb4f1ee9)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup genarch
+/** @addtogroup uspace_drv_apic
  * @{
  */