diff --git a/boards/remote-pa/board.c b/boards/remote-pa/board.c
index f95c99bb26719c3a79a5e5d6b928bcb575c44258..cf9e638676b08dc61cbd5e1db62b894859d5db01 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 3a165453f9387834b8c18b52adcc6f05d837082c..c5543aa1297b717cf6a18961984dd937c15a6d8a 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 eeb5e1a14959b4274fd34ed2bc1480be87dbb4f1..4212494a77a3860eb7ae436f73e34b5974fb62fb 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 5c9b514c7541a9b04660144de78cb4d7b0279a0e..1a82943e2e45a0221eae0fea05465382044b4ef3 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 6ccb84f87fcf5c403870f883a73238ee3a601742..6b7350d41fe7477df5e6e9ae6127a69ef4704bde 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 abbe23abcc4da74e0b579b15eb13d732c3e79c4b..e8e7d683407571ac879f1dfbf9886db8d5326343 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 a4269867ae7ceb634b5468d4500aa0fc050918a1..930cccfa92ca70c78a77266c36e5e47a7bcdae01 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