diff --git a/pkg/fatfs/fatfs_diskio/mtd/include/fatfs_diskio_mtd.h b/pkg/fatfs/fatfs_diskio/mtd/include/fatfs_diskio_mtd.h
index a81ccfd2adcf32782c67112898f847347f0adebf..e4cb69a1d7701adb671308425b2ba204636ef1a1 100644
--- a/pkg/fatfs/fatfs_diskio/mtd/include/fatfs_diskio_mtd.h
+++ b/pkg/fatfs/fatfs_diskio/mtd/include/fatfs_diskio_mtd.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     sys_fatfs_diskio
+ * @ingroup     pkg_fatfs
  * @brief
  * @{
  *
diff --git a/pkg/fatfs/fatfs_diskio/mtd/mtd_diskio.c b/pkg/fatfs/fatfs_diskio/mtd/mtd_diskio.c
index 5e072397545cd3452595d8e32542c47074e07213..1930038daacce4877dd3db806cc6a5c7c4e4776a 100644
--- a/pkg/fatfs/fatfs_diskio/mtd/mtd_diskio.c
+++ b/pkg/fatfs/fatfs_diskio/mtd/mtd_diskio.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup  sys_fatfs_diskio
+ * @ingroup  pkg_fatfs
  * @{
  *
  * @file
diff --git a/pkg/fatfs/fatfs_vfs/fatfs_vfs.c b/pkg/fatfs/fatfs_vfs/fatfs_vfs.c
index 5234fc1563aaef10bf21868796aed3d17ec90fa5..a41168d1a99bb827d467b24dc400c88e6b19a459 100644
--- a/pkg/fatfs/fatfs_vfs/fatfs_vfs.c
+++ b/pkg/fatfs/fatfs_vfs/fatfs_vfs.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     fs
+ * @ingroup     pkg_fatfs
  * @{
  *
  * @file
diff --git a/pkg/lwip/contrib/doc.txt b/pkg/lwip/contrib/doc.txt
index d11a87565bf8bc93487ae368de9a516a6b6c698b..9ddba3fdb534de61fdbb50a50eeb2642bf27a87e 100644
--- a/pkg/lwip/contrib/doc.txt
+++ b/pkg/lwip/contrib/doc.txt
@@ -1,3 +1,3 @@
 /**
- * @defgroup lwip_contrib   RIOT lwIP port
+ * @defgroup pkg_lwip_contrib   RIOT lwIP port
  */
diff --git a/pkg/lwip/include/arch/cc.h b/pkg/lwip/include/arch/cc.h
index d31d7d8f710bf9f9265a484869aab6f5048b64e4..b79ecb287e3cc13c066af0b89a11d90261ed04a3 100644
--- a/pkg/lwip/include/arch/cc.h
+++ b/pkg/lwip/include/arch/cc.h
@@ -7,8 +7,8 @@
  */
 
 /**
- * @defgroup    lwip_arch_cc    Compiler and processor description
- * @ingroup     lwip
+ * @defgroup    pkg_lwip_arch_cc    Compiler and processor description
+ * @ingroup     pkg_lwip
  * @brief       Describes compiler and processor to lwIP
  * @{
  *
diff --git a/pkg/lwip/include/arch/sys_arch.h b/pkg/lwip/include/arch/sys_arch.h
index aad33a1b75bf0392b59a6be3c8466ddbfe8a3b03..ed4fd467af2be1dca588377d3aabb331a3b4c2b8 100644
--- a/pkg/lwip/include/arch/sys_arch.h
+++ b/pkg/lwip/include/arch/sys_arch.h
@@ -7,8 +7,8 @@
  */
 
 /**
- * @defgroup    lwip_arch_sys_arch Architecture depentent definitions
- * @ingroup     lwip
+ * @defgroup    pkg_lwip_arch_sys_arch Architecture depentent definitions
+ * @ingroup     pkg_lwip
  * @brief       Semaphores and mailboxes.
  * @{
  *
diff --git a/pkg/lwip/include/lwipopts.h b/pkg/lwip/include/lwipopts.h
index 0fcfc7c8a700d26b53668c985d1e7396942354c5..3eab2e3c95a588d9b7c31f7c815e2e3b26e6a8f8 100644
--- a/pkg/lwip/include/lwipopts.h
+++ b/pkg/lwip/include/lwipopts.h
@@ -7,8 +7,8 @@
  */
 
 /**
- * @defgroup    lwip_opts   lwIP options
- * @ingroup     lwip
+ * @defgroup    pkg_lwip_opts   lwIP options
+ * @ingroup     pkg_lwip
  * @brief       Options for the lwIP stack
  * @{
  *
diff --git a/pkg/lwip/include/sock_types.h b/pkg/lwip/include/sock_types.h
index ddb890d18bac5edadf5fac68d37298e1f98fd952..28e3c83026b134b9f525bc37df2220a33b27034a 100644
--- a/pkg/lwip/include/sock_types.h
+++ b/pkg/lwip/include/sock_types.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @addtogroup pkg_lwip_sokc
+ * @ingroup pkg_lwip_sock
  * @{
  *
  * @file
diff --git a/pkg/spiffs/fs/spiffs_fs.c b/pkg/spiffs/fs/spiffs_fs.c
index 73c017035142504b612b6db8b6cf1141a5e76b19..3a7d959468a2a2da6a3018181972d50debe7bbff 100644
--- a/pkg/spiffs/fs/spiffs_fs.c
+++ b/pkg/spiffs/fs/spiffs_fs.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     fs
+ * @ingroup     pkg_spiffs
  * @{
  *
  * @file