diff --git a/doc/doxygen/dumux.bib b/doc/doxygen/dumux.bib
index d3874cb4f673a00a86fc2bb0aaecc211b4dd28d3..b98d485626718c079c6685e3af7e247baee802d9 100644
--- a/doc/doxygen/dumux.bib
+++ b/doc/doxygen/dumux.bib
@@ -2050,3 +2050,14 @@ author = {F. Fichot and F. Duval and N. Trégourès and C. Béchaud and M. Quint
   year={1997},
   publisher={Courier Corporation}
 }
+
+@inbook{aichlmayr2006effective,
+  title     = {The effective thermal conductivity of saturated porous media},
+  author    = {Aichlmayr, H.T. and Kulacki, F.A.},
+  booktitle = {Advances in Heat Transfer},
+  pages     = {377--460},
+  year      = {2006},
+  doi       = {10.1016/s0065-2717(06)39004-1},
+  ISSN      = {0065-2717},
+  publisher = {Elsevier}
+}
diff --git a/doc/doxygen/groups/main.md b/doc/doxygen/groups/main.md
index ee2709bef9dcf770a0bc002a478e2bb965fbe0d8..14b7c448ed4455ab5ec43ef86d2570e7b3d2a40e 100644
--- a/doc/doxygen/groups/main.md
+++ b/doc/doxygen/groups/main.md
@@ -11,7 +11,8 @@
 @defgroup Parameter Parameters and runtime configuration
 
 @defgroup Material Constitutive modeling
-@brief Constitutive model framework, material models, fluids, solids.
+@brief Constitutive model framework - Constitutive relations for fluids, solids, fluid-matrix-interactions and more
+@details Constitutive relations formalize the functional dependence among physical variables, thereby providing the missing equations to close systems.
 
 @defgroup MultiDomain Multidomain framework
 @brief Coupling of several regular DuMu<sup>x</sup> problems
diff --git a/doc/doxygen/groups/material.md b/doc/doxygen/groups/material.md
index 0e2f166a03275d1389615b9aa4e2db0882504e56..3d058a9fc4d3f75f271348511dd3e0e32f57b72e 100644
--- a/doc/doxygen/groups/material.md
+++ b/doc/doxygen/groups/material.md
@@ -46,9 +46,21 @@ chemical species or a _fixed_ mixture of species. Fluid systems use components t
 
 @defgroup Fluidmatrixinteractions Fluid-matrix interactions
 @brief Constitutive relations such as pc-Sw relations, kr-Sw relations, effective diffusion coefficients, friction laws
-@details Constitutive models for interaction of fluids and solids. The relations depend on the fluid state as well as material parameters of the matrix. For example, in porous media theory, capillary pressure is often expressed as a function of the phase saturation and some shape parameter \f$\lambda\f$ which is dependent on the material (Brooks-Corey model).
+@details Constitutive models for interaction of fluids and solids. The relations depend on the fluid state as well as material parameters of the matrix. For example, in porous media theory, the effective heat conductivity depends on the solid heat conductivity, the fluid heat conductivity, as well as the porosity of the solid and the fluid saturation.
 @ingroup Material
 
+<!-- Fluidmatrixinteractions subgroups  -->
+
+@defgroup EffectiveDiffusivity Effective diffusivity in porous media
+@brief Laws for calculating effective diffusion coefficients.
+@details When averaging over a given volume of a porous medium, diffusion appears effectively restricted since not all volume is accessible to particles and diffusion is hindered by the solid matrix acting as obstacles. Effective diffusivity laws provide constitutive relations for the effective diffusion coefficients based on the solid matrix material parameters and the fluid configuration in the pore space.
+@ingroup Fluidmatrixinteractions
+
+@defgroup EffectiveHeatConductivity Effective heat conductivity in porous media
+@brief Laws for calculating effective heat conductivity coefficients.
+@details In porous media, the effective heat conductivity depends on the solid-fluid conductivity ratio, the volume fractions of the constituent phases, and the geometry of the solid-fluid interface \cite aichlmayr2006effective. The following laws are implemented:
+@ingroup Fluidmatrixinteractions
+
 <!-- FluidStates -->
 
 @defgroup FluidStates Fluid States
diff --git a/dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh b/dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh
index 1d76c1752dcef7d8df54f933a839ae7de7c65361..ede182b1c129b4aeceb8d2fbce523ae5413196df 100644
--- a/dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh
+++ b/dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh
@@ -4,11 +4,6 @@
 // SPDX-FileCopyrightInfo: Copyright © DuMux Project contributors, see AUTHORS.md in root folder
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
-/*!
- * \file
- * \ingroup Fluidmatrixinteractions
- * \brief Reation for a simple effective thermal conductivity
- */
 #ifndef DUMUX_MATERIAL_THERMALCONDUCTIVITY_AVERAGE_HH
 #define DUMUX_MATERIAL_THERMALCONDUCTIVITY_AVERAGE_HH
 
@@ -17,8 +12,14 @@
 namespace Dumux {
 
 /*!
- * \ingroup Fluidmatrixinteractions
+ * \ingroup EffectiveHeatConductivity
  * \brief Relation for a simple effective thermal conductivity
+ *
+ * ### Average
+ *
+ * The effective thermal conductivity is calculated as a weighted average of the thermal
+ * conductivities of the solid and the fluid phases. Additionally, the saturation is taken
+ * into account.
  */
 template<class Scalar>
 class ThermalConductivityAverage
diff --git a/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/johansen.hh b/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/johansen.hh
index 55e5ddf64bb0eb5707e3df8948babe23771aca56..537fc27c8c03bc2737e862e73247182177673062 100644
--- a/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/johansen.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/johansen.hh
@@ -4,11 +4,6 @@
 // SPDX-FileCopyrightInfo: Copyright © DuMux Project contributors, see AUTHORS.md in root folder
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
-/*!
- * \file
- * \ingroup Fluidmatrixinteractions
- * \brief   Relation for the saturation-dependent effective thermal conductivity
- */
 #ifndef DUMUX_MATERIAL_FLUIDMATRIX_THERMALCONDUCTIVITY_JOHANSEN_HH
 #define DUMUX_MATERIAL_FLUIDMATRIX_THERMALCONDUCTIVITY_JOHANSEN_HH
 
@@ -18,28 +13,38 @@
 namespace Dumux {
 
 /*!
- * \ingroup Fluidmatrixinteractions
+ * \addtogroup EffectiveHeatConductivity
+ * \copydoc Dumux::ThermalConductivityJohansen
+*/
+
+/*!
+ * \ingroup EffectiveHeatConductivity
  * \brief Relation for the saturation-dependent effective thermal conductivity
  *
+ * ### Johansen Method
+ *
  * The Johansen method (Johansen 1975 \cite johansen1977 ) computes the thermal conductivity of dry and the
  * wet soil material and uses a root function of the wetting saturation to compute the
  * effective thermal conductivity for a two-phase fluidsystem. The individual thermal
  * conductivities are calculated as geometric mean of the thermal conductivity of the porous
  * material and of the respective fluid phase.
  * The material law is:
- * \f$\mathrm{[
- \lambda_\text{eff} = \lambda_{\text{dry}} + \sqrt{(S_w)} \left(\lambda_\text{wet} - \lambda_\text{dry}\right)
- }\f$
+ * \f[
+ * \mathrm{[
+ * \lambda_\text{eff} = \lambda_{\text{dry}} + \sqrt{(S_w)} \left(\lambda_\text{wet} - \lambda_\text{dry}\right)
+ * }\f]
  *
  * with
- * \f$\mathrm{
- \lambda_\text{wet} = \lambda_{solid}^{\left(1-\phi\right)}*\lambda_w^\phi
- }\f$
+ * \f[
+ * \mathrm{
+ * \lambda_\text{wet} = \lambda_{solid}^{\left(1-\phi\right)}*\lambda_w^\phi
+ * }\f]
  * and the semi-empirical relation
  *
- * \f$\mathrm{
- \lambda_\text{dry} = \frac{0.135*\rho_s*\phi + 64.7}{\rho_s - 0.947 \rho_s*\phi}.
- }\f$
+ * \f[
+ * \mathrm{
+ * \lambda_\text{dry} = \frac{0.135*\rho_s*\phi + 64.7}{\rho_s - 0.947 \rho_s*\phi}.
+ * }\f]
  *
  * Source: Phdthesis (Johansen1975) Johansen, O. Thermal conductivity of soils Norw. Univ. of Sci. Technol., Trondheim, Norway, 1975 \cite johansen1977
  */
diff --git a/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/simplefluidlumping.hh b/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/simplefluidlumping.hh
index b3f5cfa8f5b762dba29b3fe5cf5f72b424381c5f..425c719247a84a1a6263398071c12e0a9e4efec6 100644
--- a/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/simplefluidlumping.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/simplefluidlumping.hh
@@ -4,11 +4,6 @@
 // SPDX-FileCopyrightInfo: Copyright © DuMux Project contributors, see AUTHORS.md in root folder
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
-/*!
- * \file
- * \ingroup Fluidmatrixinteractions
- * \brief   Relation for the saturation-dependent effective thermal conductivity
- */
 #ifndef DUMUX_MATERIAL_FLUIDMATRIX_THERMALCONDUCTIVITY_SIMPLE_FLUID_LUMPING_HH
 #define DUMUX_MATERIAL_FLUIDMATRIX_THERMALCONDUCTIVITY_SIMPLE_FLUID_LUMPING_HH
 
@@ -18,8 +13,17 @@
 namespace Dumux {
 
 /*!
- * \ingroup Fluidmatrixinteractions
- * \brief   Relation for the saturation-dependent effective thermal conductivity
+ * \addtogroup EffectiveHeatConductivity
+ * \copydoc Dumux::ThermalConductivitySimpleFluidLumping
+*/
+
+/*!
+ * \ingroup EffectiveHeatConductivity
+ * \brief Relation for the saturation-dependent effective thermal conductivity
+ *
+ * ### Simple Fluid Lumping
+ *
+ * TODO: DOCUMENTATION of the fluid lumping method
  */
 template<class Scalar>
 class ThermalConductivitySimpleFluidLumping
diff --git a/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/somerton.hh b/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/somerton.hh
index 48ff25beff5f9f66f8dbda518655d2ed3aee329c..7e21a2201677b024dac9a48be17ce3a540e2a657 100644
--- a/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/somerton.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/somerton.hh
@@ -4,11 +4,6 @@
 // SPDX-FileCopyrightInfo: Copyright © DuMux Project contributors, see AUTHORS.md in root folder
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
-/*!
- * \file
- * \ingroup Fluidmatrixinteractions
- * \brief   Relation for the saturation-dependent effective thermal conductivity
- */
 #ifndef DUMUX_MATERIAL_FLUIDMATRIX_THERMALCONDUCTIVITY_SOMERTON_HH
 #define DUMUX_MATERIAL_FLUIDMATRIX_THERMALCONDUCTIVITY_SOMERTON_HH
 
@@ -18,29 +13,41 @@
 namespace Dumux {
 
 /*!
- * \ingroup Fluidmatrixinteractions
+ * \addtogroup EffectiveHeatConductivity
+ * \copydoc Dumux::ThermalConductivitySomerton
+*/
+
+/*!
+ * \addtogroup EffectiveHeatConductivity
+ * \ingroup EffectiveHeatConductivity
  * \brief Relation for the saturation-dependent effective thermal conductivity
  *
- *  The Somerton method computes the thermal conductivity of dry and the wet soil material
- *  and uses a root function of the wetting saturation to compute the
- *  effective thermal conductivity for a two-phase fluidsystem. The individual thermal
- *  conductivities are calculated as geometric mean of the thermal conductivity of the porous
- *  material and of the respective fluid phase.
+ * ### Somerton Method (2p)
+ *
+ * The Somerton method computes the thermal conductivity of dry and the wet soil material
+ * and uses a root function of the wetting saturation to compute the
+ * effective thermal conductivity for a two-phase fluidsystem. The individual thermal
+ * conductivities are calculated as geometric mean of the thermal conductivity of the porous
+ * material and of the respective fluid phase.
  *
  * The material law is:
- * \f$\mathrm{
- \lambda_\text{eff} = \lambda_{\text{dry}} + \sqrt{(S_w)} \left(\lambda_\text{wet} - \lambda_\text{dry}\right)
- }\f$
+ * \f[
+ * \mathrm{
+ * \lambda_\text{eff} = \lambda_{\text{dry}} + \sqrt{(S_w)} \left(\lambda_\text{wet} - \lambda_\text{dry}\right)
+ * }
+ * \f]
  *
  * with
- * \f$\mathrm{
- \lambda_\text{wet} = \lambda_{solid}^{\left(1-\phi\right)}*\lambda_w^\phi
- }\f$
+ * \f[
+ * \mathrm{
+ * \lambda_\text{wet} = \lambda_{solid}^{\left(1-\phi\right)}*\lambda_w^\phi
+ * }\f]
  * and
  *
- * \f$\mathrm{
- \lambda_\text{dry} = \lambda_{solid}^{\left(1-\phi\right)}*\lambda_n^\phi.
- }\f$
+ * \f[
+ * \mathrm{
+ * \lambda_\text{dry} = \lambda_{solid}^{\left(1-\phi\right)}*\lambda_n^\phi.
+ * }\f]
  *
  */
 template<class Scalar>
diff --git a/dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh b/dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh
index e663023f2bdeb448adbb83cff6b0f43c8ca4d3b8..33989b345afe255cc9b24fdc50956152909dfa55 100644
--- a/dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh
@@ -4,11 +4,6 @@
 // SPDX-FileCopyrightInfo: Copyright © DuMux Project contributors, see AUTHORS.md in root folder
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
-/*!
- * \file
- * \ingroup Fluidmatrixinteractions
- * \brief   Relation for the saturation-dependent effective thermal conductivity
- */
 #ifndef DUMUX_MATERIAL_THERMALCONDUCTIVITY_SOMERTON_3P_HH
 #define DUMUX_MATERIAL_THERMALCONDUCTIVITY_SOMERTON_3P_HH
 
@@ -18,35 +13,42 @@
 namespace Dumux {
 
 /*!
- * \ingroup Fluidmatrixinteractions
+ * \addtogroup EffectiveHeatConductivity
+ * \copydoc Dumux::ThermalConductivitySomerton
+*/
+
+/*!
+ * \ingroup EffectiveHeatConductivity
  * \brief Relation for the saturation-dependent effective thermal conductivity
  *
- *  The Somerton method computes the thermal conductivity of dry and the wet soil material.
- *  It is extended here to a three phase system of water (w), NAPL (n) and gas (g).
- *  It uses a root function of the water and NAPL saturation to compute the
- *  effective thermal conductivity for a three-phase fluidsystem. The individual thermal
- *  conductivities are calculated as geometric mean of the thermal conductivity of the porous
- *  material and of the respective fluid phase.
+ * ### Somerton Method (3p)
+ *
+ * The Somerton method computes the thermal conductivity of dry and the wet soil material.
+ * It is extended here to a three phase system of water (w), NAPL (n) and gas (g).
+ * It uses a root function of the water and NAPL saturation to compute the
+ * effective thermal conductivity for a three-phase fluidsystem. The individual thermal
+ * conductivities are calculated as geometric mean of the thermal conductivity of the porous
+ * material and of the respective fluid phase.
  *
  * The material law is:
  * \f[
- \lambda_\text{eff} = \lambda_\text{g,eff} + \sqrt{(S_w)} \left(\lambda_\text{w,eff} - \lambda_\text{g,eff}\right) +
- \sqrt{(S_n)} \left(\lambda0_\text{n,eff} - \lambda_\text{g,eff}\right)
- \f]
+ * \lambda_\text{eff} = \lambda_\text{g,eff} + \sqrt{(S_w)} \left(\lambda_\text{w,eff} - \lambda_\text{g,eff}\right) +
+ * \sqrt{(S_n)} \left(\lambda0_\text{n,eff} - \lambda_\text{g,eff}\right)
+ * \f]
  *
  * with
  * \f[
- \lambda_\text{w,eff} = \lambda_{solid}^{\left(1-\phi\right)}*\lambda_w^\phi
- \f]
+ * \lambda_\text{w,eff} = \lambda_{solid}^{\left(1-\phi\right)}*\lambda_w^\phi
+ * \f]
  * and
  *
  * \f[
- \lambda0_\text{n,eff} = \lambda_{solid}^{\left(1-\phi\right)}*\lambda_n^\phi.
- \f]
+ * \lambda0_\text{n,eff} = \lambda_{solid}^{\left(1-\phi\right)}*\lambda_n^\phi.
+ * \f]
  *
- * * \f[
- \lambda_\text{g,eff} = \lambda_{solid}^{\left(1-\phi\right)}*\lambda_g^\phi.
- \f]
+ * \f[
+ * \lambda_\text{g,eff} = \lambda_{solid}^{\left(1-\phi\right)}*\lambda_g^\phi.
+ * \f]
  */
 template<class Scalar>
 class ThermalConductivitySomerton
diff --git a/dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh b/dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh
index 7d62743d0a1ec5a56b2afaad7c0f3eb51a470396..1aea53b4ea4a9a707e64603e629b020e9608952c 100644
--- a/dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh
+++ b/dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh
@@ -4,11 +4,6 @@
 // SPDX-FileCopyrightInfo: Copyright © DuMux Project contributors, see AUTHORS.md in root folder
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
-/*!
- * \file
- * \ingroup Fluidmatrixinteractions
- * \brief   Relation for the saturation-dependent effective diffusion coefficient
- */
 #ifndef DUMUX_MATERIAL_DIFFUSIVITY_CONSTANT_TORTUOSITY_HH
 #define DUMUX_MATERIAL_DIFFUSIVITY_CONSTANT_TORTUOSITY_HH
 
@@ -17,15 +12,25 @@
 namespace Dumux {
 
 /*!
- * \ingroup Fluidmatrixinteractions
+* \addtogroup EffectiveDiffusivity
+* \copydoc Dumux::DiffusivityConstantTortuosity
+*/
+
+/*!
+ * \ingroup EffectiveDiffusivity
  * \brief Relation for the saturation-dependent effective diffusion coefficient
  *
+ * ### Constant Tortuosity
+ *
  * The material law is:
  * \f[
  *  D_\text{eff,pm} = \phi * S_w * \tau * D
  * \f]
  *
- * with a constant tau.
+ * with
+ * \f[
+ * \tau = \text{const}
+ * \f]
  *
  * The default value is 0.5, empirically obtained in Carman 1937:
  * <i>Fluid flow through granular beds</i> \cite carman1937
diff --git a/dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh b/dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh
index 50d00f98ced681d4474764a289a0398b126a2b77..70592c462925386bd4b72afd9ae78925acb33f54 100644
--- a/dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh
+++ b/dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh
@@ -4,11 +4,6 @@
 // SPDX-FileCopyrightInfo: Copyright © DuMux Project contributors, see AUTHORS.md in root folder
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
-/*!
- * \file
- * \ingroup Fluidmatrixinteractions
- * \brief   Relation for the saturation-dependent effective diffusion coefficient
- */
 #ifndef DUMUX_MATERIAL_DIFFUSIVITY_MILLINGTON_QUIRK_HH
 #define DUMUX_MATERIAL_DIFFUSIVITY_MILLINGTON_QUIRK_HH
 
@@ -18,9 +13,15 @@
 namespace Dumux {
 
 /*!
- * \ingroup Fluidmatrixinteractions
+* \addtogroup EffectiveDiffusivity
+* \copydoc Dumux::DiffusivityMillingtonQuirk
+*/
+
+/*!
+ * \ingroup EffectiveDiffusivity
  * \brief Relation for the saturation-dependent effective diffusion coefficient
  *
+ * ### Millington Quirk
  * The material law is:
  * \f[
  *  D_\text{eff,pm} = \phi * S_w * \tau * D
diff --git a/dumux/porousmediumflow/2pnc/model.hh b/dumux/porousmediumflow/2pnc/model.hh
index 8503e967d7580b6f95edf276ac4d888a5cb39500..d6f1103fc2526b6a0ae9a107d19d95251212a391 100644
--- a/dumux/porousmediumflow/2pnc/model.hh
+++ b/dumux/porousmediumflow/2pnc/model.hh
@@ -37,7 +37,7 @@
  * * \f$ X_\alpha^\kappa \f$ is the mass fraction of component \f$ \kappa \f$ in phase  \f$ \alpha \f$,
  * * \f$ x_\alpha^\kappa \f$ is the mole fraction of component \f$ \kappa \f$ in phase    \f$ \alpha \f$,
  * * \f$ v_\alpha \f$ is the velocity of phase \f$ \alpha \f$,
- * * \f$ {\bf D_{\alpha, pm}^\kappa} \f$ is the diffusivity of component \f$ \kappa \f$  in phase \f$ \alpha \f$,
+ * * \f$ {\bf D_{\alpha, pm}^\kappa} \f$ is the effective diffusivity of component \f$ \kappa \f$  in phase \f$ \alpha \f$,
  * * \f$ q_\alpha^\kappa \f$ is a source or sink term.
  *
  * The solid or mineral phases are assumed to consist of a single component.
diff --git a/dumux/porousmediumflow/2pncmin/model.hh b/dumux/porousmediumflow/2pncmin/model.hh
index f78816b71c2032268f5c58682679a6c822d14a71..73d9a789fae5615d0f10bcfb91d4f48884b5d8a6 100644
--- a/dumux/porousmediumflow/2pncmin/model.hh
+++ b/dumux/porousmediumflow/2pncmin/model.hh
@@ -38,7 +38,7 @@
  * * \f$ X_\alpha^\kappa \f$ is the mass fraction of component \f$ \kappa \f$ in phase  \f$ \alpha \f$,
  * * \f$ x_\alpha^\kappa \f$ is the mole fraction of component \f$ \kappa \f$ in phase    \f$ \alpha \f$,
  * * \f$ v_\alpha \f$ is the velocity of phase \f$ \alpha \f$,
- * * \f$ {\bf D_{\alpha, pm}^\kappa} \f$ is the diffusivity of component \f$ \kappa \f$  in phase \f$ \alpha \f$,
+ * * \f$ {\bf D_{\alpha, pm}^\kappa} \f$ is the effective diffusivity of component \f$ \kappa \f$  in phase \f$ \alpha \f$,
  * * \f$ q_\alpha^\kappa \f$ is a source or sink term.
  *
  * The solid or mineral phases are assumed to consist of a single component.
diff --git a/dumux/porousmediumflow/mpnc/model.hh b/dumux/porousmediumflow/mpnc/model.hh
index 8181f0af7fa925e15f42bf7a2afdc6c2b6c7d3f4..78ca4df4ad200a10d31c2cc287cac975ca2fed58 100644
--- a/dumux/porousmediumflow/mpnc/model.hh
+++ b/dumux/porousmediumflow/mpnc/model.hh
@@ -46,7 +46,7 @@
  * * \f$ X_\alpha^\kappa \f$ is the mass fraction of component \f$ \kappa \f$ in phase  \f$ \alpha \f$,
  * * \f$ x_\alpha^\kappa \f$ is the mole fraction of component \f$ \kappa \f$ in phase    \f$ \alpha \f$,
  * * \f$ v_\alpha \f$ is the velocity of phase \f$ \alpha \f$,
- * * \f$ {\bf D_{\alpha, pm}^\kappa} \f$ is the diffusivity of component \f$ \kappa \f$  in phase \f$ \alpha \f$,
+ * * \f$ {\bf D_{\alpha, pm}^\kappa} \f$ is the effective diffusivity of component \f$ \kappa \f$  in phase \f$ \alpha \f$,
  * * \f$ \overline M_\alpha \f$ is the average molar mass of phase \f$ \alpha \f$
  * * \f$ q_\alpha^\kappa \f$ is a source or sink term.
  *
diff --git a/dumux/porousmediumflow/nonisothermal/model.hh b/dumux/porousmediumflow/nonisothermal/model.hh
index 294b58497509d6769ddf12c8d955baf481b260c2..18eadc2149c66131718acd8d83b438493088f47e 100644
--- a/dumux/porousmediumflow/nonisothermal/model.hh
+++ b/dumux/porousmediumflow/nonisothermal/model.hh
@@ -38,7 +38,7 @@
  * * \f$ \rho_\alpha \f$ is the mass density of phase \f$ \alpha \f$,
  * * \f$ h_\alpha \f$ is the specific enthalpy of phase  \f$ \alpha \f$,
  * * \f$ u_\alpha \f$ is the specific internal energy of phase \f$ \alpha \f$,
- * * \f$ \lambda_{pm}\f$ is the heat conductivity in the porous medium,
+ * * \f$ \lambda_{pm}\f$ is the effective heat conductivity in the porous medium,
  * * \f$ T \f$ is the temperature,
  * * \f$ \rho_s \f$ is the mass density of the solid phase,
  * * \f$ c_s \f$ is the heat capacity of the solid,
diff --git a/dumux/porousmediumflow/solidenergy/model.hh b/dumux/porousmediumflow/solidenergy/model.hh
index 877618f032901416795d2153895ccdd556405a76..8ce2764cb841bba943aff1ffc9dad07652a99a7e 100644
--- a/dumux/porousmediumflow/solidenergy/model.hh
+++ b/dumux/porousmediumflow/solidenergy/model.hh
@@ -19,7 +19,7 @@
  * * \f$ n \f$  represents volume fraction of the conducting material,
  * * \f$ c_p \f$ is the specific heat capacity at constant pressure,
  * * \f$ \varrho \f$ is the mass density,
- * * \f$ \lambda_\text{pm} \f$ is the heat conductivity in the  porous medium,
+ * * \f$ \lambda_\text{pm} \f$ is the effective heat conductivity in the  porous medium,
  * * \f$ T \f$ is the temperature,
  * * \f$ q \f$ is the heat source term.
  *
diff --git a/dumux/porousmediumflow/tracer/model.hh b/dumux/porousmediumflow/tracer/model.hh
index a448ca67db101332d0830067d04dd8f4c2567d50..7e69e2032db76f31dc01119921c3dbc3b7a8739c 100644
--- a/dumux/porousmediumflow/tracer/model.hh
+++ b/dumux/porousmediumflow/tracer/model.hh
@@ -28,7 +28,7 @@
  * * \f$ \varrho \f$ is the mass density,
  * * \f$ X^\kappa \f$ is the mass fraction of component \f$ \kappa \f$,
  * * \f$ \textbf{v}_f \f$ is the velocity of the fluid,
- * * \f$ {\bf D_{pm}^\kappa} \f$ is the diffusivity in the porous medium,
+ * * \f$ {\bf D_{pm}^\kappa} \f$ is the effective diffusivity in the porous medium,
  * * \f$ q \f$ is a source or sink term.
  *
  * The model is able to use either mole or mass fractions. The property useMoles can be set to either true or false in the