diff --git a/dumux/freeflow/stokes/stokesmodel.hh b/dumux/freeflow/stokes/stokesmodel.hh
index 586fb1486fb1c5e8c0711a886403fe64aef37bd4..a60f4aba91b1205164c9743f68b1d1ca36a3a866 100644
--- a/dumux/freeflow/stokes/stokesmodel.hh
+++ b/dumux/freeflow/stokes/stokesmodel.hh
@@ -137,7 +137,7 @@ public:
         flux = this->problem_.gridView().comm().sum(flux);
     }
 
-    //! \copydoc BoxModel::addOutputVtkFields
+    //! \copydoc ImplicitModel::addOutputVtkFields
     template <class MultiWriter>
     void addOutputVtkFields(const SolutionVector &sol,
                             MultiWriter &writer)
diff --git a/dumux/freeflow/stokes/stokesvolumevariables.hh b/dumux/freeflow/stokes/stokesvolumevariables.hh
index 24bdff122e12e4b334dab3e9ecc0ab9cb1b54a60..694446af4f667fc44da6944eb71c1654fc218a4a 100644
--- a/dumux/freeflow/stokes/stokesvolumevariables.hh
+++ b/dumux/freeflow/stokes/stokesvolumevariables.hh
@@ -70,7 +70,7 @@ class StokesVolumeVariables : public ImplicitVolumeVariables<TypeTag>
 
 public:
     /*!
-     * \copydoc BoxVolumeVariables::update()
+     * \copydoc ImplicitVolumeVariables::update()
      */
     void update(const PrimaryVariables &priVars,
                 const Problem &problem,
@@ -93,7 +93,7 @@ public:
     }
 
     /*!
-     * \copydoc BoxModel::completeFluidState()
+     * \copydoc ImplicitModel::completeFluidState()
      * \param isOldSol Specifies whether this is the previous solution or the current one
      */
     static void completeFluidState(const PrimaryVariables& priVars,
diff --git a/dumux/freeflow/stokes2c/stokes2cmodel.hh b/dumux/freeflow/stokes2c/stokes2cmodel.hh
index a7dd3411a5d0611f99c4d6ea92204b8f8660fc8d..b4d2774b11c69a84bd596b265c6a5a96170f9e86 100644
--- a/dumux/freeflow/stokes2c/stokes2cmodel.hh
+++ b/dumux/freeflow/stokes2c/stokes2cmodel.hh
@@ -84,7 +84,7 @@ class Stokes2cModel : public StokesModel<TypeTag>
     typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
 
 public:
-    //! \copydoc BoxModel::addOutputVtkFields
+    //! \copydoc ImplicitModel::addOutputVtkFields
     template <class MultiWriter>
     void addOutputVtkFields(const SolutionVector &sol,
                             MultiWriter &writer)
diff --git a/dumux/freeflow/stokes2c/stokes2cvolumevariables.hh b/dumux/freeflow/stokes2c/stokes2cvolumevariables.hh
index e3258b268a6581215c5efc242ab46b1c9eb77257..621b0cb0bfc63c466779004722fb4d5053f42577 100644
--- a/dumux/freeflow/stokes2c/stokes2cvolumevariables.hh
+++ b/dumux/freeflow/stokes2c/stokes2cvolumevariables.hh
@@ -64,7 +64,7 @@ class Stokes2cVolumeVariables : public StokesVolumeVariables<TypeTag>
 
 public:
     /*!
-     * \copydoc BoxVolumeVariables::update()
+     * \copydoc ImplicitVolumeVariables::update()
      */
     void update(const PrimaryVariables &priVars,
                 const Problem &problem,
@@ -100,7 +100,7 @@ public:
     };
 
     /*!
-     * \copydoc BoxModel::completeFluidState()
+     * \copydoc ImplicitModel::completeFluidState()
      * \param isOldSol Specifies whether this is the previous solution or the current one
      */
     static void completeFluidState(const PrimaryVariables& priVars,
diff --git a/dumux/freeflow/stokes2cni/stokes2cnimodel.hh b/dumux/freeflow/stokes2cni/stokes2cnimodel.hh
index 199745170a4700478b49832fe8c17b7b1dec2b93..dd39354c4b128c10dcf40ea62b4eaa0cc5d0b464 100644
--- a/dumux/freeflow/stokes2cni/stokes2cnimodel.hh
+++ b/dumux/freeflow/stokes2cni/stokes2cnimodel.hh
@@ -94,7 +94,7 @@ class Stokes2cniModel : public Stokes2cModel<TypeTag>
     typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
 
 public:
-    //! \copydoc BoxModel::addOutputVtkFields
+    //! \copydoc ImplicitModel::addOutputVtkFields
     template <class MultiWriter>
     void addOutputVtkFields(const SolutionVector &sol,
                             MultiWriter &writer)
diff --git a/dumux/freeflow/stokes2cni/stokes2cnivolumevariables.hh b/dumux/freeflow/stokes2cni/stokes2cnivolumevariables.hh
index c85918d2099765ad61009ba33c368f0bc1b5a710..1bcb1e5df0293a8185fa12abdd668a55a7fc5bca 100644
--- a/dumux/freeflow/stokes2cni/stokes2cnivolumevariables.hh
+++ b/dumux/freeflow/stokes2cni/stokes2cnivolumevariables.hh
@@ -60,7 +60,7 @@ class Stokes2cniVolumeVariables : public Stokes2cVolumeVariables<TypeTag>
 
 public:
     /*!
-     * \copydoc BoxVolumeVariables::update()
+     * \copydoc ImplicitVolumeVariables::update()
      */
     void update(const PrimaryVariables &priVars,
                 const Problem &problem,
diff --git a/dumux/implicit/1p/1pmodel.hh b/dumux/implicit/1p/1pmodel.hh
index c60097c8cea1ff00bd88ba75df7fcc45f3f19534..1ee183b07094bffcca8e19ad84abb37c5d695e37 100644
--- a/dumux/implicit/1p/1pmodel.hh
+++ b/dumux/implicit/1p/1pmodel.hh
@@ -62,7 +62,7 @@ class OnePBoxModel : public GET_PROP_TYPE(TypeTag, BaseModel)
 
 public:
     /*!
-     * \brief \copybrief Dumux::BoxModel::addOutputVtkFields
+     * \brief \copybrief Dumux::ImplicitModel::addOutputVtkFields
      *
      * Specialization for the OnePBoxModel, adding the pressure and
      * the process rank to the VTK writer.
diff --git a/dumux/implicit/1p/1pvolumevariables.hh b/dumux/implicit/1p/1pvolumevariables.hh
index cb28a58189ea107f66a07921804188f6b39240be..d7d5b16356442987423e321e6e434d1b393bda10 100644
--- a/dumux/implicit/1p/1pvolumevariables.hh
+++ b/dumux/implicit/1p/1pvolumevariables.hh
@@ -81,7 +81,7 @@ public:
     };
 
     /*!
-     * \copydoc BoxModel::completeFluidState
+     * \copydoc ImplicitModel::completeFluidState
      */
     static void completeFluidState(const PrimaryVariables& priVars,
                                    const Problem& problem,
diff --git a/dumux/implicit/1p2c/1p2cmodel.hh b/dumux/implicit/1p2c/1p2cmodel.hh
index 0a52459dcdfa9bc6c557dc8bc6da7ffe4bbfdda0..09c6796e76117ed13f6262b78cfef5a473a96583 100644
--- a/dumux/implicit/1p2c/1p2cmodel.hh
+++ b/dumux/implicit/1p2c/1p2cmodel.hh
@@ -103,7 +103,7 @@ public:
     }
 
     /*!
-     * \brief \copybrief Dumux::BoxModel::addOutputVtkFields
+     * \brief \copybrief ImplicitModel::addOutputVtkFields
      *
      * Specialization for the OnePTwoCBoxModel, adding pressure,
      * mass and mole fractions, and the process rank to the VTK writer.
diff --git a/dumux/implicit/1p2c/1p2cvolumevariables.hh b/dumux/implicit/1p2c/1p2cvolumevariables.hh
index 9b05aff50cab008032f7e035fdb335d6a98dcd22..41500787fc19b694182b41fdab3cc00fe30d87f6 100644
--- a/dumux/implicit/1p2c/1p2cvolumevariables.hh
+++ b/dumux/implicit/1p2c/1p2cvolumevariables.hh
@@ -114,7 +114,7 @@ public:
     }
 
     /*!
-     * \copydoc BoxModel::completeFluidState
+     * \copydoc ImplicitModel::completeFluidState
      */
     static void completeFluidState(const PrimaryVariables& priVars,
                                    const Problem& problem,
diff --git a/dumux/implicit/2p/2pvolumevariables.hh b/dumux/implicit/2p/2pvolumevariables.hh
index 114e430e0dd6670605b44fe9b5a043424c88182a..0f9bd89d181a58f1cb4adb6f49f963e7e0bc0f9b 100644
--- a/dumux/implicit/2p/2pvolumevariables.hh
+++ b/dumux/implicit/2p/2pvolumevariables.hh
@@ -110,7 +110,7 @@ public:
     }
 
     /*!
-     * \copydoc BoxModel::completeFluidState
+     * \copydoc ImplicitModel::completeFluidState
      */
     static void completeFluidState(const PrimaryVariables& priVars,
                                    const Problem& problem,
diff --git a/dumux/implicit/2p2c/2p2cvolumevariables.hh b/dumux/implicit/2p2c/2p2cvolumevariables.hh
index cc1d8bfd661556c405a470f189b599eca5bde395..3785baaadd1662892326b4a506f2bf5839a6f7b6 100644
--- a/dumux/implicit/2p2c/2p2cvolumevariables.hh
+++ b/dumux/implicit/2p2c/2p2cvolumevariables.hh
@@ -170,7 +170,7 @@ public:
     }
 
     /*!
-     * \copydoc BoxModel::completeFluidState
+     * \copydoc ImplicitModel::completeFluidState
      * \param isOldSol Specifies whether this is the previous solution or the current one
      */
     static void completeFluidState(const PrimaryVariables& priVars,
diff --git a/dumux/implicit/cellcentered/ccproperties.hh b/dumux/implicit/cellcentered/ccproperties.hh
index 4243b42272a618443b12160cda5947a3b370778d..b0dae7041117213043acbe93636edba553b73583 100644
--- a/dumux/implicit/cellcentered/ccproperties.hh
+++ b/dumux/implicit/cellcentered/ccproperties.hh
@@ -43,7 +43,7 @@ namespace Properties
 // Type tags
 //////////////////////////////////////////////////////////////////
 
-//! The type tag for models based on the box-scheme
+//! The type tag for models based on the cell-centered scheme
 NEW_TYPE_TAG(CCModel, INHERITS_FROM(ImplicitBase));
 }
 }
diff --git a/dumux/implicit/richards/richardsvolumevariables.hh b/dumux/implicit/richards/richardsvolumevariables.hh
index 13c3c3c50090b896b601c7e56bf95b1ca3e6a143..f0deb7d45894d3003e10ade8c06905bf4abd48eb 100644
--- a/dumux/implicit/richards/richardsvolumevariables.hh
+++ b/dumux/implicit/richards/richardsvolumevariables.hh
@@ -105,7 +105,7 @@ public:
     }
 
     /*!
-     * \copydoc BoxModel::completeFluidState
+     * \copydoc ImplicitModel::completeFluidState
      */
     static void completeFluidState(const PrimaryVariables& priVars,
                                    const Problem& problem,
diff --git a/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh b/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh
index 5d253664e9bb5e2569dc20e689c96f9961a0f627..5105cacd0648abdf0cd1351a659587f265466eec 100644
--- a/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh
@@ -61,7 +61,7 @@ public:
      */
     static Scalar effectiveThermalConductivity(const Scalar Sw,
                                                const Scalar lambdaW,
-                                               const Scalar lamdaN,
+                                               const Scalar lambdaN,
                                                const Scalar lambdaSolid,
                                                const Scalar porosity)
     {