diff --git a/dumux/geomechanics/el2p/el2pindices.hh b/dumux/geomechanics/el2p/el2pindices.hh
index e3c39e74ee59d354d5b0d5aee3f06b6fa9b0af33..7bda6fe95b05d02fb093af5c3ed6cc662dc6c4af 100644
--- a/dumux/geomechanics/el2p/el2pindices.hh
+++ b/dumux/geomechanics/el2p/el2pindices.hh
@@ -25,15 +25,16 @@
 #ifndef DUMUX_ELASTIC2P_INDICES_HH
 #define DUMUX_ELASTIC2P_INDICES_HH
 
-
 #include <dumux/geomechanics/elastic/elasticindices.hh>
 #include <dumux/implicit/2p/2pindices.hh>
 
-
 namespace Dumux
 {
 // \{
 
+namespace Properties
+{
+
 /*!
  * \ingroup ElTwoPBoxModel
  * \ingroup ImplicitIndices
@@ -41,12 +42,10 @@ namespace Dumux
  *
  * This class inherits from the TwoPIndices and from the ElasticIndices
  */
-namespace Properties
-{
+
 // PVOffset is set to 0 for the TwoPIndices and to 2 for the ElasticIndices since
 // the first two primary variables are the primary variables of the two-phase
 // model followed by the primary variables of the elastic model
-
 template <class TypeTag,
 int formulation = 0,
 int PVOffset =  2>
@@ -57,4 +56,3 @@ class ElTwoPIndices : public ElasticIndices<PVOffset>, public TwoPIndices<TypeTa
 }
 
 #endif
-
diff --git a/dumux/implicit/mpnc/energy/mpncindicesenergykinetic.hh b/dumux/implicit/mpnc/energy/mpncindicesenergykinetic.hh
index 6fc95dcb7bfe2c44e12f8828da2881e31f7ed600..7a4cef1a1a39406e6f5dd6bbd6e7da92a50c0620 100644
--- a/dumux/implicit/mpnc/energy/mpncindicesenergykinetic.hh
+++ b/dumux/implicit/mpnc/energy/mpncindicesenergykinetic.hh
@@ -17,6 +17,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  *****************************************************************************/
 /*!
+ * \file
  * \brief The indices for the thermal non-equilibrium part of the MpNc model.
  */
 #ifndef DUMUX_MPNC_INDICES_ENERGY_KINETIC_HH
diff --git a/dumux/implicit/mpnc/mass/mpncindicesmasskinetic.hh b/dumux/implicit/mpnc/mass/mpncindicesmasskinetic.hh
index 15a732590bc4f4fb72c000eb8426b76dcc2128be..2ed88e3516bfb18c0292492fa91fd932ea87646a 100644
--- a/dumux/implicit/mpnc/mass/mpncindicesmasskinetic.hh
+++ b/dumux/implicit/mpnc/mass/mpncindicesmasskinetic.hh
@@ -17,6 +17,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  *****************************************************************************/
 /*!
+ * \file
  * \brief The indices for the kinetic mass transfer module of the
  *        compositional multi-phase model.
  */
diff --git a/dumux/implicit/mpnc/mass/mpnclocalresidualmasskinetic.hh b/dumux/implicit/mpnc/mass/mpnclocalresidualmasskinetic.hh
index 266b87dc8e85a3bfa7f392b25181383c47aa4469..4a7534c0fcb00009e40b6e884eabfe8f28fec332 100644
--- a/dumux/implicit/mpnc/mass/mpnclocalresidualmasskinetic.hh
+++ b/dumux/implicit/mpnc/mass/mpnclocalresidualmasskinetic.hh
@@ -17,6 +17,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  *****************************************************************************/
 /*!
+ * \file
  * \brief The local residual for the kinetic mass transfer module of
  *        the compositional multi-phase model.
  */
diff --git a/dumux/implicit/mpnc/mpncmodelkinetic.hh b/dumux/implicit/mpnc/mpncmodelkinetic.hh
index 3303996f5608991801b9ad7303054bfb8a6c02d7..c82b56895d7754963a2d8019a014832cc8dfea1a 100644
--- a/dumux/implicit/mpnc/mpncmodelkinetic.hh
+++ b/dumux/implicit/mpnc/mpncmodelkinetic.hh
@@ -16,6 +16,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  *****************************************************************************/
 /*!
+ * \file
  * \brief This file adds kinetic mass and energy transfer modules to
  *        the M-phase N-component model.
  */
diff --git a/dumux/implicit/mpnc/mpncpropertieskinetic.hh b/dumux/implicit/mpnc/mpncpropertieskinetic.hh
index 1c36862ee3f6b869770d9e06f5edc2a28447e252..db42058cf4f5a674b4a33708b74750ead9c446bb 100644
--- a/dumux/implicit/mpnc/mpncpropertieskinetic.hh
+++ b/dumux/implicit/mpnc/mpncpropertieskinetic.hh
@@ -17,6 +17,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  *****************************************************************************/
 /*!
+ * \file
  * \brief This file declares and defines the properties required by
  *        the kinetic modules the M-phase N-component model.
  */
diff --git a/dumux/implicit/mpnc/mpncpropertydefaultskinetic.hh b/dumux/implicit/mpnc/mpncpropertydefaultskinetic.hh
index 631743d2675078d9f97419eba1d125032cf62422..a8d9a4296b9f454b9379f3c9b4aae72a831ba4d9 100644
--- a/dumux/implicit/mpnc/mpncpropertydefaultskinetic.hh
+++ b/dumux/implicit/mpnc/mpncpropertydefaultskinetic.hh
@@ -17,6 +17,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  *****************************************************************************/
 /*!
+ * \file
  * \brief This file declares and defines the properties required by
  *        the kinetic modules the M-phase N-component model.
  */