4 files changed, 12 insertions, 12 deletions
diff --git a/bsps/sparc/leon2/include/bsp.h b/bsps/sparc/leon2/include/bsp.h
index 82f7728ff9..5fe39d09d2 100644
--- a/bsps/sparc/leon2/include/bsp.h
+++ b/bsps/sparc/leon2/include/bsp.h
@@ -1,9 +1,9 @@
 /**
  * @file
  *
- * @ingroup sparc_leon2
+ * @ingroup RTEMSBSPsSPARCLEON2
  *
- * @brief Global BSP Definitions.
+ * @brief Global BSP definitions.
  */
 
 /*  bsp.h
@@ -40,12 +40,13 @@ extern "C" {
 #endif
 
 /**
- *  @defgroup sparc_leon2 LEON2 Support
+ * @defgroup RTEMSBSPsSPARCLEON2 LEON2
  *
- *  @ingroup RTEMSBSPsSPARC
+ * @ingroup RTEMSBSPsSPARC
  *
- *  @brief LEON2 Support Package
+ * @brief LEON2 Board Support Package.
  *
+ * @{
  */
 
 /* SPARC CPU variant: LEON2 */
@@ -221,4 +222,6 @@ int console_inbyte_nonblocking( int port );
 }
 #endif
 
+/** @} */
+
 #endif
diff --git a/bsps/sparc/leon2/include/bsp/irq.h b/bsps/sparc/leon2/include/bsp/irq.h
index 086bf253c4..169f3cb598 100644
--- a/bsps/sparc/leon2/include/bsp/irq.h
+++ b/bsps/sparc/leon2/include/bsp/irq.h
@@ -1,6 +1,6 @@
 /**
  * @file
- * @ingroup sparc_leon2
+ * @ingroup RTEMSBSPsSPARCLEON2
  * @brief Interrupts definitions
  *
  * Based on libbsp/shared/include/irq.h.
diff --git a/bsps/sparc/leon2/include/leon.h b/bsps/sparc/leon2/include/leon.h
index 7ec6b1dcf9..2b3379f713 100644
--- a/bsps/sparc/leon2/include/leon.h
+++ b/bsps/sparc/leon2/include/leon.h
@@ -1,10 +1,7 @@
 /**
- * @defgroup leon1 Leon-1 Handler
- * @ingroup sparc_leon2
- *
  * @file
- * @ingroup leon1
- * @brief Handlers Leon-1
+ *
+ * @ingroup RTEMSBSPsSPARCLEON2
  *
  *  This include file contains information pertaining to the LEON-1.
  *  The LEON-1 is a custom SPARC V7 implementation.
diff --git a/bsps/sparc/leon2/include/tm27.h b/bsps/sparc/leon2/include/tm27.h
index 0d28641b9b..7b1afe96af 100644
--- a/bsps/sparc/leon2/include/tm27.h
+++ b/bsps/sparc/leon2/include/tm27.h
@@ -1,6 +1,6 @@
 /**
  * @file
- * @ingroup sparc_leon2
+ * @ingroup RTEMSBSPsSPARCLEON2
  * @brief Implementations for interrupt mechanisms for Time Test 27
  */