diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a2c07e6f7bb8f899aa4bf101cf3497510ff71dd..1dfadefcaade3aaa0500d26ed3512b7443da3b8e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,7 +68,7 @@ An additional new option is `Vtk.CoordPrecision` which changes the precision of
 ### Immediate interface changes not allowing/requiring a deprecation period
 
 - Remove `Grid.HeapSize` as dune-ugrid removed the according feature as well.
-- __Van Genuchten__: Corrected VanGenuchten-Mualem exponent in the non-wetting saturation formula (`1/3` instead of `1/2` (or `l`, see above))
+- __Van Genuchten__: Corrected VanGenuchten-Mualem exponent in the nonwetting saturation formula (`1/3` instead of `1/2` (or `l`, see above))
 - __Van Genuchten__: Corrected VanGenuchten-Mualem implementation of `dkrn/dSw`
 - __Brooks-Corey__: Corrected Brooks-Corey implementation of `dkrn/dSw` and added the derivatives for the regularized version
 - __AMGBackend__: The internal structure of the AMGBackend and the ParallelISTLHelper has been overhauled, as only used by the AMG, we did not make the changes backwards-compatible
@@ -1349,7 +1349,7 @@ Differences Between DuMu<sup>x</sup> 2.2 and DuMu<sup>x</sup> 2.3
     test/decoupled/2p. They work in parallel only if the AMGBackend is used
     as linear solver. No dynamic loadbalancing can be done yet.
 
-  - The MPNC model can use either the most wetting or the most non-wetting phase
+  - The MPNC model can use either the most wetting or the most nonwetting phase
     pressure as primary variable. This is controlled via the property
     "PressureFormulation."
 
diff --git a/doc/handbook/6_basics.tex b/doc/handbook/6_basics.tex
index bfcfe229cf80b24722dadb1b1794ad9961dc2476..9820c770e5dd611dd5fad31cde3e006e0386686e 100644
--- a/doc/handbook/6_basics.tex
+++ b/doc/handbook/6_basics.tex
@@ -10,7 +10,7 @@ Basic definitions and assumptions are given. More information can be found e.g.
 \begin{description}
 \item[Phases:]
 A \emph{phase} is defined as a continuum having distinct properties (e.g. density and viscosity). If phases are miscible, they contain dissolved portions of the substance of the other phase. 
-Fluid and solid phases are distinguished. The fluid phases have different affinities to the solid phases. The phase, which has a higher affinity to the solid phases is referred to as the (more) wetting phase. In the case of two phases, the less wetting one is called the non-wetting phase. 
+Fluid and solid phases are distinguished. The fluid phases have different affinities to the solid phases. The phase, which has a higher affinity to the solid phases is referred to as the (more) wetting phase. In the case of two phases, the less wetting one is called the nonwetting phase. 
 
 For compositional multi-phase models, fluid phases may be composed of several components, while the solid phases are assumed to consist exclusively of a single component. 
 
@@ -257,10 +257,10 @@ for each of the fluid phases.
 This increases the resistance to flow of the phases, which is accounted for by the means of 
 the relative permeability $k_\mathrm{r,\alpha}$, which scales the intrinsic permeability. 
 It is a value between zero and one, depending on the saturation. 
-The relations describing the relative permeabilities of the wetting and non-wetting phase are different 
+The relations describing the relative permeabilities of the wetting and nonwetting phase are different 
 as the wetting phase predominantly occupies small pores and the edges of larger pores while the 
-non-wetting phases occupies large pores.
-The relative permeabilities for the wetting phase $k_\mathrm{r,w}$ and the non-wetting phase are e.g. calculated as (also by \citet{brooks1964hydrau}):
+nonwetting phases occupies large pores.
+The relative permeabilities for the wetting phase $k_\mathrm{r,w}$ and the nonwetting phase are e.g. calculated as (also by \citet{brooks1964hydrau}):
 
 \begin{equation}\label{eq:krw}
 k_\mathrm{r,w} = S_\mathrm{e}^{\frac{2+3\lambda}{\lambda}}
diff --git a/dumux/common/properties.hh b/dumux/common/properties.hh
index 764efe89467ea42141e292863494a8eb3c954dec..bb621833bca72d58f16784e279faae04df419e0b 100644
--- a/dumux/common/properties.hh
+++ b/dumux/common/properties.hh
@@ -181,7 +181,7 @@ struct EnableBoxInterfaceSolver { using type = UndefinedProperty; };
 template<class TypeTag, class MyTypeTag>
 struct Chemistry { using type = UndefinedProperty; };                           //!< The chemistry class with which solves equlibrium reactions
 template<class TypeTag, class MyTypeTag>
-struct SetMoleFractionsForFirstPhase { using type = UndefinedProperty; };       //!< Set the mole fraction in the wetting or non-wetting phase
+struct SetMoleFractionsForFirstPhase { using type = UndefinedProperty; };       //!< Set the mole fraction in the wetting or nonwetting phase
 
 //////////////////////////////////////////////////////////////
 // Additional properties used by the richards model
diff --git a/dumux/io/plotmateriallaw3p.hh b/dumux/io/plotmateriallaw3p.hh
index 7f4082a02e2195e5d5e6fa4981a8d97b162fe087..43c016fee0130dfba20b98453c2d49de8fab9120 100644
--- a/dumux/io/plotmateriallaw3p.hh
+++ b/dumux/io/plotmateriallaw3p.hh
@@ -285,7 +285,7 @@ public:
             }
         }
 
-        gnuplot.setXlabel("non-wetting phase saturation [-]");
+        gnuplot.setXlabel("nonwetting phase saturation [-]");
         gnuplot.setYlabel("transition function [-]");
         gnuplot.addDataSetToPlot(sn, alpha, curveTitle + "_alpha");
     }
diff --git a/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh b/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh
index c74214cbc293b8dd77c99595cbc908ccb8daf880..19cfc930bc2ca985bfe607a918765857c2a91145 100644
--- a/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh
@@ -215,7 +215,7 @@ public:
     }
 
     /*!
-     * \brief The relative permeability for the non-wetting phase of
+     * \brief The relative permeability for the nonwetting phase of
      *        the medium as implied by the Brooks-Corey
      *        parameterization.
      *
@@ -223,7 +223,7 @@ public:
      * \param params A container object that is populated with the appropriate coefficients for the respective law.
      *                  Therefore, in the (problem specific) spatialParameters first, the material law is chosen, and then the params container
      *                  is constructed accordingly. Afterwards the values are set there, too.
-     * \return Relative permeability of the non-wetting phase calculated as implied by Brooks & Corey.
+     * \return Relative permeability of the nonwetting phase calculated as implied by Brooks & Corey.
      *
      * \note Instead of undefined behaviour if pc is not in the valid range, we return a valid number,
      *       by clamping the input.
@@ -242,7 +242,7 @@ public:
 
     /*!
      * \brief The derivative of the relative permeability for the
-     *        non-wetting phase in regard to the wetting saturation of
+     *        nonwetting phase in regard to the wetting saturation of
      *        the medium as implied by the Brooks-Corey
      *        parameterization.
      *
@@ -250,7 +250,7 @@ public:
      * \param params A container object that is populated with the appropriate coefficients for the respective law.
      *                  Therefore, in the (problem specific) spatialParameters first, the material law is chosen,
      *                  and then the params container is constructed accordingly. Afterwards the values are set there, too.
-     * \return Derivative of the relative permeability of the non-wetting phase w.r.t. effective wetting phase
+     * \return Derivative of the relative permeability of the nonwetting phase w.r.t. effective wetting phase
      *                  saturation calculated as implied by Brooks & Corey.
      *
      * \note Instead of undefined behaviour if pc is not in the valid range, we return a valid number,
diff --git a/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh b/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh
index 94502f0024bef42ddd3cd435584a91d4a00e8306..6afd11a0fa45033379384250574a1790fc1d956d 100644
--- a/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh
@@ -178,14 +178,14 @@ public:
     }
 
     /*!
-     * \brief The relative permeability for the non-wetting phase.
+     * \brief The relative permeability for the nonwetting phase.
      *
      * \param sw Absolute saturation of the wetting phase \f$\mathrm{[{S}_w]}\f$. It is converted to effective saturation
      *                  and then handed over to the material law actually used for calculation.
      * \param params A container object that is populated with the appropriate coefficients for the respective law.
      *                  Therefore, in the (problem specific) spatialParameters first, the material law is chosen,
      *                  and then the params container is constructed accordingly. Afterwards the values are set there, too.
-     * \return          Relative permeability of the non-wetting phase calculated as implied by
+     * \return          Relative permeability of the nonwetting phase calculated as implied by
      *                  EffLaw e.g. Brooks & Corey, van Genuchten, linear... .
      */
     static Scalar krn(const Params &params, Scalar sw)
@@ -195,7 +195,7 @@ public:
 
     /*!
      * \brief Returns the partial derivative of the relative permeability
-     *        of the non-wetting phase with respect to the wetting saturation.
+     *        of the nonwetting phase with respect to the wetting saturation.
      *
      * \param sw Absolute saturation of the wetting phase \f$\mathrm{[\overline{S}_w]}\f$.
      * \param params A container object that is populated with the appropriate coefficients
@@ -221,13 +221,13 @@ public:
     }
 
     /*!
-     * \brief Convert an absolute non-wetting saturation to an effective one.
+     * \brief Convert an absolute nonwetting saturation to an effective one.
      *
-     * \param sn Absolute saturation of the non-wetting phase \f$\mathrm{[{S}_n]}\f$.
+     * \param sn Absolute saturation of the nonwetting phase \f$\mathrm{[{S}_n]}\f$.
      * \param params A container object that is populated with the appropriate coefficients for the respective law.
      *                  Therefore, in the (problem specific) spatialParameters first, the material law is chosen,
      *                  and then the params container is constructed accordingly. Afterwards the values are set there, too.
-     * \return Effective saturation of the non-wetting phase.
+     * \return Effective saturation of the nonwetting phase.
      */
     static Scalar snToSne(const Params &params, Scalar sn)
     {
@@ -237,23 +237,23 @@ public:
     /*!
      * \brief Convert an effective wetting saturation to an absolute one.
      *
-     * \param swe Effective saturation of the non-wetting phase \f$\mathrm{[\overline{S}_n]}\f$.
+     * \param swe Effective saturation of the nonwetting phase \f$\mathrm{[\overline{S}_n]}\f$.
      * \param params A container object that is populated with the appropriate coefficients for the respective law.
      *                  Therefore, in the (problem specific) spatialParameters first, the material law is chosen,
      *                  and then the params container is constructed accordingly. Afterwards the values are set there, too.
-     * \return Absolute saturation of the non-wetting phase.
+     * \return Absolute saturation of the nonwetting phase.
      */
     static Scalar sweToSw(const Params &params, Scalar swe)
     { return swe*(1. - params.swr() - params.snr()) + params.swr(); }
 
     /*!
-     * \brief Convert an effective non-wetting saturation to an absolute one.
+     * \brief Convert an effective nonwetting saturation to an absolute one.
      *
-     * \param sne Effective saturation of the non-wetting phase \f$\mathrm{[{S}_n]}\f$.
+     * \param sne Effective saturation of the nonwetting phase \f$\mathrm{[{S}_n]}\f$.
      * \param params A container object that is populated with the appropriate coefficients for the respective law.
      *                  Therefore, in the (problem specific) spatialParameters first, the material law is chosen,
      *                  and then the params container is constructed accordingly. Afterwards the values are set there, too.
-     * \return Absolute saturation of the non-wetting phase.
+     * \return Absolute saturation of the nonwetting phase.
      */
     static Scalar sneToSn(const Params &params, Scalar sne)
     { return sne*(1. - params.swr() - params.snr()) + params.snr(); }
diff --git a/dumux/material/fluidmatrixinteractions/2p/efftoabslawparams.hh b/dumux/material/fluidmatrixinteractions/2p/efftoabslawparams.hh
index 65491da39b2120c51e21b7c6476eb81df3a0257e..bd83efb5462a6673701deccb68e465526600f0fc 100644
--- a/dumux/material/fluidmatrixinteractions/2p/efftoabslawparams.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/efftoabslawparams.hh
@@ -71,13 +71,13 @@ public:
     { swr_ = v; }
 
     /*!
-     * \brief Return the residual non-wetting saturation.
+     * \brief Return the residual nonwetting saturation.
      */
     Scalar snr() const
     { return snr_; }
 
     /*!
-     * \brief Set the residual non-wetting saturation.
+     * \brief Set the residual nonwetting saturation.
      */
     void setSnr(Scalar v)
     { snr_ = v; }
diff --git a/dumux/material/fluidmatrixinteractions/2p/heatpipelaw.hh b/dumux/material/fluidmatrixinteractions/2p/heatpipelaw.hh
index 46506d67e0c93addcbe6faedf4df08613ba9d5b8..b21b2ebe5f4ef1c2f57e2749ef4d1a3e3d3292b2 100644
--- a/dumux/material/fluidmatrixinteractions/2p/heatpipelaw.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/heatpipelaw.hh
@@ -133,7 +133,7 @@ public:
     }
 
     /*!
-     * \brief The relative permeability for the non-wetting phase.
+     * \brief The relative permeability for the nonwetting phase.
      *
      * \param params Array of parameters
      * \param Sw The mobile saturation of the wetting phase.
diff --git a/dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh b/dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh
index e7299fbd195c69501fe1343a6548bdf74e6947bb..b35f3dac9bfad49e45a404b68b959e6f999ac6c5 100644
--- a/dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh
@@ -149,13 +149,13 @@ public:
     }
 
     /*!
-     * \brief The relative permeability for the non-wetting phase.
+     * \brief The relative permeability for the nonwetting phase.
      *
      * \param params A container object that is populated with the appropriate coefficients for the respective law.
      *                  Therefore, in the (problem specific) spatialParameters first, the material law is chosen, and then the params container
      *                  is constructed accordingly. Afterwards the values are set there, too.
      * \param swe Effective saturation of the wetting phase \f$\mathrm{[\overline{S}_w]}\f$ conversion from absolute saturation happened in EffToAbsLaw.
-     * \return Relative permeability of the non-wetting phase calculated as linear relation.
+     * \return Relative permeability of the nonwetting phase calculated as linear relation.
      */
     static Scalar krn(const Params &params, Scalar swe)
     {
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh
index 742bd0ebb91a93617312a3a2b650c0a4889121c8..4857f91b0583354b06a0584e894b01b2a28c4b88 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh
@@ -284,7 +284,7 @@ public:
 
     /*!
      * \brief   Regularized version of the  relative permeability
-     *          for the non-wetting phase of
+     *          for the nonwetting phase of
      *          the medium implied by the Brooks-Corey
      *          parameterization.
      *
@@ -308,7 +308,7 @@ public:
 
     /*!
      * \brief A regularized version of the derivative of the relative permeability
-     *        for the non-wetting phase in regard to the wetting saturation of
+     *        for the nonwetting phase in regard to the wetting saturation of
      *        the medium as implied by the Brooks-Corey parameterization.
      *
      * \copydetails BrooksCorey::dkrn_dswe()
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterial.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterial.hh
index c52dd4474ae85ac039dbe7530bd03427c33763a2..02f81c4a0737037ad4b97ab0f73bb5dfe1804c0c 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterial.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterial.hh
@@ -156,7 +156,7 @@ public:
     }
 
     /*!
-     * \brief The relative permeability for the non-wetting phase.
+     * \brief The relative permeability for the nonwetting phase.
      *
      * \param params A container object that is populated with the appropriate coefficients for the respective law.
      *                  Therefore, in the (problem specific) spatialParameters  first, the material law is chosen, and then the params container
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh
index 133d0d629eda812603ab05fe690a47c3df787845..1973cf212caca473292c7b5599b0255cd31387eb 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh
@@ -377,7 +377,7 @@ public:
 
     /*!
      * \brief   Regularized version of the  relative permeability
-     *          for the non-wetting phase of
+     *          for the nonwetting phase of
      *          the medium implied by the van Genuchten
      *          parameterization.
      *
@@ -392,7 +392,7 @@ public:
     static Scalar krn(const Params &params, Scalar swe)
     {
         // retrieve the low threshold saturation for the unregularized
-        // relative permeability curve of the non-wetting phase from
+        // relative permeability curve of the nonwetting phase from
         // the parameters
         const Scalar swThLow = params.krnLowSw();
 
@@ -413,7 +413,7 @@ public:
 
     /*!
      * \brief A regularized version of the derivative of the relative permeability
-     *        for the non-wetting phase in regard to the wetting saturation of
+     *        for the nonwetting phase in regard to the wetting saturation of
      *        the medium as implied by the van Genuchten parameterization.
      *
      * \copydetails VanGenuchten::dkrw_dswe()
@@ -421,7 +421,7 @@ public:
     static Scalar dkrn_dswe(const Params &params, Scalar swe)
     {
         // retrieve the low threshold saturation for the unregularized
-        // relative permeability curve of the non-wetting phase from
+        // relative permeability curve of the nonwetting phase from
         // the parameters
         const Scalar swThLow = params.krnLowSw();
 
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchtenparams.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchtenparams.hh
index 457182bb24100d049f3755c55b82bed97f34b4a9..452d15825711a3b9e74e119c615b2bc539ec3cf5 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchtenparams.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchtenparams.hh
@@ -118,7 +118,7 @@ public:
 
     /*!
      * \brief Set the threshold saturation below which the relative
-     *        permeability of the non-wetting phase gets regularized.
+     *        permeability of the nonwetting phase gets regularized.
      */
     void setKrnLowSw(Scalar krnLowSw)
     {
@@ -127,7 +127,7 @@ public:
 
     /*!
      * \brief Threshold saturation below which the relative
-     *        permeability of the non-wetting phase gets regularized.
+     *        permeability of the nonwetting phase gets regularized.
      */
     Scalar krnLowSw() const
     {
diff --git a/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/johansen.hh b/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/johansen.hh
index be4be1f51be2486d57579e946c98d6647cabd5cd..24a2b3fb492c1fd813b5681c79e356138e98c0ee 100644
--- a/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/johansen.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/johansen.hh
@@ -67,7 +67,7 @@ public:
      *
      * This formulation is semi-empirical and fitted to quartz sand.
      * This gives an interpolation of the effective thermal conductivities of a porous medium
-     * filled with the non-wetting phase and a porous medium filled with the wetting phase.
+     * filled with the nonwetting phase and a porous medium filled with the wetting phase.
      * These two effective conductivities are computed as geometric mean of the solid and the
      * fluid conductivities and interpolated with the Kersten number.<br>
      * Johansen, O. 1975. Thermal conductivity of soils. Ph.D. diss. Norwegian Univ.
@@ -97,7 +97,7 @@ private:
      *
      * \param Sw The saturation of the wetting phase
      * \param lambdaW The thermal conductivity of the wetting phase in \f$\mathrm{[W/(m K)]}\f$
-     * \param lambdaN The thermal conductivity of the non-wetting phase in \f$\mathrm{[W/(m K)]}\f$
+     * \param lambdaN The thermal conductivity of the nonwetting phase in \f$\mathrm{[W/(m K)]}\f$
      * \param lambdaSolid The thermal conductivity of the solid phase in \f$\mathrm{[W/(m K)]}\f$
      * \param porosity The porosity
      * \param rhoSolid The density of solid phase in \f$\mathrm{[kg/m^3]}\f$
diff --git a/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/simplefluidlumping.hh b/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/simplefluidlumping.hh
index 3580e2a5a3cedfd8d4962b88875973787f7c1735..c0806e5f1adb904d315d90f344109e1b22a3e281 100644
--- a/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/simplefluidlumping.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/simplefluidlumping.hh
@@ -62,7 +62,7 @@ private:
      *
      * \param sw The saturation of the wetting phase
      * \param lambdaW The thermal conductivity of the wetting phase in \f$\mathrm{[W/(m K)]}\f$
-     * \param lambdaN The thermal conductivity of the non-wetting phase in \f$\mathrm{[W/(m K)]}\f$
+     * \param lambdaN The thermal conductivity of the nonwetting phase in \f$\mathrm{[W/(m K)]}\f$
      * \param lambdaSolid The thermal conductivity of the solid phase in \f$\mathrm{[W/(m K)]}\f$
      * \param porosity The porosity
      *
diff --git a/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/somerton.hh b/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/somerton.hh
index 33e0d94a02face78b6f3cf75cc99b079c28e09cd..23cc82fccc0d62aed8d0121b71ab2ec33c4bda2d 100644
--- a/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/somerton.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/somerton.hh
@@ -66,7 +66,7 @@ public:
      * \return effective thermal conductivity \f$\mathrm{[W/(m K)]}\f$ after Somerton (1974) \cite somerton1974 <BR>
      *
      * This gives an interpolation of the effective thermal conductivities of a porous medium
-     * filled with the non-wetting phase and a porous medium filled with the wetting phase.
+     * filled with the nonwetting phase and a porous medium filled with the wetting phase.
      * These two effective conductivities are computed as geometric mean of the solid and the
      * fluid conductivities and interpolated with the square root of the wetting saturation.
      * See f.e. Ebigbo, A.: Thermal Effects of Carbon Dioxide Sequestration in the Subsurface, Diploma thesis \cite ebigbo2005 .
diff --git a/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh b/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh
index 36cddb1501defd3588cfb16ba4df06c6ff6fa95e..0f124f069948b376aaa03923e16d2066fd0f7906 100644
--- a/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh
@@ -226,7 +226,7 @@ public:
     }
 
     /*!
-     * \brief The relative permeability for the non-wetting phase
+     * \brief The relative permeability for the nonwetting phase
      *        of the medium implied by van Genuchten's
      *        parameterization.
      *
@@ -238,7 +238,7 @@ public:
      *
      * \note Instead of undefined behaviour if pc is not in the valid range, we return a valid number,
      *       by clamping the input.
-     * \note See e.g. Dury, Fischer, Schulin (1999) for application of Mualem model to non-wetting rel. perm.
+     * \note See e.g. Dury, Fischer, Schulin (1999) for application of Mualem model to nonwetting rel. perm.
      */
     static Scalar krn(const Params &params, Scalar swe)
     {
@@ -252,7 +252,7 @@ public:
 
     /*!
      * \brief The derivative of the relative permeability for the
-     *        non-wetting phase in regard to the wetting saturation of
+     *        nonwetting phase in regard to the wetting saturation of
      *        the medium as implied by the van Genuchten
      *        parameterization.
      *
diff --git a/dumux/material/fluidmatrixinteractions/3p/efftoabslaw.hh b/dumux/material/fluidmatrixinteractions/3p/efftoabslaw.hh
index d557b36771e659a9bdef2c04516e9b9aa157e20a..cdc4fa6435995c069eed847bcedb9fb32091a568 100644
--- a/dumux/material/fluidmatrixinteractions/3p/efftoabslaw.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/efftoabslaw.hh
@@ -91,7 +91,7 @@ public:
     }
 
     /*!
-     * \brief The capillary pressure-saturation curve the non-wetting and wetting phase
+     * \brief The capillary pressure-saturation curve the nonwetting and wetting phase
      * \param params Array of parameters
      * \param sw wetting phase saturation or sum of wetting phase saturations
      */
@@ -101,7 +101,7 @@ public:
     }
 
     /*!
-     * \brief The capillary pressure-saturation curve for the gas and non-wetting phase
+     * \brief The capillary pressure-saturation curve for the gas and nonwetting phase
      * \param params Array of parameters
      * \param st sum of wetting (liquid) phase saturations
      */
@@ -113,7 +113,7 @@ public:
     /*!
      * \brief This function ensures a continuous transition from 2 to 3 phases and vice versa
      * \param params Array of parameters
-     * \param sn Non-wetting liquid saturation
+     * \param sn Nonwetting liquid saturation
      */
     static Scalar pcAlpha(const Params &params, const Scalar sn)
     {
@@ -183,7 +183,7 @@ public:
      *
      * \param sw Absolute saturation of the wetting phase \f$\mathrm{[\overline{S}_w]}\f$. It is converted to effective saturation
      *                  and then handed over to the material law actually used for calculation.
-     * \param sn Absolute saturation of the non-wetting phase \f$\mathrm{[{S}_n]}\f$. It is converted to effective saturation
+     * \param sn Absolute saturation of the nonwetting phase \f$\mathrm{[{S}_n]}\f$. It is converted to effective saturation
      *                  and then handed over to the material law actually used for calculation.
      * \param params A container object that is populated with the appropriate coefficients for the respective law.
      *                  Therefore, in the (problem specific) spatialParameters  first, the material law is chosen,
@@ -198,16 +198,16 @@ public:
     }
 
     /*!
-     * \brief The relative permeability for the non-wetting phase.
+     * \brief The relative permeability for the nonwetting phase.
      *
      * \param sw Absolute saturation of the wetting phase \f$\mathrm{[{S}_w]}\f$. It is converted to effective saturation
      *                  and then handed over to the material law actually used for calculation.
-     * \param sn Absolute saturation of the non-wetting phase \f$\mathrm{[{S}_n]}\f$. It is converted to effective saturation
+     * \param sn Absolute saturation of the nonwetting phase \f$\mathrm{[{S}_n]}\f$. It is converted to effective saturation
      *                  and then handed over to the material law actually used for calculation.
      * \param params A container object that is populated with the appropriate coefficients for the respective law.
      *                  Therefore, in the (problem specific) spatialParameters  first, the material law is chosen,
      *                  and then the params container is constructed accordingly. Afterwards the values are set there, too.
-     * \return          Relative permeability of the non-wetting phase calculated as implied by
+     * \return          Relative permeability of the nonwetting phase calculated as implied by
      *                  EffLaw e.g. Brooks & Corey, van Genuchten, linear... .
      */
     static Scalar krn(const Params &params, const Scalar sw, const Scalar sn)
@@ -221,12 +221,12 @@ public:
      *
      * \param sw Absolute saturation of the wetting phase \f$\mathrm{[{S}_w]}\f$. It is converted to effective saturation
      *                  and then handed over to the material law actually used for calculation.
-     * \param sn Absolute saturation of the non-wetting phase \f$\mathrm{[{S}_n]}\f$. It is converted to effective saturation
+     * \param sn Absolute saturation of the nonwetting phase \f$\mathrm{[{S}_n]}\f$. It is converted to effective saturation
      *                  and then handed over to the material law actually used for calculation.
      * \param params A container object that is populated with the appropriate coefficients for the respective law.
      *                  Therefore, in the (problem specific) spatialParameters  first, the material law is chosen,
      *                  and then the params container is constructed accordingly. Afterwards the values are set there, too.
-     * \return          Relative permeability of the non-wetting phase calculated as implied by
+     * \return          Relative permeability of the nonwetting phase calculated as implied by
      *                  EffLaw e.g. Brooks & Corey, van Genuchten, linear... .
      */
     static Scalar krg(const Params &params, const Scalar sw, const Scalar sn)
@@ -239,7 +239,7 @@ public:
      * \brief The relative permeability for a phase.
      * \param sw Wetting liquid saturation
      * \param sg Gas saturation
-     * \param sn Non-wetting liquid saturation
+     * \param sn Nonwetting liquid saturation
      * \param params Array of parameters.
      * \param phaseIdx indicator, The saturation of all phases.
      */
@@ -273,13 +273,13 @@ public:
     }
 
     /*!
-     * \brief Convert an absolute non-wetting saturation to an effective one.
+     * \brief Convert an absolute nonwetting saturation to an effective one.
      *
-     * \param sn Absolute saturation of the non-wetting phase \f$\mathrm{[{S}_n]}\f$.
+     * \param sn Absolute saturation of the nonwetting phase \f$\mathrm{[{S}_n]}\f$.
      * \param params A container object that is populated with the appropriate coefficients for the respective law.
      *                  Therefore, in the (problem specific) spatialParameters first, the material law is chosen,
      *                  and then the params container is constructed accordingly. Afterwards the values are set there, too.
-     * \return Effective saturation of the non-wetting phase.
+     * \return Effective saturation of the nonwetting phase.
      */
     static Scalar snToSne(const Params &params, const Scalar sn)
     {
@@ -293,7 +293,7 @@ public:
      * \param params A container object that is populated with the appropriate coefficients for the respective law.
      *                  Therefore, in the (problem specific) spatialParameters first, the material law is chosen,
      *                  and then the params container is constructed accordingly. Afterwards the values are set there, too.
-     * \return Effective saturation of the non-wetting phase.
+     * \return Effective saturation of the nonwetting phase.
      */
     static Scalar stToSte(const Params &params, const Scalar st)
     {
@@ -307,7 +307,7 @@ public:
      * \param params A container object that is populated with the appropriate coefficients for the respective law.
      *                  Therefore, in the (problem specific) spatialParameters first, the material law is chosen,
      *                  and then the params container is constructed accordingly. Afterwards the values are set there, too.
-     * \return Effective saturation of the non-wetting phase.
+     * \return Effective saturation of the nonwetting phase.
      */
     static Scalar sgToSge(const Params &params, Scalar sg)
     {
@@ -318,11 +318,11 @@ public:
     /*!
      * \brief Convert an effective wetting saturation to an absolute one.
      *
-     * \param swe Effective saturation of the non-wetting phase \f$\mathrm{[\overline{S}_n]}\f$.
+     * \param swe Effective saturation of the nonwetting phase \f$\mathrm{[\overline{S}_n]}\f$.
      * \param params A container object that is populated with the appropriate coefficients for the respective law.
      *                  Therefore, in the (problem specific) spatialParameters first, the material law is chosen,
      *                  and then the params container is constructed accordingly. Afterwards the values are set there, too.
-     * \return Absolute saturation of the non-wetting phase.
+     * \return Absolute saturation of the nonwetting phase.
      */
     static Scalar sweToSw_(const Params &params, Scalar swe)
     {
diff --git a/dumux/material/fluidmatrixinteractions/3p/efftoabslawparams.hh b/dumux/material/fluidmatrixinteractions/3p/efftoabslawparams.hh
index 2f463a526be2fd604a97e496739e4ec0ee835897..4fd831ccbdabaffd8517b068561f4f7ea6672607 100644
--- a/dumux/material/fluidmatrixinteractions/3p/efftoabslawparams.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/efftoabslawparams.hh
@@ -58,13 +58,13 @@ public:
     { EffLawParams::setSwr(v); }
 
     /*!
-     * \brief Return the residual non-wetting saturation.
+     * \brief Return the residual nonwetting saturation.
      */
     Scalar snr() const
     { return EffLawParams::snr(); }
 
     /*!
-     * \brief Set the residual non-wetting saturation.
+     * \brief Set the residual nonwetting saturation.
      */
     void setSnr(Scalar v)
     { EffLawParams::setSnr(v); }
diff --git a/dumux/material/fluidmatrixinteractions/3p/parkervangen3p.hh b/dumux/material/fluidmatrixinteractions/3p/parkervangen3p.hh
index 436269fb095f4cbf360b6ee5b9592e7e15d8e9ed..1f7da166996089671177ca7011576f52d3da685b 100644
--- a/dumux/material/fluidmatrixinteractions/3p/parkervangen3p.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/parkervangen3p.hh
@@ -80,9 +80,9 @@ public:
     }
 
     /*!
-     * \brief The capillary pressure-saturation curve for the gas and non-wetting phase
+     * \brief The capillary pressure-saturation curve for the gas and nonwetting phase
      * \param params Array of parameters
-     * \param ste Effective total liquid (wetting + non-wetting) saturation
+     * \param ste Effective total liquid (wetting + nonwetting) saturation
      */
     static Scalar pcgn(const Params &params, const Scalar ste)
     {
@@ -93,7 +93,7 @@ public:
     /*!
      * \brief This function ensures a continuous transition from 2 to 3 phases and vice versa
      * \param params Array of parameters
-     * \param sne Non-wetting liquid saturation
+     * \param sne Nonwetting liquid saturation
      */
     static Scalar pcAlpha(const Params &params, Scalar sne)
     {
@@ -211,7 +211,7 @@ public:
     }
 
     /*!
-     * \brief The relative permeability for the non-wetting phase
+     * \brief The relative permeability for the nonwetting phase
      *        after the Model of Parker et al. (1987).
      *
      * See model 7 in "Comparison of the Three-Phase Oil Relative Permeability Models"
@@ -224,8 +224,8 @@ public:
      *
      * \param params Array of parameters.
      * \param swe Effective wetting phase saturation
-     * \param sn Absolute non-wetting liquid saturation
-     * \param ste Effective total liquid (wetting + non-wetting) saturation
+     * \param sn Absolute nonwetting liquid saturation
+     * \param ste Effective total liquid (wetting + nonwetting) saturation
      */
     static Scalar krn(const Params &params, const Scalar swe, const Scalar sn, const Scalar ste)
     {
@@ -250,7 +250,7 @@ public:
     }
 
     /*!
-     * \brief The relative permeability for the non-wetting phase
+     * \brief The relative permeability for the nonwetting phase
      *        of the medium implied by van Genuchten's
      *        parameterization.
      *
@@ -259,7 +259,7 @@ public:
      * MOJDEH  DELSHAD and GARY A. POPE, Transport in Porous Media 4 (1989), 59-83.) \cite delshad1989 <BR>
      *
      * \param params Array of parameters.
-     * \param ste Effective total liquid (wetting + non-wetting) saturation
+     * \param ste Effective total liquid (wetting + nonwetting) saturation
      */
     static Scalar krg(const Params &params, const Scalar ste)
     {
@@ -297,8 +297,8 @@ public:
      * \param params Array of parameters.
      * \param phaseIdx Indicator, The saturation of all phases.
      * \param swe Effective wetting phase saturation
-     * \param sn Absolute non-wetting liquid saturation
-     * \param ste Effective total liquid (wetting + non-wetting) saturation
+     * \param sn Absolute nonwetting liquid saturation
+     * \param ste Effective total liquid (wetting + nonwetting) saturation
      */
     static Scalar kr(const Params &params, const int phaseIdx, const Scalar swe, const Scalar sn, const Scalar ste)
     {
diff --git a/dumux/material/fluidmatrixinteractions/3p/parkervangen3pparams.hh b/dumux/material/fluidmatrixinteractions/3p/parkervangen3pparams.hh
index ca6b9271ca923877354cd9e1ebe9ac5a4927cad2..7e407ed4da60bb24a56783f24424a99377de7a71 100644
--- a/dumux/material/fluidmatrixinteractions/3p/parkervangen3pparams.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/parkervangen3pparams.hh
@@ -155,14 +155,14 @@ public:
     { swr_ = input; }
 
     /*!
-     * \brief Return the residual non-wetting saturation.
+     * \brief Return the residual nonwetting saturation.
      */
     Scalar snr() const
     { return snr_; }
 
     /*!
-     * \brief Set the residual non-wetting saturation.
-     * \param input Set the resiudal non-wetting saturation
+     * \brief Set the residual nonwetting saturation.
+     * \param input Set the resiudal nonwetting saturation
      */
     void setSnr(Scalar input)
     { snr_ = input; }
diff --git a/dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh b/dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh
index dfdef7a82400f9fc53886b2d5b47230dd88bee2e..231218d4d71cd27ec0705a99e02f69e8cd028981 100644
--- a/dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh
@@ -194,9 +194,9 @@ public:
     }
 
     /*!
-     * \brief The capillary pressure-saturation curve for the gas and non-wetting phase
+     * \brief The capillary pressure-saturation curve for the gas and nonwetting phase
      * \param params Array of parameters
-     * \param ste Effective total liquid (wetting + non-wetting) saturation
+     * \param ste Effective total liquid (wetting + nonwetting) saturation
      */
     static Scalar pcgn(const Params &params, Scalar ste)
     {
@@ -251,7 +251,7 @@ public:
     /*!
      * \brief This function ensures a continuous transition from 2 to 3 phases and vice versa
      * \param params Array of parameters
-     * \param sne Effective non-wetting liquid saturation
+     * \param sne Effective nonwetting liquid saturation
      */
     static Scalar pcAlpha(const Params &params, Scalar sne)
     {
@@ -314,7 +314,7 @@ public:
     }
 
     /*!
-     * \brief The relative permeability for the non-wetting phase
+     * \brief The relative permeability for the nonwetting phase
      *        after the Model of Parker et al. (1987).
      *
      * See model 7 in "Comparison of the Three-Phase Oil Relative Permeability Models"
@@ -326,8 +326,8 @@ public:
      *
      * \param params Array of parameters.
      * \param swe Effective wetting phase saturation
-     * \param sn Absolute non-wetting liquid saturation
-     * \param ste Effective total liquid (wetting + non-wetting) saturation
+     * \param sn Absolute nonwetting liquid saturation
+     * \param ste Effective total liquid (wetting + nonwetting) saturation
      */
     static Scalar krn(const Params &params, Scalar swe, Scalar sn, Scalar ste)
     {
@@ -344,7 +344,7 @@ public:
 
 
     /*!
-     * \brief The relative permeability for the non-wetting phase
+     * \brief The relative permeability for the nonwetting phase
      *        of the medium implied by van Genuchten's
      *        parameterization.
      *
@@ -353,7 +353,7 @@ public:
      * MOJDEH  DELSHAD and GARY A. POPE, Transport in Porous Media 4 (1989), 59-83.)
      *
      * \param params Array of parameters.
-     * \param ste Effective total liquid (wetting + non-wetting) saturation
+     * \param ste Effective total liquid (wetting + nonwetting) saturation
      */
     static Scalar krg(const Params &params, const Scalar ste)
     {
@@ -394,8 +394,8 @@ public:
      * \param params Array of parameters.
      * \param phaseIdx Indicator, The saturation of all phases.
      * \param swe Effective wetting phase saturation
-     * \param sn Absolute non-wetting liquid saturation
-     * \param ste Effective total liquid (wetting + non-wetting) saturation
+     * \param sn Absolute nonwetting liquid saturation
+     * \param ste Effective total liquid (wetting + nonwetting) saturation
      */
     static Scalar kr(const Params &params, const int phaseIdx, const Scalar swe, const Scalar sn, const Scalar ste)
     {
diff --git a/dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh b/dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh
index 5c54f492144ac900e93c8b8a7ae091af28211a0e..98057277832fab097d729182f4fc5bf78ba62dc7 100644
--- a/dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh
@@ -96,7 +96,7 @@ public:
      * \brief effective thermal conductivity \f$\mathrm{[W/(m K)]}\f$ after Somerton (1974)
      *
      * \param sw The saturation of the wetting phase
-     * \param sn The saturation of the non-wetting phase
+     * \param sn The saturation of the nonwetting phase
      * \param lambdaW The thermal conductivity of the water phase in \f$\mathrm{[W/(m K)]}\f$
      * \param lambdaN The thermal conductivity of the NAPL phase in \f$\mathrm{[W/(m K)]}\f$
      * \param lambdaG The thermal conductivity of the gas phase in \f$\mathrm{[W/(m K)]}\f$
diff --git a/dumux/material/fluidmatrixinteractions/mp/mpadapter.hh b/dumux/material/fluidmatrixinteractions/mp/mpadapter.hh
index c8bb59cf39a6af8d45e9e27e8ec9f3388efde3c7..7176f552b32313068ecee6496c82132d064561e0 100644
--- a/dumux/material/fluidmatrixinteractions/mp/mpadapter.hh
+++ b/dumux/material/fluidmatrixinteractions/mp/mpadapter.hh
@@ -63,7 +63,7 @@ public:
     {
         assert(values.size() == 2);
         const int nPhaseIdx = 1 - wPhaseIdx;
-        // non-wetting phase gets the capillary pressure added
+        // nonwetting phase gets the capillary pressure added
         values[nPhaseIdx] = 0;
         // wetting phase does not get anything added
         values[wPhaseIdx] = - MaterialLaw::pc(params, state.saturation(wPhaseIdx));
diff --git a/dumux/material/fluidstates/pseudo1p2c.hh b/dumux/material/fluidstates/pseudo1p2c.hh
index d9e0199a04a7cae5791c88268c58633eed1d48fa..9eb91bd5a9e73d858e348dd4b72e1a139bdfb626 100644
--- a/dumux/material/fluidstates/pseudo1p2c.hh
+++ b/dumux/material/fluidstates/pseudo1p2c.hh
@@ -130,7 +130,7 @@ public:
      * \brief Returns the molar fraction \f$x^\kappa_\alpha\f$ of the component \f$\kappa\f$ in fluid phase \f$\alpha\f$ in \f$\mathrm{[-]}\f$.
      *
      * This is either set to 1 or 0 depending on the phase presence for the
-     * non-wetting phase in general.
+     * nonwetting phase in general.
      * It is set to the mole fraction of water or 1-moleFractionWater
      * if the considered component is the main component of the wetting phase.
      * \param phaseIdx the index of the phase
diff --git a/dumux/material/fluidsystems/3pimmiscible.hh b/dumux/material/fluidsystems/3pimmiscible.hh
index b7285ac81d05eef634ce97ee09066b86c22e31c7..5976f5e67cdc5ed32367226c82b9137d961ce103 100644
--- a/dumux/material/fluidsystems/3pimmiscible.hh
+++ b/dumux/material/fluidsystems/3pimmiscible.hh
@@ -46,7 +46,7 @@ namespace FluidSystems {
  *
  * The fluid phases are completely specified by means of their
  * constituting components.
- * The wetting and the non-wetting phase can be defined individually
+ * The wetting and the nonwetting phase can be defined individually
  * via FluidSystem::OnePLiquid<Scalar, Component>. The gas phase can be defined via
  * FluidSystems::OnePGas<Scalar, Component>
  * These phases consist of one pure component.
@@ -79,7 +79,7 @@ public:
 
     //! Index of the wetting phase
     static constexpr int wPhaseIdx = 0;
-    //! Index of the non-wetting phase
+    //! Index of the nonwetting phase
     static constexpr int nPhaseIdx = 1;
     //! Index of the gas phase
     static constexpr int gPhaseIdx = 2;
@@ -193,7 +193,7 @@ public:
 
     //! Index of the wetting phase's component
     static constexpr int wCompIdx = 0;
-    //! Index of the non-wetting phase's component
+    //! Index of the nonwetting phase's component
     static constexpr int nCompIdx = 1;
     //! Index of the gas phase's component
     static constexpr int gCompIdx = 2; // TODO: correct??
@@ -328,7 +328,7 @@ public:
 
         if (NonwettingFluid::Component::isTabulated)
         {
-            std::cout << "Initializing tables for the non-wetting fluid properties ("
+            std::cout << "Initializing tables for the nonwetting fluid properties ("
                       << nTemp*nPress
                       << " entries).\n";
 
diff --git a/dumux/porousmediumflow/1pnc/indices.hh b/dumux/porousmediumflow/1pnc/indices.hh
index fef7226a5b0545b3bc068edb84db5ab43c99f731..280f5e6b812ad8d30d42afb2d256b7d9d039f78e 100644
--- a/dumux/porousmediumflow/1pnc/indices.hh
+++ b/dumux/porousmediumflow/1pnc/indices.hh
@@ -38,7 +38,7 @@ struct OnePNCIndices
 {
     //! Reference index for mass conservation equation.
     static constexpr int conti0EqIdx = 0;
-    //! Index for wetting/non-wetting phase pressure (depending on formulation) in a solution vector
+    //! Index for wetting/nonwetting phase pressure (depending on formulation) in a solution vector
     static constexpr int pressureIdx = 0;
 };
 
diff --git a/dumux/porousmediumflow/2p/incompressiblelocalresidual.hh b/dumux/porousmediumflow/2p/incompressiblelocalresidual.hh
index 9475f5c797dd4e38e037364b9e9ae660668a986c..5cd473eaf8bd5c6a6b9d924208d00932be7e3191 100644
--- a/dumux/porousmediumflow/2p/incompressiblelocalresidual.hh
+++ b/dumux/porousmediumflow/2p/incompressiblelocalresidual.hh
@@ -76,9 +76,9 @@ public:
     using ParentType::ParentType;
 
     /*!
-     * \brief Adds storage derivatives for wetting and non-wetting phase
+     * \brief Adds storage derivatives for wetting and nonwetting phase
      *
-     * Compute storage derivatives for the wetting and the non-wetting phase with respect to \f$p_w\f$
+     * Compute storage derivatives for the wetting and the nonwetting phase with respect to \f$p_w\f$
      * and \f$S_n\f$.
      *
      * \param partialDerivatives The partial derivatives
@@ -114,7 +114,7 @@ public:
     }
 
     /*!
-     * \brief Adds source derivatives for wetting and non-wetting phase.
+     * \brief Adds source derivatives for wetting and nonwetting phase.
      *
      * \param partialDerivatives The partial derivatives
      * \param problem The problem
@@ -133,9 +133,9 @@ public:
     { /* TODO maybe forward to problem for the user to implement the source derivatives?*/ }
 
     /*!
-     * \brief Adds flux derivatives for wetting and non-wetting phase for cell-centered FVM using TPFA
+     * \brief Adds flux derivatives for wetting and nonwetting phase for cell-centered FVM using TPFA
      *
-     * Compute derivatives for the wetting and the non-wetting phase flux with respect to \f$p_w\f$
+     * Compute derivatives for the wetting and the nonwetting phase flux with respect to \f$p_w\f$
      * and \f$S_n\f$.
      *
      * \param derivativeMatrices The partial derivatives
@@ -238,23 +238,23 @@ public:
         dI_dI[conti0EqIdx+0][saturationIdx] += rho_mu_flux_w*dKrw_dSn_inside*insideWeight_w;
         dI_dJ[conti0EqIdx+0][saturationIdx] += rho_mu_flux_w*dKrw_dSn_outside*outsideWeight_w;
 
-        // partial derivative of the non-wetting phase flux w.r.t. p_w
+        // partial derivative of the nonwetting phase flux w.r.t. p_w
         dI_dI[conti0EqIdx+1][pressureIdx] += tij_up_n;
         dI_dJ[conti0EqIdx+1][pressureIdx] -= tij_up_n;
 
-        // partial derivative of the non-wetting phase flux w.r.t. S_n (relative permeability derivative contribution)
+        // partial derivative of the nonwetting phase flux w.r.t. S_n (relative permeability derivative contribution)
         dI_dI[conti0EqIdx+1][saturationIdx] += rho_mu_flux_n*dKrn_dSn_inside*insideWeight_n;
         dI_dJ[conti0EqIdx+1][saturationIdx] += rho_mu_flux_n*dKrn_dSn_outside*outsideWeight_n;
 
-        // partial derivative of the non-wetting phase flux w.r.t. S_n (capillary pressure derivative contribution)
+        // partial derivative of the nonwetting phase flux w.r.t. S_n (capillary pressure derivative contribution)
         dI_dI[conti0EqIdx+1][saturationIdx] += tij_up_n*dpc_dSn_inside;
         dI_dJ[conti0EqIdx+1][saturationIdx] -= tij_up_n*dpc_dSn_outside;
     }
 
     /*!
-     * \brief Adds flux derivatives for wetting and non-wetting phase for box method
+     * \brief Adds flux derivatives for wetting and nonwetting phase for box method
      *
-     * Compute derivatives for the wetting and the non-wetting phase flux with respect to \f$p_w\f$
+     * Compute derivatives for the wetting and the nonwetting phase flux with respect to \f$p_w\f$
      * and \f$S_n\f$.
      *
      * \param A The Jacobian Matrix
@@ -355,7 +355,7 @@ public:
             dI_dJ_inside[globalJ][conti0EqIdx+0][pressureIdx] += tj_up_w;
             dI_dJ_outside[globalJ][conti0EqIdx+0][pressureIdx] -= tj_up_w;
 
-            // partial derivative of the non-wetting phase flux w.r.t. p_w
+            // partial derivative of the nonwetting phase flux w.r.t. p_w
             const auto tj_up_n = tj*up_n;
             dI_dJ_inside[globalJ][conti0EqIdx+1][pressureIdx] += tj_up_n;
             dI_dJ_outside[globalJ][conti0EqIdx+1][pressureIdx] -= tj_up_n;
@@ -371,13 +371,13 @@ public:
                 dI_dJ_inside[globalJ][conti0EqIdx+0][saturationIdx] += dFluxW_dSnJ;
                 dI_dJ_outside[globalJ][conti0EqIdx+0][saturationIdx] -= dFluxW_dSnJ;
 
-                // partial derivative of the non-wetting phase flux w.r.t. S_n (k_rn contribution)
+                // partial derivative of the nonwetting phase flux w.r.t. S_n (k_rn contribution)
                 const auto dKrn_dSn_inside = -1.0*MaterialLaw::dkrn_dsw(insideMaterialParams, insideSw);
                 const auto dFluxN_dSnJ_krn = rho_mu_flux_n*dKrn_dSn_inside*insideWeight_n;
                 dI_dJ_inside[globalJ][conti0EqIdx+1][saturationIdx] += dFluxN_dSnJ_krn;
                 dI_dJ_outside[globalJ][conti0EqIdx+1][saturationIdx] -= dFluxN_dSnJ_krn;
 
-                // partial derivative of the non-wetting phase flux w.r.t. S_n (p_c contribution)
+                // partial derivative of the nonwetting phase flux w.r.t. S_n (p_c contribution)
                 const auto dFluxN_dSnJ_pc = -1.0*tj_up_n*MaterialLaw::dpc_dsw(insideMaterialParams, insideSw);
                 dI_dJ_inside[globalJ][conti0EqIdx+1][saturationIdx] += dFluxN_dSnJ_pc;
                 dI_dJ_outside[globalJ][conti0EqIdx+1][saturationIdx] -= dFluxN_dSnJ_pc;
@@ -412,9 +412,9 @@ public:
     }
 
     /*!
-     * \brief Adds cell-centered Dirichlet flux derivatives for wetting and non-wetting phase
+     * \brief Adds cell-centered Dirichlet flux derivatives for wetting and nonwetting phase
      *
-     * Compute derivatives for the wetting and the non-wetting phase flux with respect to \f$p_w\f$
+     * Compute derivatives for the wetting and the nonwetting phase flux with respect to \f$p_w\f$
      * and \f$S_n\f$.
      *
      * \param derivativeMatrices The matrices containing the derivatives
@@ -482,19 +482,19 @@ public:
         // partial derivative of the wetting phase flux w.r.t. S_n
         dI_dI[conti0EqIdx+0][saturationIdx] += rhow_muw*flux_w*dKrw_dSn_inside*insideWeight_w;
 
-        // partial derivative of the non-wetting phase flux w.r.t. p_w
+        // partial derivative of the nonwetting phase flux w.r.t. p_w
         const auto up_n = rhonKrn_mun_inside*insideWeight_n + rhonKrn_mun_outside*outsideWeight_n;
         dI_dI[conti0EqIdx+1][pressureIdx] += tij*up_n;
 
-        // partial derivative of the non-wetting phase flux w.r.t. S_n (relative permeability derivative contribution)
+        // partial derivative of the nonwetting phase flux w.r.t. S_n (relative permeability derivative contribution)
         dI_dI[conti0EqIdx+1][saturationIdx] += rhon_mun*flux_n*dKrn_dSn_inside*insideWeight_n;
 
-        // partial derivative of the non-wetting phase flux w.r.t. S_n (capillary pressure derivative contribution)
+        // partial derivative of the nonwetting phase flux w.r.t. S_n (capillary pressure derivative contribution)
         dI_dI[conti0EqIdx+1][saturationIdx] += tij*dpc_dSn_inside*up_n;
     }
 
     /*!
-     * \brief Adds Robin flux derivatives for wetting and non-wetting phase
+     * \brief Adds Robin flux derivatives for wetting and nonwetting phase
      *
      * \param derivativeMatrices The matrices containing the derivatives
      * \param problem The problem
diff --git a/dumux/porousmediumflow/2p/model.hh b/dumux/porousmediumflow/2p/model.hh
index 998a20ad33c04be53eb55834db5a42ffcda23fa1..da5b73bd5c1c7d9e49d9c74eb67397693e53e943 100644
--- a/dumux/porousmediumflow/2p/model.hh
+++ b/dumux/porousmediumflow/2p/model.hh
@@ -110,7 +110,7 @@ struct TwoPModelTraits
  * \tparam PT The type used for permeabilities
  * \tparam MT The model traits
  * \tparam SR The class used for reconstruction of
- *            non-wetting phase saturations in scvs
+ *            nonwetting phase saturations in scvs
  */
 template<class PV, class FSY, class FST, class SSY, class SST, class PT, class MT, class SR>
 struct TwoPVolumeVariablesTraits
@@ -182,7 +182,7 @@ private:
 
     static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
-    // class used for scv-wise reconstruction of non-wetting phase saturations
+    // class used for scv-wise reconstruction of nonwetting phase saturations
     using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
 
     using Traits = TwoPVolumeVariablesTraits<PV, FSY, FST, SSY, SST, PT, MT, SR>;
@@ -223,7 +223,7 @@ private:
     using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
     static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
-    // class used for scv-wise reconstruction of non-wetting phase saturations
+    // class used for scv-wise reconstruction of nonwetting phase saturations
     using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
     using BaseTraits = TwoPVolumeVariablesTraits<PV, FSY, FST, SSY, SST, PT, MT, SR>;
 
diff --git a/dumux/porousmediumflow/2p/saturationreconstruction.hh b/dumux/porousmediumflow/2p/saturationreconstruction.hh
index 7398f0d6ce6d6c0bcac357047219825085b1ea2b..ef2b49216b8910920fc42998a8cf9aad6c75d017 100644
--- a/dumux/porousmediumflow/2p/saturationreconstruction.hh
+++ b/dumux/porousmediumflow/2p/saturationreconstruction.hh
@@ -31,11 +31,11 @@ namespace Dumux {
 
 /*!
  * \ingroup TwoPModel
- * \brief Class that computes the non-wetting saturation in an scv from the saturation
+ * \brief Class that computes the nonwetting saturation in an scv from the saturation
  *        at the global degree of freedom.
  *
  * This is only necessary in conjunction with the box scheme where the degrees of
- * freedom lie on material interfaces. There the non-wetting phase saturation is
+ * freedom lie on material interfaces. There the nonwetting phase saturation is
  * generally discontinuous.
  */
 template<DiscretizationMethod M, bool enableReconstruction>
@@ -43,7 +43,7 @@ class TwoPScvSaturationReconstruction
 {
 public:
     /*!
-     * \brief Compute the non-wetting phase saturation in an scv
+     * \brief Compute the nonwetting phase saturation in an scv
      *
      * \note In the default case, we don't reconstruct anything. We do
      *       Reconstruction is only done when using the box method
@@ -53,7 +53,7 @@ public:
      * \param element The finite element the scv is embedded in
      * \param scv The sub-control volume for which the saturation is computed
      * \param elemSol The solution at all dofs inside this element
-     * \param Sn The non-wetting phase saturation at the global dof
+     * \param Sn The nonwetting phase saturation at the global dof
      */
     template<class SpatialParams, class Element, class Scv, class ElemSol>
     static typename ElemSol::PrimaryVariables::value_type
@@ -71,13 +71,13 @@ class TwoPScvSaturationReconstruction<DiscretizationMethod::box, /*enableReconst
 {
 public:
     /*!
-     * \brief Compute the non-wetting phase saturation in an scv
+     * \brief Compute the nonwetting phase saturation in an scv
      *
      * \param spatialParams Class encapsulating the spatial parameters
      * \param element The finite element the scv is embedded in
      * \param scv The sub-control volume for which the saturation is computed
      * \param elemSol The solution at all dofs inside this element
-     * \param Sn The non-wetting phase saturation at the global dof
+     * \param Sn The nonwetting phase saturation at the global dof
      */
     template<class SpatialParams, class Element, class Scv, class ElemSol>
     static typename ElemSol::PrimaryVariables::value_type
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressure.hh b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressure.hh
index 22184122b734b41bdfe7005074d6c57ce2ab24de..b3c867d583c0c7d89d84a99be1e052885c4360fc 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressure.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressure.hh
@@ -59,7 +59,7 @@ namespace Dumux {
    p_c - \sum f_\alpha \varrho_\alpha {\textbf g}\right)\right] = q,
  \f]
  *
- * for the non-wetting (\f$ n \f$) phase pressure as primary variable it yields
+ * for the nonwetting (\f$ n \f$) phase pressure as primary variable it yields
  \f[
   - \text{div}\,  \left[\lambda \boldsymbol K  \left(\textbf{grad}\, p_n - f_w \textbf{grad}\,
     p_c - \sum f_\alpha \varrho_\alpha {\textbf g}\right)\right] = q,
@@ -90,7 +90,7 @@ namespace Dumux {
  * \left[\lambda \boldsymbol{K} \left(\textbf{grad}\, p_w + f_n \, \textbf{grad}\, p_c - \sum f_\alpha \varrho_\alpha
  * {\textbf g}\right)\right] = q,
  * \f]
- * and for a non-wetting (\f$ n \f$) phase pressure as primary variable as
+ * and for a nonwetting (\f$ n \f$) phase pressure as primary variable as
  *  \f[
  *  \phi \left( \varrho_w  \frac{\partial S_w}{\partial t} + \varrho_n \frac{\partial S_n}{\partial t}\right) - \text{div}\,
  * \left[\lambda \boldsymbol{K}  \left(\textbf{grad}\, p_n - f_w \textbf{grad}\, p_c - \sum f_\alpha \varrho_\alpha
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocity.hh
index 0ed893cc8c178def711faffecff318f1bb6a30a6..7bd5b3f8a91f16168cdb849d798b47d1e6d6e00b 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocity.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocity.hh
@@ -35,7 +35,7 @@ namespace Dumux {
  * \brief Determines the velocity from a finite volume solution of the  pressure equation of a sequential model (IMPES).
  *
  * Calculates phase velocities or total velocity from a known pressure field applying a finite volume discretization.
- * The wetting or the non-wetting phase pressure, or the global pressure has to be given as piecewise constant cell values.
+ * The wetting or the nonwetting phase pressure, or the global pressure has to be given as piecewise constant cell values.
  * The phase velocities are calculated following  Darcy's law as
  \f[
  v_\alpha = - \frac{k_{r\alpha}}{\mu_\alpha} \textbf{K}
@@ -46,7 +46,7 @@ namespace Dumux {
  * \f$ \varrho_\alpha \f$ the phase density and \f$ {\textbf g} \f$ the gravitational acceleration vector.
  * The total velocity is either calculated as sum of the phase velocities
  * \f[
- * \boldsymbol v_{total} = \boldsymbol v_{wetting}+\boldsymbol v_{non-wetting},
+ * \boldsymbol v_{total} = \boldsymbol v_{wetting}+\boldsymbol v_{nonwetting},
  * \f]
  * or with a given global pressure
  * \f[
@@ -295,7 +295,7 @@ public:
             else
             {
                 writer.attachCellData(velocity, "wetting-velocity", dim);
-                writer.attachCellData(velocitySecondPhase, "non-wetting-velocity", dim);
+                writer.attachCellData(velocitySecondPhase, "nonwetting-velocity", dim);
             }
         }
 
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressure.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressure.hh
index a03080ad9859706feea44f08ab6ccb1cda3c5ec0..92fa2c1259aa26fb13c6bbb4b0d7b746482aa480 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressure.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressure.hh
@@ -45,7 +45,7 @@ namespace Dumux {
  * This could be a wetting (w) phase pressure leading to
  * \f[ - \text{div}\,  \left[\lambda \boldsymbol{K} \left(\text{grad}\, p_w + f_n \text{grad}\, p_c
  *     + \sum f_\alpha \rho_\alpha g  \text{grad}\, z\right)\right] = q, \f]
- * a non-wetting (n) phase pressure yielding
+ * a nonwetting (n) phase pressure yielding
  * \f[ - \text{div}\,  \left[\lambda \boldsymbol{K}  \left(\text{grad}\, p_n - f_w \text{grad}\, p_c
  *     + \sum f_\alpha \rho_\alpha g  \text{grad}\, z\right)\right] = q, \f]
  * or a global pressure leading to
@@ -406,7 +406,7 @@ public:
             }
 
             writer.attachCellData(*velocityWetting, "wetting-velocity", dim);
-            writer.attachCellData(*velocityNonwetting, "non-wetting-velocity", dim);
+            writer.attachCellData(*velocityNonwetting, "nonwetting-velocity", dim);
             }
     }
 
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressureadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressureadaptive.hh
index e89c75849473acb70078e4452585bf967b3b2492..fb0f271f81bc7401adb27cfe5d3feba591b44013 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressureadaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressureadaptive.hh
@@ -45,7 +45,7 @@ namespace Dumux {
  * This could be a wetting (w) phase pressure leading to
  * \f[ - \text{div}\,  \left[\lambda \boldsymbol{K} \left(\text{grad}\, p_w + f_n \text{grad}\, p_c
  *     + \sum f_\alpha \rho_\alpha g  \text{grad}\, z\right)\right] = q, \f]
- * a non-wetting (n) phase pressure yielding
+ * a nonwetting (n) phase pressure yielding
  * \f[ - \text{div}\,  \left[\lambda \boldsymbol{K}  \left(\text{grad}\, p_n - f_w \text{grad}\, p_c
  *     + \sum f_\alpha \rho_\alpha g  \text{grad}\, z\right)\right] = q, \f]
  * or a global pressure leading to
@@ -420,7 +420,7 @@ public:
             }
 
             writer.attachCellData(*velocityWetting, "wetting-velocity", dim);
-            writer.attachCellData(*velocityNonwetting, "non-wetting-velocity", dim);
+            writer.attachCellData(*velocityNonwetting, "nonwetting-velocity", dim);
             }
     }
 
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocity.hh
index c7822502c6391cfd147bf084e0608ec33e31f682..269960826c4a6b674404ffa3a7f2bd0dce5e9458 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocity.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocity.hh
@@ -232,7 +232,7 @@ public:
             }
 
             writer.attachCellData(velocityWetting, "wetting-velocity", dim);
-            writer.attachCellData(velocityNonwetting, "non-wetting-velocity", dim);
+            writer.attachCellData(velocityNonwetting, "nonwetting-velocity", dim);
         }
 
         return;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocity.hh
index 88bfcc94b37a6800ba898b9316800fa06a924065..8aef1f4cb8e9b5f0a868ed53fcff349b6f268337 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocity.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocity.hh
@@ -246,7 +246,7 @@ public:
             }
 
             writer.attachCellData(velocityWetting, "wetting-velocity", dim);
-            writer.attachCellData(velocityNonwetting, "non-wetting-velocity", dim);
+            writer.attachCellData(velocityNonwetting, "nonwetting-velocity", dim);
         }
 
         return;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dvelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dvelocity.hh
index 634ef6a40e8002c30fa2ff73dd02d77916d1965c..b9ede8717aa6b397cd3b9d74621f2bb994007ee4 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dvelocity.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dvelocity.hh
@@ -230,7 +230,7 @@ public:
             }
 
             writer.attachCellData(velocityWetting, "wetting-velocity", dim);
-            writer.attachCellData(velocityNonwetting, "non-wetting-velocity", dim);
+            writer.attachCellData(velocityNonwetting, "nonwetting-velocity", dim);
         }
 
         return;
diff --git a/dumux/porousmediumflow/2p/sequential/indices.hh b/dumux/porousmediumflow/2p/sequential/indices.hh
index a1eeba0f43f8858c07be364371ba1428221476fe..95481b7ffb03b60eaf371d874ef5a8dca021e490 100644
--- a/dumux/porousmediumflow/2p/sequential/indices.hh
+++ b/dumux/porousmediumflow/2p/sequential/indices.hh
@@ -42,24 +42,24 @@ struct SequentialTwoPCommonIndices
 
     // Phase indices
     static const int wPhaseIdx = 0; //!< index of the wetting phase in a phase vector
-    static const int nPhaseIdx = 1; //!< index of the non-wetting phase in a phase vector
+    static const int nPhaseIdx = 1; //!< index of the nonwetting phase in a phase vector
     static const int totalPhaseIdx = 2; //!< index of the total phase (wetting + nonwetting)
 
     //saturation flags
     static const int saturationW = 0; //!< Indicates wetting phase saturation
-    static const int saturationN = 1; //!<  Indicates non-wetting phase saturation
-    static const int saturationNw = saturationN; //!<  Indicates non-wetting phase saturation
+    static const int saturationN = 1; //!<  Indicates nonwetting phase saturation
+    static const int saturationNw = saturationN; //!<  Indicates nonwetting phase saturation
 
     //pressure flags
     static const int pressureW = 0; //!< Indicates wetting phase pressure
-    static const int pressureN = 1; //!<  Indicates non-wetting phase pressure
-    static const int pressureNw = pressureN; //!<  Indicates non-wetting phase pressure
+    static const int pressureN = 1; //!<  Indicates nonwetting phase pressure
+    static const int pressureNw = pressureN; //!<  Indicates nonwetting phase pressure
     static const int pressureGlobal = 2; //!<  Indicates global-pressure
 
     //velocity flags
     static const int velocityW = 0; //!< Indicates wetting phase velocity
-    static const int velocityN = 1; //!<  Indicates non-wetting phase velocity
-    static const int velocityNw = velocityN; //!<  Indicates non-wetting phase velocity
+    static const int velocityN = 1; //!<  Indicates nonwetting phase velocity
+    static const int velocityNw = velocityN; //!<  Indicates nonwetting phase velocity
     static const int velocityTotal = 2; //!<  Indicates total velocity
 };
 
@@ -92,8 +92,8 @@ struct SequentialTwoPIndices : public SequentialTwoPCommonIndices
     // indices of the equations
     static const int contiWEqIdx = PVOffset + 0; //!< index of the continuity equation of the wetting phase
     static const int pressureEqIdx = contiWEqIdx; //!< index of the pressure equation (total mass balance)
-    static const int contiNEqIdx = PVOffset + 1; //!< index of the continuity equation of the non-wetting phase
-    static const int satEqIdx = contiNEqIdx; //!< index of the continuity equation of the non-wetting phase (saturation equation)
+    static const int contiNEqIdx = PVOffset + 1; //!< index of the continuity equation of the nonwetting phase
+    static const int satEqIdx = contiNEqIdx; //!< index of the continuity equation of the nonwetting phase (saturation equation)
     static const int transportEqIdx = satEqIdx; //!< index of the saturation transport equation
 };
 
@@ -112,7 +112,7 @@ struct SequentialTwoPIndices<SequentialTwoPCommonIndices::pnsw, PVOffset>
     static const int saturationIdx = PVOffset + 1; //!< index for the primary saturation variable in a solution vector
 
     // indices of the primary variables
-    static const int pnIdx = PVOffset + 0; //!< index of the non-wetting phase pressure
+    static const int pnIdx = PVOffset + 0; //!< index of the nonwetting phase pressure
     static const int swIdx = PVOffset + 1; //!< index of the wetting phase saturation
 
     //! \cond \private
@@ -124,10 +124,10 @@ struct SequentialTwoPIndices<SequentialTwoPCommonIndices::pnsw, PVOffset>
     //! \endcond
 
     // indices of the equations
-    static const int contiNEqIdx = PVOffset + 0; //!< index of the continuity equation of the non-wetting phase
+    static const int contiNEqIdx = PVOffset + 0; //!< index of the continuity equation of the nonwetting phase
     static const int pressureEqIdx = contiNEqIdx; //!< index of the pressure equation (total mass balance)
     static const int contiWEqIdx = PVOffset + 1; //!< index of the continuity equation of the wetting phase
-    static const int satEqIdx = contiWEqIdx; //!< index of the continuity equation of the non-wetting phase (saturation equation)
+    static const int satEqIdx = contiWEqIdx; //!< index of the continuity equation of the nonwetting phase (saturation equation)
     static const int transportEqIdx = satEqIdx; //!< index of the saturation transport equation
 };
 
@@ -161,8 +161,8 @@ struct SequentialTwoPIndices<SequentialTwoPCommonIndices::pwsw, PVOffset>
     // indices of the equations
     static const int contiWEqIdx = PVOffset + 0; //!< index of the continuity equation of the wetting phase
     static const int pressureEqIdx = contiWEqIdx; //!< index of the pressure equation (total mass balance)
-    static const int contiNEqIdx = PVOffset + 1; //!< index of the continuity equation of the non-wetting phase
-    static const int satEqIdx = contiNEqIdx; //!< index of the continuity equation of the non-wetting phase (saturation equation)
+    static const int contiNEqIdx = PVOffset + 1; //!< index of the continuity equation of the nonwetting phase
+    static const int satEqIdx = contiNEqIdx; //!< index of the continuity equation of the nonwetting phase (saturation equation)
     static const int transportEqIdx = satEqIdx; //!< index of the saturation transport equation
 };
 
@@ -193,10 +193,10 @@ struct SequentialTwoPIndices<SequentialTwoPCommonIndices::pnsn, PVOffset>
     //! \endcond
 
     // indices of the equations
-    static const int contiNEqIdx = PVOffset + 0; //!< index of the continuity equation of the non-wetting phase
+    static const int contiNEqIdx = PVOffset + 0; //!< index of the continuity equation of the nonwetting phase
     static const int pressureEqIdx = contiNEqIdx; //!< index of the pressure equation (total mass balance)
     static const int contiWEqIdx = PVOffset + 1; //!< index of the continuity equation of the wetting phase
-    static const int satEqIdx = contiWEqIdx; //!< index of the continuity equation of the non-wetting phase (saturation equation)
+    static const int satEqIdx = contiWEqIdx; //!< index of the continuity equation of the nonwetting phase (saturation equation)
     static const int transportEqIdx = satEqIdx; //!< index of the saturation transport equation
 };
 
@@ -228,7 +228,7 @@ struct SequentialTwoPIndices<SequentialTwoPCommonIndices::pGlobalSw, PVOffset> :
 
     // indices of the equations
     static const int pressureEqIdx = PVOffset + 0; //!< index of the pressure equation (total mass balance)
-    static const int satEqIdx = PVOffset + 1; //!< index of the continuity equation of the non-wetting phase (saturation equation)
+    static const int satEqIdx = PVOffset + 1; //!< index of the continuity equation of the nonwetting phase (saturation equation)
     static const int transportEqIdx = satEqIdx; //!< index of the saturation transport equation
 };
 
@@ -260,7 +260,7 @@ struct SequentialTwoPIndices<SequentialTwoPCommonIndices::pGlobalSn, PVOffset>
 
     // indices of the equations
     static const int pressureEqIdx = PVOffset + 0; //!< index of the pressure equation (total mass balance)
-    static const int satEqIdx = PVOffset + 1; //!< index of the continuity equation of the non-wetting phase (saturation equation)
+    static const int satEqIdx = PVOffset + 1; //!< index of the continuity equation of the nonwetting phase (saturation equation)
     static const int transportEqIdx = satEqIdx; //!< index of the saturation transport equation
 };
 
diff --git a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflflux.hh b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflflux.hh
index ebac4ef81ac2702d576e0174955d947aa9824408..49e2d6dda4afc53ecee6fd30d97ea3a73e5a5bf1 100644
--- a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflflux.hh
+++ b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflflux.hh
@@ -66,12 +66,12 @@ public:
      * \brief adds a flux to the cfl-criterion evaluation
      *
      *  \param lambdaW        wetting phase mobility
-     *  \param lambdaNw       non-wetting phase mobility
+     *  \param lambdaNw       nonwetting phase mobility
      *  \param viscosityW     wetting phase viscosity
-     *  \param viscosityNw    non-wetting phase viscosity
+     *  \param viscosityNw    nonwetting phase viscosity
      *  \param flux           flux to add
      *  \param intersection   intersection corresponding to the flux
-     *  \param phaseIdx       index of the phase (wetting, non-wetting)
+     *  \param phaseIdx       index of the phase (wetting, nonwetting)
      */
     void addFlux(Scalar& lambdaW, Scalar& lambdaNw, Scalar& viscosityW, Scalar& viscosityNw, Scalar flux,
                  const Intersection& intersection, int phaseIdx)
@@ -81,12 +81,12 @@ public:
      * \brief adds a flux to the cfl-criterion evaluation
      *
      *  \param lambdaW        wetting phase mobility
-     *  \param lambdaNw       non-wetting phase mobility
+     *  \param lambdaNw       nonwetting phase mobility
      *  \param viscosityW     wetting phase viscosity
-     *  \param viscosityNw    non-wetting phase viscosity
+     *  \param viscosityNw    nonwetting phase viscosity
      *  \param flux           flux to add
      *  \param element        element corresponding to the flux
-     *  \param phaseIdx       index of the phase (wetting, non-wetting)
+     *  \param phaseIdx       index of the phase (wetting, nonwetting)
      */
     void addFlux(Scalar& lambdaW, Scalar& lambdaNw, Scalar& viscosityW, Scalar& viscosityNw, Scalar flux,
                  const Element& element, int phaseIdx)
diff --git a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxcoats.hh b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxcoats.hh
index 75ef21c258c9b99e35213169e633d700b321d922..0f43ac4153a351d4c83048a9cc62f62a903cefec 100644
--- a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxcoats.hh
+++ b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxcoats.hh
@@ -283,7 +283,7 @@ void EvalCflFluxCoats<TypeTag>::addDefaultFlux(Scalar flux, int phaseIdx)
             break;
         }
 
-        //for time step criterion if the non-wetting phase velocity is used
+        //for time step criterion if the nonwetting phase velocity is used
     case nPhaseIdx:
         {
             if (flux >= 0)
diff --git a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxdefault.hh b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxdefault.hh
index 9793e91f97e15cbd7bb1a77ebb502a4b58dc7cb7..ae2e2ac4ec4378b80aa7d3f1ecf13de490ef2247 100644
--- a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxdefault.hh
+++ b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxdefault.hh
@@ -150,7 +150,7 @@ private:
              break;
          }
 
-             //for time step criterion if the non-wetting phase velocity is used
+             //for time step criterion if the nonwetting phase velocity is used
          case nPhaseIdx:
          {
              if (flux >= 0)
diff --git a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/saturation.hh b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/saturation.hh
index cdb38fa7f6a90bc56deffbad90314c26b068c185..d8331db50676270f8242d0e37dfeb673e0575f52 100644
--- a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/saturation.hh
+++ b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/saturation.hh
@@ -55,7 +55,7 @@ namespace Dumux {
  * \phi \frac{\partial S_n}{\partial t} + f_n \text{div}\, \boldsymbol{v}_{t} - f_n \lambda_w \boldsymbol{K}\left(\textbf{grad}\,
  * p_c - (\varrho_n-\varrho_w) {\textbf g} \right)= q_\alpha,
  * \f]
- * if the non-wetting phase saturation is the primary transport variable.
+ * if the nonwetting phase saturation is the primary transport variable.
  *
  *  The total velocity formulation is only implemented for incompressible fluids and \f$ f_\alpha \f$
  *  is the fractional flow function, \f$ \lambda_\alpha \f$ is the mobility, \f$ \boldsymbol K \f$
diff --git a/dumux/porousmediumflow/2p2c/model.hh b/dumux/porousmediumflow/2p2c/model.hh
index 8fc4795243e0bba55c7317dfa5e61f457cd1ab02..1c7e87633cc33b02c6d0e05eb8108de0ac682898 100644
--- a/dumux/porousmediumflow/2p2c/model.hh
+++ b/dumux/porousmediumflow/2p2c/model.hh
@@ -70,7 +70,7 @@
  *      as long as \f$ 0 < S_\alpha < 1\f$</li>.
  *  <li> Only wetting phase is present: The mole fraction of, e.g., air in the wetting phase \f$x^a_w\f$ is used,
  *      as long as the maximum mole fraction is not exceeded \f$(x^a_w<x^a_{w,max})\f$</li>
- *  <li> Only non-wetting phase is present: The mole fraction of, e.g., water in the non-wetting phase, \f$x^w_n\f$, is used,
+ *  <li> Only nonwetting phase is present: The mole fraction of, e.g., water in the nonwetting phase, \f$x^w_n\f$, is used,
  *      as long as the maximum mole fraction is not exceeded \f$(x^w_n<x^w_{n,max})\f$</li>
  * </ul>
  */
@@ -148,7 +148,7 @@ private:
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
     static_assert(FSY::numComponents == 2, "Only fluid systems with 2 components are supported by the 2p2c model!");
     static_assert(FSY::numPhases == 2, "Only fluid systems with 2 phases are supported by the 2p2c model!");
-    // class used for scv-wise reconstruction of non-wetting phase saturations
+    // class used for scv-wise reconstruction of nonwetting phase saturations
     using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
     using BaseTraits = TwoPVolumeVariablesTraits<PV, FSY, FST, SSY, SST, PT, MT, SR>;
 
@@ -197,7 +197,7 @@ private:
     using MT = GetPropType<TypeTag, Properties::ModelTraits>;
     static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
-    // class used for scv-wise reconstruction of non-wetting phase saturations
+    // class used for scv-wise reconstruction of nonwetting phase saturations
     using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
     using BaseTraits = TwoPVolumeVariablesTraits<PV, FSY, FST, SSY, SST, PT, MT, SR>;
 
@@ -300,7 +300,7 @@ private:
     using MT = GetPropType<TypeTag, Properties::ModelTraits>;
     static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
-    // class used for scv-wise reconstruction of non-wetting phase saturations
+    // class used for scv-wise reconstruction of nonwetting phase saturations
     using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
     using BaseTraits = TwoPVolumeVariablesTraits<PV, FSY, FST, SSY, SST, PT, MT, SR>;
 
@@ -370,7 +370,7 @@ private:
     using PT = typename GetPropType<TypeTag, Properties::SpatialParams>::PermeabilityType;
     static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
-    // class used for scv-wise reconstruction of non-wetting phase saturations
+    // class used for scv-wise reconstruction of nonwetting phase saturations
     using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
     using BaseTraits = TwoPVolumeVariablesTraits<PV, FSY, FST, SSY, SST, PT, MT, SR>;
 
diff --git a/dumux/porousmediumflow/2pnc/model.hh b/dumux/porousmediumflow/2pnc/model.hh
index 8dad8844b521c5bceb73c35845ed804b893f947d..bc16441281972faa3c6ba034b547497807fe0507 100644
--- a/dumux/porousmediumflow/2pnc/model.hh
+++ b/dumux/porousmediumflow/2pnc/model.hh
@@ -75,7 +75,7 @@
  *      as long as \f$ 0 < S_\alpha < 1\f$</li>.
  *  <li> Only wetting phase is present: The mole fraction of, e.g., air in the wetting phase \f$x^a_w\f$ is used,
  *      as long as the maximum mole fraction is not exceeded (\f$x^a_w<x^a_{w,max}\f$)</li>
- *  <li> Only non-wetting phase is present: The mole fraction of, e.g., water in the non-wetting phase, \f$x^w_n\f$, is used,
+ *  <li> Only nonwetting phase is present: The mole fraction of, e.g., water in the nonwetting phase, \f$x^w_n\f$, is used,
  *      as long as the maximum mole fraction is not exceeded (\f$x^w_n<x^w_{n,max}\f$)</li>
  * </ul>
  *
@@ -175,7 +175,7 @@ private:
     using MT = GetPropType<TypeTag, Properties::ModelTraits>;
     static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
-    // class used for scv-wise reconstruction of non-wetting phase saturations
+    // class used for scv-wise reconstruction of nonwetting phase saturations
     using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
     using BaseTraits = TwoPVolumeVariablesTraits<PV, FSY, FST, SSY, SST, PT, MT, SR>;
 
@@ -226,7 +226,7 @@ struct Formulation<TypeTag, TTag::TwoPNC>
 { static constexpr auto value = TwoPFormulation::p0s1; };
 
 template<class TypeTag>
-struct SetMoleFractionsForFirstPhase<TypeTag, TTag::TwoPNC> { static constexpr bool value = true; };  //!< Set the primary variables mole fractions for the wetting or non-wetting phase
+struct SetMoleFractionsForFirstPhase<TypeTag, TTag::TwoPNC> { static constexpr bool value = true; };  //!< Set the primary variables mole fractions for the wetting or nonwetting phase
 template<class TypeTag>
 struct UseMoles<TypeTag, TTag::TwoPNC> { static constexpr bool value = true; };                         //!< Use mole fractions in the balance equations by default
 
@@ -273,7 +273,7 @@ private:
     using MT = GetPropType<TypeTag, Properties::ModelTraits>;
     static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
-    // class used for scv-wise reconstruction of non-wetting phase saturations
+    // class used for scv-wise reconstruction of nonwetting phase saturations
     using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
     using BaseTraits = TwoPVolumeVariablesTraits<PV, FSY, FST, SSY, SST, PT, MT, SR>;
 
diff --git a/dumux/porousmediumflow/2pnc/primaryvariableswitch.hh b/dumux/porousmediumflow/2pnc/primaryvariableswitch.hh
index f18fddd2110da45f82073092a95be6c41b794b23..a711dd767bcf23703ab7745aad24ee64c7a23c5b 100644
--- a/dumux/porousmediumflow/2pnc/primaryvariableswitch.hh
+++ b/dumux/porousmediumflow/2pnc/primaryvariableswitch.hh
@@ -102,7 +102,7 @@ protected:
                 else // mass-fraction formulation
                     priVars[switchIdx] = volVars.massFraction(phase1Idx, comp0Idx);
 
-                // switch all secondary components to mole fraction in non-wetting phase
+                // switch all secondary components to mole fraction in nonwetting phase
                 if(useMoles) // mole-fraction formulation
                     for (int compIdx = numMajorComponents; compIdx < numComponents; ++compIdx)
                         priVars[compIdx] = volVars.moleFraction(phase1Idx, compIdx);
diff --git a/dumux/porousmediumflow/2pncmin/model.hh b/dumux/porousmediumflow/2pncmin/model.hh
index 0d837f2aa1aa160beecedb3a33e2bd2559d58110..3a73d713b70ab1ff9c02d862bb4761356cd9a9d9 100644
--- a/dumux/porousmediumflow/2pncmin/model.hh
+++ b/dumux/porousmediumflow/2pncmin/model.hh
@@ -75,7 +75,7 @@
  *      as long as \f$ 0 < S_\alpha < 1\f$</li>.
  *  <li> Only wetting phase is present: The mole fraction of, e.g., air in the wetting phase \f$x^a_w\f$ is used,
  *      as long as the maximum mole fraction is not exceeded (\f$x^a_w<x^a_{w,max}\f$)</li>
- *  <li> Only non-wetting phase is present: The mole fraction of, e.g., water in the non-wetting phase, \f$x^w_n\f$, is used,
+ *  <li> Only nonwetting phase is present: The mole fraction of, e.g., water in the nonwetting phase, \f$x^w_n\f$, is used,
  *      as long as the maximum mole fraction is not exceeded (\f$x^w_n<x^w_{n,max}\f$)</li>
  * </ul>
  *
@@ -138,7 +138,7 @@ private:
     using MT = GetPropType<TypeTag, Properties::ModelTraits>;
     static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
-    // class used for scv-wise reconstruction of non-wetting phase saturations
+    // class used for scv-wise reconstruction of nonwetting phase saturations
     using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
     using BaseTraits = TwoPVolumeVariablesTraits<PV, FSY, FST, SSY, SST, PT, MT, SR>;
 
@@ -214,7 +214,7 @@ private:
     using MT = GetPropType<TypeTag, Properties::ModelTraits>;
     static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
-    // class used for scv-wise reconstruction of non-wetting phase saturations
+    // class used for scv-wise reconstruction of nonwetting phase saturations
     using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
     using BaseTraits = TwoPVolumeVariablesTraits<PV, FSY, FST, SSY, SST, PT, MT, SR>;
 
diff --git a/dumux/porousmediumflow/co2/model.hh b/dumux/porousmediumflow/co2/model.hh
index 2213dff32b0969e679e520e1dddd586123c4d1e3..bc48834f91ed387439f31e80d5e2885501ddaf80 100644
--- a/dumux/porousmediumflow/co2/model.hh
+++ b/dumux/porousmediumflow/co2/model.hh
@@ -71,7 +71,7 @@ private:
     using MT = GetPropType<TypeTag, Properties::ModelTraits>;
     static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
-    // class used for scv-wise reconstruction of non-wetting phase saturations
+    // class used for scv-wise reconstruction of nonwetting phase saturations
     using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
     using BaseTraits = TwoPVolumeVariablesTraits<PV, FSY, FST, SSY, SST, PT, MT, SR>;
 
@@ -101,7 +101,7 @@ private:
     using MT = GetPropType<TypeTag, Properties::ModelTraits>;
     static constexpr auto DM = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
     static constexpr bool enableIS = getPropValue<TypeTag, Properties::EnableBoxInterfaceSolver>();
-    // class used for scv-wise reconstruction of non-wetting phase saturations
+    // class used for scv-wise reconstruction of nonwetting phase saturations
     using SR = TwoPScvSaturationReconstruction<DM, enableIS>;
     using BaseTraits = TwoPVolumeVariablesTraits<PV, FSY, FST, SSY, SST, PT, MT, SR>;
 
diff --git a/dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh b/dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh
index 8647db84e43c7447b6c10b2270dfcc27b26fe837..09212057280abc27596f52273146b4dc27cfbb63 100644
--- a/dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh
+++ b/dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh
@@ -325,12 +325,12 @@ public:
         const Scalar Ts = volVars.temperatureSolid();
 
         const  Scalar lambdaWetting = volVars.fluidThermalConductivity(phase0Idx);
-        const  Scalar lambdaNonWetting = volVars.fluidThermalConductivity(phase1Idx);
+        const  Scalar lambdaNonwetting = volVars.fluidThermalConductivity(phase1Idx);
         const  Scalar lambdaSolid = volVars.solidThermalConductivity();
 
-        const Scalar lambdaWN = harmonicMean(lambdaWetting, lambdaNonWetting);
+        const Scalar lambdaWN = harmonicMean(lambdaWetting, lambdaNonwetting);
         const Scalar lambdaWS = harmonicMean(lambdaWetting, lambdaSolid);
-        const Scalar lambdaNS = harmonicMean(lambdaNonWetting, lambdaSolid);
+        const Scalar lambdaNS = harmonicMean(lambdaNonwetting, lambdaSolid);
 
         const Scalar characteristicLength = volVars.characteristicLength()  ;
         const Scalar factorEnergyTransfer = volVars.factorEnergyTransfer()  ;
@@ -339,22 +339,22 @@ public:
         const Scalar nusseltWS = volVars.nusseltNumber(phase0Idx);
         const Scalar nusseltNS = volVars.nusseltNumber(phase1Idx);
 
-        const Scalar wettingToNonWettingEnergyExchange = factorEnergyTransfer * (Tw - Tn) / characteristicLength * awn * lambdaWN * nusseltWN  ;
+        const Scalar wettingToNonwettingEnergyExchange = factorEnergyTransfer * (Tw - Tn) / characteristicLength * awn * lambdaWN * nusseltWN  ;
         const Scalar wettingToSolidEnergyExchange = factorEnergyTransfer * (Tw - Ts) / characteristicLength * aws * lambdaWS * nusseltWS  ;
-        const Scalar nonWettingToSolidEnergyExchange = factorEnergyTransfer * (Tn - Ts) / characteristicLength * ans * lambdaNS * nusseltNS  ;
+        const Scalar nonwettingToSolidEnergyExchange = factorEnergyTransfer * (Tn - Ts) / characteristicLength * ans * lambdaNS * nusseltNS  ;
 
         for(int phaseIdx = 0; phaseIdx < numEnergyEqFluid+numEnergyEqSolid; ++phaseIdx)
         {
             switch (phaseIdx)
             {
             case phase0Idx:
-                source[energyEq0Idx + phaseIdx] += ( - wettingToNonWettingEnergyExchange - wettingToSolidEnergyExchange);
+                source[energyEq0Idx + phaseIdx] += ( - wettingToNonwettingEnergyExchange - wettingToSolidEnergyExchange);
                 break;
             case phase1Idx:
-                source[energyEq0Idx + phaseIdx] += (+ wettingToNonWettingEnergyExchange - nonWettingToSolidEnergyExchange);
+                source[energyEq0Idx + phaseIdx] += (+ wettingToNonwettingEnergyExchange - nonwettingToSolidEnergyExchange);
                 break;
             case sPhaseIdx:
-                source[energyEq0Idx + phaseIdx] += (+ wettingToSolidEnergyExchange + nonWettingToSolidEnergyExchange);
+                source[energyEq0Idx + phaseIdx] += (+ wettingToSolidEnergyExchange + nonwettingToSolidEnergyExchange);
                 break;
             default:
                 DUNE_THROW(Dune::NotImplemented,
diff --git a/dumux/porousmediumflow/nonequilibrium/volumevariables.hh b/dumux/porousmediumflow/nonequilibrium/volumevariables.hh
index 116a5617fa9d1b765ce25083f2f7caf3a070189b..54ec786a0876fab8f6d788f57e1e62efb51b0b21 100644
--- a/dumux/porousmediumflow/nonequilibrium/volumevariables.hh
+++ b/dumux/porousmediumflow/nonequilibrium/volumevariables.hh
@@ -180,20 +180,20 @@ public:
         const auto& materialParams = problem.spatialParams().materialLawParams(element, scv, elemSol);
 
         //obtain parameters for interfacial area constitutive relations
-        const auto& aWettingNonWettingSurfaceParams = problem.spatialParams().aWettingNonWettingSurfaceParams(element, scv, elemSol);
+        const auto& aWettingNonwettingSurfaceParams = problem.spatialParams().aWettingNonwettingSurfaceParams(element, scv, elemSol);
 
         const Scalar pc = fluidState.pressure(phase1Idx) - fluidState.pressure(phase0Idx);
         const Scalar Sw = fluidState.saturation(phase0Idx);
 
         using AwnSurface = typename Problem::SpatialParams::AwnSurface;
-        const auto awn = AwnSurface::interfacialArea(aWettingNonWettingSurfaceParams, materialParams, Sw, pc);
+        const auto awn = AwnSurface::interfacialArea(aWettingNonwettingSurfaceParams, materialParams, Sw, pc);
         interfacialArea_[phase0Idx][phase1Idx] = awn;
         interfacialArea_[phase1Idx][phase0Idx] = interfacialArea_[phase0Idx][phase1Idx];
         interfacialArea_[phase0Idx][phase0Idx] = 0.;
 
         using AnsSurface = typename Problem::SpatialParams::AnsSurface;
-        const auto& aNonWettingSolidSurfaceParams = problem.spatialParams().aNonWettingSolidSurfaceParams(element, scv, elemSol);
-        const auto ans = AnsSurface::interfacialArea(aNonWettingSolidSurfaceParams, materialParams, Sw, pc);
+        const auto& aNonwettingSolidSurfaceParams = problem.spatialParams().aNonwettingSolidSurfaceParams(element, scv, elemSol);
+        const auto ans = AnsSurface::interfacialArea(aNonwettingSolidSurfaceParams, materialParams, Sw, pc);
 
         // Switch for using a a_{wn} relations that has some "maximum capillary pressure" as parameter
         // That value is obtained by regularization of the pc(Sw) function.
@@ -201,8 +201,8 @@ public:
         if (computeAwsFromAnsAndPcMax)
         {
             // I know the solid surface from the pore network. But it is more consistent to use the fit value.
-            const Scalar pcMax = aWettingNonWettingSurfaceParams.pcMax();
-            const auto solidSurface = AnsSurface::interfacialArea(aNonWettingSolidSurfaceParams, materialParams, /*Sw=*/0., pcMax);
+            const Scalar pcMax = aWettingNonwettingSurfaceParams.pcMax();
+            const auto solidSurface = AnsSurface::interfacialArea(aNonwettingSolidSurfaceParams, materialParams, /*Sw=*/0., pcMax);
             interfacialArea_[phase0Idx][sPhaseIdx] = solidSurface - ans;
         }
         else
@@ -501,7 +501,7 @@ public:
             const auto density = fluidState.density(phaseIdx);
             const auto kinematicViscosity = dynamicViscosity/density;
 
-            // diffusion coefficient of non-wetting component in wetting phase
+            // diffusion coefficient of nonwetting component in wetting phase
             using FluidSystem = typename Traits::FluidSystem;
             const auto diffCoeff = FluidSystem::binaryDiffusionCoefficient(fluidState,
                                                                            paramCache,
@@ -536,14 +536,14 @@ public:
                                const Scv& scv)
     {
         // obtain parameters for awnsurface and material law
-        const auto& awnSurfaceParams = problem.spatialParams().aWettingNonWettingSurfaceParams(element, scv, elemSol) ;
+        const auto& awnSurfaceParams = problem.spatialParams().aWettingNonwettingSurfaceParams(element, scv, elemSol) ;
         const auto& materialParams = problem.spatialParams().materialLawParams(element, scv, elemSol) ;
 
         const auto Sw = fluidState.saturation(phase0Idx) ;
         const auto pc = fluidState.pressure(phase1Idx) - fluidState.pressure(phase0Idx);
 
         // when we only consider chemical non-equilibrium there is only mass transfer between
-        // the fluid phases, so in 2p only interfacial area between wetting and non-wetting
+        // the fluid phases, so in 2p only interfacial area between wetting and nonwetting
         using AwnSurface = typename Problem::SpatialParams::AwnSurface;
         interfacialArea_ = AwnSurface::interfacialArea(awnSurfaceParams, materialParams, Sw, pc);
     }
@@ -680,7 +680,7 @@ public:
             const auto heatCapacity = FluidSystem::heatCapacity(fluidState, paramCache, phaseIdx);
             const auto thermalConductivity = FluidSystem::thermalConductivity(fluidState, paramCache, phaseIdx);
 
-            // diffusion coefficient of non-wetting component in wetting phase
+            // diffusion coefficient of nonwetting component in wetting phase
             const auto porosity = this->porosity();
             const auto diffCoeff = FluidSystem::binaryDiffusionCoefficient(fluidState,
                                                                            paramCache,
@@ -724,20 +724,20 @@ public:
         const auto& materialParams = problem.spatialParams().materialLawParams(element, scv, elemSol);
 
         //obtain parameters for interfacial area constitutive relations
-        const auto& aWettingNonWettingSurfaceParams = problem.spatialParams().aWettingNonWettingSurfaceParams(element, scv, elemSol);
+        const auto& aWettingNonwettingSurfaceParams = problem.spatialParams().aWettingNonwettingSurfaceParams(element, scv, elemSol);
 
         const Scalar pc = fluidState.pressure(phase1Idx) - fluidState.pressure(phase0Idx);
         const Scalar Sw = fluidState.saturation(phase0Idx);
 
         using AwnSurface = typename Problem::SpatialParams::AwnSurface;
-        const auto awn = AwnSurface::interfacialArea(aWettingNonWettingSurfaceParams, materialParams, Sw, pc);
+        const auto awn = AwnSurface::interfacialArea(aWettingNonwettingSurfaceParams, materialParams, Sw, pc);
         interfacialArea_[phase0Idx][phase1Idx] = awn;
         interfacialArea_[phase1Idx][phase0Idx] = interfacialArea_[phase0Idx][phase1Idx];
         interfacialArea_[phase0Idx][phase0Idx] = 0.;
 
         using AnsSurface = typename Problem::SpatialParams::AnsSurface;
-        const auto& aNonWettingSolidSurfaceParams = problem.spatialParams().aNonWettingSolidSurfaceParams(element, scv, elemSol);
-        const auto ans = AnsSurface::interfacialArea(aNonWettingSolidSurfaceParams, materialParams, Sw, pc);
+        const auto& aNonwettingSolidSurfaceParams = problem.spatialParams().aNonwettingSolidSurfaceParams(element, scv, elemSol);
+        const auto ans = AnsSurface::interfacialArea(aNonwettingSolidSurfaceParams, materialParams, Sw, pc);
 
         // Switch for using a a_{wn} relations that has some "maximum capillary pressure" as parameter.
         // That value is obtained by regularization of the pc(Sw) function.
@@ -745,8 +745,8 @@ public:
         if (computeAwsFromAnsAndPcMax)
         {
             // I know the solid surface from the pore network. But it is more consistent to use the fit value.
-            const Scalar pcMax = aWettingNonWettingSurfaceParams.pcMax();
-            const auto solidSurface = AnsSurface::interfacialArea(aNonWettingSolidSurfaceParams, materialParams, /*Sw=*/0., pcMax);
+            const Scalar pcMax = aWettingNonwettingSurfaceParams.pcMax();
+            const auto solidSurface = AnsSurface::interfacialArea(aNonwettingSolidSurfaceParams, materialParams, /*Sw=*/0., pcMax);
             interfacialArea_[phase0Idx][sPhaseIdx] = solidSurface - ans;
         }
         else
diff --git a/dumux/porousmediumflow/richards/localresidual.hh b/dumux/porousmediumflow/richards/localresidual.hh
index 5434833c98a58d31d9c8d3ec9c4e5ec0828ec194..dbf42d9544fe49857ae86e3bb1608d2d81d4e0f5 100644
--- a/dumux/porousmediumflow/richards/localresidual.hh
+++ b/dumux/porousmediumflow/richards/localresidual.hh
@@ -208,7 +208,7 @@ public:
     }
 
     /*!
-     * \brief Adds source derivatives for wetting and non-wetting phase.
+     * \brief Adds source derivatives for wetting and nonwetting phase.
      *
      * \param partialDerivatives The partial derivatives
      * \param problem The problem
@@ -229,9 +229,9 @@ public:
     { /* TODO maybe forward to problem for the user to implement the source derivatives?*/ }
 
     /*!
-     * \brief Adds flux derivatives for wetting and non-wetting phase for cell-centered FVM using TPFA
+     * \brief Adds flux derivatives for wetting and nonwetting phase for cell-centered FVM using TPFA
      *
-     * Compute derivatives for the wetting and the non-wetting phase flux with respect to \f$p_w\f$
+     * Compute derivatives for the wetting and the nonwetting phase flux with respect to \f$p_w\f$
      * and \f$S_n\f$.
      *
      * \param derivativeMatrices The partial derivatives
@@ -404,9 +404,9 @@ public:
     }
 
     /*!
-     * \brief Adds cell-centered Dirichlet flux derivatives for wetting and non-wetting phase
+     * \brief Adds cell-centered Dirichlet flux derivatives for wetting and nonwetting phase
      *
-     * Compute derivatives for the wetting and the non-wetting phase flux with respect to \f$p_w\f$
+     * Compute derivatives for the wetting and the nonwetting phase flux with respect to \f$p_w\f$
      * and \f$S_n\f$.
      *
      * \param derivativeMatrices The matrices containing the derivatives
@@ -470,7 +470,7 @@ public:
     }
 
     /*!
-     * \brief Adds Robin flux derivatives for wetting and non-wetting phase
+     * \brief Adds Robin flux derivatives for wetting and nonwetting phase
      *
      * \param derivativeMatrices The matrices containing the derivatives
      * \param problem The problem
diff --git a/dumux/porousmediumflow/richards/model.hh b/dumux/porousmediumflow/richards/model.hh
index 884fc9632231dfedc29b858c1cafb5785c238745..de769a8a6756f27433ec475c3107de0cae1b267d 100644
--- a/dumux/porousmediumflow/richards/model.hh
+++ b/dumux/porousmediumflow/richards/model.hh
@@ -61,7 +61,7 @@
  * \f$g\f$ is the potential of the gravity field.
  *
  * In contrast to the full two-phase model, the Richards model assumes
- * gas as the non-wetting fluid and that it exhibits a much lower
+ * gas as the nonwetting fluid and that it exhibits a much lower
  * viscosity than the (liquid) wetting phase. (For example at
  * atmospheric pressure and at room temperature, the viscosity of air
  * is only about \f$1\%\f$ of the viscosity of liquid water.) As a
diff --git a/dumux/porousmediumflow/richards/newtonsolver.hh b/dumux/porousmediumflow/richards/newtonsolver.hh
index 421f3783d80585572f42a2f4b5a1c87ffa462255..fd3e9dbbd53af8be86659c77a6b205b7ac342fa7 100644
--- a/dumux/porousmediumflow/richards/newtonsolver.hh
+++ b/dumux/porousmediumflow/richards/newtonsolver.hh
@@ -90,7 +90,7 @@ private:
                     const Scalar pcMin = MaterialLaw::pc(materialLawParams, 1.0);
                     const Scalar pw = uLastIter[dofIdxGlobal][pressureIdx];
                     using std::max;
-                    const Scalar pn = max(this->assembler().problem().nonWettingReferencePressure(), pw + pcMin);
+                    const Scalar pn = max(this->assembler().problem().nonwettingReferencePressure(), pw + pcMin);
                     const Scalar pcOld = pn - pw;
                     const Scalar SwOld = max(0.0, MaterialLaw::sw(materialLawParams, pcOld));
 
diff --git a/dumux/porousmediumflow/richards/volumevariables.hh b/dumux/porousmediumflow/richards/volumevariables.hh
index bba813fb30b9e1758d83f39e1242331de4204351..218e88abfc5bf6132d6ec47760bef839f0e68ae3 100644
--- a/dumux/porousmediumflow/richards/volumevariables.hh
+++ b/dumux/porousmediumflow/richards/volumevariables.hh
@@ -141,14 +141,14 @@ public:
             const Scalar pc = MaterialLaw::pc(materialParams, 0.0);
 
             // set the wetting pressure
-            fluidState_.setPressure(FluidSystem::liquidPhaseIdx, problem.nonWettingReferencePressure() - pc);
-            fluidState_.setPressure(FluidSystem::gasPhaseIdx, problem.nonWettingReferencePressure());
+            fluidState_.setPressure(FluidSystem::liquidPhaseIdx, problem.nonwettingReferencePressure() - pc);
+            fluidState_.setPressure(FluidSystem::gasPhaseIdx, problem.nonwettingReferencePressure());
 
             // set molar densities
             if (enableWaterDiffusionInAir())
             {
                 molarDensity_[FluidSystem::liquidPhaseIdx] = FluidSystem::H2O::liquidDensity(temperature(), pressure(FluidSystem::liquidPhaseIdx))/FluidSystem::H2O::molarMass();
-                molarDensity_[FluidSystem::gasPhaseIdx] = IdealGas<Scalar>::molarDensity(temperature(), problem.nonWettingReferencePressure());
+                molarDensity_[FluidSystem::gasPhaseIdx] = IdealGas<Scalar>::molarDensity(temperature(), problem.nonwettingReferencePressure());
             }
 
             // density and viscosity
@@ -176,10 +176,10 @@ public:
             if (enableWaterDiffusionInAir())
             {
                 molarDensity_[FluidSystem::liquidPhaseIdx] = FluidSystem::H2O::liquidDensity(temperature(), pressure(FluidSystem::liquidPhaseIdx))/FluidSystem::H2O::molarMass();
-                molarDensity_[FluidSystem::gasPhaseIdx] = IdealGas<Scalar>::molarDensity(temperature(), problem.nonWettingReferencePressure());
+                molarDensity_[FluidSystem::gasPhaseIdx] = IdealGas<Scalar>::molarDensity(temperature(), problem.nonwettingReferencePressure());
                 moleFraction_[FluidSystem::liquidPhaseIdx] = 1.0;
 
-                moleFraction_[FluidSystem::gasPhaseIdx] = FluidSystem::H2O::vaporPressure(temperature()) / problem.nonWettingReferencePressure();
+                moleFraction_[FluidSystem::gasPhaseIdx] = FluidSystem::H2O::vaporPressure(temperature()) / problem.nonwettingReferencePressure();
 
                 const auto averageMolarMassGasPhase = (moleFraction_[FluidSystem::gasPhaseIdx]*FluidSystem::molarMass(FluidSystem::liquidPhaseIdx)) +
                 ((1-moleFraction_[FluidSystem::gasPhaseIdx])*FluidSystem::molarMass(FluidSystem::gasPhaseIdx));
@@ -201,7 +201,7 @@ public:
             if (enableWaterDiffusionInAir())
             {
                 molarDensity_[FluidSystem::liquidPhaseIdx] = FluidSystem::H2O::liquidDensity(temperature(), pressure(FluidSystem::liquidPhaseIdx))/FluidSystem::H2O::molarMass();
-                molarDensity_[FluidSystem::gasPhaseIdx] = IdealGas<Scalar>::molarDensity(temperature(), problem.nonWettingReferencePressure());
+                molarDensity_[FluidSystem::gasPhaseIdx] = IdealGas<Scalar>::molarDensity(temperature(), problem.nonwettingReferencePressure());
                 moleFraction_[FluidSystem::liquidPhaseIdx] = 1.0;
                 moleFraction_[FluidSystem::gasPhaseIdx] = 0.0;
                 massFraction_[FluidSystem::liquidPhaseIdx] = 1.0;
@@ -254,14 +254,14 @@ public:
         using MaterialLaw = typename Problem::SpatialParams::MaterialLaw;
         Scalar minPc = MaterialLaw::pc(materialParams, 1.0);
         fluidState.setPressure(FluidSystem::liquidPhaseIdx, priVars[Indices::pressureIdx]);
-        fluidState.setPressure(FluidSystem::gasPhaseIdx, max(problem.nonWettingReferencePressure(), fluidState.pressure(FluidSystem::liquidPhaseIdx) + minPc));
+        fluidState.setPressure(FluidSystem::gasPhaseIdx, max(problem.nonwettingReferencePressure(), fluidState.pressure(FluidSystem::liquidPhaseIdx) + minPc));
 
         // compute the capillary pressure to compute the saturation
         // make sure that we the capillary pressure is not smaller than the minimum pc
         // this would possibly return unphysical values from regularized material laws
         using std::max;
         const Scalar pc = max(MaterialLaw::endPointPc(materialParams),
-                              problem.nonWettingReferencePressure() - fluidState.pressure(FluidSystem::liquidPhaseIdx));
+                              problem.nonwettingReferencePressure() - fluidState.pressure(FluidSystem::liquidPhaseIdx));
         const Scalar sw = MaterialLaw::sw(materialParams, pc);
         fluidState.setSaturation(FluidSystem::liquidPhaseIdx, sw);
         fluidState.setSaturation(FluidSystem::gasPhaseIdx, 1.0-sw);
@@ -342,8 +342,8 @@ public:
      * \brief Returns the effective pressure \f$\mathrm{[Pa]}\f$ of a given phase within
      *        the control volume.
      *
-     * For the non-wetting phase (i.e. the gas phase), we assume
-     * infinite mobility, which implies that the non-wetting phase
+     * For the nonwetting phase (i.e. the gas phase), we assume
+     * infinite mobility, which implies that the nonwetting phase
      * pressure is equal to the finite volume's reference pressure
      * defined by the problem.
      *
@@ -371,7 +371,7 @@ public:
      *        the control volume.
      *
      * \param phaseIdx The index of the fluid phase
-     * \note The non-wetting phase is infinitely mobile
+     * \note The nonwetting phase is infinitely mobile
      */
     Scalar viscosity(const int phaseIdx = FluidSystem::liquidPhaseIdx) const
     { return phaseIdx == FluidSystem::liquidPhaseIdx ? fluidState_.viscosity(FluidSystem::liquidPhaseIdx) : 0.0; }
@@ -390,7 +390,7 @@ public:
      *        control volume.
      *
      * The capillary pressure is defined as the difference in
-     * pressures of the non-wetting and the wetting phase, i.e.
+     * pressures of the nonwetting and the wetting phase, i.e.
      * \f[ p_c = p_n - p_w \f]
      *
      * \note Capillary pressures are always larger than the entry pressure
@@ -406,8 +406,8 @@ public:
      * \brief Returns the pressureHead \f$\mathrm{[cm]}\f$ of a given phase within
      *        the control volume.
      *
-     * For the non-wetting phase (i.e. the gas phase), we assume
-     * infinite mobility, which implies that the non-wetting phase
+     * For the nonwetting phase (i.e. the gas phase), we assume
+     * infinite mobility, which implies that the nonwetting phase
      * pressure is equal to the finite volume's reference pressure
      * defined by the problem.
      *
diff --git a/dumux/porousmediumflow/richardsnc/model.hh b/dumux/porousmediumflow/richardsnc/model.hh
index 2ae33422cf744ccda576dad58216c0ddca77506a..6efeba9af99867a982e0017160f21ee82e7d82d8 100644
--- a/dumux/porousmediumflow/richardsnc/model.hh
+++ b/dumux/porousmediumflow/richardsnc/model.hh
@@ -38,7 +38,7 @@
  * approximate the water distribution above the groundwater level.
  *
  * In contrast to the full two-phase model, the Richards model assumes
- * gas as the non-wetting fluid and that it exhibits a much lower
+ * gas as the nonwetting fluid and that it exhibits a much lower
  * viscosity than the (liquid) wetting phase. (For example at
  * atmospheric pressure and at room temperature, the viscosity of air
  * is only about \f$1\%\f$ of the viscosity of liquid water.) As a
diff --git a/dumux/porousmediumflow/richardsnc/volumevariables.hh b/dumux/porousmediumflow/richardsnc/volumevariables.hh
index 0463346001c9f195bba8836ca956943705521014..6e2194f452ce513d7bed5154b9154ed644ad4d81 100644
--- a/dumux/porousmediumflow/richardsnc/volumevariables.hh
+++ b/dumux/porousmediumflow/richardsnc/volumevariables.hh
@@ -100,7 +100,7 @@ public:
         // precompute the minimum capillary pressure (entry pressure)
         // needed to make sure we don't compute unphysical capillary pressures and thus saturations
         minPc_ = MaterialLaw::endPointPc(materialParams);
-        pn_ = problem.nonWettingReferencePressure();
+        pn_ = problem.nonwettingReferencePressure();
         //porosity
         updateSolidVolumeFractions(elemSol, problem, element, scv, solidState_, ParentType::numFluidComponents());
         EnergyVolVars::updateSolidEnergyParams(elemSol, problem, element, scv, solidState_);
@@ -162,7 +162,7 @@ public:
         using std::max;
         using MaterialLaw = typename Problem::SpatialParams::MaterialLaw;
         const Scalar pc = max(MaterialLaw::endPointPc(materialParams),
-                              problem.nonWettingReferencePressure() - fluidState.pressure(0));
+                              problem.nonwettingReferencePressure() - fluidState.pressure(0));
         const Scalar sw = MaterialLaw::sw(materialParams, pc);
         fluidState.setSaturation(0, sw);
 
@@ -262,8 +262,8 @@ public:
      * \brief Returns the effective pressure \f$\mathrm{[Pa]}\f$ of a given phase within
      *        the control volume.
      *
-     * For the non-wetting phase (i.e. the gas phase), we assume
-     * infinite mobility, which implies that the non-wetting phase
+     * For the nonwetting phase (i.e. the gas phase), we assume
+     * infinite mobility, which implies that the nonwetting phase
      * pressure is equal to the finite volume's reference pressure
      * defined by the problem.
      *
@@ -291,7 +291,7 @@ public:
      *        the control volume.
      *
      * \param phaseIdx The index of the fluid phase
-     * \note The non-wetting phase is infinitely mobile
+     * \note The nonwetting phase is infinitely mobile
      */
     Scalar viscosity(const int phaseIdx = 0) const
     { return phaseIdx == 0 ? fluidState_.viscosity(0) : 0.0; }
@@ -310,7 +310,7 @@ public:
      *        control volume.
      *
      * The capillary pressure is defined as the difference in
-     * pressures of the non-wetting and the wetting phase, i.e.
+     * pressures of the nonwetting and the wetting phase, i.e.
      * \f[ p_c = p_n - p_w \f]
      *
      * \note Capillary pressures are always larger than the entry pressure
@@ -326,8 +326,8 @@ public:
      * \brief Returns the pressureHead \f$\mathrm{[cm]}\f$ of a given phase within
      *        the control volume.
      *
-     * For the non-wetting phase (i.e. the gas phase), we assume
-     * infinite mobility, which implies that the non-wetting phase
+     * For the nonwetting phase (i.e. the gas phase), we assume
+     * infinite mobility, which implies that the nonwetting phase
      * pressure is equal to the finite volume's reference pressure
      * defined by the problem.
      *
@@ -420,7 +420,7 @@ private:
     Scalar relativePermeabilityWetting_; // the relative permeability of the wetting phase
     SolidState solidState_;
     PermeabilityType permeability_; // the instrinsic permeability
-    Scalar pn_; // the reference non-wetting pressure
+    Scalar pn_; // the reference nonwetting pressure
     Scalar minPc_; // the minimum capillary pressure (entry pressure)
 };
 
diff --git a/examples/2pinfiltration/README.md b/examples/2pinfiltration/README.md
index 47ad340103bef92aed3cf945d1dc341ea12460ab..1e64fe95cfb9052298d7c3d44b1b11a2073640a3 100644
--- a/examples/2pinfiltration/README.md
+++ b/examples/2pinfiltration/README.md
@@ -43,7 +43,7 @@ If we insert this into the conservation equations for each phase $`\alpha`$ that
 To reduce the number of unknowns and close the system we need closure relations for this equations. For that, we make use of a $`p_c - S_w`$ as well as a $`k_r - S_w`$ - relationship. In this problem we use a Van-Genuchten parameterization. The parameters for that relationship are specified in the `spatialparams.hh` file.
 
 With the additional constraint that $`S_w + S_n = 1`$ we reduce the number of primary variables to two.
-In this example we use the wetting phase pressure $`p_0`$ and the saturation of the non-wetting phase $`S_1`$ as primary variables. It is also possible to switch that formulation to the non-wetting pressure and the wetting saturation.
+In this example we use the wetting phase pressure $`p_0`$ and the saturation of the nonwetting phase $`S_1`$ as primary variables. It is also possible to switch that formulation to the nonwetting pressure and the wetting saturation.
 
 The two-dimensional model domain is 6m x 4m and contains a lens with a lower permeability and porosity. We read the initial values for the DNAPL saturation and the water pressure from a file.
 The lens and the initial saturation can be seen in Figures 1 and 2.
diff --git a/examples/2pinfiltration/doc/2p.md b/examples/2pinfiltration/doc/2p.md
index e29210515e8459130682f0c0b485e4dc91bf5776..3074f3498e8735134b8cb6781ba30055df4e8961 100644
--- a/examples/2pinfiltration/doc/2p.md
+++ b/examples/2pinfiltration/doc/2p.md
@@ -427,7 +427,7 @@ Here, we get parameters for the position of the lens and porosity and permeabili
         lensUpperRight_ = getParam<GlobalPosition>("SpatialParams.LensUpperRight");
 
         // We set the parameters for the material law (here Van-Genuchten Law).
-        // First we set the residual saturations for the wetting phase and the non-wetting phase.
+        // First we set the residual saturations for the wetting phase and the nonwetting phase.
         // lensMaterialParams_ define the material parameters for the lens while
         // outerMaterialParams_ define material params for the rest of the domain.
         lensMaterialParams_.setSwr(0.18);
diff --git a/examples/2pinfiltration/doc/_intro.md b/examples/2pinfiltration/doc/_intro.md
index 6ed89c3a77bde3cd3a23e832102968c2cbe8e102..f6b8c23d276e4aebf57eaa42f6485e9335ba7ba0 100644
--- a/examples/2pinfiltration/doc/_intro.md
+++ b/examples/2pinfiltration/doc/_intro.md
@@ -41,7 +41,7 @@ If we insert this into the conservation equations for each phase $`\alpha`$ that
 To reduce the number of unknowns and close the system we need closure relations for this equations. For that, we make use of a $`p_c - S_w`$ as well as a $`k_r - S_w`$ - relationship. In this problem we use a Van-Genuchten parameterization. The parameters for that relationship are specified in the `spatialparams.hh` file.
 
 With the additional constraint that $`S_w + S_n = 1`$ we reduce the number of primary variables to two.
-In this example we use the wetting phase pressure $`p_0`$ and the saturation of the non-wetting phase $`S_1`$ as primary variables. It is also possible to switch that formulation to the non-wetting pressure and the wetting saturation.
+In this example we use the wetting phase pressure $`p_0`$ and the saturation of the nonwetting phase $`S_1`$ as primary variables. It is also possible to switch that formulation to the nonwetting pressure and the wetting saturation.
 
 The two-dimensional model domain is 6m x 4m and contains a lens with a lower permeability and porosity. We read the initial values for the DNAPL saturation and the water pressure from a file.
 The lens and the initial saturation can be seen in Figures 1 and 2.
diff --git a/examples/2pinfiltration/spatialparams.hh b/examples/2pinfiltration/spatialparams.hh
index ee1a68c240aa80b589c5f54623e8589b15d2e47d..7ef356def8016ad268c4658353d10f8ab481f678 100644
--- a/examples/2pinfiltration/spatialparams.hh
+++ b/examples/2pinfiltration/spatialparams.hh
@@ -70,7 +70,7 @@ public:
         lensUpperRight_ = getParam<GlobalPosition>("SpatialParams.LensUpperRight");
 
         // We set the parameters for the material law (here Van-Genuchten Law).
-        // First we set the residual saturations for the wetting phase and the non-wetting phase.
+        // First we set the residual saturations for the wetting phase and the nonwetting phase.
         // lensMaterialParams_ define the material parameters for the lens while
         // outerMaterialParams_ define material params for the rest of the domain.
         lensMaterialParams_.setSwr(0.18);
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh
index 01bad91ee9eee14795d74ada23926dc2f9ae64bf..7459221af590e7a96d2f2bfee4886b06eb374ec9 100644
--- a/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh
+++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh
@@ -184,12 +184,12 @@ public:
     { return 273.15 + 10; } // in [K]
 
     /*
-      * \brief Returns the reference pressure [Pa] of the non-wetting
+      * \brief Returns the reference pressure [Pa] of the nonwetting
      *        fluid phase within a finite volume.
      *
      * This problem assumes a constant reference pressure of 1 bar.
      */
-    Scalar nonWettingReferencePressure() const
+    Scalar nonwettingReferencePressure() const
     { return 1.0e5; }
 
 
@@ -331,7 +331,7 @@ public:
 
         PrimaryVariables priVars(0.0);
         //! Hydrostatic pressure profile
-        priVars[pressureIdx] = (nonWettingReferencePressure() - pcTop_)
+        priVars[pressureIdx] = (nonwettingReferencePressure() - pcTop_)
                                 -9.81*1000*(globalPos[dimWorld-1] - gg.bBoxMax()[dimWorld-1]);
         priVars[transportCompIdx] = xTracer;
         return priVars;
diff --git a/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh b/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh
index 8976cd18459e985344e8875b74fb28f21949d4fe..40495c32aacad7bee41e0bc6502410b6f5f36655 100644
--- a/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh
+++ b/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh
@@ -144,12 +144,12 @@ public:
     { return 273.15 + 10; } // in [K]
 
     /*
-      * \brief Returns the reference pressure [Pa] of the non-wetting
+      * \brief Returns the reference pressure [Pa] of the nonwetting
      *        fluid phase within a finite volume.
      *
      * This problem assumes a constant reference pressure of 1 bar.
      */
-    Scalar nonWettingReferencePressure() const
+    Scalar nonwettingReferencePressure() const
     { return 1.0e5; }
 
 
diff --git a/test/porousmediumflow/2p/implicit/adaptive/pointsourceproblem.hh b/test/porousmediumflow/2p/implicit/adaptive/pointsourceproblem.hh
index 22fc6622ebca404d885fa9b340efe53fcb0583ba..512fbd87c6c88483d8a326f2110a912d183d1a05 100644
--- a/test/porousmediumflow/2p/implicit/adaptive/pointsourceproblem.hh
+++ b/test/porousmediumflow/2p/implicit/adaptive/pointsourceproblem.hh
@@ -59,7 +59,7 @@ public:
      */
     void addPointSources(std::vector<PointSource>& pointSources) const
     {
-        // inject 2 kg/s of non-wetting phase at position (1, 1);
+        // inject 2 kg/s of nonwetting phase at position (1, 1);
         pointSources.push_back(PointSource({0.502, 3.02}, {0, 0.1}));
     }
 };
diff --git a/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh b/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
index 2ebb57009d698ec9e84e39864cfbdec426179c46..537b91688df064d12039ca23f760150883931546 100644
--- a/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
@@ -109,8 +109,8 @@ struct AdaptionIndicator<TypeTag, TTag::ThreeDTwoPTest> { using type = GridAdapt
  *
  * \brief test problem for the sequential 2p models in 3d
  *
- * Standard setting: one eighth of a nine-spot waterflood problem. The domain of size 1 x 1 x 1 m is initially saturated by a non-wetting fluid.
- * Water is injected in the corner of the origin (0,0,0) and non-wetting fluid produced in the upper corner at (1,1,1).
+ * Standard setting: one eighth of a nine-spot waterflood problem. The domain of size 1 x 1 x 1 m is initially saturated by a nonwetting fluid.
+ * Water is injected in the corner of the origin (0,0,0) and nonwetting fluid produced in the upper corner at (1,1,1).
  *
  * To run the simulation execute the following line in shell:
  * <tt>./test_3d2p</tt>.
diff --git a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/params.input b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/params.input
index ed68bdc8fed5afea4b4a98749f22f8fbf6509b33..353c491f265ce36fc7300c2430f8a7cc3e9f397b 100644
--- a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/params.input
+++ b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/params.input
@@ -12,9 +12,9 @@ Name = chemicalnonequilibrium
 EnableGravity = false
 
 [SpatialParams]
-WettingNonWettingAreaA1 = -1.603e-01
-WettingNonWettingAreaA2 = 1.429e-05
-WettingNonWettingAreaA3 = 1.915e-01
+WettingNonwettingAreaA1 = -1.603e-01
+WettingNonwettingAreaA2 = 1.429e-05
+WettingNonwettingAreaA3 = 1.915e-01
 MeanPoreSize = 5e-4
 MassTransferFactor = 0.5
 
diff --git a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/spatialparams.hh b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/spatialparams.hh
index a8fb9a3f61d9780fb29d751e33520a633994ce1f..50f229a1580d8eab66a627d50e159ee2ce60c6e9 100644
--- a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/spatialparams.hh
+++ b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/spatialparams.hh
@@ -90,18 +90,18 @@ public:
         coarseMaterialParams_.setPe(1e4);
         coarseMaterialParams_.setLambda(2.0);
 
-        aWettingNonWettingA1_ = getParam<Scalar>("SpatialParams.WettingNonWettingAreaA1");
-        aWettingNonWettingA2_ = getParam<Scalar>("SpatialParams.WettingNonWettingAreaA2");
-        aWettingNonWettingA3_ = getParam<Scalar>("SpatialParams.WettingNonWettingAreaA3");
+        aWettingNonwettingA1_ = getParam<Scalar>("SpatialParams.WettingNonwettingAreaA1");
+        aWettingNonwettingA2_ = getParam<Scalar>("SpatialParams.WettingNonwettingAreaA2");
+        aWettingNonwettingA3_ = getParam<Scalar>("SpatialParams.WettingNonwettingAreaA3");
 
         // wetting-non wetting: surface which goes to zero on the edges, but is a polynomial
-        aWettingNonWettingSurfaceParams_.setA1(aWettingNonWettingA1_);
-        aWettingNonWettingSurfaceParams_.setA2(aWettingNonWettingA2_);
-        aWettingNonWettingSurfaceParams_.setA3(aWettingNonWettingA3_);
+        aWettingNonwettingSurfaceParams_.setA1(aWettingNonwettingA1_);
+        aWettingNonwettingSurfaceParams_.setA2(aWettingNonwettingA2_);
+        aWettingNonwettingSurfaceParams_.setA3(aWettingNonwettingA3_);
         // determine maximum capillary pressure for wetting-nonwetting surface
         using TwoPLaw = EffToAbsLaw<RegularizedBrooksCorey<Scalar>>;
         pcMax_ = TwoPLaw::pc(coarseMaterialParams_, /*sw = */0.0);
-        aWettingNonWettingSurfaceParams_.setPcMax(pcMax_);
+        aWettingNonwettingSurfaceParams_.setPcMax(pcMax_);
         characteristicLength_ =getParam<Scalar>("SpatialParams.MeanPoreSize");
         factorMassTransfer_ = getParam<Scalar>("SpatialParams.MassTransferFactor");
     }
@@ -137,7 +137,7 @@ public:
     }
 
     /*!\brief Returns a reference to the container object for the
-     *        parametrization of the surface between wetting and non-Wetting phase.
+     *        parametrization of the surface between wetting and nonwetting phase.
      *
      * The position is determined based on the coordinate of
      * the vertex belonging to the considered sub-control volume.
@@ -147,11 +147,11 @@ public:
      * \param elemSol The element solution
      */
     template<class ElementSolution>
-    const AwnSurfaceParams& aWettingNonWettingSurfaceParams(const Element &element,
+    const AwnSurfaceParams& aWettingNonwettingSurfaceParams(const Element &element,
                                                             const SubControlVolume &scv,
                                                             const ElementSolution &elemSol) const
     {
-        return aWettingNonWettingSurfaceParams_ ;
+        return aWettingNonwettingSurfaceParams_ ;
     }
 
     /*!\brief Returns the maximum capillary pressure for the given pc-Sw curve
@@ -171,7 +171,7 @@ public:
     const Scalar pcMax(const Element &element,
                        const SubControlVolume &scv,
                        const ElementSolution &elemSol) const
-    { return aWettingNonWettingSurfaceParams_.pcMax() ; }
+    { return aWettingNonwettingSurfaceParams_.pcMax() ; }
 
     /*!
      * \brief Returns the characteristic length for the mass transfer.
@@ -206,13 +206,13 @@ private:
     MaterialLawParams coarseMaterialParams_;
     static constexpr Scalar eps_ = 1e-6;
 
-    AwnSurfaceParams aWettingNonWettingSurfaceParams_;
+    AwnSurfaceParams aWettingNonwettingSurfaceParams_;
     Scalar pcMax_ ;
 
     // interfacial area parameters
-    Scalar aWettingNonWettingA1_ ;
-    Scalar aWettingNonWettingA2_ ;
-    Scalar aWettingNonWettingA3_ ;
+    Scalar aWettingNonwettingA1_ ;
+    Scalar aWettingNonwettingA2_ ;
+    Scalar aWettingNonwettingA3_ ;
 
     Scalar factorMassTransfer_ ;
     Scalar characteristicLength_ ;
diff --git a/test/porousmediumflow/2pnc/implicit/fuelcell/spatialparams.hh b/test/porousmediumflow/2pnc/implicit/fuelcell/spatialparams.hh
index 668a1cde91ea892f1f5df2a0ac7f47a4538fe9a5..33c29ca340550653c509913c931e517768884016 100644
--- a/test/porousmediumflow/2pnc/implicit/fuelcell/spatialparams.hh
+++ b/test/porousmediumflow/2pnc/implicit/fuelcell/spatialparams.hh
@@ -74,7 +74,7 @@ public:
 
         // residual saturations
         materialParams_.setSwr(0.12); // air is wetting phase
-        materialParams_.setSnr(0.0); // water is non-wetting
+        materialParams_.setSnr(0.0); // water is nonwetting
 
         //parameters for the vanGenuchten law
         materialParams_.setVgAlpha(6.66e-5); // alpha = 1/pcb
diff --git a/test/porousmediumflow/3p/implicit/conduction/problem.hh b/test/porousmediumflow/3p/implicit/conduction/problem.hh
index 2b3d3c74213c2ba17ea6d7deaa905c7178844b77..f0cd5c27e96cd2c1c91ee8926fefc3a130633800 100644
--- a/test/porousmediumflow/3p/implicit/conduction/problem.hh
+++ b/test/porousmediumflow/3p/implicit/conduction/problem.hh
@@ -303,7 +303,7 @@ public:
         PrimaryVariables values;
         values[pressureIdx] = 1e5; // initial condition for the pressure
         values[swIdx] = 1.0;  // initial condition for the wetting phase saturation
-        values[snIdx] = 1e-5;  // initial condition for the non-wetting phase saturation
+        values[snIdx] = 1e-5;  // initial condition for the nonwetting phase saturation
         values[temperatureIdx] = 290;
         return values;
     }
diff --git a/test/porousmediumflow/3p/implicit/convection/problem.hh b/test/porousmediumflow/3p/implicit/convection/problem.hh
index 8d670db6b72d76283744723ea2ffa197e41da5ad..cbd0c48852c0f9559715a60bd6bd4dead6f1952a 100644
--- a/test/porousmediumflow/3p/implicit/convection/problem.hh
+++ b/test/porousmediumflow/3p/implicit/convection/problem.hh
@@ -317,7 +317,7 @@ public:
         PrimaryVariables values;
         values[pressureIdx] = pressureLow_; // initial condition for the pressure
         values[swIdx] = 1.0;  // initial condition for the wetting phase saturation
-        values[snIdx] = 1e-10;  // initial condition for the non-wetting phase saturation
+        values[snIdx] = 1e-10;  // initial condition for the nonwetting phase saturation
         values[temperatureIdx] = temperatureLow_;
         return values;
     }
diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/params.input b/test/porousmediumflow/mpnc/implicit/kinetic/params.input
index 8c7a9bad776f37a7cf4470d49b8389f8c914683c..4519ec64e4c9226e7ab040f7dd1d77e8a807b502 100644
--- a/test/porousmediumflow/mpnc/implicit/kinetic/params.input
+++ b/test/porousmediumflow/mpnc/implicit/kinetic/params.input
@@ -44,16 +44,16 @@ Swr = 0 #
 Snr = 0 #
 specificSolidsurface = 4022.994# (1/m)
 
-aWettingNonWettingA1 = -1.603e-01 #
-aWettingNonWettingA2 = 1.429e-05 #
-aWettingNonWettingA3 = 1.915e-01 #
+aWettingNonwettingA1 = -1.603e-01 #
+aWettingNonwettingA2 = 1.429e-05 #
+aWettingNonwettingA3 = 1.915e-01 #
 
 BCPd = 2.290e+03 #
 BClambda = 2.740e+00 #
 
-aNonWettingSolidA1 = 1.369e+03 #
-aNonWettingSolidA2 = -3.782e+00 #
-aNonWettingSolidA3 = 1.063e-09 #
+aNonwettingSolidA1 = 1.369e+03 #
+aNonwettingSolidA2 = -3.782e+00 #
+aNonwettingSolidA3 = 1.063e-09 #
 
 [SourceSink]
 heatIntoSolid = 0  #
diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh b/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh
index fda52a9e4dfbeff737c4c3afd6ad256170e1f0ec..644fb6d817e04ae47653d06758b1b7bb4555a0f3 100644
--- a/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh
@@ -93,13 +93,13 @@ public:
         porosityFF_                 = getParam<Scalar>("SpatialParams.FreeFlow.porosity");
         intrinsicPermeabilityFF_    = getParam<Scalar>("SpatialParams.FreeFlow.permeability");
 
-        aWettingNonWettingA1_ = getParam<Scalar>("SpatialParams.soil.aWettingNonWettingA1");
-        aWettingNonWettingA2_ = getParam<Scalar>("SpatialParams.soil.aWettingNonWettingA2");
-        aWettingNonWettingA3_ = getParam<Scalar>("SpatialParams.soil.aWettingNonWettingA3");
+        aWettingNonwettingA1_ = getParam<Scalar>("SpatialParams.soil.aWettingNonwettingA1");
+        aWettingNonwettingA2_ = getParam<Scalar>("SpatialParams.soil.aWettingNonwettingA2");
+        aWettingNonwettingA3_ = getParam<Scalar>("SpatialParams.soil.aWettingNonwettingA3");
 
-        aNonWettingSolidA1_ = getParam<Scalar>("SpatialParams.soil.aNonWettingSolidA1");
-        aNonWettingSolidA2_ = getParam<Scalar>("SpatialParams.soil.aNonWettingSolidA2");
-        aNonWettingSolidA3_ = getParam<Scalar>("SpatialParams.soil.aNonWettingSolidA3");
+        aNonwettingSolidA1_ = getParam<Scalar>("SpatialParams.soil.aNonwettingSolidA1");
+        aNonwettingSolidA2_ = getParam<Scalar>("SpatialParams.soil.aNonwettingSolidA2");
+        aNonwettingSolidA3_ = getParam<Scalar>("SpatialParams.soil.aNonwettingSolidA3");
 
         BCPd_           = getParam<Scalar>("SpatialParams.soil.BCPd");
         BClambda_       = getParam<Scalar>("SpatialParams.soil.BClambda");
@@ -138,28 +138,28 @@ public:
          */
         using TwoPLaw = EffToAbsLaw<RegularizedBrooksCorey<Scalar>>;
         const auto pcMax = TwoPLaw::pc(materialParamsPM_, /*sw = */0.0);
-        aWettingNonWettingSurfaceParams_.setPcMax(pcMax);
+        aWettingNonwettingSurfaceParams_.setPcMax(pcMax);
 
         // wetting-non wetting: surface which goes to zero on the edges, but is a polynomial
-        aWettingNonWettingSurfaceParams_.setA1(aWettingNonWettingA1_);
-        aWettingNonWettingSurfaceParams_.setA2(aWettingNonWettingA2_);
-        aWettingNonWettingSurfaceParams_.setA3(aWettingNonWettingA3_);
+        aWettingNonwettingSurfaceParams_.setA1(aWettingNonwettingA1_);
+        aWettingNonwettingSurfaceParams_.setA2(aWettingNonwettingA2_);
+        aWettingNonwettingSurfaceParams_.setA3(aWettingNonwettingA3_);
 
-        // non-wetting-solid
-        aNonWettingSolidSurfaceParams_.setA1(aNonWettingSolidA1_);
-        aNonWettingSolidSurfaceParams_.setA2(aNonWettingSolidA2_);
-        aNonWettingSolidSurfaceParams_.setA3(aNonWettingSolidA3_);
+        // nonwetting-solid
+        aNonwettingSolidSurfaceParams_.setA1(aNonwettingSolidA1_);
+        aNonwettingSolidSurfaceParams_.setA2(aNonwettingSolidA2_);
+        aNonwettingSolidSurfaceParams_.setA3(aNonwettingSolidA3_);
 
         // dummys for free flow: no interface where there is only one phase
-        aWettingNonWettingSurfaceParamsFreeFlow_.setA1(0.);
-        aWettingNonWettingSurfaceParamsFreeFlow_.setA2(0.);
-        aWettingNonWettingSurfaceParamsFreeFlow_.setA3(0.);
-        aWettingNonWettingSurfaceParamsFreeFlow_.setPcMax(42.); // not needed because it is anyways zero;
+        aWettingNonwettingSurfaceParamsFreeFlow_.setA1(0.);
+        aWettingNonwettingSurfaceParamsFreeFlow_.setA2(0.);
+        aWettingNonwettingSurfaceParamsFreeFlow_.setA3(0.);
+        aWettingNonwettingSurfaceParamsFreeFlow_.setPcMax(42.); // not needed because it is anyways zero;
 
         // dummys for free flow: no interface where there is only one phase
-        aNonWettingSolidSurfaceParamsFreeFlow_.setA1(0.);
-        aNonWettingSolidSurfaceParamsFreeFlow_.setA2(0.);
-        aNonWettingSolidSurfaceParamsFreeFlow_.setA3(0.);
+        aNonwettingSolidSurfaceParamsFreeFlow_.setA1(0.);
+        aNonwettingSolidSurfaceParamsFreeFlow_.setA2(0.);
+        aNonwettingSolidSurfaceParamsFreeFlow_.setA3(0.);
     }
 
     template<class ElementSolution>
@@ -216,7 +216,7 @@ public:
     }
 
     /*!\brief Returns a reference to the container object for the
-     *        parametrization of the surface between wetting and non-Wetting phase.
+     *        parametrization of the surface between wetting and nonwetting phase.
      *
      * The position is determined based on the coordinate of
      * the vertex belonging to the considered sub-control volume.
@@ -226,20 +226,20 @@ public:
      * \param elemSol The element solution
      */
     template<class ElementSolution>
-    const AwnSurfaceParams& aWettingNonWettingSurfaceParams(const Element &element,
+    const AwnSurfaceParams& aWettingNonwettingSurfaceParams(const Element &element,
                                                             const SubControlVolume &scv,
                                                             const ElementSolution &elemSol) const
     {
         const auto& globalPos =  scv.dofPosition();
         if (inFF_(globalPos) )
-            return aWettingNonWettingSurfaceParamsFreeFlow_  ;
+            return aWettingNonwettingSurfaceParamsFreeFlow_  ;
         else if (inPM_(globalPos))
-            return aWettingNonWettingSurfaceParams_ ;
+            return aWettingNonwettingSurfaceParams_ ;
         else DUNE_THROW(Dune::InvalidStateException, "You should not be here: x=" << globalPos[0] << " y= "<< globalPos[dimWorld-1]);
     }
 
     /*!\brief Returns a reference to the container object for the
-     *        parametrization of the surface between non-Wetting and solid phase.
+     *        parametrization of the surface between nonwetting and solid phase.
      *
      *        The position is determined based on the coordinate of
      *        the vertex belonging to the considered sub-control volume.
@@ -248,15 +248,15 @@ public:
      * \param elemSol The element solution
      */
     template<class ElementSolution>
-    const AnsSurfaceParams& aNonWettingSolidSurfaceParams(const Element &element,
+    const AnsSurfaceParams& aNonwettingSolidSurfaceParams(const Element &element,
                                                           const SubControlVolume &scv,
                                                           const ElementSolution &elemSol) const
     {
         const auto& globalPos =  scv.dofPosition();
         if (inFF_(globalPos) )
-            return aNonWettingSolidSurfaceParamsFreeFlow_  ;
+            return aNonwettingSolidSurfaceParamsFreeFlow_  ;
         else if (inPM_(globalPos))
-            return aNonWettingSolidSurfaceParams_ ;
+            return aNonwettingSolidSurfaceParams_ ;
         else DUNE_THROW(Dune::InvalidStateException, "You should not be here: x=" << globalPos[0] << " y= "<< globalPos[dimWorld-1]);
     }
 
@@ -368,10 +368,10 @@ private:
     static constexpr Scalar eps_  = 1e-6;
     Scalar heightDomain_ ;
 
-    AwnSurfaceParams aWettingNonWettingSurfaceParams_;
-    AnsSurfaceParams aNonWettingSolidSurfaceParams_ ;
-    AwnSurfaceParams aWettingNonWettingSurfaceParamsFreeFlow_;
-    AnsSurfaceParams aNonWettingSolidSurfaceParamsFreeFlow_ ;
+    AwnSurfaceParams aWettingNonwettingSurfaceParams_;
+    AnsSurfaceParams aNonwettingSolidSurfaceParams_ ;
+    AwnSurfaceParams aWettingNonwettingSurfaceParamsFreeFlow_;
+    AnsSurfaceParams aNonwettingSolidSurfaceParamsFreeFlow_ ;
 
     // Porous Medium Domain
     Scalar intrinsicPermeabilityPM_ ;
@@ -389,13 +389,13 @@ private:
     MaterialLawParams materialParamsFF_ ;
 
     // interfacial area parameters
-    Scalar aWettingNonWettingA1_ ;
-    Scalar aWettingNonWettingA2_ ;
-    Scalar aWettingNonWettingA3_ ;
+    Scalar aWettingNonwettingA1_ ;
+    Scalar aWettingNonwettingA2_ ;
+    Scalar aWettingNonwettingA3_ ;
 
-    Scalar aNonWettingSolidA1_;
-    Scalar aNonWettingSolidA2_;
-    Scalar aNonWettingSolidA3_;
+    Scalar aNonwettingSolidA1_;
+    Scalar aNonwettingSolidA2_;
+    Scalar aNonwettingSolidA3_;
 
     // capillary pressures parameters
     Scalar BCPd_ ;
diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/combustionfluidsystem.hh b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/combustionfluidsystem.hh
index 0e782310fe190fd73c92ada092a34b2a34f147f5..fc2fe115998d0227117a8ea8061135de99d2a20f 100644
--- a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/combustionfluidsystem.hh
+++ b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/combustionfluidsystem.hh
@@ -66,9 +66,9 @@ public:
     static constexpr int numPhases = 2;
 
     static constexpr int wPhaseIdx = 0; // index of the wetting phase
-    static constexpr int nPhaseIdx = 1; // index of the non-wetting phase
+    static constexpr int nPhaseIdx = 1; // index of the nonwetting phase
     static constexpr int phase0Idx = 0; // index of the wetting phase
-    static constexpr int phase1Idx = 1; // index of the non-wetting phase
+    static constexpr int phase1Idx = 1; // index of the nonwetting phase
 
     // export component indices to indicate the main component
     // of the corresponding phase at atmospheric pressure 1 bar
@@ -76,7 +76,7 @@ public:
     static constexpr int wCompIdx = wPhaseIdx;
     static constexpr int nCompIdx = nPhaseIdx;
     static constexpr int comp0Idx = 0; // index of the wetting phase
-    static constexpr int comp1Idx = 1; // index of the non-wetting phase
+    static constexpr int comp1Idx = 1; // index of the nonwetting phase
 
     /*!
      * \brief Returns the human readable name of a fluid phase
diff --git a/test/porousmediumflow/richards/implicit/analytical/problem.hh b/test/porousmediumflow/richards/implicit/analytical/problem.hh
index 818e2cd5724bc97ed72c29329bc091ed9472c981..98d5df3b448ace185543d308b371f9e47b76eb17 100644
--- a/test/porousmediumflow/richards/implicit/analytical/problem.hh
+++ b/test/porousmediumflow/richards/implicit/analytical/problem.hh
@@ -160,12 +160,12 @@ public:
     { return 273.15 + 10; } // -> 10°C
 
     /*!
-     * \brief Returns the reference pressure [Pa] of the non-wetting
+     * \brief Returns the reference pressure [Pa] of the nonwetting
      *        fluid phase within a finite volume
      *
      * This problem assumes a constant reference pressure of 1 bar.
      */
-    Scalar nonWettingReferencePressure() const
+    Scalar nonwettingReferencePressure() const
     { return pnRef_; }
 
    /*!
diff --git a/test/porousmediumflow/richards/implicit/lens/problem.hh b/test/porousmediumflow/richards/implicit/lens/problem.hh
index bcf448e218a1c1a388ff65e7ffa4bf2aa4a9b29c..69f408cfe33203df79cd55c44b13e8551fbde7eb 100644
--- a/test/porousmediumflow/richards/implicit/lens/problem.hh
+++ b/test/porousmediumflow/richards/implicit/lens/problem.hh
@@ -165,12 +165,12 @@ public:
     { return 273.15 + 10; }; // -> 10°C
 
     /*!
-     * \brief Returns the reference pressure [Pa] of the non-wetting
+     * \brief Returns the reference pressure [Pa] of the nonwetting
      *        fluid phase within a finite volume
      *
      * This problem assumes a constant reference pressure of 1 bar.
      */
-    Scalar nonWettingReferencePressure() const
+    Scalar nonwettingReferencePressure() const
     { return 1.0e5; };
 
     // \}
@@ -249,7 +249,7 @@ private:
         const Scalar sw = 0.0;
         using MaterialLaw = typename ParentType::SpatialParams::MaterialLaw;
         const Scalar pc = MaterialLaw::pc(this->spatialParams().materialLawParamsAtPos(globalPos), sw);
-        values[pressureIdx] = nonWettingReferencePressure() - pc;
+        values[pressureIdx] = nonwettingReferencePressure() - pc;
         values.setState(bothPhases);
         return values;
     }
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh
index d1270c794d991b8eb23e2b29834d299adce3f40b..b161899190e70ebecaa5596eaf3be70bf52ac989 100644
--- a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh
@@ -276,12 +276,12 @@ public:
     // \{
 
     /*!
-     * \brief Returns the reference pressure [Pa] of the non-wetting
+     * \brief Returns the reference pressure [Pa] of the nonwetting
      *        fluid phase within a finite volume.
      *
      * This problem assumes a constant reference pressure of 1 bar.
      */
-     Scalar nonWettingReferencePressure() const
+     Scalar nonwettingReferencePressure() const
     { return 1e5; };
 
     /*!
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh
index 89f8851c8e2a98cd9f438a14bf3acea45a18d508..c2fc0ec91b6f5e583680c4c7c626cd7ba8b03b65 100644
--- a/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh
@@ -296,12 +296,12 @@ public:
 
 
     /*!
-     * \brief Returns the reference pressure [Pa] of the non-wetting
+     * \brief Returns the reference pressure [Pa] of the nonwetting
      *        fluid phase within a finite volume.
      *
      * This problem assumes a constant reference pressure of 1 bar.
      */
-    Scalar nonWettingReferencePressure() const
+    Scalar nonwettingReferencePressure() const
     { return 1e5; };
 
     /*!
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh
index 1a4f1f23431f8adefc166e8b65fa209f26009a75..8d95b157acd7178f0783f08a7129a13514ce8e1d 100644
--- a/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh
@@ -237,12 +237,12 @@ public:
 
 
     /*!
-     * \brief Returns the reference pressure [Pa] of the non-wetting
+     * \brief Returns the reference pressure [Pa] of the nonwetting
      *        fluid phase within a finite volume.
      *
      * This problem assumes a constant reference pressure of 1 bar.
      */
-    Scalar nonWettingReferencePressure() const
+    Scalar nonwettingReferencePressure() const
     { return 1e5; };
 
     /*!
diff --git a/test/porousmediumflow/richardsnc/implicit/problem.hh b/test/porousmediumflow/richardsnc/implicit/problem.hh
index 6f10763218c0341ed1f2a2f16d92bf6450428fc0..4986d23678073cb955f94edbc8f7b910898ee903 100644
--- a/test/porousmediumflow/richardsnc/implicit/problem.hh
+++ b/test/porousmediumflow/richardsnc/implicit/problem.hh
@@ -211,12 +211,12 @@ public:
     { return 273.15 + 10; }; // -> 10°C
 
     /*!
-     * \brief Returns the reference pressure [Pa] of the non-wetting
+     * \brief Returns the reference pressure [Pa] of the nonwetting
      *        fluid phase within a finite volume
      *
      * This problem assumes a constant reference pressure of 1 bar.
      */
-    Scalar nonWettingReferencePressure() const
+    Scalar nonwettingReferencePressure() const
     { return 1.0e5; };
 
     // \}
@@ -327,7 +327,7 @@ private:
 
         PrimaryVariables values(0.0);
         //! Hydrostatic pressure profile
-        values[pressureIdx] = (nonWettingReferencePressure() - pcTop_)
+        values[pressureIdx] = (nonwettingReferencePressure() - pcTop_)
                                - 9.81*1000*(globalPos[dimWorld-1] - this->gridGeometry().bBoxMax()[dimWorld-1]);
         values[compIdx] = xTracer;
         return values;
diff --git a/test/references/test_3d2pfv-reference.vtu b/test/references/test_3d2pfv-reference.vtu
index d1b1672f62bfef496099cad2edde0efc6aa30571..abe38cad820109e71749656a85860f0e5ec93c19 100644
--- a/test/references/test_3d2pfv-reference.vtu
+++ b/test/references/test_3d2pfv-reference.vtu
@@ -448,7 +448,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="non-wetting-velocity" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="nonwetting-velocity" NumberOfComponents="3" format="ascii">
           2.68709e-09 3.4232e-09 3.60165e-09 1.47845e-08 9.31325e-09 7.56836e-09 2.98564e-08 3.07457e-08 1.10739e-08 8.08325e-09 1.54746e-08 7.60041e-09
           5.859e-09 6.95727e-09 1.34628e-08 2.20786e-08 1.23303e-08 2.40416e-08 3.73442e-08 3.83802e-08 3.52134e-08 1.13296e-08 2.4106e-08 2.50223e-08
           4.59339e-08 1.58837e-08 1.06132e-08 1.29078e-07 3.00689e-08 1.62042e-08 1.84513e-07 1.07739e-07 2.70601e-08 7.03605e-08 5.05984e-08 1.48724e-08
diff --git a/test/references/test_3d2pfvadaptive-reference.vtu b/test/references/test_3d2pfvadaptive-reference.vtu
index e0922341069a9cd8ec50ee28a9f2958185fd7aa0..c8d5d42056ba8a1d10c287361675b87f085499ef 100644
--- a/test/references/test_3d2pfvadaptive-reference.vtu
+++ b/test/references/test_3d2pfvadaptive-reference.vtu
@@ -182,7 +182,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="non-wetting-velocity" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="nonwetting-velocity" NumberOfComponents="3" format="ascii">
           2.67512e-09 3.43264e-09 3.60167e-09 1.60875e-08 9.01011e-09 7.01255e-09 3.36632e-08 2.81615e-08 9.09346e-09 7.75778e-09 1.53435e-08 7.79984e-09
           5.73929e-09 7.13571e-09 1.35139e-08 2.55299e-08 1.1506e-08 2.08865e-08 4.55474e-08 3.55862e-08 2.45876e-08 9.73938e-09 2.42261e-08 2.65908e-08
           4.81219e-08 1.64089e-08 1.24793e-08 1.31911e-07 3.06085e-08 1.82228e-08 1.88337e-07 1.12779e-07 2.79213e-08 7.60922e-08 6.00309e-08 1.57898e-08
diff --git a/test/references/test_3d2pmimetic-reference.vtu b/test/references/test_3d2pmimetic-reference.vtu
index 7fcfd8741e480b00552f240b5c79afee0ee91b7f..150477b4e2c4ea3842a9d45d0330b4d6b4c71b74 100644
--- a/test/references/test_3d2pmimetic-reference.vtu
+++ b/test/references/test_3d2pmimetic-reference.vtu
@@ -313,7 +313,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="non-wetting-velocity" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="nonwetting-velocity" NumberOfComponents="3" format="ascii">
           2.9518e-09 3.44395e-09 3.46661e-09 1.10505e-08 1.03892e-08 8.89206e-09 3.00195e-08 3.23541e-08 1.20384e-08 9.68364e-09 1.40043e-08 7.89111e-09
           7.41518e-09 6.9783e-09 1.23971e-08 2.23261e-08 1.27712e-08 2.68672e-08 3.92783e-08 3.85761e-08 3.68786e-08 1.32295e-08 2.36236e-08 2.49443e-08
           4.85388e-08 1.70555e-08 1.03843e-08 1.52657e-07 4.31803e-08 2.91079e-08 2.09752e-07 1.25991e-07 4.25572e-08 6.50336e-08 5.48369e-08 1.62653e-08
diff --git a/test/references/test_3d2pmimeticadaptive-reference.vtu b/test/references/test_3d2pmimeticadaptive-reference.vtu
index 744f51d103d9017f2135d2c8454c417b8176eaed..1ab887a7f4c1ca6bbe8917499e6a3752f2b35e0d 100644
--- a/test/references/test_3d2pmimeticadaptive-reference.vtu
+++ b/test/references/test_3d2pmimeticadaptive-reference.vtu
@@ -172,7 +172,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="non-wetting-velocity" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="nonwetting-velocity" NumberOfComponents="3" format="ascii">
           2.87581e-09 3.39296e-09 3.53177e-09 1.01604e-08 1.01657e-08 9.17897e-09 2.77666e-08 3.29209e-08 1.20042e-08 9.36374e-09 1.37054e-08 8.16684e-09
           6.91834e-09 6.45166e-09 1.30908e-08 1.97003e-08 1.1748e-08 2.85317e-08 3.52405e-08 3.78566e-08 3.65472e-08 1.22438e-08 2.21306e-08 2.61632e-08
           4.7215e-08 1.67057e-08 9.17616e-09 1.54274e-07 4.27911e-08 2.68976e-08 2.15116e-07 1.2428e-07 4.12068e-08 6.28246e-08 5.18585e-08 1.43804e-08
diff --git a/test/references/test_3d2pmpfal-reference.vtu b/test/references/test_3d2pmpfal-reference.vtu
index 5c79f4b59a817aa176e3e35c3b737c477d18bc5d..d6d79e67ee8e77a67ee81c7664270850262831ca 100644
--- a/test/references/test_3d2pmpfal-reference.vtu
+++ b/test/references/test_3d2pmpfal-reference.vtu
@@ -358,7 +358,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="non-wetting-velocity" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="nonwetting-velocity" NumberOfComponents="3" format="ascii">
           2.73592e-09 3.34939e-09 3.62226e-09 1.51313e-08 9.33882e-09 7.88181e-09 3.14853e-08 3.11367e-08 1.08325e-08 8.75189e-09 1.56046e-08 7.30123e-09
           6.53506e-09 6.67608e-09 1.31143e-08 2.32091e-08 1.26517e-08 2.43343e-08 3.8895e-08 3.88555e-08 3.43162e-08 1.21698e-08 2.39174e-08 2.37683e-08
           4.6294e-08 1.6079e-08 1.20821e-08 1.26512e-07 3.1595e-08 2.4334e-08 1.77904e-07 1.08369e-07 4.06938e-08 7.01442e-08 5.06842e-08 1.65383e-08
diff --git a/test/references/test_3d2pmpfaladaptive-reference.vtu b/test/references/test_3d2pmpfaladaptive-reference.vtu
index 987462de4d90454e92d29badacb5806747d22324..6682ec99e8f69b5e134a83c9fd64e05c9d34e70f 100644
--- a/test/references/test_3d2pmpfaladaptive-reference.vtu
+++ b/test/references/test_3d2pmpfaladaptive-reference.vtu
@@ -182,7 +182,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="non-wetting-velocity" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="nonwetting-velocity" NumberOfComponents="3" format="ascii">
           2.75308e-09 2.94103e-09 2.77117e-09 1.50804e-08 9.89439e-09 9.68641e-09 3.43744e-08 3.7858e-08 1.60101e-08 1.21122e-08 9.97126e-09 8.87184e-09
           9.70962e-09 8.85545e-09 7.84382e-09 2.45076e-08 1.34021e-08 3.4376e-08 3.9644e-08 4.69736e-08 5.58916e-08 1.78324e-08 2.41976e-08 3.15856e-08
           4.67585e-08 1.76121e-08 1.29717e-08 1.25171e-07 3.30641e-08 2.61119e-08 1.75891e-07 1.11225e-07 4.21997e-08 6.94584e-08 5.52829e-08 1.8096e-08
diff --git a/test/references/test_mpfal2p-reference.vtu b/test/references/test_mpfal2p-reference.vtu
index 9e5c4fc465b371676c4a156ddf35f0d5d8a1d79c..e138b613d0151ca35aecde3680f33db5e0458428 100644
--- a/test/references/test_mpfal2p-reference.vtu
+++ b/test/references/test_mpfal2p-reference.vtu
@@ -85,7 +85,7 @@
           -9.7322e-06 2.30537e-08 0 -6.83606e-06 1.54882e-06 0 -1.98406e-06 8.97655e-07 0 2.12407e-06 8.89776e-07 0
           6.78288e-06 1.52252e-06 0 9.34179e-06 -6.54876e-08 0 9.68521e-06 2.02873e-07 0 1.02844e-05 9.65329e-08 0
         </DataArray>
-        <DataArray type="Float32" Name="non-wetting-velocity" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="nonwetting-velocity" NumberOfComponents="3" format="ascii">
           0 -1.63362e-17 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 -1.13577e-36 0
           0 -1.6373e-38 0 1.60642e-26 -8.76095e-11 0 -7.45218e-19 -2.01923e-08 0 0 -1.40241e-28 0
diff --git a/test/references/test_mpfal2padaptive-reference.vtu b/test/references/test_mpfal2padaptive-reference.vtu
index dbed4cd2b138eb85882f91fe47a152320cf3c1f9..69b1247921beb86ff9deab668f0d7f7b724d0bf0 100644
--- a/test/references/test_mpfal2padaptive-reference.vtu
+++ b/test/references/test_mpfal2padaptive-reference.vtu
@@ -167,7 +167,7 @@
           1.07924e-06 6.17466e-07 0 1.15407e-06 2.0292e-07 0 5.20247e-07 1.12781e-07 0 2.62606e-06 5.47433e-07 0
           4.59453e-06 4.36802e-07 0 5.74018e-06 1.36021e-07 0
         </DataArray>
-        <DataArray type="Float32" Name="non-wetting-velocity" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="nonwetting-velocity" NumberOfComponents="3" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 -1.36278e-21 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
diff --git a/test/references/test_mpfao2p-reference.vtu b/test/references/test_mpfao2p-reference.vtu
index 864dfadf0939e8a5828d0d26194fd6e501d7d60c..d016d536d159c94cf11dbfcad06c3818e755f1fe 100644
--- a/test/references/test_mpfao2p-reference.vtu
+++ b/test/references/test_mpfao2p-reference.vtu
@@ -85,7 +85,7 @@
           -9.7322e-06 2.30537e-08 0 -6.83606e-06 1.54882e-06 0 -1.98406e-06 8.97655e-07 0 2.12407e-06 8.89776e-07 0
           6.78288e-06 1.52252e-06 0 9.34179e-06 -6.54876e-08 0 9.68521e-06 2.02873e-07 0 1.02844e-05 9.65329e-08 0
         </DataArray>
-        <DataArray type="Float32" Name="non-wetting-velocity" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="nonwetting-velocity" NumberOfComponents="3" format="ascii">
           0 -1.63362e-17 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 -1.15405e-36 0
           0 -1.71867e-38 0 1.60642e-26 -8.76095e-11 0 -7.45218e-19 -2.01923e-08 0 0 -1.40243e-28 0