diff --git a/fem/common/fastbase.hh b/fem/common/fastbase.hh
index 6b35063015e2e0832b86f219b1e85b999ecc8af9..3a00279d23eca66226398e163f0ac36d204ae187 100644
--- a/fem/common/fastbase.hh
+++ b/fem/common/fastbase.hh
@@ -8,7 +8,7 @@
 namespace Dune {
 
   /** @defgroup FastBaseFunctionSet The FastBaseFunctionSet
-     @ingroup BaseFunctionSet
+     @ingroup BaseFunction
      The FastBaseFunctionSet is an special implementation of the interface
      BaseFunctionSetInterface. The idea here is to cache all evaluations of
      the base functions for a given quadrature. That means if we use an
diff --git a/grid/albertgrid.hh b/grid/albertgrid.hh
index 6e1696b92e8956f00e46012d6def9eb762098e55..79fd24cea07bb374751e9893d2a1d4698a6aa805 100644
--- a/grid/albertgrid.hh
+++ b/grid/albertgrid.hh
@@ -102,7 +102,7 @@ namespace Dune {
 
 namespace Dune
 {
-  /** @defgroup AlbertGrid AlbertGrid
+  /** @defgroup AlbertGrid Albert Grid
      @ingroup GridCommon
 
      This is one implementation of the grid interface providing 2d triangle
diff --git a/grid/common/grid.hh b/grid/common/grid.hh
index b5e3971dfd4f1dd9281444de1866c5f3f34db2ce..77d4c879d017380057ecbcd4547eb16da5b02a4a 100644
--- a/grid/common/grid.hh
+++ b/grid/common/grid.hh
@@ -9,7 +9,7 @@
 
 namespace Dune {
 
-  /** @defgroup GridCommon Dune Grid
+  /** @defgroup GridCommon Grid Interface
 
      The Dune Grid module defines a general interface to a hierarchical finite element mesh.
      The interface is independent of dimension and element type. Various implementations
@@ -35,6 +35,8 @@ namespace Dune {
      of the interface. As with STL containers, all implementations must implement the
      same classes with exactly the same members to be used in generic algorithms.
 
+     \sa AlbertGrid UGGrid SPGrid SGrid YaspGrid
+
 
      @{
    */
diff --git a/grid/yaspgrid.hh b/grid/yaspgrid.hh
index 790d18d0d3852f38d85b8e2e56ae8b7b4d721fc4..56ac9726c71b5f01cbed5707387e6bcb49b32599 100644
--- a/grid/yaspgrid.hh
+++ b/grid/yaspgrid.hh
@@ -18,7 +18,7 @@
 
 namespace Dune {
 
-  /** @defgroup Yaspgrid Yet Another Structured Parallel Grid
+  /** @defgroup YaspGrid Yet Another Structured Parallel Grid (YaspGrid)
       \ingroup GridCommon
 
      Yaspgrid stands for yet another structured parallel grid.
diff --git a/grid/yaspgrid/grids.hh b/grid/yaspgrid/grids.hh
index ebf53378f9a28ebcea3785e4cbc51f99b0d10655..0b54ef3490c3daba867124ce011ac3c8d1244bb7 100644
--- a/grid/yaspgrid/grids.hh
+++ b/grid/yaspgrid/grids.hh
@@ -24,7 +24,7 @@
 
 namespace Dune {
 
-  /** @addtogroup Yaspgrid Yet Another Structured Parallel Grid
+  /** @addtogroup YaspGrid
       \ingroup GridCommon
 
         This is the basis of a parallel implementation of the dune grid interface