diff --git a/dumux/implicit/2p2cni/2p2cnifluxvariables.hh b/dumux/implicit/2p2cni/2p2cnifluxvariables.hh
index 1ca0b0de0d46d9ef009d611fc87fb74499bba360..48a9d71740cd8eb5bffc40553d471b32edda4c87 100644
--- a/dumux/implicit/2p2cni/2p2cnifluxvariables.hh
+++ b/dumux/implicit/2p2cni/2p2cnifluxvariables.hh
@@ -39,7 +39,7 @@ namespace Dumux
  * \ingroup ImplicitFluxVariables
  * \brief This template class contains data which is required to
  *        calculate the heat fluxes over a face of a finite
- *        volume for the non-isothermal two-phase, two-component model.
+ *        volume for the non-isothermal two-phase two-component model.
  *        The mass fluxes are computed in the parent class.
  *
  * This means temperature gradients and the normal matrix
@@ -74,9 +74,9 @@ public:
      * \param problem The problem
      * \param element The finite element
      * \param fvGeometry The finite-volume geometry in the fully implicit scheme
-     * \param faceIdx The local index of the SCV (sub-control-volume) face
+     * \param faceIdx The local index of the sub-control-volume face
      * \param elemVolVars The volume variables of the current element
-     * \param onBoundary Distinguishes if we are on a SCV face or on a boundary face
+     * \param onBoundary Distinguishes if we are on a sub-control-volume face or on a boundary face
      */
     TwoPTwoCNIFluxVariables(const Problem &problem,
                             const Element &element,
diff --git a/dumux/implicit/2p2cni/2p2cniindices.hh b/dumux/implicit/2p2cni/2p2cniindices.hh
index ec83b91631478ac2c3e29f0059f3c62b610cff28..982e4e1c45cb7c912641be9ddc4c2106d741f7f9 100644
--- a/dumux/implicit/2p2cni/2p2cniindices.hh
+++ b/dumux/implicit/2p2cni/2p2cniindices.hh
@@ -33,7 +33,7 @@ namespace Dumux
 /*!
  * \ingroup TwoPTwoCNIModel
  * \ingroup ImplicitIndices
- * \brief Indices for the non-isothermal 2-phase 2-component model
+ * \brief Indices for the non-isothermal two-phase two-component model
  *
  * \tparam formulation The formulation, either pwsn or pnsw.
  * \tparam PVOffset The first index in a primary variable vector.
diff --git a/dumux/implicit/2p2cni/2p2cnilocalresidual.hh b/dumux/implicit/2p2cni/2p2cnilocalresidual.hh
index 34c2039dd8424bc1264bf6ee2d0e2e0406b1d268..4cc4cb38b980cfc6cf93ba65ac44674ba58f67f9 100644
--- a/dumux/implicit/2p2cni/2p2cnilocalresidual.hh
+++ b/dumux/implicit/2p2cni/2p2cnilocalresidual.hh
@@ -70,14 +70,14 @@ public:
     };
 
     /*!
-     * \brief Evaluate the amount all conservation quantities
+     * \brief Evaluate the amount of all conservation quantities
      *        (e.g. phase mass) within a sub-control volume.
      *
      * The result should be averaged over the volume (e.g. phase mass
      * inside a sub control volume divided by the volume)
      *
      *  \param storage The storage of the conservation quantity (mass or energy) within the sub-control volume
-     *  \param scvIdx The SCV (sub-control-volume) index
+     *  \param scvIdx The sub-control-volume index
      *  \param usePrevSol Evaluate function with solution of current or previous time step
      */
     void computeStorage(PrimaryVariables &storage, const int scvIdx, bool usePrevSol) const
@@ -110,11 +110,11 @@ public:
 
     /*!
      * \brief Evaluates the advective mass flux and the heat flux
-     * over a face of a subcontrol volume and writes the result in
+     * over a face of a sub-control volume and writes the result in
      * the flux vector.
      *
-     * \param flux The advective flux over the SCV (sub-control-volume) face for each component
-     * \param fluxVars The flux variables at the current SCV face
+     * \param flux The advective flux over the sub-control-volume face for each component
+     * \param fluxVars The flux variables at the current sub-control-volume face
      *
      * This method is called by compute flux (base class)
      */
@@ -146,8 +146,8 @@ public:
      * \brief Adds the diffusive heat flux to the flux vector over
      *        the face of a sub-control volume.
      *
-     * \param flux The diffusive flux over the SCV (sub-control-volume) face for each conservation quantity (mass, energy)
-     * \param fluxVars The flux variables at the current SCV face
+     * \param flux The diffusive flux over the sub-control-volume face for each conservation quantity (mass, energy)
+     * \param fluxVars The flux variables at the current sub-control-volume face
      *
      * This method is called by compute flux (base class)
      */
diff --git a/dumux/implicit/2p2cni/2p2cniproperties.hh b/dumux/implicit/2p2cni/2p2cniproperties.hh
index 55030b50184d973a1cfb82f4705023eae1da9861..243e051780d8e0d4a28f369927775404a8ca6dd7 100644
--- a/dumux/implicit/2p2cni/2p2cniproperties.hh
+++ b/dumux/implicit/2p2cni/2p2cniproperties.hh
@@ -22,7 +22,7 @@
  * \ingroup TwoPTwoCNIModel
  * \file
  *
- * \brief Defines the properties required for the non-isothermal two-phase,
+ * \brief Defines the properties required for the non-isothermal two-phase
  * two-component fully implicit model.
  */
 #ifndef DUMUX_2P2CNI_PROPERTIES_HH
diff --git a/dumux/implicit/2p2cni/2p2cnivolumevariables.hh b/dumux/implicit/2p2cni/2p2cnivolumevariables.hh
index 4627c2632483a1797e0c2c780134fb0271192255..d2e2eb344eac67d091f02316a31e294127845763 100644
--- a/dumux/implicit/2p2cni/2p2cnivolumevariables.hh
+++ b/dumux/implicit/2p2cni/2p2cnivolumevariables.hh
@@ -20,7 +20,7 @@
  * \file
  *
  * \brief Contains the quantities which are constant within a
- *        finite volume in the non-isothermal two-phase, two-component
+ *        finite volume in the non-isothermal two-phase two-component
  *        model.
  */
 #ifndef DUMUX_2P2CNI_VOLUME_VARIABLES_HH
@@ -35,7 +35,7 @@ namespace Dumux
  * \ingroup TwoPTwoCNIModel
  * \ingroup ImplicitVolumeVariables
  * \brief Contains the quantities which are are constant within a
- *        finite volume in the non-isothermal two-phase, two-component
+ *        finite volume in the non-isothermal two-phase two-component
  *        model.
  */
 template <class TypeTag>
@@ -121,7 +121,7 @@ protected:
      * \param problem The problem
      * \param element The element
      * \param fvGeometry The current finite volume geometry of the element
-     * \param scvIdx The local index of the SCV (sub-control volume)
+     * \param scvIdx The local index of the sub-control volume
      * \param isOldSol Evaluate function with solution of current or previous time step
      */
     void updateEnergy_(const PrimaryVariables &sol,