diff --git a/boards/remote-pa/board.c b/boards/remote-pa/board.c
index f95c99bb26..cf9e638676 100644
--- a/boards/remote-pa/board.c
+++ b/boards/remote-pa/board.c
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     board_remote
+ * @ingroup     board_remote-pa
  * @{
  *
  * @file
diff --git a/boards/remote-pa/include/board.h b/boards/remote-pa/include/board.h
index 3a165453f9..c5543aa129 100644
--- a/boards/remote-pa/include/board.h
+++ b/boards/remote-pa/include/board.h
@@ -8,7 +8,7 @@
  */
 
 /**
- * @defgroup    board_remote Re-Mote
+ * @defgroup    boards_remote-pa Re-Mote Prototype A
  * @ingroup     boards
  * @brief       Support for the Re-Mote board prototype A
  * @{
diff --git a/boards/remote-pa/include/periph_conf.h b/boards/remote-pa/include/periph_conf.h
index eeb5e1a149..4212494a77 100644
--- a/boards/remote-pa/include/periph_conf.h
+++ b/boards/remote-pa/include/periph_conf.h
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     board_remote
+ * @ingroup     boards_remote-pa
  * @{
  *
  * @file
diff --git a/boards/remote-reva/include/board.h b/boards/remote-reva/include/board.h
index 5c9b514c75..1a82943e2e 100644
--- a/boards/remote-reva/include/board.h
+++ b/boards/remote-reva/include/board.h
@@ -8,7 +8,8 @@
  */
 
 /**
- * @ingroup     boards_remote
+ * @defgroup    boards_reva RE-Mote Revision A
+ * @ingroup     boards
  * @brief       Support for the RE-Mote board Revision A
  * @{
  *
diff --git a/boards/remote-reva/include/periph_conf.h b/boards/remote-reva/include/periph_conf.h
index 6ccb84f87f..6b7350d41f 100644
--- a/boards/remote-reva/include/periph_conf.h
+++ b/boards/remote-reva/include/periph_conf.h
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     board_remote
+ * @ingroup     boards_remote-reva
  * @{
  *
  * @file
diff --git a/boards/remote-revb/include/board.h b/boards/remote-revb/include/board.h
index abbe23abcc..e8e7d68340 100644
--- a/boards/remote-revb/include/board.h
+++ b/boards/remote-revb/include/board.h
@@ -8,7 +8,8 @@
  */
 
 /**
- * @ingroup     boards_remote
+ * @defgroup    boards_remote-revb RE-Mote Revision B
+ * @ingroup     boards
  * @brief       Support for the RE-Mote board Revision B
  * @{
  *
diff --git a/boards/remote-revb/include/periph_conf.h b/boards/remote-revb/include/periph_conf.h
index a4269867ae..930cccfa92 100644
--- a/boards/remote-revb/include/periph_conf.h
+++ b/boards/remote-revb/include/periph_conf.h
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     board_remote
+ * @ingroup     boards_remote-revb
  * @{
  *
  * @file