diff --git a/dumux/common/structuredcubegridcreator.hh b/dumux/common/structuredcubegridcreator.hh
index ba6077f92c7d766028f5db9dc5f263fbf5a507e7..66ed265c0617b0a2564d88fdf7d4ab07b3c5daad 100644
--- a/dumux/common/structuredcubegridcreator.hh
+++ b/dumux/common/structuredcubegridcreator.hh
@@ -57,7 +57,7 @@ NEW_PROP_TAG(Grid);
 
 
 template <class TypeTag>
-class CubeGridCreator
+class StructuredCubeGridCreator
 {
     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
     typedef typename GET_PROP_TYPE(TypeTag, Grid)  Grid;
@@ -118,7 +118,7 @@ protected:
 };
 
 template <class TypeTag>
-typename CubeGridCreator<TypeTag>::GridPointer CubeGridCreator<TypeTag>::cubeGrid_;
+typename StructuredCubeGridCreator<TypeTag>::GridPointer StructuredCubeGridCreator<TypeTag>::cubeGrid_;
 
 }
 
diff --git a/dumux/common/structuredsimplexgridcreator.hh b/dumux/common/structuredsimplexgridcreator.hh
index 5a0eadddf87aa4faba50050dbfce6e0a9c6d0f5e..524c141ade1800e7e2758de0c108347584f492f6 100644
--- a/dumux/common/structuredsimplexgridcreator.hh
+++ b/dumux/common/structuredsimplexgridcreator.hh
@@ -57,7 +57,7 @@ NEW_PROP_TAG(Grid);
 
 
 template <class TypeTag>
-class SimplexGridCreator
+class StructuredSimplexGridCreator
 {
     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
     typedef typename GET_PROP_TYPE(TypeTag, Grid)  Grid;
@@ -118,7 +118,7 @@ private:
 };
 
 template <class TypeTag>
-typename SimplexGridCreator<TypeTag>::GridPointer SimplexGridCreator<TypeTag>::simplexGrid_;
+typename StructuredSimplexGridCreator<TypeTag>::GridPointer StructuredSimplexGridCreator<TypeTag>::simplexGrid_;
 
 }