diff --git a/dumux/material/components/mesitylene.hh b/dumux/material/components/mesitylene.hh
index 8f80669eb0aed44b7a5ebd7442a00d4c0b6921d6..9de69ef05984501819b2c872e013906e086282ed 100644
--- a/dumux/material/components/mesitylene.hh
+++ b/dumux/material/components/mesitylene.hh
@@ -86,7 +86,7 @@ public:
      *        pure mesitylene at a given temperature according to
      *        Antoine after Betz 1997, see Gmehling et al 1980
      *
-     * \param T temperature of component in \f$\mathrm{[K]}\f$
+     * \param temperature temperature of component in \f$\mathrm{[K]}\f$
      */
     static Scalar vaporPressure(Scalar temperature)
     {
@@ -103,7 +103,7 @@ public:
     /*!
      * \brief Specific enthalpy of liquid mesitylene \f$\mathrm{[J/kg]}\f$.
      *
-     * \param temp temperature of component in \f$\mathrm{[K]}\f$
+     * \param temperature temperature of component in \f$\mathrm{[K]}\f$
      * \param pressure pressure of component in \f$\mathrm{[Pa]}\f$
      */
     static Scalar liquidEnthalpy(Scalar temperature, Scalar pressure)
@@ -252,7 +252,7 @@ protected:
     /*!
      * \brief Specific heat cap of liquid mesitylene \f$\mathrm{[J/kg]}\f$.
      *
-     * \param temp temperature of component in \f$\mathrm{[K]}\f$
+     * \param temperature temperature of component in \f$\mathrm{[K]}\f$
      */
     static Scalar spHeatCapLiquidPhase_(Scalar temperature)
     {
diff --git a/dumux/material/components/xylene.hh b/dumux/material/components/xylene.hh
index 4e53776a4398177c7cebe93e9a0a6c069a01f781..e996012b5f8349bc05867e576a08845bc4e44c59 100644
--- a/dumux/material/components/xylene.hh
+++ b/dumux/material/components/xylene.hh
@@ -85,7 +85,7 @@ public:
      * \brief The saturation vapor pressure in \f$\mathrm{[Pa]}\f$ of pure xylene
      *        at a given temperature according to Antoine after Betz 1997 ->  Gmehling et al 1980
      *
-     * \param T temperature of component in \f$\mathrm{[K]}\f$
+     * \param temperature temperature of component in \f$\mathrm{[K]}\f$
      */
 
     static Scalar vaporPressure(Scalar temperature)
@@ -159,7 +159,7 @@ public:
     /*!
      * \brief latent heat of vaporization for xylene \f$\mathrm{[J/kg]}\f$.
      *
-     * \param temperature temperature of component in \f$\mathrm{[K]}\f$
+     * \param temp temperature of component in \f$\mathrm{[K]}\f$
      * \param pressure pressure of component in \f$\mathrm{[Pa]}\f$
      */
     static Scalar heatVap(Scalar temp, Scalar pressure)
@@ -210,7 +210,7 @@ public:
      * \brief The molar density of pure xylene at a given pressure and temperature
      * \f$\mathrm{[mol/m^3]}\f$.
      *
-     * \param temperature temperature of component in \f$\mathrm{[K]}\f$
+     * \param temp temperature of component in \f$\mathrm{[K]}\f$
      * \param pressure pressure of component in \f$\mathrm{[Pa]}\f$
      */
     static Scalar molarLiquidDensity(Scalar temp, Scalar pressure)
@@ -261,7 +261,7 @@ public:
     /*!
      * \brief The dynamic viscosity \f$\mathrm{[Pa*s]}\f$ of xylene vapor
      *
-     * \param temperature temperature of component in \f$\mathrm{[K]}\f$
+     * \param temp temperature of component in \f$\mathrm{[K]}\f$
      * \param pressure pressure of component in \f$\mathrm{[Pa]}\f$
      * \param regularize defines, if the functions is regularized or not, set to true by default
      */
@@ -286,7 +286,7 @@ public:
     /*!
      * \brief The dynamic viscosity \f$\mathrm{[Pa*s]}\f$ of pure xylene.
      *
-     * \param temperature temperature of component in \f$\mathrm{[K]}\f$
+     * \param temp temperature of component in \f$\mathrm{[K]}\f$
      * \param pressure pressure of component in \f$\mathrm{[Pa]}\f$
      */
     static Scalar liquidViscosity(Scalar temp, Scalar pressure)
diff --git a/dumux/material/constraintsolvers/computefromreferencephase.hh b/dumux/material/constraintsolvers/computefromreferencephase.hh
index 70d3a0817f3f08fe4b7414f404313a525568ffbc..37ff6410e12be7a1a89724ad3ae003e5ec340232 100644
--- a/dumux/material/constraintsolvers/computefromreferencephase.hh
+++ b/dumux/material/constraintsolvers/computefromreferencephase.hh
@@ -101,7 +101,8 @@ public:
      * - if the setViscosity parameter is true, also dynamic viscosities of *all* phases
      * - if the setEnthalpy parameter is true, also specific enthalpies and internal energies of *all* phases
      *
-     * \param mutParams The mutable parameters object which ought to be set
+     * \param fluidState Thermodynamic state of the fluids
+     * \param paramCache  Container for cache parameters
      * \param refPhaseIdx The phase index of the reference phase
      * \param setViscosity Specify whether the dynamic viscosity of
      *                     each phase should also be set.
diff --git a/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3p.hh b/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3p.hh
index 396f74690b6b620990fad7cfdb58831855b10714..a7e2d2c771592b3e48f24dcc77709a29a36ea34e 100644
--- a/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3p.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3p.hh
@@ -249,7 +249,10 @@ public:
      * (see p61. in "Comparison of the Three-Phase Oil Relative Permeability Models"
      * MOJDEH  DELSHAD and GARY A. POPE, Transport in Porous Media 4 (1989), 59-83.)
      *
-     * \param The mobile saturation of all phases. (Sw used)
+     * \param Sn saturation of the NAPL phase.
+     * \param Sg saturation of the gas phase.
+     * \param saturation saturation of the water phase.
+     * \param params Array of parameters.
      */
     static Scalar krw(const Params &params,  Scalar saturation, Scalar Sn, Scalar Sg)
     {
@@ -277,7 +280,10 @@ public:
      * Journal of Contaminant Hydrology 66 (2003), 261-285
      *
      *
-     * \param The mobile saturation of all phases. (Sw and Sn used)
+     * \param Sw saturation of the water phase.
+     * \param Sg saturation of the gas phase.
+     * \param saturation saturation of the NAPL phase.
+     * \param params Array of parameters.
      */
     static Scalar krn(const Params &params, Scalar Sw, Scalar saturation, Scalar Sg)
     {
@@ -318,7 +324,10 @@ public:
      * (see p61. in "Comparison of the Three-Phase Oil Relative Permeability Models"
      * MOJDEH  DELSHAD and GARY A. POPE, Transport in Porous Media 4 (1989), 59-83.)
      *
-     * \param The mobile saturation of all phases. (Sg used)
+     * \param Sw saturation of the water phase.
+     * \param Sn saturation of the NAPL phase.
+     * \param saturation saturation of the gas phase.
+     * \param params Array of parameters.
      */
     static Scalar krg(const Params &params, Scalar Sw, Scalar Sn, Scalar saturation)
     {
@@ -344,8 +353,11 @@ public:
 
     /*!
      * \brief The relative permeability for a phase.
-     *
-     * \param Phase indicator, The saturation of all phases.
+     * \param Sw saturation of the water phase.
+     * \param Sg saturation of the gas phase.
+     * \param Sn saturation of the NAPL phase.
+     * \param params Array of parameters.
+     * \param phase indicator, The saturation of all phases.
      */
     static Scalar kr(const Params &params, const int phase, const Scalar Sw, const Scalar Sn, const Scalar Sg)
     {
diff --git a/dumux/material/fluidsystems/spe5fluidsystem.hh b/dumux/material/fluidsystems/spe5fluidsystem.hh
index eaf7925867111d066936c1ef4f8b4df0a865debe..74aabc88672f05352f3c22b91b1096ac8e8303f7 100644
--- a/dumux/material/fluidsystems/spe5fluidsystem.hh
+++ b/dumux/material/fluidsystems/spe5fluidsystem.hh
@@ -361,6 +361,7 @@ public:
      *
      *
      * \param fluidState An abitrary fluid state
+     * \param paramCache Container for cache parameters
      * \param phaseIdx The index of the fluid phase to consider
      */
     template <class FluidState>
@@ -465,6 +466,7 @@ public:
      *        \f$i\f$ and \f$j\f$ in this phase.
      *
      * \param fluidState An abitrary fluid state
+     * \param paramCache Container for cache parameters
      * \param phaseIdx The index of the fluid phase to consider
      * \param compIIdx The index of the first component to consider
      * \param compJIdx The index of the second component to consider
diff --git a/test/boxmodels/1p2c/1p2coutflowproblem.hh b/test/boxmodels/1p2c/1p2coutflowproblem.hh
index b0516f8aa201cd1c8410274d9ec53e09c9a4ae7d..85ef93061cec330403b976ac3fb15d0a07e6ca2c 100644
--- a/test/boxmodels/1p2c/1p2coutflowproblem.hh
+++ b/test/boxmodels/1p2c/1p2coutflowproblem.hh
@@ -107,7 +107,7 @@ SET_BOOL_PROP(OnePTwoCOutflowProblem, EnableGravity, false);
  * gradient of 1e5Pa/m. The nitrogen is transported with the water flow
  * and leaves the domain at the right boundary
  * where an outflow boundary condition is applied.
- * This problem uses the \ref OnePTwoCModel.
+ * This problem uses the \ref OnePTwoCBoxModel.
  *
  * To run the simulation execute the following line in shell:
  * <tt>./test_1p2c -parameterFile ./test_1p2c.input</tt>
diff --git a/test/boxmodels/2p/lensproblem.hh b/test/boxmodels/2p/lensproblem.hh
index 82645f155482c0a8008ba453bd948da3a4748b7b..9de6f9311a11ef8c6019a49e2526aac429364e8a 100644
--- a/test/boxmodels/2p/lensproblem.hh
+++ b/test/boxmodels/2p/lensproblem.hh
@@ -193,8 +193,6 @@ public:
      *
      * \param timeManager The time manager
      * \param gridView The grid view
-     * \param lensLowerLeft Global position of the lenses lower left corner
-     * \param lensUpperRight Global position of the lenses upper right corner
      */
     LensProblem(TimeManager &timeManager,
                 const GridView &gridView)