Index: kernel/generic/include/adt/hash_table.h
===================================================================
--- kernel/generic/include/adt/hash_table.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/adt/hash_table.h	(revision e88eb48e75ad044807a59279a35841cbebbc9611)
@@ -29,5 +29,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup kernel_generic
  * @{
  */
@@ -35,6 +35,6 @@
  */
 
-#ifndef LIBC_HASH_TABLE_H_
-#define LIBC_HASH_TABLE_H_
+#ifndef KERNEL_HASH_TABLE_H_
+#define KERNEL_HASH_TABLE_H_
 
 #include <adt/list.h>
Index: kernel/generic/include/main/kinit.h
===================================================================
--- kernel/generic/include/main/kinit.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/main/kinit.h	(revision e88eb48e75ad044807a59279a35841cbebbc9611)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup main
+/** @addtogroup kernel_generic
  * @{
  */
Index: kernel/generic/include/main/main.h
===================================================================
--- kernel/generic/include/main/main.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/main/main.h	(revision e88eb48e75ad044807a59279a35841cbebbc9611)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup main
+/** @addtogroup kernel_generic
  * @{
  */
Index: kernel/generic/include/main/uinit.h
===================================================================
--- kernel/generic/include/main/uinit.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/main/uinit.h	(revision e88eb48e75ad044807a59279a35841cbebbc9611)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup main
+/** @addtogroup kernel_generic
  * @{
  */
Index: kernel/generic/include/main/version.h
===================================================================
--- kernel/generic/include/main/version.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/main/version.h	(revision e88eb48e75ad044807a59279a35841cbebbc9611)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup main
+/** @addtogroup kernel_generic
  * @{
  */
Index: kernel/generic/include/synch/condvar.h
===================================================================
--- kernel/generic/include/synch/condvar.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/synch/condvar.h	(revision e88eb48e75ad044807a59279a35841cbebbc9611)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sync
+/** @addtogroup kernel_sync
  * @{
  */
Index: kernel/generic/include/synch/futex.h
===================================================================
--- kernel/generic/include/synch/futex.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/synch/futex.h	(revision e88eb48e75ad044807a59279a35841cbebbc9611)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sync
+/** @addtogroup kernel_sync
  * @{
  */
Index: kernel/generic/include/synch/mutex.h
===================================================================
--- kernel/generic/include/synch/mutex.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/synch/mutex.h	(revision e88eb48e75ad044807a59279a35841cbebbc9611)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sync
+/** @addtogroup kernel_sync
  * @{
  */
Index: kernel/generic/include/synch/rcu.h
===================================================================
--- kernel/generic/include/synch/rcu.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/synch/rcu.h	(revision e88eb48e75ad044807a59279a35841cbebbc9611)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sync
+/** @addtogroup kernel_sync
  * @{
  */
Index: kernel/generic/include/synch/rcu_types.h
===================================================================
--- kernel/generic/include/synch/rcu_types.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/synch/rcu_types.h	(revision e88eb48e75ad044807a59279a35841cbebbc9611)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sync
+/** @addtogroup kernel_sync
  * @{
  */
Index: kernel/generic/include/synch/semaphore.h
===================================================================
--- kernel/generic/include/synch/semaphore.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/synch/semaphore.h	(revision e88eb48e75ad044807a59279a35841cbebbc9611)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sync
+/** @addtogroup kernel_sync
  * @{
  */
Index: kernel/generic/include/synch/smc.h
===================================================================
--- kernel/generic/include/synch/smc.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/synch/smc.h	(revision e88eb48e75ad044807a59279a35841cbebbc9611)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sync
+/** @addtogroup kernel_sync
  * @{
  */
Index: kernel/generic/include/synch/smp_memory_barrier.h
===================================================================
--- kernel/generic/include/synch/smp_memory_barrier.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/synch/smp_memory_barrier.h	(revision e88eb48e75ad044807a59279a35841cbebbc9611)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sync
+/** @addtogroup kernel_sync
  * @{
  */
Index: kernel/generic/include/synch/spinlock.h
===================================================================
--- kernel/generic/include/synch/spinlock.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/synch/spinlock.h	(revision e88eb48e75ad044807a59279a35841cbebbc9611)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sync
+/** @addtogroup kernel_sync
  * @{
  */
Index: kernel/generic/include/synch/waitq.h
===================================================================
--- kernel/generic/include/synch/waitq.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/synch/waitq.h	(revision e88eb48e75ad044807a59279a35841cbebbc9611)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sync
+/** @addtogroup kernel_sync
  * @{
  */
Index: kernel/generic/include/time/clock.h
===================================================================
--- kernel/generic/include/time/clock.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/time/clock.h	(revision e88eb48e75ad044807a59279a35841cbebbc9611)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup time
+/** @addtogroup kernel_time
  * @{
  */
Index: kernel/generic/include/time/delay.h
===================================================================
--- kernel/generic/include/time/delay.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/time/delay.h	(revision e88eb48e75ad044807a59279a35841cbebbc9611)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup time
+/** @addtogroup kernel_time
  * @{
  */
Index: kernel/generic/include/time/timeout.h
===================================================================
--- kernel/generic/include/time/timeout.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/time/timeout.h	(revision e88eb48e75ad044807a59279a35841cbebbc9611)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup time
+/** @addtogroup kernel_time
  * @{
  */