diff --git a/dumux/io/interfacegridcreator.hh b/dumux/io/interfacegridcreator.hh
index 0cddca1a1b0194d5e3e5a994e05f159cabb23ac2..3c1fa7d37ae14b6399309360a4d6ac23c2102946 100644
--- a/dumux/io/interfacegridcreator.hh
+++ b/dumux/io/interfacegridcreator.hh
@@ -22,8 +22,8 @@
  * \brief A grid creator for the coupled problems, with a refined interface
  */
 
-#ifndef DUMUX_INTERFACEMESHCREATOR_HH
-#define DUMUX_INTERFACEMESHCREATOR_HH
+#ifndef DUMUX_INTERFACEGRIDCREATOR_HH
+#define DUMUX_INTERFACEGRIDCREATOR_HH
 
 #include <dune/common/deprecated.hh>
 
@@ -48,7 +48,7 @@ NEW_PROP_TAG(Grid);
  * A grid creator, which can refine the grid towards the
  * coupling interface and the top of the domain.
  */
-template <class TypeTag>
+template<class TypeTag>
 class InterfaceGridCreator
 {
 public:
diff --git a/test/material/fluidmatrixinteractions/effectivediffusivityconstanttauproblem.hh b/test/material/fluidmatrixinteractions/effectivediffusivityconstanttauproblem.hh
index feea02063cde4737d617b115955ba1f142d29915..4e7db831db142d3f2db150734e3de52bec0b1559 100644
--- a/test/material/fluidmatrixinteractions/effectivediffusivityconstanttauproblem.hh
+++ b/test/material/fluidmatrixinteractions/effectivediffusivityconstanttauproblem.hh
@@ -19,10 +19,10 @@
 /*!
  * \file
  *
- * \brief Simple test problem for the Somerton thermal conductivity law
+ * \brief Test for the constant tau effective diffusivity model
  */
-#ifndef DUMUX_THERMAL_CONDUCTIVITY_SOMERTON_PROBLEM_HH
-#define DUMUX_THERMAL_CONDUCTIVITY_SOMERTON_PROBLEM_HH
+#ifndef DUMUX_EFFECTIVE_DIFFUSIVITY_CONSTANT_TAU_PROBLEM_HH
+#define DUMUX_EFFECTIVE_DIFFUSIVITY_CONSTANT_TAU_PROBLEM_HH
 
 #include <dune/grid/io/file/dgfparser/dgfyasp.hh>
 
@@ -63,10 +63,10 @@ SET_TYPE_PROP(EffectiveDiffusivityConstantTauProblem, EffectiveDiffusivityModel,
 /*!
  * \ingroup MaterialTestProblems
  *
- * \brief Simple test problem for the Somerton thermal conductivity law
+ * \brief Test for the constant tau effective diffusivity model
  *
  * To run the test execute the following line in shell:
- * <tt>./test_thermalconductivitysomerton</tt>
+ * <tt>./test_effectivediffusivityconstanttau</tt>
  *
  */
 template <class TypeTag >