diff --git a/dumux/material/components/base.hh b/dumux/material/components/base.hh
index 48213dd5b5b9f7faf58cb3098da6532129c4009c..e9f85a96f956428c5c187eaa4ed5bf1306e012f7 100644
--- a/dumux/material/components/base.hh
+++ b/dumux/material/components/base.hh
@@ -39,6 +39,9 @@
 namespace Dumux {
 namespace Components {
 
+template <class Component>
+struct IsAqueous : public std::false_type {};
+
 template <class ScalarType, class Component>
 class Base
 {
diff --git a/dumux/material/components/brine.hh b/dumux/material/components/brine.hh
index feac74ee26a9c8b1233a5c3c0e9f114a0bfa9660..25780d2baf7019cba2e701ec74d3f1593b77dc36 100644
--- a/dumux/material/components/brine.hh
+++ b/dumux/material/components/brine.hh
@@ -426,6 +426,9 @@ public:
     { return H2O::liquidThermalConductivity(temperature, pressure); }
 };
 
+template <class Scalar, class H2O>
+struct IsAqueous<Brine<Scalar, H2O>> : public std::true_type {};
+
 /*!
  * \brief Default value for the salinity of the brine (dimensionless).
  */
diff --git a/dumux/material/components/h2o.hh b/dumux/material/components/h2o.hh
index 137e6862ec86dfdce84e8b9b6f3393a0ca26687b..d8dc37268d4d37938f7d297b4d40e7c0d6cb95c4 100644
--- a/dumux/material/components/h2o.hh
+++ b/dumux/material/components/h2o.hh
@@ -915,6 +915,9 @@ private:
     }
 }; // end class
 
+template <class Scalar>
+struct IsAqueous<H2O<Scalar>> : public std::true_type {};
+
 } // end namespace Components
 
 } // end namespace Dumux
diff --git a/dumux/material/components/simpleh2o.hh b/dumux/material/components/simpleh2o.hh
index 7a6dcce9273d11770a1bd3cb296ec423be726b9b..c132eb08af6d89220750e0e141bb9fd5365b8bc0 100644
--- a/dumux/material/components/simpleh2o.hh
+++ b/dumux/material/components/simpleh2o.hh
@@ -359,6 +359,9 @@ public:
 
 };
 
+template <class Scalar>
+struct IsAqueous<SimpleH2O<Scalar>> : public std::true_type {};
+
 template <class Scalar>
 const Scalar Components::SimpleH2O<Scalar>::R = Constants<Scalar>::R / 18e-3;
 
diff --git a/dumux/material/components/tabulatedcomponent.hh b/dumux/material/components/tabulatedcomponent.hh
index 9abacc1a7ce3b2b316500f7631f708f78cbb67c7..059fe021cf3407a5f642918cdb744e2c071ac33c 100644
--- a/dumux/material/components/tabulatedcomponent.hh
+++ b/dumux/material/components/tabulatedcomponent.hh
@@ -1061,6 +1061,9 @@ typename RawComponent::Scalar TabulatedComponent<RawComponent, useVaporPressure>
 template <class RawComponent, bool useVaporPressure>
 unsigned TabulatedComponent<RawComponent, useVaporPressure>::nDensity_;
 
+template <class RawComponent, bool useVaporPressure>
+struct IsAqueous<TabulatedComponent<RawComponent, useVaporPressure>> : public IsAqueous<RawComponent> {};
+
 } // end namespace Components
 
 } // end namespace Dumux
diff --git a/dumux/material/fluidsystems/1pgas.hh b/dumux/material/fluidsystems/1pgas.hh
index 42cf64735fe2794f91b16cad792c025e8210f496..a889a3f2d80636112301c25f811c01482a8fe173 100644
--- a/dumux/material/fluidsystems/1pgas.hh
+++ b/dumux/material/fluidsystems/1pgas.hh
@@ -73,7 +73,7 @@ public:
      * \param phaseIdx The index of the fluid phase to consider
      */
     static std::string phaseName(int phaseIdx = 0)
-    { return Component::name(); }
+    { return "gas"; }
 
     /*!
      * \brief A human readable name for the component.
diff --git a/dumux/material/fluidsystems/1pliquid.hh b/dumux/material/fluidsystems/1pliquid.hh
index e02eaeac781ce5d482a95724d4467df1d34aacfc..1d03e0403325675c9bd89909b56056a384b79267 100644
--- a/dumux/material/fluidsystems/1pliquid.hh
+++ b/dumux/material/fluidsystems/1pliquid.hh
@@ -73,7 +73,7 @@ public:
      * \param phaseIdx The index of the fluid phase to consider
      */
     static std::string phaseName(int phaseIdx = 0)
-    { return Component::name(); }
+    { return "liq"; }
 
     /*!
      * \brief A human readable name for the component.
diff --git a/dumux/material/fluidsystems/2p1c.hh b/dumux/material/fluidsystems/2p1c.hh
index 2224d6404c5fda3b2e58d783b3675df2c4da6b6e..4857dc4b947cb9d32bc905aa2e60f26f186b50f7 100644
--- a/dumux/material/fluidsystems/2p1c.hh
+++ b/dumux/material/fluidsystems/2p1c.hh
@@ -68,8 +68,8 @@ public:
     static std::string phaseName(int phaseIdx)
     {
         static std::string name[] = {
-            std::string("liquid"),
-            std::string("vapor"),
+            std::string("liq"),
+            std::string("gas"),
         };
 
         assert(0 <= phaseIdx && phaseIdx < numPhases);
diff --git a/dumux/material/fluidsystems/2pimmiscible.hh b/dumux/material/fluidsystems/2pimmiscible.hh
index d713d150d6ef3ba3feb38b693ecb2826635f0378..2429a039a0ca4903234fdc41903257e29e674d9e 100644
--- a/dumux/material/fluidsystems/2pimmiscible.hh
+++ b/dumux/material/fluidsystems/2pimmiscible.hh
@@ -32,6 +32,7 @@
 #include <dumux/material/fluidsystems/1pliquid.hh>
 #include <dumux/material/fluidsystems/1pgas.hh>
 #include <dumux/material/fluidstates/immiscible.hh>
+#include <dumux/material/components/base.hh>
 
 #include "base.hh"
 
@@ -85,10 +86,20 @@ public:
     {
         assert(0 <= phaseIdx && phaseIdx < numPhases);
 
-        if (phaseIdx == phase0Idx)
-            return Fluid0::phaseName();
+        if (!Fluid0::isGas() && !Fluid1::isGas())
+        {
+            if (phaseIdx == phase0Idx)
+                return Components::IsAqueous<typename Fluid0::Component>::value ? "aq" : "napl";
+            else
+                return Components::IsAqueous<typename Fluid1::Component>::value ? "aq" : "napl";
+        }
         else
-            return Fluid1::phaseName();
+        {
+            if (phaseIdx == phase0Idx)
+                return Fluid0::isGas() ? "gas" : "liq";
+            else
+                return Fluid1::isGas() ? "gas" : "liq";
+        }
     }
 
     /*!
diff --git a/dumux/material/fluidsystems/3pimmiscible.hh b/dumux/material/fluidsystems/3pimmiscible.hh
index a670e8c49b1aeb10d4d2e01ef429485e37e52ac3..3d362ffad3cc27e2bf319261b84ee7b4a3caad18 100644
--- a/dumux/material/fluidsystems/3pimmiscible.hh
+++ b/dumux/material/fluidsystems/3pimmiscible.hh
@@ -33,6 +33,7 @@
 #include <dumux/material/fluidsystems/1pliquid.hh>
 #include <dumux/material/fluidsystems/1pgas.hh>
 #include <dumux/material/fluidstates/immiscible.hh>
+#include <dumux/material/components/base.hh>
 
 namespace Dumux {
 namespace FluidSystems {
@@ -89,13 +90,15 @@ public:
     static std::string phaseName(int phaseIdx)
     {
         assert(0 <= phaseIdx && phaseIdx < numPhases);
-
-        static std::string name[] = {
-            std::string("w"),
-            std::string("n"),
-            std::string("g")
-        };
-        return name[phaseIdx];
+        switch (phaseIdx)
+        {
+            case wPhaseIdx: return Components::IsAqueous<typename WettingFluid::Component>::value
+                            ? "aq" : "napl";
+            case nPhaseIdx: return Components::IsAqueous<typename NonwettingFluid::Component>::value
+                            ? "aq" : "napl";
+            case gPhaseIdx: return "gas";
+        }
+        DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
     }
 
     /*!
diff --git a/dumux/material/fluidsystems/brine.hh b/dumux/material/fluidsystems/brine.hh
index beba2dfe3e5dd5e96b659c81e6e23e561b8b6a3f..9bfc0769a499d02f88490aae3110de63bc36ebe8 100644
--- a/dumux/material/fluidsystems/brine.hh
+++ b/dumux/material/fluidsystems/brine.hh
@@ -69,7 +69,7 @@ public:
     static const std::string phaseName(int phaseIdx = liquidPhaseIdx)
     {
         assert(phaseIdx == liquidPhaseIdx);
-        return "brine";
+        return "liq";
     }
 
     /*!
diff --git a/dumux/material/fluidsystems/brineair.hh b/dumux/material/fluidsystems/brineair.hh
index b73f94bd5c716cbf9f286b552a5bd82567707728..bba23499ddc91efc1f26b975a48996e247ec3f46 100644
--- a/dumux/material/fluidsystems/brineair.hh
+++ b/dumux/material/fluidsystems/brineair.hh
@@ -148,8 +148,8 @@ public:
         assert(0 <= phaseIdx && phaseIdx < numPhases);
         switch (phaseIdx)
         {
-            case liquidPhaseIdx: return Brine::phaseName(Brine::liquidPhaseIdx);
-            case gasPhaseIdx: return Air::name();
+            case liquidPhaseIdx: return "liq";
+            case gasPhaseIdx: return "gas";
         }
         DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
     }
diff --git a/dumux/material/fluidsystems/brineco2.hh b/dumux/material/fluidsystems/brineco2.hh
index 7c1c603735878c7a30d1fb19f0b0eb599c739493..55eb96777b8e02d83e99e9104fe1840af953bc17 100644
--- a/dumux/material/fluidsystems/brineco2.hh
+++ b/dumux/material/fluidsystems/brineco2.hh
@@ -195,8 +195,8 @@ public:
     {
         switch (phaseIdx)
         {
-            case liquidPhaseIdx: return "l";
-            case gasPhaseIdx: return "g";
+            case liquidPhaseIdx: return "liq";
+            case gasPhaseIdx: return "gas";
         }
         DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
     }
diff --git a/dumux/material/fluidsystems/h2oair.hh b/dumux/material/fluidsystems/h2oair.hh
index 79f23ff2d78f41a929eed864ae2f2918effd316e..c1ea24d39d3e57d93ac510aaf59e26244cdf7f37 100644
--- a/dumux/material/fluidsystems/h2oair.hh
+++ b/dumux/material/fluidsystems/h2oair.hh
@@ -101,9 +101,10 @@ public:
      */
     static std::string phaseName(int phaseIdx)
     {
+        assert(0 <= phaseIdx && phaseIdx < numPhases);
         switch (phaseIdx)
         {
-            case liquidPhaseIdx: return "liquid";
+            case liquidPhaseIdx: return "liq";
             case gasPhaseIdx: return "gas";
         }
         DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
diff --git a/dumux/material/fluidsystems/h2oairmesitylene.hh b/dumux/material/fluidsystems/h2oairmesitylene.hh
index e06bee221d9a4827a599241ec2148061f36a0a20..3db76865d2d1028d1a5cf2f8f32e25a9213b101c 100644
--- a/dumux/material/fluidsystems/h2oairmesitylene.hh
+++ b/dumux/material/fluidsystems/h2oairmesitylene.hh
@@ -194,10 +194,12 @@ public:
      */
     static std::string phaseName(int phaseIdx)
     {
-        switch (phaseIdx) {
-            case wPhaseIdx: return "w";
-            case nPhaseIdx: return "n";
-            case gPhaseIdx: return "g";
+        assert(0 <= phaseIdx && phaseIdx < numPhases);
+        switch (phaseIdx)
+        {
+            case wPhaseIdx: return "aq";
+            case nPhaseIdx: return "napl";
+            case gPhaseIdx: return "gas";
         }
         DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
     }
diff --git a/dumux/material/fluidsystems/h2oairxylene.hh b/dumux/material/fluidsystems/h2oairxylene.hh
index 15ead9572445235ff338391ef7dfb2442c3c7baa..944304bb1c621a1c4dd9a8702aafe5115f3f6cd2 100644
--- a/dumux/material/fluidsystems/h2oairxylene.hh
+++ b/dumux/material/fluidsystems/h2oairxylene.hh
@@ -195,10 +195,12 @@ public:
      */
     static std::string phaseName(int phaseIdx)
     {
-        switch (phaseIdx) {
-            case wPhaseIdx: return "w";
-            case nPhaseIdx: return "n";
-            case gPhaseIdx: return "g";
+        assert(0 <= phaseIdx && phaseIdx < numPhases);
+        switch (phaseIdx)
+        {
+            case wPhaseIdx: return "aq";
+            case nPhaseIdx: return "napl";
+            case gPhaseIdx: return "gas";
         }
         DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
     }
diff --git a/dumux/material/fluidsystems/h2oheavyoil.hh b/dumux/material/fluidsystems/h2oheavyoil.hh
index 45ebf44435a496b3819859979c6c1cd84f7266e0..575b2c74f721ebe7fb18fa25584c1e82f6566243 100644
--- a/dumux/material/fluidsystems/h2oheavyoil.hh
+++ b/dumux/material/fluidsystems/h2oheavyoil.hh
@@ -184,11 +184,13 @@ public:
      */
     static std::string phaseName(int phaseIdx)
     {
-        switch (phaseIdx) {
-            case wPhaseIdx: return "w";
-            case nPhaseIdx: return "n";
-            case gPhaseIdx: return "g";
-        };
+        assert(0 <= phaseIdx && phaseIdx < numPhases);
+        switch (phaseIdx)
+        {
+            case wPhaseIdx: return "aq";
+            case nPhaseIdx: return "napl";
+            case gPhaseIdx: return "gas";
+        }
         DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
     }
 
diff --git a/dumux/material/fluidsystems/h2on2.hh b/dumux/material/fluidsystems/h2on2.hh
index 68f8ba5b610029af2801249b44eee06502b0349a..e5c75bc42b2fa21ff804f8e23df2ffa7d1b1dd3e 100644
--- a/dumux/material/fluidsystems/h2on2.hh
+++ b/dumux/material/fluidsystems/h2on2.hh
@@ -100,11 +100,15 @@ public:
      *
      * \param phaseIdx The index of the fluid phase to consider
      */
-    static const std::string& phaseName(int phaseIdx)
+    static std::string phaseName(int phaseIdx)
     {
-        static const std::string name[] = { std::string("w"), std::string("n") };
         assert(0 <= phaseIdx && phaseIdx < numPhases);
-        return name[phaseIdx];
+        switch (phaseIdx)
+        {
+            case liquidPhaseIdx: return "liq";
+            case gasPhaseIdx: return "gas";
+        }
+        DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
     }
 
     /*!
diff --git a/dumux/material/fluidsystems/h2on2o2.hh b/dumux/material/fluidsystems/h2on2o2.hh
index b0a32cb97b58ff9d84a4bbcc33d969f770eec481..868dbe8f85d409c59d9e45331c7ccc30521eee76 100644
--- a/dumux/material/fluidsystems/h2on2o2.hh
+++ b/dumux/material/fluidsystems/h2on2o2.hh
@@ -119,15 +119,15 @@ public:
      *
      * \param phaseIdx The index of the fluid phase to consider
      */
-    static const std::string& phaseName(int phaseIdx)
+    static std::string phaseName(int phaseIdx)
     {
-        static const std::string name[] = {
-            std::string("l"),
-            std::string("g")
-        };
-
         assert(0 <= phaseIdx && phaseIdx < numPhases);
-        return name[phaseIdx];
+        switch (phaseIdx)
+        {
+            case liquidPhaseIdx: return "liq";
+            case gasPhaseIdx: return "gas";
+        }
+        DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
     }
 
     /*!
diff --git a/dumux/material/fluidsystems/liquidphase2c.hh b/dumux/material/fluidsystems/liquidphase2c.hh
index 8e8aff571a680591db4173eff71161eb9ca68ce3..67e5847579475e91afda022059355708176db301 100644
--- a/dumux/material/fluidsystems/liquidphase2c.hh
+++ b/dumux/material/fluidsystems/liquidphase2c.hh
@@ -75,7 +75,7 @@ public:
      * \param phaseIdx The index of the fluid phase to consider
      */
     static std::string phaseName(int phaseIdx = 0)
-    { return MainComponent::name(); }
+    { return "liq"; }
 
     /*!
      * \brief Returns whether the fluids are miscible
diff --git a/dumux/material/fluidsystems/spe5.hh b/dumux/material/fluidsystems/spe5.hh
index bfdbef98bdba61855ce955a38e9ee3fe6c67c7c5..b7fc35f9c4a1b61e0476ab995cebd4d84724efac 100644
--- a/dumux/material/fluidsystems/spe5.hh
+++ b/dumux/material/fluidsystems/spe5.hh
@@ -86,14 +86,14 @@ public:
      */
     static std::string phaseName(int phaseIdx)
     {
-        static std::string name[] = {
-            std::string("g"),
-            std::string("w"),
-            std::string("o"),
-        };
-
         assert(0 <= phaseIdx && phaseIdx < numPhases);
-        return name[phaseIdx];
+        switch (phaseIdx)
+        {
+            case gPhaseIdx: return "gas";
+            case wPhaseIdx: return "aq";
+            case oPhaseIdx: return "napl";
+        }
+        DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
     }
 
     /*!
diff --git a/dumux/material/solidsystems/compositionalsolidphase.hh b/dumux/material/solidsystems/compositionalsolidphase.hh
index a65ffab1769c29feff8df30fe79a856d4e6b604b..9e513f034c84170464457b8872f75deb4d2ba757 100644
--- a/dumux/material/solidsystems/compositionalsolidphase.hh
+++ b/dumux/material/solidsystems/compositionalsolidphase.hh
@@ -73,7 +73,7 @@ public:
      * \brief A human readable name for the solid system.
      */
     static std::string name()
-    { return "CompositionalSolidPhase"; }
+    { return "s"; }
 
     /*!
      * \brief Returns whether the phase is incompressible
diff --git a/dumux/material/solidsystems/inertsolidphase.hh b/dumux/material/solidsystems/inertsolidphase.hh
index d93028eb4355e66a9e3faab863630c21f7e07b2d..a01314390d76ee6a00f01562db9e100fd14efd69 100644
--- a/dumux/material/solidsystems/inertsolidphase.hh
+++ b/dumux/material/solidsystems/inertsolidphase.hh
@@ -60,7 +60,7 @@ public:
      * \brief A human readable name for the solid system.
      */
     static std::string name()
-    { return Component::name(); }
+    { return "s"; }
 
     /*!
      * \brief Returns whether the phase is incompressible
diff --git a/dumux/porousmediumflow/2p/model.hh b/dumux/porousmediumflow/2p/model.hh
index b73fa645ccd12c2763bf9f3378145bce3ae6c5ea..958309b5f12b20874d027d8591b56e1f94a3ac22 100644
--- a/dumux/porousmediumflow/2p/model.hh
+++ b/dumux/porousmediumflow/2p/model.hh
@@ -99,13 +99,15 @@ struct TwoPModelTraits
     static constexpr bool enableMolecularDiffusion() { return false; }
     static constexpr bool enableEnergyBalance() { return false; }
 
-    template <class FluidSystem = void, class SolidSystem = void>
+    template <class FluidSystem, class SolidSystem = void>
     static std::string primaryVariableName(int pvIdx, int state = 0)
     {
         if (priVarFormulation() == TwoPFormulation::p0s1)
-            return pvIdx == 0 ? "p_w" : "S_n";
+            return pvIdx == 0 ? "p_" + FluidSystem::phaseName(FluidSystem::phase0Idx)
+                              : "S_" + FluidSystem::phaseName(FluidSystem::phase1Idx) ;
         else
-            return pvIdx == 0 ? "p_n" : "S_w";
+            return pvIdx == 0 ? "p_" + FluidSystem::phaseName(FluidSystem::phase1Idx)
+                              : "S_" + FluidSystem::phaseName(FluidSystem::phase0Idx);
     }
 };
 
diff --git a/dumux/porousmediumflow/2p/vtkoutputfields.hh b/dumux/porousmediumflow/2p/vtkoutputfields.hh
index 281333441fdce55a652380c7e5538e80d47d8fa5..a9e9b380d65cc507d7b666a4e9253f9b92f3d7dc 100644
--- a/dumux/porousmediumflow/2p/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/2p/vtkoutputfields.hh
@@ -37,20 +37,19 @@ public:
     static void init(VtkOutputModule& vtk)
     {
         using VolumeVariables = typename VtkOutputModule::VolumeVariables;
-        using FS = typename VolumeVariables::FluidSystem;
+        using FluidSystem = typename VolumeVariables::FluidSystem;
 
-        vtk.addVolumeVariable([](const VolumeVariables& v){ return v.porosity(); }, "porosity");
-        vtk.addVolumeVariable([](const VolumeVariables& v){ return v.capillaryPressure(); }, "pc");
+        vtk.addVolumeVariable([](const VolumeVariables& v){ return v.saturation(FluidSystem::phase0Idx); }, "S_"+FluidSystem::phaseName(FluidSystem::phase0Idx));
+        vtk.addVolumeVariable([](const VolumeVariables& v){ return v.saturation(FluidSystem::phase1Idx); }, "S_"+FluidSystem::phaseName(FluidSystem::phase1Idx));
+        vtk.addVolumeVariable([](const VolumeVariables& v){ return v.pressure(FluidSystem::phase0Idx); }, "p_"+FluidSystem::phaseName(FluidSystem::phase0Idx));
+        vtk.addVolumeVariable([](const VolumeVariables& v){ return v.pressure(FluidSystem::phase1Idx); }, "p_"+FluidSystem::phaseName(FluidSystem::phase1Idx));
+        vtk.addVolumeVariable([](const auto& v){ return v.capillaryPressure(); }, "pc");
+        vtk.addVolumeVariable([](const auto& v){ return v.density(FluidSystem::phase0Idx); }, "rho_"+FluidSystem::phaseName(FluidSystem::phase0Idx));
+        vtk.addVolumeVariable([](const auto& v){ return v.density(FluidSystem::phase1Idx); }, "rho_"+FluidSystem::phaseName(FluidSystem::phase1Idx));
+        vtk.addVolumeVariable([](const auto& v){ return v.mobility(FluidSystem::phase0Idx); },"mob_"+ FluidSystem::phaseName(FluidSystem::phase0Idx));
+        vtk.addVolumeVariable([](const auto& v){ return v.mobility(FluidSystem::phase1Idx); },"mob_"+ FluidSystem::phaseName(FluidSystem::phase1Idx));
 
-        vtk.addVolumeVariable([](const VolumeVariables& v){ return v.saturation(FS::phase0Idx); }, "S_w");
-        vtk.addVolumeVariable([](const VolumeVariables& v){ return v.pressure(FS::phase0Idx); }, "p_w");
-        vtk.addVolumeVariable([](const VolumeVariables& v){ return v.density(FS::phase0Idx); }, "rho_w");
-        vtk.addVolumeVariable([](const VolumeVariables& v){ return v.mobility(FS::phase0Idx); }, "mob_w");
-
-        vtk.addVolumeVariable([](const VolumeVariables& v){ return v.saturation(FS::phase1Idx); }, "S_n");
-        vtk.addVolumeVariable([](const VolumeVariables& v){ return v.pressure(FS::phase1Idx); }, "p_n");
-        vtk.addVolumeVariable([](const VolumeVariables& v){ return v.density(FS::phase1Idx); }, "rho_n");
-        vtk.addVolumeVariable([](const VolumeVariables& v){ return v.mobility(FS::phase1Idx); }, "mob_n");
+        vtk.addVolumeVariable([](const auto& v){ return v.porosity(); }, "porosity");
     }
 };
 
diff --git a/dumux/porousmediumflow/2pnc/model.hh b/dumux/porousmediumflow/2pnc/model.hh
index 2b9c32552ca63a25e5942a6129a6e6c816c792ee..120d821ef8f6b880edba650592c7f20b2352a3df 100644
--- a/dumux/porousmediumflow/2pnc/model.hh
+++ b/dumux/porousmediumflow/2pnc/model.hh
@@ -153,18 +153,20 @@ struct TwoPNCModelTraits
         const std::vector<std::string> p0s1SwitchedPvNames = {
             xString + "^" + FluidSystem::componentName(FluidSystem::comp1Idx) + "_" + FluidSystem::phaseName(FluidSystem::phase0Idx),
             xString + "^" + FluidSystem::componentName(FluidSystem::comp0Idx) + "_" + FluidSystem::phaseName(FluidSystem::phase1Idx),
-            "S_n"};
+            "S_" + FluidSystem::phaseName(FluidSystem::phase1Idx)};
         const std::vector<std::string> p1s0SwitchedPvNames = {
             xString + "^" + FluidSystem::componentName(FluidSystem::comp1Idx) + "_" + FluidSystem::phaseName(FluidSystem::phase0Idx),
             xString + "^" + FluidSystem::componentName(FluidSystem::comp0Idx) + "_" + FluidSystem::phaseName(FluidSystem::phase1Idx),
-            "S_w"};
+            "S_" + FluidSystem::phaseName(FluidSystem::phase0Idx)};
 
         switch (priVarFormulation())
         {
         case TwoPFormulation::p0s1:
-            return pvIdx == 0 ? "p_w" : p0s1SwitchedPvNames[state-1];
+            return pvIdx == 0 ? "p_" + FluidSystem::phaseName(FluidSystem::phase0Idx)
+                              : p0s1SwitchedPvNames[state-1];
         case TwoPFormulation::p1s0:
-            return pvIdx == 0 ? "p_n" : p1s0SwitchedPvNames[state-1];
+            return pvIdx == 0 ? "p_" + FluidSystem::phaseName(FluidSystem::phase1Idx)
+                              : p1s0SwitchedPvNames[state-1];
         default: DUNE_THROW(Dune::InvalidStateException, "Invalid formulation ");
         }
     }
diff --git a/dumux/porousmediumflow/3p/vtkoutputfields.hh b/dumux/porousmediumflow/3p/vtkoutputfields.hh
index 74f96a023196f6aa29a526dfed5f6237365a31b7..11c78810d6e3e3578422efae8672291379461b3e 100644
--- a/dumux/porousmediumflow/3p/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/3p/vtkoutputfields.hh
@@ -36,18 +36,17 @@ public:
     template <class VtkOutputModule>
     static void init(VtkOutputModule& vtk)
     {
-        using FluidSystem = typename VtkOutputModule::VolumeVariables::FluidSystem;
+        using VolumeVariables = typename VtkOutputModule::VolumeVariables;
+        using FluidSystem = typename VolumeVariables::FluidSystem;
 
         // register standardized vtk output fields
-        vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::wPhaseIdx); }, "S_w");
-        vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::nPhaseIdx); },"S_n");
-        vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::gPhaseIdx); },"S_g");
-        vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::wPhaseIdx); },"p_w");
-        vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::nPhaseIdx); },"p_n");
-        vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::gPhaseIdx); },"p_g");
-        vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::wPhaseIdx); },"rho_w");
-        vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::nPhaseIdx); },"rho_n");
-        vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::gPhaseIdx); },"rho_g");
+        for (int i = 0; i < VolumeVariables::numPhases(); ++i)
+        {
+            vtk.addVolumeVariable([i](const auto& v){ return v.saturation(i); }, "S_"+ FluidSystem::phaseName(i));
+            vtk.addVolumeVariable([i](const auto& v){ return v.pressure(i); }, "p_"+ FluidSystem::phaseName(i));
+            vtk.addVolumeVariable([i](const auto& v){ return v.density(i); }, "rho_"+ FluidSystem::phaseName(i));
+        }
+
         vtk.addVolumeVariable( [](const auto& v){ return v.porosity(); },"porosity");
         vtk.addVolumeVariable( [](const auto& v){ return v.permeability(); },"permeability");
     }
diff --git a/dumux/porousmediumflow/3p3c/vtkoutputfields.hh b/dumux/porousmediumflow/3p3c/vtkoutputfields.hh
index ed996a98e0f295018af1b150722fdbbcd12fad92..23905e4e7264281361b6f618233705f06618f44b 100644
--- a/dumux/porousmediumflow/3p3c/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/3p3c/vtkoutputfields.hh
@@ -40,20 +40,15 @@ public:
         using FluidSystem = typename VolumeVariables::FluidSystem;
 
         // register standardized vtk output fields
-        vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::wPhaseIdx); }, "S_w");
-        vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::nPhaseIdx); },"S_n");
-        vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::gPhaseIdx); },"S_g");
-        vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::wPhaseIdx); },"p_w");
-        vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::nPhaseIdx); },"p_n");
-        vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::gPhaseIdx); },"p_g");
-        vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::wPhaseIdx); },"rho_w");
-        vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::nPhaseIdx); },"rho_n");
-        vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::gPhaseIdx); },"rho_g");
-
         for (int i = 0; i < VolumeVariables::numPhases(); ++i)
+        {
+            vtk.addVolumeVariable([i](const auto& v){ return v.saturation(i); }, "S_"+ FluidSystem::phaseName(i));
+            vtk.addVolumeVariable([i](const auto& v){ return v.pressure(i); }, "p_"+ FluidSystem::phaseName(i));
+            vtk.addVolumeVariable([i](const auto& v){ return v.density(i); }, "rho_"+ FluidSystem::phaseName(i));
+
             for (int j = 0; j < VolumeVariables::numComponents(); ++j)
-                vtk.addVolumeVariable([i,j](const auto& v){ return v.moleFraction(i,j); },
-                                      "x^" + FluidSystem::componentName(j) + "_" +  FluidSystem::phaseName(i));
+                vtk.addVolumeVariable([i,j](const auto& v){ return v.moleFraction(i,j); },"x^"+ FluidSystem::componentName(j) + "_" + FluidSystem::phaseName(i));
+        }
 
         vtk.addVolumeVariable( [](const auto& v){ return v.porosity(); },"porosity");
         vtk.addVolumeVariable( [](const auto& v){ return v.priVars().state(); },"phase presence");
diff --git a/dumux/porousmediumflow/3pwateroil/vtkoutputfields.hh b/dumux/porousmediumflow/3pwateroil/vtkoutputfields.hh
index df921d7e70363211ffddef51d1926607c3eeee02..68129047279e0a77736df292bcb0ce7c742bb857 100644
--- a/dumux/porousmediumflow/3pwateroil/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/3pwateroil/vtkoutputfields.hh
@@ -41,27 +41,17 @@ public:
         using FluidSystem = typename VolumeVariables::FluidSystem;
 
         // register standardized vtk output fields
-        vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::wPhaseIdx); }, "S_w");
-        vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::nPhaseIdx); },"S_n");
-        vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::gPhaseIdx); },"S_g");
-        vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::wPhaseIdx); },"p_w");
-        vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::nPhaseIdx); },"p_n");
-        vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::gPhaseIdx); },"p_g");
-        vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::wPhaseIdx); },"rho_w");
-        vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::nPhaseIdx); },"rho_n");
-        vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::gPhaseIdx); },"rho_g");
-        vtk.addVolumeVariable( [](const auto& v){ return v.mobility(FluidSystem::wPhaseIdx); },"mob_w");
-        vtk.addVolumeVariable( [](const auto& v){ return v.mobility(FluidSystem::nPhaseIdx); },"mob_n");
-        vtk.addVolumeVariable( [](const auto& v){ return v.mobility(FluidSystem::gPhaseIdx); },"mob_g");
-        vtk.addVolumeVariable( [](const auto& v){ return v.viscosity(FluidSystem::wPhaseIdx); },"viscos_w");
-        vtk.addVolumeVariable( [](const auto& v){ return v.viscosity(FluidSystem::nPhaseIdx); },"viscos_n");
-        vtk.addVolumeVariable( [](const auto& v){ return v.viscosity(FluidSystem::gPhaseIdx); },"viscos_g");
-
         for (int i = 0; i < VolumeVariables::numPhases(); ++i)
-            for (int j = 0; j < VolumeVariables::numComponents(); ++j)
-                vtk.addVolumeVariable([i,j](const auto& v){ return v.moleFraction(i,j); },
-                                      "x^" + FluidSystem::componentName(j) + "_" +  FluidSystem::phaseName(i));
+        {
+            vtk.addVolumeVariable([i](const auto& v){ return v.saturation(i); }, "S_"+ FluidSystem::phaseName(i));
+            vtk.addVolumeVariable([i](const auto& v){ return v.pressure(i); }, "p_"+ FluidSystem::phaseName(i));
+            vtk.addVolumeVariable([i](const auto& v){ return v.density(i); }, "rho_"+ FluidSystem::phaseName(i));
+            vtk.addVolumeVariable([i](const auto& v){ return v.mobility(i); },"mob_"+ FluidSystem::phaseName(i));
+            vtk.addVolumeVariable([i](const auto& v){return v.viscosity(i); }, "mu_"+FluidSystem::phaseName(i));
 
+            for (int j = 0; j < VolumeVariables::numComponents(); ++j)
+                vtk.addVolumeVariable([i,j](const auto& v){ return v.moleFraction(i,j); },"x^"+ FluidSystem::componentName(j) + "_" + FluidSystem::phaseName(i));
+        }
         vtk.addVolumeVariable( [](const auto& v){ return v.porosity(); },"porosity");
         vtk.addVolumeVariable( [](const auto& v){ return v.priVars().state(); },"phase presence");
         vtk.addVolumeVariable( [](const auto& v){ return v.permeability(); },"permeability");
diff --git a/dumux/porousmediumflow/mpnc/vtkoutputfields.hh b/dumux/porousmediumflow/mpnc/vtkoutputfields.hh
index b62a0a634361939bb13ee3738672d613702aae6f..5f4b571fb91eeb74f18d56486845ab14aff551ec 100644
--- a/dumux/porousmediumflow/mpnc/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/mpnc/vtkoutputfields.hh
@@ -45,7 +45,7 @@ public:
             vtk.addVolumeVariable([i](const auto& v){ return v.saturation(i); }, "S_"+ FluidSystem::phaseName(i));
             vtk.addVolumeVariable([i](const auto& v){ return v.pressure(i); }, "p_"+ FluidSystem::phaseName(i));
             vtk.addVolumeVariable([i](const auto& v){ return v.density(i); }, "rho_"+ FluidSystem::phaseName(i));
-            vtk.addVolumeVariable([i](const auto& v){ return v.mobility(i); },"lambda_"+ FluidSystem::phaseName(i));
+            vtk.addVolumeVariable([i](const auto& v){ return v.mobility(i); },"mob_"+ FluidSystem::phaseName(i));
 
             for (int j = 0; j < VolumeVariables::numComponents(); ++j)
                 vtk.addVolumeVariable([i,j](const auto& v){ return v.moleFraction(i,j); },"x^"+ FluidSystem::componentName(j) + "_" + FluidSystem::phaseName(i));
diff --git a/dumux/porousmediumflow/nonequilibrium/vtkoutputfields.hh b/dumux/porousmediumflow/nonequilibrium/vtkoutputfields.hh
index 0b679457924c5569204695db0105458dc330492f..22171798638c3acd1b1fa8716d666912690f9bac 100644
--- a/dumux/porousmediumflow/nonequilibrium/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/nonequilibrium/vtkoutputfields.hh
@@ -43,7 +43,7 @@ public:
         for (int i = 0; i < ModelTraits::numEnergyEqFluid(); ++i)
             vtk.addVolumeVariable( [i](const auto& v){ return v.temperatureFluid(i); }, "T_" + FluidSystem::phaseName(i) );
         for (int i = 0; i < ModelTraits::numEnergyEqSolid(); ++i)
-            vtk.addVolumeVariable( [i](const auto& v){ return v.temperatureSolid(); }, "T_solid" );
+            vtk.addVolumeVariable( [i](const auto& v){ return v.temperatureSolid(); }, "T_s" );
         for (int i = 0; i < ModelTraits::numPhases(); ++i){
             vtk.addVolumeVariable( [i](const auto& v){ return v.reynoldsNumber(i); }, "reynoldsNumber_" + FluidSystem::phaseName(i) );
             vtk.addVolumeVariable( [i](const auto& v){ return v.nusseltNumber(i); }, "nusseltNumber_" + FluidSystem::phaseName(i) );
diff --git a/dumux/porousmediumflow/richards/model.hh b/dumux/porousmediumflow/richards/model.hh
index 330b3b927e54762dce7b3ae6deec8736a14db8b2..99321fbda570a2ea1770bc72d3a4801b6717d30b 100644
--- a/dumux/porousmediumflow/richards/model.hh
+++ b/dumux/porousmediumflow/richards/model.hh
@@ -136,13 +136,14 @@ struct RichardsModelTraits
     static constexpr bool enableMolecularDiffusion() { return enableDiff; }
     static constexpr bool enableEnergyBalance() { return false; }
 
-    template<class FluidSystem = void, class SolidSystem = void>
+    template<class FluidSystem, class SolidSystem = void>
     static std::string primaryVariableName(int pvIdx, int state)
     {
         if (state == Indices::gasPhaseOnly)
-            return "x^w_n";
+            return "x^" + FluidSystem::componentName(FluidSystem::comp0Idx)
+                   + "_" + FluidSystem::phaseName(FluidSystem::phase1Idx);
         else
-            return "p_w";
+            return "p_" + FluidSystem::phaseName(FluidSystem::phase0Idx);
     }
 };
 
diff --git a/dumux/porousmediumflow/richards/vtkoutputfields.hh b/dumux/porousmediumflow/richards/vtkoutputfields.hh
index 729877cc44ea2fd724e21bae1d5eff510395cebc..3d6825d08545f97d61bf65611c4d6e2fdd1f3970 100644
--- a/dumux/porousmediumflow/richards/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/richards/vtkoutputfields.hh
@@ -39,15 +39,16 @@ public:
     template <class VtkOutputModule>
     static void init(VtkOutputModule& vtk)
     {
-        using FluidSystem = typename VtkOutputModule::VolumeVariables::FluidSystem;
+        using VolumeVariables = typename VtkOutputModule::VolumeVariables;
+        using FluidSystem = typename VolumeVariables::FluidSystem;
 
-        vtk.addVolumeVariable([](const auto& v){ return v.saturation(FluidSystem::liquidPhaseIdx); }, "S_w");
-        vtk.addVolumeVariable([](const auto& v){ return v.saturation(FluidSystem::gasPhaseIdx); }, "S_n");
-        vtk.addVolumeVariable([](const auto& v){ return v.pressure(FluidSystem::liquidPhaseIdx); }, "p_w");
-        vtk.addVolumeVariable([](const auto& v){ return v.pressure(FluidSystem::gasPhaseIdx); }, "p_n");
+        vtk.addVolumeVariable([](const auto& v){ return v.saturation(FluidSystem::liquidPhaseIdx); }, "S_"+FluidSystem::phaseName(FluidSystem::liquidPhaseIdx));
+        vtk.addVolumeVariable([](const auto& v){ return v.saturation(FluidSystem::gasPhaseIdx); }, "S_"+FluidSystem::phaseName(FluidSystem::gasPhaseIdx));
+        vtk.addVolumeVariable([](const auto& v){ return v.pressure(FluidSystem::liquidPhaseIdx); }, "p_"+FluidSystem::phaseName(FluidSystem::liquidPhaseIdx));
+        vtk.addVolumeVariable([](const auto& v){ return v.pressure(FluidSystem::gasPhaseIdx); }, "p_"+FluidSystem::phaseName(FluidSystem::gasPhaseIdx));
         vtk.addVolumeVariable([](const auto& v){ return v.capillaryPressure(); }, "pc");
-        vtk.addVolumeVariable([](const auto& v){ return v.density(FluidSystem::liquidPhaseIdx); }, "density");
-        vtk.addVolumeVariable([](const auto& v){ return v.mobility(FluidSystem::liquidPhaseIdx); }, "mobility");
+        vtk.addVolumeVariable([](const auto& v){ return v.density(FluidSystem::liquidPhaseIdx); }, "rho_"+FluidSystem::phaseName(FluidSystem::liquidPhaseIdx));
+        vtk.addVolumeVariable([](const auto& v){ return v.mobility(FluidSystem::liquidPhaseIdx); }, "mob_"+FluidSystem::phaseName(FluidSystem::liquidPhaseIdx));
         vtk.addVolumeVariable([](const auto& v){ return v.relativePermeability(FluidSystem::liquidPhaseIdx); }, "kr");
         vtk.addVolumeVariable([](const auto& v){ return v.porosity(); }, "porosity");
 
@@ -56,7 +57,7 @@ public:
         if(gravity)
             vtk.addVolumeVariable([](const auto& v){ return v.pressureHead(FluidSystem::liquidPhaseIdx); }, "pressure head");
         if (enableWaterDiffusionInAir)
-            vtk.addVolumeVariable([](const auto& v){ return v.moleFraction(1, 0); }, "x^air_w");
+            vtk.addVolumeVariable([](const auto& v){ return v.moleFraction(1, 0); }, "x^"+FluidSystem::componentName(FluidSystem::gasCompIdx)+"_"+FluidSystem::phaseName(FluidSystem::liquidPhaseIdx));
         vtk.addVolumeVariable([](const auto& v){ return v.waterContent(FluidSystem::liquidPhaseIdx); },"water content");
 
         vtk.addVolumeVariable([](const auto& v){ return v.priVars().state(); }, "phase presence");
diff --git a/dumux/porousmediumflow/richardsnc/vtkoutputfields.hh b/dumux/porousmediumflow/richardsnc/vtkoutputfields.hh
index 360a9a0865bb39836de69eb7ffda4f0e32047f07..414b6e3faa99d101e45711984be571d419d97687 100644
--- a/dumux/porousmediumflow/richardsnc/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/richardsnc/vtkoutputfields.hh
@@ -41,13 +41,13 @@ public:
         using VolumeVariables = typename VtkOutputModule::VolumeVariables;
         using FluidSystem = typename VolumeVariables::FluidSystem;
 
-        vtk.addVolumeVariable([](const auto& v){ return v.saturation(VolumeVariables::liquidPhaseIdx); }, "S_w");
-        vtk.addVolumeVariable([](const auto& v){ return v.saturation(VolumeVariables::gasPhaseIdx); }, "S_n");
-        vtk.addVolumeVariable([](const auto& v){ return v.pressure(VolumeVariables::liquidPhaseIdx); }, "p_w");
-        vtk.addVolumeVariable([](const auto& v){ return v.pressure(VolumeVariables::gasPhaseIdx); }, "p_n");
+        vtk.addVolumeVariable([](const auto& v){ return v.saturation(VolumeVariables::liquidPhaseIdx); }, "S_"+FluidSystem::phaseName(VolumeVariables::liquidPhaseIdx));
+        vtk.addVolumeVariable([](const auto& v){ return v.saturation(VolumeVariables::gasPhaseIdx); }, "S_gas");
+        vtk.addVolumeVariable([](const auto& v){ return v.pressure(VolumeVariables::liquidPhaseIdx); }, "p_"+FluidSystem::phaseName(VolumeVariables::liquidPhaseIdx));
+        vtk.addVolumeVariable([](const auto& v){ return v.pressure(VolumeVariables::gasPhaseIdx); }, "p_gas");
         vtk.addVolumeVariable([](const auto& v){ return v.capillaryPressure(); }, "pc");
-        vtk.addVolumeVariable([](const auto& v){ return v.density(VolumeVariables::liquidPhaseIdx); }, "density");
-        vtk.addVolumeVariable([](const auto& v){ return v.mobility(VolumeVariables::liquidPhaseIdx); }, "mobility");
+        vtk.addVolumeVariable([](const auto& v){ return v.density(FluidSystem::liquidPhaseIdx); }, "rho_"+FluidSystem::phaseName(FluidSystem::liquidPhaseIdx));
+        vtk.addVolumeVariable([](const auto& v){ return v.mobility(FluidSystem::liquidPhaseIdx); }, "mob_"+FluidSystem::phaseName(FluidSystem::liquidPhaseIdx));
         vtk.addVolumeVariable([](const auto& v){ return v.relativePermeability(VolumeVariables::liquidPhaseIdx); }, "kr");
         vtk.addVolumeVariable([](const auto& v){ return v.porosity(); }, "porosity");
         vtk.addVolumeVariable([](const auto& v){ return v.temperature(); }, "T");
diff --git a/test/freeflow/navierstokes/CMakeLists.txt b/test/freeflow/navierstokes/CMakeLists.txt
index 96ec34ce148c7f3398f0d99aa844b84f2d835d80..09e9e5c151dc35f2bfbbe73cb53344db123f4c6b 100644
--- a/test/freeflow/navierstokes/CMakeLists.txt
+++ b/test/freeflow/navierstokes/CMakeLists.txt
@@ -29,7 +29,7 @@ dune_add_test(NAME test_navierstokes_hydrostaticpressure
                              --files ${CMAKE_SOURCE_DIR}/test/references/stokeshydrostaticpressure-reference.vtu
                                      ${CMAKE_CURRENT_BINARY_DIR}/test_hydrostaticpressure-00002.vtu
                              --command "${CMAKE_CURRENT_BINARY_DIR}/test_closedsystem test_hydrostaticpressure.input"
-                             --zeroThreshold {"velocity_Constant \(m/s\)":1e-16})
+                             --zeroThreshold {"velocity_liq \(m/s\)":1e-16})
 
 dune_add_test(NAME test_channel_stokes
               SOURCES test_channel.cc
@@ -60,7 +60,7 @@ dune_add_test(NAME test_channel_stokesni_conduction
                              --files ${CMAKE_SOURCE_DIR}/test/references/stokesni-conduction-reference.vtu
                                      ${CMAKE_CURRENT_BINARY_DIR}/test_channel_stokesni_conduction-00004.vtu
                              --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel_stokesni test_channel_stokesni_conduction.input"
-                             --zeroThreshold {"velocity_H2O \(m/s\)":1e-20})
+                             --zeroThreshold {"velocity_liq \(m/s\)":1e-20})
 
 dune_add_test(NAME test_channel_navierstokes
               SOURCES test_channel.cc
@@ -140,7 +140,7 @@ dune_add_test(NAME test_stokes_channel_3d
                              --files ${CMAKE_SOURCE_DIR}/test/references/stokes_channel_3d-reference.vtu
                                      ${CMAKE_CURRENT_BINARY_DIR}/test_stokes_channel_3d-00001.vtu
                              --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes_channel_3d"
-                             --zeroThreshold {"velocity_component \(m/s\)":1e-12})
+                             --zeroThreshold {"velocity_liq \(m/s\)":1e-12})
 
 dune_add_test(NAME test_stokes_channel_pseudo3d
               SOURCES test_stokes_channel_3d.cc
@@ -151,4 +151,4 @@ dune_add_test(NAME test_stokes_channel_pseudo3d
                              --files ${CMAKE_SOURCE_DIR}/test/references/stokes_channel_pseudo3d-reference.vtu
                                      ${CMAKE_CURRENT_BINARY_DIR}/test_stokes_channel_pseudo3d-00001.vtu
                              --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes_channel_pseudo3d"
-                             --zeroThreshold {"velocity_component \(m/s\)":1e-12})
+                             --zeroThreshold {"velocity_liq \(m/s\)":1e-12})
diff --git a/test/freeflow/navierstokesnc/CMakeLists.txt b/test/freeflow/navierstokesnc/CMakeLists.txt
index 9dfb78288b7a8432f162fbf65d8cba858deca0ef..5931814a7da7baa3f68037f06515b87e0e693b09 100644
--- a/test/freeflow/navierstokesnc/CMakeLists.txt
+++ b/test/freeflow/navierstokesnc/CMakeLists.txt
@@ -8,9 +8,9 @@ dune_add_test(NAME test_stokes2c_densitydrivenflow
                              --files ${CMAKE_SOURCE_DIR}/test/references/stokes2c-densitydriven-reference.vtu
                                      ${CMAKE_CURRENT_BINARY_DIR}/test_densitydrivenflow-00021.vtu
                              --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c_densitydrivenflow"
-                             --zeroThreshold {"X^Air_liquid":1e-12}
-                             --zeroThreshold {"x^Air_liquid":1e-12}
-                             --zeroThreshold {"velocity_liquid \(m/s\)":1e-10}
+                             --zeroThreshold {"X^Air_liq":1e-12}
+                             --zeroThreshold {"x^Air_liq":1e-12}
+                             --zeroThreshold {"velocity_liq \(m/s\)":1e-10}
                              --zeroThreshold {"deltaRho":1e-7})
 
 add_executable(test_stokes2c_mass EXCLUDE_FROM_ALL test_channel.cc)
@@ -26,7 +26,7 @@ dune_add_test(NAME test_stokes2c_purediffusion_mass
                              --files ${CMAKE_SOURCE_DIR}/test/references/stokes2c-purediffusion.vtu
                                      ${CMAKE_CURRENT_BINARY_DIR}/test_purediffusion-00014.vtu
                              --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c_mass test_stokes2c_purediffusion.input"
-                             --zeroThreshold {"velocity_liquid \(m/s\)":1e-22})
+                             --zeroThreshold {"velocity_liq \(m/s\)":1e-22})
 
 dune_add_test(NAME test_stokes2c_purediffusion_mole
               TARGET test_stokes2c
@@ -36,7 +36,7 @@ dune_add_test(NAME test_stokes2c_purediffusion_mole
                              --files ${CMAKE_SOURCE_DIR}/test/references/stokes2c-purediffusion.vtu
                                      ${CMAKE_CURRENT_BINARY_DIR}/test_purediffusion-00013.vtu
                              --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c test_stokes2c_purediffusion.input"
-                             --zeroThreshold {"velocity_liquid \(m/s\)":1e-22})
+                             --zeroThreshold {"velocity_liq \(m/s\)":1e-22})
 
 dune_add_test(NAME test_stokes2c_advection
               TARGET test_stokes2c
@@ -77,7 +77,7 @@ dune_add_test(NAME test_stokes2cni_diffusion
                              --files ${CMAKE_SOURCE_DIR}/test/references/stokes2cni-diffusion.vtu
                                      ${CMAKE_CURRENT_BINARY_DIR}/test_stokes2cni_diffusion-00014.vtu
                              --command "${CMAKE_CURRENT_BINARY_DIR}//test_stokes2cni test_stokes2cni_diffusion.input"
-                             --zeroThreshold {"velocity_liquid \(m/s\)":1e-13})
+                             --zeroThreshold {"velocity_liq \(m/s\)":1e-13})
 
 dune_add_test(NAME test_msfreeflow
               SOURCES test_msfreeflow.cc
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/CMakeLists.txt
index ef7b693285b72eac75fd2fafdda308a4d0f070c0..386bc3ca8d506512048a7327ce5320255ca5e9a2 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/CMakeLists.txt
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/CMakeLists.txt
@@ -7,7 +7,7 @@ dune_add_test(NAME test_stokes1p2cdarcy1p2cvertical_diffusion
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
-                             --zeroThreshold {"velocity_liquid \(m/s\)":1e-20}
+                             --zeroThreshold {"velocity_liq \(m/s\)":1e-20}
                              --files ${CMAKE_SOURCE_DIR}/test/references/test_stokes1p2cdarcy1p2cvertical_diffusion_stokes-reference.vtu
                                      ${CMAKE_CURRENT_BINARY_DIR}/test_stokes1p2cdarcy1p2cvertical_diffusion_stokes-00003.vtu
                                      ${CMAKE_SOURCE_DIR}/test/references/test_stokes1p2cdarcy1p2cvertical_diffusion_darcy-reference.vtu
@@ -19,7 +19,7 @@ dune_add_test(NAME test_stokes1p2cdarcy1p2cvertical_advection
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
-                             --zeroThreshold {"velocity_liquid \(m/s\)":1e-15}
+                             --zeroThreshold {"velocity_liq \(m/s\)":1e-15}
                              --files ${CMAKE_SOURCE_DIR}/test/references/test_stokes1p2cdarcy1p2cvertical_advection_stokes-reference.vtu
                                      ${CMAKE_CURRENT_BINARY_DIR}/test_stokes1p2cdarcy1p2cvertical_stokes-00030.vtu
                                      ${CMAKE_SOURCE_DIR}/test/references/test_stokes1p2cdarcy1p2cvertical_advection_darcy-reference.vtu
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/CMakeLists.txt
index a5b0dac9fb55308e9c1de7c83f883650ebbef901..2eb1f7d1f0972c6bf454107a8921aee9d9113dd1 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/CMakeLists.txt
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/CMakeLists.txt
@@ -11,4 +11,4 @@ dune_add_test(NAME test_stokes1pdarcy1pvertical
                                      ${CMAKE_CURRENT_BINARY_DIR}/test_stokes1pdarcy1pvertical_darcy-00001.vtu
 
                              --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes1pdarcy1pvertical test_stokes1pdarcy1pvertical.input"
-                             --zeroThreshold {"velocity_SimpleH2O \(m/s\)_0":6e-17})
+                             --zeroThreshold {"velocity_liq \(m/s\)_0":6e-17})
diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p_2p/CMakeLists.txt
index ffaf2b8c27631cbfa00f4558b165b488cb3584f5..69c173688ddac148476b37b5636363cf7df6cebc 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_2p/CMakeLists.txt
+++ b/test/multidomain/boundary/stokesdarcy/1p_2p/CMakeLists.txt
@@ -11,4 +11,4 @@ dune_add_test(NAME test_stokes1pdarcy2pvertical
                                      ${CMAKE_CURRENT_BINARY_DIR}/test_stokes1pdarcy2pvertical_darcy-00024.vtu
 
                              --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes1pdarcy2pvertical test_stokes1pdarcy2pvertical.input"
-                             --zeroThreshold {"velocity_SimpleH2O \(m/s\)_0":1e-14,"velocity_Air \(m/s\)":1e-15})
+                             --zeroThreshold {"velocity_liq \(m/s\)_0":1e-14,"velocity_gas \(m/s\)":1e-15})
diff --git a/test/porousmediumflow/1p/implicit/CMakeLists.txt b/test/porousmediumflow/1p/implicit/CMakeLists.txt
index bbfe6bdfc0d56f964b3a3682f7ce6d35f8359749..5d93908fe520bf897481a08d15b4c0cd44496358 100644
--- a/test/porousmediumflow/1p/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/1p/implicit/CMakeLists.txt
@@ -51,7 +51,7 @@ dune_add_test(NAME test_1pnibox_conduction
                        --files ${CMAKE_SOURCE_DIR}/test/references/1pniboxconduction-reference.vtu
                                ${CMAKE_CURRENT_BINARY_DIR}/1pnibox_conduction-00005.vtu
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pnibox_conduction test_1pnifv_conduction.input -Problem.Name 1pnibox_conduction"
-                       --zeroThreshold {"velocity_H2O":1e-8})
+                       --zeroThreshold {"velocity_liq":1e-8})
 
 add_executable(test_1pnibox_convection EXCLUDE_FROM_ALL test_1pnifv.cc)
 target_compile_definitions(test_1pnibox_convection PUBLIC TYPETAG=OnePNIConvectionBoxTypeTag)
diff --git a/test/porousmediumflow/1pnc/implicit/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/CMakeLists.txt
index 6d3ff5ea1719846559e97e08e88a0875e2856f05..94cbfd65fdb08ab86c373d99a3b3e3703c99615f 100644
--- a/test/porousmediumflow/1pnc/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/1pnc/implicit/CMakeLists.txt
@@ -8,7 +8,7 @@ dune_add_test(NAME test_1p2c_box
                         --files ${CMAKE_SOURCE_DIR}/test/references/outflowbox-reference.vtu
                                 ${CMAKE_CURRENT_BINARY_DIR}/1pnctestbox-00009.vtu
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p2c_box test_1p2c_fv.input -Problem.Name 1pnctestbox"
-                        --zeroThreshold {"velocity_w \(m/s\)_1":1e-15})
+                        --zeroThreshold {"velocity_liq \(m/s\)_1":1e-15})
 
 dune_add_test(NAME test_1p2c_tpfa
               SOURCES test_1p2c_fv.cc
@@ -18,7 +18,7 @@ dune_add_test(NAME test_1p2c_tpfa
                         --files ${CMAKE_SOURCE_DIR}/test/references/1p2ctestcc-reference.vtu
                                 ${CMAKE_CURRENT_BINARY_DIR}/1pnctest_tpfa-00009.vtu
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p2c_tpfa test_1p2c_fv.input -Problem.Name 1pnctest_tpfa"
-                        --zeroThreshold {"velocity_w \(m/s\)_1":1e-15})
+                        --zeroThreshold {"velocity_liq \(m/s\)_1":1e-15})
 
 #Note: The mpfa model does not support velocity output yet. We therefore deactivate it for the test and use a copy of the tpfa reference
 #      solution where the velocities have been removed.
@@ -51,7 +51,7 @@ dune_add_test(NAME test_1p2cni_conduction_box
                         --files ${CMAKE_SOURCE_DIR}/test/references/1p2cniboxconduction-reference.vtu
                                 ${CMAKE_CURRENT_BINARY_DIR}/1p2cni_conductiontest_box-00005.vtu
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p2cni_conduction_box test_1p2cni_conduction_fv.input -Problem.Name 1p2cni_conductiontest_box"
-                        --zeroThreshold {"velocity_w \(m/s\)":1e-9})
+                        --zeroThreshold {"velocity_liq \(m/s\)":1e-9})
 
 dune_add_test(NAME test_1p2cni_conduction_tpfa
               SOURCES test_1p2cni_conduction_fv.cc
@@ -61,7 +61,7 @@ dune_add_test(NAME test_1p2cni_conduction_tpfa
                         --files ${CMAKE_SOURCE_DIR}/test/references/1p2cniccconduction-reference.vtu
                                 ${CMAKE_CURRENT_BINARY_DIR}/1p2cni_conductiontest_tpfa-00005.vtu
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p2cni_conduction_tpfa test_1p2cni_conduction_fv.input -Problem.Name 1p2cni_conductiontest_tpfa"
-                        --zeroThreshold {"velocity_w \(m/s\)_0":1e-9})
+                        --zeroThreshold {"velocity_liq \(m/s\)_0":1e-9})
 
 #Note: The mpfa model does not support velocity output yet. We therefore deactivate it for the test and use a copy of the tpfa reference
 #      solution where the velocities have been removed.
@@ -83,7 +83,7 @@ dune_add_test(NAME test_1p2cni_convection_box
                         --files ${CMAKE_SOURCE_DIR}/test/references/1p2cniboxconvection-reference.vtu
                                 ${CMAKE_CURRENT_BINARY_DIR}/1p2cni_convectiontest_box-00009.vtu
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p2cni_convection_box test_1p2cni_convection_fv.input -Problem.Name 1p2cni_convectiontest_box"
-                        --zeroThreshold {"velocity_w \(m/s\)":1e-9})
+                        --zeroThreshold {"velocity_liq \(m/s\)":1e-9})
 
 dune_add_test(NAME test_1p2cni_convection_tpfa
               SOURCES test_1p2cni_convection_fv.cc
@@ -93,7 +93,7 @@ dune_add_test(NAME test_1p2cni_convection_tpfa
                         --files ${CMAKE_SOURCE_DIR}/test/references/1p2cniccconvection-reference.vtu
                                 ${CMAKE_CURRENT_BINARY_DIR}/1p2cni_convectiontest_tpfa-00009.vtu
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p2cni_convection_tpfa test_1p2cni_convection_fv.input -Problem.Name 1p2cni_convectiontest_tpfa"
-                        --zeroThreshold {"velocity_w \(m/s\)_0":1e-9})
+                        --zeroThreshold {"velocity_liq \(m/s\)_0":1e-9})
 
 #Note: The mpfa model does not support velocity output yet. We therefore deactivate it for the test and use a copy of the tpfa reference
 #      solution where the velocities have been removed.
diff --git a/test/porousmediumflow/2p/implicit/incompressible/test_2p_fv.cc b/test/porousmediumflow/2p/implicit/incompressible/test_2p_fv.cc
index 475a49fdfb7d30947ac067079e23c080c5025070..b7c94c4de9d9966abd1de0ae8d3f33de76cecfc7 100644
--- a/test/porousmediumflow/2p/implicit/incompressible/test_2p_fv.cc
+++ b/test/porousmediumflow/2p/implicit/incompressible/test_2p_fv.cc
@@ -137,8 +137,9 @@ int main(int argc, char** argv) try
     if (restartTime > 0)
     {
         using ModelTraits = typename GET_PROP_TYPE(TypeTag, ModelTraits);
+        using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
         const auto fileName = getParam<std::string>("Restart.File");
-        loadSolution(x, fileName, createPVNameFunction<ModelTraits>(), *fvGridGeometry);
+        loadSolution(x, fileName, createPVNameFunction<ModelTraits, FluidSystem>(), *fvGridGeometry);
     }
     else
         problem->applyInitialSolution(x);
diff --git a/test/porousmediumflow/2p2c/implicit/mpnccomparison/vtkoutputfields.hh b/test/porousmediumflow/2p2c/implicit/mpnccomparison/vtkoutputfields.hh
index e161c32264bcb24472aa179715f8a42d1a7a4568..c9b21f177ada7067a5034a9fd4e8f45ca09eceba 100644
--- a/test/porousmediumflow/2p2c/implicit/mpnccomparison/vtkoutputfields.hh
+++ b/test/porousmediumflow/2p2c/implicit/mpnccomparison/vtkoutputfields.hh
@@ -41,15 +41,15 @@ public:
 
         // register standardized vtk output fields
         vtk.addVolumeVariable([](const auto& v){ return v.porosity(); }, "porosity");
-        vtk.addVolumeVariable([](const auto& v){ return v.saturation(FluidSystem::phase1Idx); }, "S_n");
-        vtk.addVolumeVariable([](const auto& v){ return v.saturation(FluidSystem::phase0Idx); }, "S_w");
-        vtk.addVolumeVariable([](const auto& v){ return v.pressure(FluidSystem::phase1Idx); }, "p_n");
-        vtk.addVolumeVariable([](const auto& v){ return v.pressure(FluidSystem::phase0Idx); }, "p_w");
+        vtk.addVolumeVariable([](const auto& v){ return v.saturation(FluidSystem::phase0Idx); }, "S_"+ FluidSystem::phaseName(FluidSystem::phase0Idx));
+        vtk.addVolumeVariable([](const auto& v){ return v.saturation(FluidSystem::phase1Idx); }, "S_"+ FluidSystem::phaseName(FluidSystem::phase1Idx));
+        vtk.addVolumeVariable([](const auto& v){ return v.pressure(FluidSystem::phase0Idx); }, "p_"+ FluidSystem::phaseName(FluidSystem::phase0Idx));
+        vtk.addVolumeVariable([](const auto& v){ return v.pressure(FluidSystem::phase1Idx); }, "p_"+ FluidSystem::phaseName(FluidSystem::phase1Idx));
 
-        vtk.addVolumeVariable([](const auto& v){ return v.density(FluidSystem::phase0Idx); }, "rho_w");
-        vtk.addVolumeVariable([](const auto& v){ return v.density(FluidSystem::phase1Idx); }, "rho_n");
-        vtk.addVolumeVariable([](const auto& v){ return v.mobility(FluidSystem::phase0Idx); }, "mob_w");
-        vtk.addVolumeVariable([](const auto& v){ return v.mobility(FluidSystem::phase1Idx); }, "mob_n");
+        vtk.addVolumeVariable([](const auto& v){ return v.density(FluidSystem::phase0Idx); }, "rho_"+ FluidSystem::phaseName(FluidSystem::phase0Idx));
+        vtk.addVolumeVariable([](const auto& v){ return v.density(FluidSystem::phase1Idx); }, "rho_"+ FluidSystem::phaseName(FluidSystem::phase1Idx));
+        vtk.addVolumeVariable([](const auto& v){ return v.mobility(FluidSystem::phase0Idx); }, "mob_"+ FluidSystem::phaseName(FluidSystem::phase0Idx));
+        vtk.addVolumeVariable([](const auto& v){ return v.mobility(FluidSystem::phase1Idx); }, "mob_"+ FluidSystem::phaseName(FluidSystem::phase1Idx));
 
         for (int i = 0; i < VolumeVariables::numPhases(); ++i)
             for (int j = 0; j < VolumeVariables::numComponents(); ++j)
diff --git a/test/porousmediumflow/2p2c/implicit/test_2p2c_fv.input b/test/porousmediumflow/2p2c/implicit/test_2p2c_fv.input
index 88a7c7fbf8d036b53e9e84ee63ac92163a26a358..2a03857bf954d35d9f4fe6aeb891cd91c26f8c3d 100644
--- a/test/porousmediumflow/2p2c/implicit/test_2p2c_fv.input
+++ b/test/porousmediumflow/2p2c/implicit/test_2p2c_fv.input
@@ -21,6 +21,6 @@ TemperatureLow = 312.15 # [Pa] lower temperature limit for tabularization
 TemperatureHigh = 314.15 # [Pa] upper temperature limit for tabularization
 
 [LoadSolution]
-PriVarNamesState1 = p_w x^N2_w
-PriVarNamesState2 = p_w x^H2O_n
-PriVarNamesState3 = p_w S_n
+PriVarNamesState1 = p_liq x^N2_liq
+PriVarNamesState2 = p_liq x^H2O_gas
+PriVarNamesState3 = p_liq S_gas
diff --git a/test/porousmediumflow/3p/implicit/CMakeLists.txt b/test/porousmediumflow/3p/implicit/CMakeLists.txt
index 7001201af3e570a2e474b6c0d892438c4e001ae2..3f4865671b5d91ef561d59911d30040bceb294e9 100644
--- a/test/porousmediumflow/3p/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/3p/implicit/CMakeLists.txt
@@ -28,7 +28,7 @@ dune_add_test(NAME test_box3pniconvection
                             --files ${CMAKE_SOURCE_DIR}/test/references/3pniconvectionbox-reference.vtu
                             ${CMAKE_CURRENT_BINARY_DIR}/test_box3pniconvection-00009.vtu
                             --command "${CMAKE_CURRENT_BINARY_DIR}/test_box3pniconvection test_3pni_fv_convection.input -Problem.Name test_box3pniconvection"
-                            --zeroThreshold {"velocity_w \(m/s\)_1":1e-8})
+                            --zeroThreshold {"velocity_aq \(m/s\)_1":1e-8})
 
 dune_add_test(NAME test_cc3pniconvection
               SOURCES test_3pni_fv_convection.cc
@@ -38,7 +38,7 @@ dune_add_test(NAME test_cc3pniconvection
                             --files ${CMAKE_SOURCE_DIR}/test/references/3pniconvectioncc-reference.vtu
                             ${CMAKE_CURRENT_BINARY_DIR}/test_cc3pniconvection-00009.vtu
                             --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc3pniconvection test_3pni_fv_convection.input -Problem.Name test_cc3pniconvection"
-                            --zeroThreshold {"velocity_w \(m/s\)_1":1e-8})
+                            --zeroThreshold {"velocity_aq \(m/s\)_1":1e-8})
 
 dune_add_test(NAME test_box3pniconduction
               SOURCES test_3pni_fv_conduction.cc
@@ -48,7 +48,7 @@ dune_add_test(NAME test_box3pniconduction
                             --files ${CMAKE_SOURCE_DIR}/test/references/3pniconductionbox-reference.vtu
                             ${CMAKE_CURRENT_BINARY_DIR}/test_box3pniconduction-00005.vtu
                             --command "${CMAKE_CURRENT_BINARY_DIR}/test_box3pniconduction test_3pni_fv_conduction.input -Problem.Name test_box3pniconduction"
-                            --zeroThreshold {"velocity_w \(m/s\)_1":1e-8})
+                            --zeroThreshold {"velocity_aq \(m/s\)_1":1e-8})
 
 dune_add_test(NAME test_cc3pniconduction
               SOURCES test_3pni_fv_conduction.cc
@@ -58,7 +58,7 @@ dune_add_test(NAME test_cc3pniconduction
                             --files ${CMAKE_SOURCE_DIR}/test/references/3pniconductioncc-reference.vtu
                             ${CMAKE_CURRENT_BINARY_DIR}/test_cc3pniconduction-00005.vtu
                             --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc3pniconduction test_3pni_fv_conduction.input -Problem.Name test_cc3pniconduction"
-                            --zeroThreshold {"velocity_w \(m/s\)_1":1e-8})
+                            --zeroThreshold {"velocity_aq \(m/s\)_1":1e-8})
 
 #install sources
 install(FILES
diff --git a/test/porousmediumflow/mpnc/implicit/combustionfluidsystem.hh b/test/porousmediumflow/mpnc/implicit/combustionfluidsystem.hh
index e3b95e4bc0f007a96d64bf7e8b8132d280d63131..75ed1e732a78cf9637764b6b5514e27d850e6ba6 100644
--- a/test/porousmediumflow/mpnc/implicit/combustionfluidsystem.hh
+++ b/test/porousmediumflow/mpnc/implicit/combustionfluidsystem.hh
@@ -86,14 +86,14 @@ public:
      */
     static std::string phaseName(int phaseIdx)
     {
-        static std::string name[] = {
-            std::string("w"),
-            std::string("n"),
-            std::string("s")
-        };
-
         assert(0 <= phaseIdx && phaseIdx < numPhases);
-        return name[phaseIdx];
+        switch (phaseIdx)
+        {
+            case wPhaseIdx: return "liq";
+            case nPhaseIdx: return "gas";
+            case sPhaseIdx: return "s";
+        }
+        DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
     }
 
     /*!
diff --git a/test/porousmediumflow/richards/implicit/CMakeLists.txt b/test/porousmediumflow/richards/implicit/CMakeLists.txt
index 9317d785ef584a3652356e7675ce508b9fc44b3b..d4277fb885a8604f2dc524b935225568386bfc7d 100644
--- a/test/porousmediumflow/richards/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/richards/implicit/CMakeLists.txt
@@ -49,7 +49,7 @@ dune_add_test(NAME test_richards_tpfa_parallel_yasp_restart
               TARGET test_richards_tpfa
               CMAKE_GUARD MPI_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-              CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100,"S_w":1e-3,"water content":1e-3}
+              CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100,"S_liq":1e-3,"water content":1e-3}
                       --files ${CMAKE_SOURCE_DIR}/test/references/richardslenscc-reference-parallel.vtu
                               ${CMAKE_CURRENT_BINARY_DIR}/s0002-p0000-test_richards_tpfa_parallel_yasp_restart-00004.vtu
                               ${CMAKE_SOURCE_DIR}/test/references/richardslenscc-reference.vtu
diff --git a/test/porousmediumflow/richards/implicit/test_richardslens_fv.cc b/test/porousmediumflow/richards/implicit/test_richardslens_fv.cc
index e097954f16f38790b23aa368f0cd04695ccd20eb..c145f63b0d99b469b9f81053ba343dbeffa5450c 100644
--- a/test/porousmediumflow/richards/implicit/test_richardslens_fv.cc
+++ b/test/porousmediumflow/richards/implicit/test_richardslens_fv.cc
@@ -99,8 +99,9 @@ int main(int argc, char** argv) try
     if (restartTime > 0)
     {
         using ModelTraits = typename GET_PROP_TYPE(TypeTag, ModelTraits);
+        using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
         const auto fileName = getParam<std::string>("Restart.File");
-        loadSolution(x, fileName, createPVNameFunction<ModelTraits>(), *fvGridGeometry);
+        loadSolution(x, fileName, createPVNameFunction<ModelTraits, FluidSystem>(), *fvGridGeometry);
     }
     else
     {
diff --git a/test/references/1p2cniboxconduction-reference.vtu b/test/references/1p2cniboxconduction-reference.vtu
index 066df3c1bbb49f036156a67e8d27369dd9a6d510..4ce45630280384d8fa110d5d74ee63020418ef26 100644
--- a/test/references/1p2cniboxconduction-reference.vtu
+++ b/test/references/1p2cniboxconduction-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="200" NumberOfPoints="402">
-      <PointData Scalars="p" Vectors="velocity_w (m/s)">
+      <PointData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -75,7 +75,7 @@
           0.00019143 0.00019143 0.000167501 0.000167501 0.000143572 0.000143572 0.000119644 0.000119644 9.57149e-05 9.57149e-05 7.17862e-05 7.17861e-05
           4.78574e-05 4.78574e-05 2.39287e-05 2.39287e-05 0 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           -1.16593e-09 8.51209e-19 0 -1.16052e-09 0 0 -1.16593e-09 8.51209e-19 0 -1.16052e-09 0 0
           -1.14449e-09 8.29172e-19 0 -1.14449e-09 8.29172e-19 0 -1.11832e-09 -4.09371e-19 0 -1.11832e-09 -4.09371e-19 0
           -1.08514e-09 -2.02051e-18 0 -1.08514e-09 -2.02051e-18 0 -1.04625e-09 -2.39224e-18 0 -1.04625e-09 -2.39224e-18 0
@@ -178,7 +178,7 @@
           8.81909e-11 -1.676e-19 0 8.81909e-11 -1.676e-19 0 8.81909e-11 6.70401e-19 0 8.81909e-11 6.70401e-19 0
           8.81909e-11 0 0 8.81909e-11 0 0
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
           0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
           0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
@@ -214,7 +214,7 @@
           0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
           0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_liq" NumberOfComponents="1" format="ascii">
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
@@ -250,7 +250,7 @@
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
           0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
           0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
@@ -286,7 +286,7 @@
           0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
           0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
         </DataArray>
-        <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2_liq" NumberOfComponents="1" format="ascii">
           1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05
           1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05
           1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05
diff --git a/test/references/1p2cniboxconvection-reference.vtu b/test/references/1p2cniboxconvection-reference.vtu
index ef7fb528653fdff73f916b4824bdc4bd9089e6d0..a60e9c09535ac97447f8249fbfd464949192c10f 100644
--- a/test/references/1p2cniboxconvection-reference.vtu
+++ b/test/references/1p2cniboxconvection-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="80" NumberOfPoints="162">
-      <PointData Scalars="pressuere" Vectors="velocity_w (m/s)">
+      <PointData Scalars="pressuere" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           121579 121315 121579 121315 121051 121051 120787 120787 120522 120522 120258 120258
           119994 119994 119730 119730 119465 119465 119201 119201 118936 118936 118672 118672
@@ -35,7 +35,7 @@
           2170.43 2170.43 1899.12 1899.12 1627.82 1627.82 1356.52 1356.52 1085.21 1085.21 813.911 813.911
           542.607 542.607 271.304 271.304 0 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           0.0001 5.50706e-18 0 0.0001 -3.44192e-19 0 0.0001 5.50706e-18 0 0.0001 -3.44192e-19 0
           0.0001 3.09773e-18 0 0.0001 3.09773e-18 0 0.0001 -1.06699e-17 0 0.0001 -1.06699e-17 0
           0.0001 2.75349e-18 0 0.0001 2.75349e-18 0 0.0001 -1.37669e-17 0 0.0001 -1.37669e-17 0
@@ -78,7 +78,7 @@
           9.99937e-05 -3.3521e-19 0 9.99937e-05 -3.3521e-19 0 9.99937e-05 0 0 9.99937e-05 0 0
           9.99937e-05 0 0 9.99937e-05 0 0
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -94,7 +94,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_liq" NumberOfComponents="1" format="ascii">
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -110,7 +110,7 @@
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -126,7 +126,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2_liq" NumberOfComponents="1" format="ascii">
           1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10
           1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10
           1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10
diff --git a/test/references/1p2cniccconduction-reference.vtu b/test/references/1p2cniccconduction-reference.vtu
index 39c440c662a6fb5a891fbcf17b02cea93c8b8589..6fdcaac51a5f824a243e868bd0ff5e8464b7d863 100644
--- a/test/references/1p2cniccconduction-reference.vtu
+++ b/test/references/1p2cniccconduction-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="200" NumberOfPoints="402">
-      <CellData Scalars="p" Vectors="velocity_w (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -41,7 +41,7 @@
           0.000466521 0.000442597 0.000418673 0.000394748 0.000370824 0.0003469 0.000322976 0.000299052 0.000275128 0.000251204 0.000227279 0.000203355
           0.000179431 0.000155507 0.000131583 0.000107659 8.37345e-05 5.98104e-05 3.58862e-05 1.19621e-05
         </DataArray>
-        <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           -1.16432e-09 0 0 -1.15349e-09 0 0 -1.13227e-09 0 0 -1.10279e-09 0 0
           -1.06692e-09 0 0 -1.02441e-09 0 0 -9.75539e-10 0 0 -9.21308e-10 0 0
           -8.62751e-10 0 0 -8.00917e-10 0 0 -7.41148e-10 0 0 -6.85144e-10 0 0
@@ -93,7 +93,7 @@
           8.81741e-11 0 0 8.81741e-11 0 0 8.81741e-11 0 0 8.81741e-11 0 0
           8.81741e-11 0 0 8.81741e-11 0 0 8.81741e-11 0 0 8.81741e-11 0 0
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
           0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
           0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
@@ -112,7 +112,7 @@
           0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
           0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_liq" NumberOfComponents="1" format="ascii">
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
@@ -131,7 +131,7 @@
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
           0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
           0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
@@ -150,7 +150,7 @@
           0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
           0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
         </DataArray>
-        <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2_liq" NumberOfComponents="1" format="ascii">
           1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05
           1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05
           1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05
diff --git a/test/references/1p2cniccconvection-reference.vtu b/test/references/1p2cniccconvection-reference.vtu
index 835d4c0ff8956d4a1f3db66197a9c9d7810edb32..0e0b8decd76433d494a9c6573f8e75cbce6c6ef2 100644
--- a/test/references/1p2cniccconvection-reference.vtu
+++ b/test/references/1p2cniccconvection-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="80" NumberOfPoints="162">
-      <CellData Scalars="p" Vectors="velocity_w (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           121447 121183 120919 120654 120390 120126 119862 119597 119333 119069 118804 118539
           118274 118009 117743 117476 117209 116941 116673 116405 116135 115866 115596 115326
@@ -21,7 +21,7 @@
           5290.4 5019.1 4747.8 4476.5 4205.2 3933.89 3662.59 3391.29 3119.99 2848.68 2577.38 2306.08
           2034.77 1763.47 1492.17 1220.87 949.562 678.259 406.955 135.652
         </DataArray>
-        <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           0.0001 0 0 0.0001 0 0 0.0001 0 0 0.0001 0 0
           0.0001 0 0 0.0001 0 0 0.0001 0 0 0.0001 0 0
           9.99999e-05 0 0 9.99997e-05 0 0 9.99994e-05 0 0 9.99991e-05 0 0
@@ -43,7 +43,7 @@
           9.99936e-05 0 0 9.99936e-05 0 0 9.99936e-05 0 0 9.99936e-05 0 0
           9.99936e-05 0 0 9.99936e-05 0 0 9.99937e-05 0 0 9.99937e-05 0 0
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -52,7 +52,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_liq" NumberOfComponents="1" format="ascii">
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -61,7 +61,7 @@
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -70,7 +70,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2_liq" NumberOfComponents="1" format="ascii">
           1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10
           1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10
           1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10
diff --git a/test/references/1p2cniccmpfaconduction-reference.vtu b/test/references/1p2cniccmpfaconduction-reference.vtu
index 2ccf1fe1ed16b350efd31250d6965b25b574d8e1..f24c4e5010989f5abe83918a6d4db8517f81137e 100644
--- a/test/references/1p2cniccmpfaconduction-reference.vtu
+++ b/test/references/1p2cniccmpfaconduction-reference.vtu
@@ -41,7 +41,7 @@
           0.000466521 0.000442597 0.000418673 0.000394748 0.000370824 0.0003469 0.000322976 0.000299052 0.000275128 0.000251204 0.000227279 0.000203355
           0.000179431 0.000155507 0.000131583 0.000107659 8.37345e-05 5.98104e-05 3.58862e-05 1.19621e-05
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
           0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
           0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
@@ -60,7 +60,7 @@
           0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
           0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_liq" NumberOfComponents="1" format="ascii">
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
@@ -79,7 +79,7 @@
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
           0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
           0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
@@ -98,7 +98,7 @@
           0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
           0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
         </DataArray>
-        <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2_liq" NumberOfComponents="1" format="ascii">
           1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05
           1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05
           1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05
diff --git a/test/references/1p2cniccmpfaconvection-reference.vtu b/test/references/1p2cniccmpfaconvection-reference.vtu
index 06b047a28d999d5df73f41ffa0d80d67fd968035..4b325bbd510c4aeaf7966cf58db20fafdfd7c72a 100644
--- a/test/references/1p2cniccmpfaconvection-reference.vtu
+++ b/test/references/1p2cniccmpfaconvection-reference.vtu
@@ -21,7 +21,7 @@
           5290.4 5019.1 4747.8 4476.5 4205.2 3933.89 3662.59 3391.29 3119.99 2848.68 2577.38 2306.08
           2034.77 1763.47 1492.17 1220.87 949.562 678.259 406.955 135.652
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -30,7 +30,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_liq" NumberOfComponents="1" format="ascii">
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -39,7 +39,7 @@
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -48,7 +48,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2_liq" NumberOfComponents="1" format="ascii">
           1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10
           1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10
           1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10
diff --git a/test/references/1p2ctestcc-reference.vtu b/test/references/1p2ctestcc-reference.vtu
index 3729e02bbe08c4d7477a6385a26fded0a5fd0291..9d8c78227476f1e20de710b1de5bcadcc21cadd1 100644
--- a/test/references/1p2ctestcc-reference.vtu
+++ b/test/references/1p2ctestcc-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="40" NumberOfPoints="63">
-      <CellData Scalars="p" Vectors="velocity_w (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           197500 192500 187500 182501 177501 172501 167501 162501 157501 152501 147501 142501
           137501 132501 127501 122501 117501 112500 107500 102500 197500 192500 187500 182501
@@ -15,7 +15,7 @@
           77500.7 72500.8 67500.8 62500.9 57500.9 52501 47501 42500.9 37500.9 32500.8 27500.8 22500.7
           17500.6 12500.4 7500.27 2500.1
         </DataArray>
-        <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           0.00997014 2.9018e-18 0 0.00997016 2.90179e-18 0 0.00997018 0 0 0.00997021 2.90178e-18 0
           0.00997023 2.90178e-18 0 0.00997025 2.90177e-18 0 0.00997027 2.90177e-18 0 0.0099703 2.90176e-18 0
           0.00997032 2.90176e-18 0 0.00997034 2.90176e-18 0 0.00997037 2.90175e-18 0 0.00997039 2.90175e-18 0
@@ -27,25 +27,25 @@
           0.00997041 2.90174e-18 0 0.00997043 0 0 0.00997046 1.45087e-18 0 0.00997048 1.45086e-18 0
           0.0099705 2.90172e-18 0 0.00997053 -1.45086e-18 0 0.00997055 -1.45086e-18 0 0.00997057 0 0
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998
           0.99998 0.99998 0.99998 0.999981 0.999981 0.999981 0.999981 0.999981 0.99998 0.99998 0.99998 0.99998
           0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.999981
           0.999981 0.999981 0.999981 0.999981
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_liq" NumberOfComponents="1" format="ascii">
           2e-05 1.99999e-05 1.99995e-05 1.99985e-05 1.99962e-05 1.99919e-05 1.99844e-05 1.99724e-05 1.99544e-05 1.99287e-05 1.98936e-05 1.98473e-05
           1.97882e-05 1.97146e-05 1.96251e-05 1.95186e-05 1.9394e-05 1.92505e-05 1.90878e-05 1.89055e-05 2e-05 1.99999e-05 1.99995e-05 1.99985e-05
           1.99962e-05 1.99919e-05 1.99844e-05 1.99724e-05 1.99544e-05 1.99287e-05 1.98936e-05 1.98473e-05 1.97882e-05 1.97146e-05 1.96251e-05 1.95186e-05
           1.9394e-05 1.92505e-05 1.90878e-05 1.89055e-05
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969
           0.999969 0.999969 0.999969 0.99997 0.99997 0.99997 0.99997 0.999971 0.999969 0.999969 0.999969 0.999969
           0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.99997
           0.99997 0.99997 0.99997 0.999971
         </DataArray>
-        <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2_liq" NumberOfComponents="1" format="ascii">
           3.10994e-05 3.10992e-05 3.10986e-05 3.1097e-05 3.10935e-05 3.10868e-05 3.10752e-05 3.10565e-05 3.10285e-05 3.09886e-05 3.0934e-05 3.0862e-05
           3.077e-05 3.06556e-05 3.05165e-05 3.03508e-05 3.01571e-05 2.9934e-05 2.9681e-05 2.93976e-05 3.10994e-05 3.10992e-05 3.10986e-05 3.1097e-05
           3.10935e-05 3.10868e-05 3.10752e-05 3.10565e-05 3.10285e-05 3.09886e-05 3.0934e-05 3.0862e-05 3.077e-05 3.06556e-05 3.05165e-05 3.03508e-05
diff --git a/test/references/1p2ctestmpfa-reference.vtu b/test/references/1p2ctestmpfa-reference.vtu
index 6b0db83b63d860a49d53d115f4f2b2b4368fe23e..e73c280d02754f14cde955bb61f9075cae0a06b5 100644
--- a/test/references/1p2ctestmpfa-reference.vtu
+++ b/test/references/1p2ctestmpfa-reference.vtu
@@ -15,25 +15,25 @@
           77500.7 72500.8 67500.8 62500.9 57500.9 52501 47501 42500.9 37500.9 32500.8 27500.8 22500.7
           17500.6 12500.4 7500.27 2500.1
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998
           0.99998 0.99998 0.99998 0.999981 0.999981 0.999981 0.999981 0.999981 0.99998 0.99998 0.99998 0.99998
           0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.999981
           0.999981 0.999981 0.999981 0.999981
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_liq" NumberOfComponents="1" format="ascii">
           2e-05 1.99999e-05 1.99995e-05 1.99985e-05 1.99962e-05 1.99919e-05 1.99844e-05 1.99724e-05 1.99544e-05 1.99287e-05 1.98936e-05 1.98473e-05
           1.97882e-05 1.97146e-05 1.96251e-05 1.95186e-05 1.9394e-05 1.92505e-05 1.90878e-05 1.89055e-05 2e-05 1.99999e-05 1.99995e-05 1.99985e-05
           1.99962e-05 1.99919e-05 1.99844e-05 1.99724e-05 1.99544e-05 1.99287e-05 1.98936e-05 1.98473e-05 1.97882e-05 1.97146e-05 1.96251e-05 1.95186e-05
           1.9394e-05 1.92505e-05 1.90878e-05 1.89055e-05
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969
           0.999969 0.999969 0.999969 0.99997 0.99997 0.99997 0.99997 0.999971 0.999969 0.999969 0.999969 0.999969
           0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.99997
           0.99997 0.99997 0.99997 0.999971
         </DataArray>
-        <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2_liq" NumberOfComponents="1" format="ascii">
           3.10994e-05 3.10992e-05 3.10986e-05 3.1097e-05 3.10935e-05 3.10868e-05 3.10752e-05 3.10565e-05 3.10285e-05 3.09886e-05 3.0934e-05 3.0862e-05
           3.077e-05 3.06556e-05 3.05165e-05 3.03508e-05 3.01571e-05 2.9934e-05 2.9681e-05 2.93976e-05 3.10994e-05 3.10992e-05 3.10986e-05 3.1097e-05
           3.10935e-05 3.10868e-05 3.10752e-05 3.10565e-05 3.10285e-05 3.09886e-05 3.0934e-05 3.0862e-05 3.077e-05 3.06556e-05 3.05165e-05 3.03508e-05
diff --git a/test/references/1pnctestbox-00009.vtu b/test/references/1pnctestbox-00009.vtu
index 2c501f60daf6a249cbaa5069b4556bca2c38d750..3036424a4477a9fb2dd70f6bc913e2dfacbfcc70 100644
--- a/test/references/1pnctestbox-00009.vtu
+++ b/test/references/1pnctestbox-00009.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="40" NumberOfPoints="63">
-      <PointData Scalars="p" Vectors="velocity_w (m/s)">
+      <PointData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           200000 195000 200000 195000 190000 190000 185000 185000 180001 180001 175001 175001
           170001 170001 165001 165001 160001 160001 155001 155001 150001 150001 145001 145001
@@ -59,7 +59,7 @@
           3.10868e-05 3.10752e-05 3.10565e-05 3.10285e-05 3.09886e-05 3.0934e-05 3.0862e-05 3.077e-05 3.06556e-05 3.05165e-05 3.03508e-05 3.01571e-05
           2.9934e-05 2.9681e-05 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           0.00997014 -2.9018e-18 0 0.00997015 0 0 0.00997014 -2.17635e-18 0 0.00997015 3.26452e-18 0
           0.00997017 1.45089e-18 0 0.00997017 2.90179e-18 0 0.0099702 6.52902e-18 0 0.0099702 3.62723e-18 0
           0.00997022 2.17634e-18 0 0.00997022 -7.25445e-19 0 0.00997024 3.62722e-18 0 0.00997024 2.17633e-18 0
diff --git a/test/references/1pnctestcc-00009.vtu b/test/references/1pnctestcc-00009.vtu
index b05e5494526f00491241ccc13f79d9c3f17057cc..bfa15c32abf7ac29f083845f7996cdcf7a063d04 100644
--- a/test/references/1pnctestcc-00009.vtu
+++ b/test/references/1pnctestcc-00009.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="40" NumberOfPoints="63">
-      <CellData Scalars="p" Vectors="velocity_w (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           197500 192500 187500 182501 177501 172501 167501 162501 157501 152501 147501 142501
           137501 132501 127501 122501 117501 112500 107500 102500 197500 192500 187500 182501
@@ -45,7 +45,7 @@
           3.10935e-05 3.10868e-05 3.10752e-05 3.10565e-05 3.10285e-05 3.09886e-05 3.0934e-05 3.0862e-05 3.077e-05 3.06556e-05 3.05165e-05 3.03508e-05
           3.01571e-05 2.9934e-05 2.9681e-05 2.93974e-05
         </DataArray>
-        <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           0.00997014 0 0 0.00997016 0 0 0.00997018 0 0 0.00997021 0 0
           0.00997023 0 0 0.00997025 0 0 0.00997027 -5.80354e-18 0 0.0099703 0 0
           0.00997032 0 0 0.00997034 0 0 0.00997037 0 0 0.00997039 0 0
diff --git a/test/references/1pniboxconduction-reference.vtu b/test/references/1pniboxconduction-reference.vtu
index e30851e869e692f5c306eb6d818f94b8f2c811b2..3e62d163f1f9f7fc790a4af58c6107ec3ffb4651 100644
--- a/test/references/1pniboxconduction-reference.vtu
+++ b/test/references/1pniboxconduction-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="200" NumberOfPoints="402">
-      <PointData Scalars="p" Vectors="velocity_H2O">
+      <PointData Scalars="p" Vectors="velocity_liq">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -39,7 +39,7 @@
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000
         </DataArray>
-        <DataArray type="Float32" Name="velocity_H2O" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq" NumberOfComponents="3" format="ascii">
           -1.17342e-09 8.52243e-19 0 -1.16807e-09 1.68217e-18 0 -1.17342e-09 8.52243e-19 0 -1.16807e-09 1.68217e-18 0
           -1.15247e-09 3.1127e-18 0 -1.15247e-09 3.1127e-18 0 -1.1275e-09 1.84323e-18 0 -1.1275e-09 1.84323e-18 0
           -1.09416e-09 3.84099e-18 0 -1.09416e-09 3.84099e-18 0 -1.05354e-09 1.9959e-18 0 -1.05354e-09 1.9959e-18 0
diff --git a/test/references/1pniboxconvection-reference.vtp b/test/references/1pniboxconvection-reference.vtp
index ec90366ab433e79e8b9d6ac3470d68a20732f765..c9c016a2b816f6a3300d69ccac4331679045008a 100644
--- a/test/references/1pniboxconvection-reference.vtp
+++ b/test/references/1pniboxconvection-reference.vtp
@@ -31,8 +31,8 @@
           290 290 290 290 290 290 290 290 290
         </DataArray>
       </PointData>
-      <CellData Scalars="velocity_H2O (m/s)">
-        <DataArray type="Float32" Name="velocity_H2O (m/s)" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="velocity_liq (m/s)">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="1" format="ascii">
           0.0001 0.0001 0.0001 0.0001 0.0001 0.0001 0.0001 0.0001 9.99999e-05 9.99998e-05 9.99995e-05 9.99992e-05
           9.99988e-05 9.99984e-05 9.99978e-05 9.99973e-05 9.99967e-05 9.99961e-05 9.99955e-05 9.9995e-05 9.99945e-05 9.99941e-05 9.99938e-05 9.99935e-05
           9.99933e-05 9.99931e-05 9.9993e-05 9.99929e-05 9.99928e-05 9.99928e-05 9.99928e-05 9.99927e-05 9.99927e-05 9.99927e-05 9.99927e-05 9.99928e-05
diff --git a/test/references/1pniccconvection-reference.vtp b/test/references/1pniccconvection-reference.vtp
index 8dd5c5f224b9148fbbda7b5b280f696b3c27762f..7910960e0e26843f3a4d007e90d2bca74e562853 100644
--- a/test/references/1pniccconvection-reference.vtp
+++ b/test/references/1pniccconvection-reference.vtp
@@ -21,7 +21,7 @@
           290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001
           290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001
         </DataArray>
-        <DataArray type="Float32" Name="velocity_H2O (m/s)" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="1" format="ascii">
           0.0001 0.0001 0.0001 0.0001 0.0001 0.0001 0.0001 0.0001 9.99999e-05 9.99997e-05 9.99995e-05 9.99992e-05
           9.99988e-05 9.99983e-05 9.99978e-05 9.99972e-05 9.99967e-05 9.99961e-05 9.99955e-05 9.9995e-05 9.99945e-05 9.99941e-05 9.99938e-05 9.99935e-05
           9.99933e-05 9.99931e-05 9.9993e-05 9.99929e-05 9.99928e-05 9.99928e-05 9.99928e-05 9.99927e-05 9.99927e-05 9.99927e-05 9.99927e-05 9.99927e-05
diff --git a/test/references/2cnistokes2p2cni-ff-reference.vtu b/test/references/2cnistokes2p2cni-ff-reference.vtu
index f354ba75249714113ba5ffd2b4f35933c7ec217c..aaa184d8d7498c583b3e04505606023a71d54b8e 100644
--- a/test/references/2cnistokes2p2cni-ff-reference.vtu
+++ b/test/references/2cnistokes2p2cni-ff-reference.vtu
@@ -27,7 +27,7 @@
           0 0.00204753 0.00170585 0.00136463 0.00102326 0.000682204 0.000341101 0 0.00204834 0.00170667 0.00136529 0.00102376
           0.000682533 0.000341262 0
         </DataArray>
-        <DataArray type="Float32" Name="x_gas^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0295603 0.0295517 0.0127981 0.0128639 0.0295518 0.0129291 0.0295586 0.0129942 0.0295655 0.0130591 0.0295729 0.0131238
           0.0295911 0.0131558 0.0127981 0.0127981 0.0127982 0.0127984 0.0127986 0.0127989 0.0127989 0.0127981 0.0127981 0.0127981
           0.0127981 0.0127981 0.0127981 0.012798 0.0127981 0.0127981 0.0127981 0.0127981 0.0127981 0.0127981 0.0127981 0.0127981
@@ -35,7 +35,7 @@
           0.0127982 0.0127981 0.0127981 0.0127982 0.0127984 0.0127986 0.0127987 0.0127989 0.0127981 0.0128152 0.0128285 0.0128378
           0.0128431 0.0128448 0.0127981
         </DataArray>
-        <DataArray type="Float32" Name="X_gas^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0185964 0.0185909 0.008 0.00804133 0.018591 0.00808232 0.0185953 0.0081232 0.0185997 0.00816399 0.0186044 0.00820464
           0.018616 0.00822477 0.008 0.00800003 0.0080001 0.0080002 0.00800034 0.0080005 0.00800051 0.008 0.008 0.008
           0.008 0.008 0.008 0.00799996 0.008 0.008 0.008 0.008 0.008 0.008 0.00800002 0.008
@@ -43,7 +43,7 @@
           0.00800007 0.008 0.00800004 0.00800011 0.00800021 0.00800032 0.00800041 0.00800052 0.008 0.00801073 0.00801909 0.00802495
           0.00802827 0.00802937 0.008
         </DataArray>
-        <DataArray type="Float32" Name="x_gas^Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
           0.97044 0.970448 0.987202 0.987136 0.970448 0.987071 0.970441 0.987006 0.970434 0.986941 0.970427 0.986876
           0.970409 0.986844 0.987202 0.987202 0.987202 0.987202 0.987201 0.987201 0.987201 0.987202 0.987202 0.987202
           0.987202 0.987202 0.987202 0.987202 0.987202 0.987202 0.987202 0.987202 0.987202 0.987202 0.987202 0.987202
@@ -51,7 +51,7 @@
           0.987202 0.987202 0.987202 0.987202 0.987202 0.987201 0.987201 0.987201 0.987202 0.987185 0.987172 0.987162
           0.987157 0.987155 0.987202
         </DataArray>
-        <DataArray type="Float32" Name="X_gas^Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Air_gas" NumberOfComponents="1" format="ascii">
           0.981404 0.981409 0.992 0.991959 0.981409 0.991918 0.981405 0.991877 0.9814 0.991836 0.981396 0.991795
           0.981384 0.991775 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992
           0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992
diff --git a/test/references/2cnistokes2p2cni-pm-reference.vtu b/test/references/2cnistokes2p2cni-pm-reference.vtu
index edf24fe616122c9b593bdaee7a716432acd19f82..cc9fe0c57544d92f0543abd6b34fc563efcd92f3 100644
--- a/test/references/2cnistokes2p2cni-pm-reference.vtu
+++ b/test/references/2cnistokes2p2cni-pm-reference.vtu
@@ -8,7 +8,7 @@
           0.0101045 0.0103706 0.0133566 0.0133566 0.0133566 0.0133566 0.0133566 0.0133566 0.0133566 0.0251665 0.0251664 0.0251664
           0.0251663 0.0251663 0.0251662 0.0251661 0.131067 0.131067 0.131067 0.131066 0.131066 0.131065 0.131065
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           0.989896 0.989896 0.989629 0.989629 0.989896 0.989629 0.989896 0.989629 0.989896 0.989629 0.989896 0.989629
           0.989896 0.989629 0.986643 0.986643 0.986643 0.986643 0.986643 0.986643 0.986643 0.974833 0.974834 0.974834
           0.974834 0.974834 0.974834 0.974834 0.868933 0.868933 0.868933 0.868934 0.868934 0.868935 0.868935
@@ -38,52 +38,52 @@
           1.16846 1.15727 1.15516 1.15516 1.15516 1.15516 1.15516 1.15515 1.15515 1.15712 1.15713 1.15713
           1.15712 1.15711 1.1571 1.15709 1.15975 1.15977 1.15977 1.15975 1.15973 1.15971 1.15967
         </DataArray>
-        <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           1123.57 1123.57 1122.91 1122.91 1123.57 1122.91 1123.57 1122.91 1123.57 1122.92 1123.57 1122.92
           1123.57 1122.92 1117.99 1117.99 1117.99 1118 1118.02 1118.03 1118.04 1091.47 1091.45 1091.46
           1091.5 1091.55 1091.62 1091.67 692.041 691.964 691.966 692.028 692.092 692.159 692.326
         </DataArray>
-        <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           0.000369198 0.000369213 0.00516169 0.00516177 0.000369185 0.00516199 0.000369222 0.00516213 0.000369213 0.00516266 0.000369236 0.00516302
           0.00036923 0.00516291 0.508919 0.508919 0.508918 0.508919 0.508919 0.508919 0.50892 11.7723 11.7722 11.7721
           11.772 11.7718 11.7717 11.7715 880.295 880.297 880.293 880.281 880.268 880.255 880.227
         </DataArray>
-        <DataArray type="Float32" Name="X_liquid^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978
           0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978
           0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978
         </DataArray>
-        <DataArray type="Float32" Name="X_liquid^Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Air_liq" NumberOfComponents="1" format="ascii">
           2.18171e-05 2.18171e-05 2.16111e-05 2.16111e-05 2.18171e-05 2.16111e-05 2.18171e-05 2.16111e-05 2.18171e-05 2.1611e-05 2.18171e-05 2.1611e-05
           2.18171e-05 2.1611e-05 2.16169e-05 2.16169e-05 2.16168e-05 2.16166e-05 2.16164e-05 2.16162e-05 2.16161e-05 2.17779e-05 2.17782e-05 2.17781e-05
           2.17775e-05 2.17767e-05 2.17757e-05 2.17749e-05 2.19961e-05 2.1998e-05 2.1998e-05 2.19965e-05 2.1995e-05 2.19933e-05 2.19893e-05
         </DataArray>
-        <DataArray type="Float32" Name="X_gas^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0197146 0.0197146 0.0198771 0.0198772 0.0197146 0.0198772 0.0197146 0.0198773 0.0197146 0.0198773 0.0197146 0.0198774
           0.0197146 0.0198774 0.0197363 0.0197363 0.0197365 0.019737 0.0197377 0.0197385 0.0197388 0.0192394 0.0192386 0.0192387
           0.0192406 0.0192431 0.0192462 0.0192485 0.0185964 0.0185909 0.018591 0.0185953 0.0185997 0.0186044 0.018616
         </DataArray>
-        <DataArray type="Float32" Name="X_gas^Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Air_gas" NumberOfComponents="1" format="ascii">
           0.980285 0.980285 0.980123 0.980123 0.980285 0.980123 0.980285 0.980123 0.980285 0.980123 0.980285 0.980123
           0.980285 0.980123 0.980264 0.980264 0.980264 0.980263 0.980262 0.980262 0.980261 0.980761 0.980761 0.980761
           0.980759 0.980757 0.980754 0.980751 0.981404 0.981409 0.981409 0.981405 0.9814 0.981396 0.981384
         </DataArray>
-        <DataArray type="Float32" Name="x_liquid^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999986 0.999986 0.999987 0.999987 0.999986 0.999987 0.999986 0.999987 0.999986 0.999987 0.999986 0.999987
           0.999986 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999986 0.999986 0.999986
           0.999986 0.999986 0.999986 0.999986 0.999986 0.999986 0.999986 0.999986 0.999986 0.999986 0.999986
         </DataArray>
-        <DataArray type="Float32" Name="x_liquid^Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_liq" NumberOfComponents="1" format="ascii">
           1.35719e-05 1.35719e-05 1.34437e-05 1.34437e-05 1.35719e-05 1.34437e-05 1.35719e-05 1.34437e-05 1.35719e-05 1.34437e-05 1.35719e-05 1.34437e-05
           1.35719e-05 1.34437e-05 1.34473e-05 1.34473e-05 1.34473e-05 1.34472e-05 1.34471e-05 1.34469e-05 1.34468e-05 1.35475e-05 1.35477e-05 1.35477e-05
           1.35473e-05 1.35468e-05 1.35461e-05 1.35456e-05 1.36833e-05 1.36845e-05 1.36844e-05 1.36835e-05 1.36825e-05 1.36815e-05 1.3679e-05
         </DataArray>
-        <DataArray type="Float32" Name="x_gas^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0313167 0.0313167 0.0315719 0.0315719 0.0313167 0.031572 0.0313167 0.0315721 0.0313167 0.0315722 0.0313167 0.0315723
           0.0313167 0.0315724 0.0313509 0.0313509 0.0313511 0.0313519 0.0313531 0.0313543 0.0313548 0.0305707 0.0305694 0.0305696
           0.0305725 0.0305765 0.0305812 0.030585 0.0295603 0.0295517 0.0295518 0.0295586 0.0295655 0.0295729 0.0295911
         </DataArray>
-        <DataArray type="Float32" Name="x_gas^Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
           0.968683 0.968683 0.968428 0.968428 0.968683 0.968428 0.968683 0.968428 0.968683 0.968428 0.968683 0.968428
           0.968683 0.968428 0.968649 0.968649 0.968649 0.968648 0.968647 0.968646 0.968645 0.969429 0.969431 0.96943
           0.969427 0.969424 0.969419 0.969415 0.97044 0.970448 0.970448 0.970441 0.970434 0.970427 0.970409
diff --git a/test/references/2cnistokes2p2cniboundarylayer-ff-reference.vtu b/test/references/2cnistokes2p2cniboundarylayer-ff-reference.vtu
index 3b87304b7f7224eab470a89c56b9c0db453a439e..2e825968ccfce2eef04dc193bc86f9a0296cb9f1 100644
--- a/test/references/2cnistokes2p2cniboundarylayer-ff-reference.vtu
+++ b/test/references/2cnistokes2p2cniboundarylayer-ff-reference.vtu
@@ -27,7 +27,7 @@
           0 0.00204714 0.00170545 0.00136429 0.00102297 0.000682016 0.00034101 0 0.00204814 0.00170645 0.00136511 0.00102358
           0.000682424 0.000341212 0
         </DataArray>
-        <DataArray type="Float32" Name="x_gas^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0274932 0.0274805 0.0127981 0.0128556 0.0274677 0.0129132 0.0274563 0.0129716 0.0274463 0.0130298 0.0274377 0.0130877
           0.0274314 0.0131162 0.0127981 0.0127981 0.0127982 0.0127984 0.0127985 0.0127988 0.0127988 0.0127981 0.0127981 0.0127981
           0.0127981 0.0127981 0.0127981 0.012798 0.0127981 0.0127981 0.0127981 0.0127981 0.0127981 0.0127981 0.0127981 0.0127981
@@ -35,7 +35,7 @@
           0.0127982 0.0127981 0.0127981 0.0127983 0.0127985 0.0127987 0.0127989 0.0127991 0.0127981 0.0128195 0.0128364 0.0128483
           0.0128551 0.0128574 0.0127981
         </DataArray>
-        <DataArray type="Float32" Name="X_gas^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0172823 0.0172743 0.008 0.00803615 0.0172661 0.00807233 0.0172588 0.00810899 0.0172525 0.00814555 0.0172471 0.00818195
           0.017243 0.00819986 0.008 0.00800003 0.00800009 0.00800018 0.0080003 0.00800045 0.00800043 0.008 0.008 0.008
           0.008 0.008 0.008 0.00799996 0.008 0.008 0.008 0.008 0.008 0.008 0.00800002 0.008
@@ -43,7 +43,7 @@
           0.00800008 0.008 0.00800005 0.00800014 0.00800026 0.0080004 0.00800052 0.00800066 0.008 0.00801349 0.00802406 0.00803154
           0.00803582 0.00803728 0.008
         </DataArray>
-        <DataArray type="Float32" Name="x_gas^Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
           0.972507 0.972519 0.987202 0.987144 0.972532 0.987087 0.972544 0.987028 0.972554 0.98697 0.972562 0.986912
           0.972569 0.986884 0.987202 0.987202 0.987202 0.987202 0.987201 0.987201 0.987201 0.987202 0.987202 0.987202
           0.987202 0.987202 0.987202 0.987202 0.987202 0.987202 0.987202 0.987202 0.987202 0.987202 0.987202 0.987202
@@ -51,7 +51,7 @@
           0.987202 0.987202 0.987202 0.987202 0.987202 0.987201 0.987201 0.987201 0.987202 0.98718 0.987164 0.987152
           0.987145 0.987143 0.987202
         </DataArray>
-        <DataArray type="Float32" Name="X_gas^Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Air_gas" NumberOfComponents="1" format="ascii">
           0.982718 0.982726 0.992 0.991964 0.982734 0.991928 0.982741 0.991891 0.982747 0.991854 0.982753 0.991818
           0.982757 0.9918 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992
           0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992
diff --git a/test/references/2cnizeroeq2p2cni-ff-reference.vtu b/test/references/2cnizeroeq2p2cni-ff-reference.vtu
index 70690970936ceff6d03d29ce28c079f7e51f2af8..03a58772c1bbb63f1df9a7dc5d3ebbbe8d0a0f11 100644
--- a/test/references/2cnizeroeq2p2cni-ff-reference.vtu
+++ b/test/references/2cnizeroeq2p2cni-ff-reference.vtu
@@ -19,7 +19,7 @@
           19.7464 -11.2911 13.9263 -7.49288 9.54425 -3.78342 5.35356 0 16.8569 -10.0753 13.3794 -7.31809
           9.39921 -3.74311 5.17663 0 16.8218 -10.1103 13.3706 -7.33017 9.39747 -3.7471 5.2037 0
         </DataArray>
-        <DataArray type="Float32" Name="x_gas^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0127981 0.0102654 0.0127981 0.0127005 0.0145671 0.0127235 0.0171487 0.0128065 0.0173452 0.0128571 0.0176067 0.012912
           0.0144057 0.0129175 0.0101329 0.0118227 0.0127981 0.0127923 0.0127909 0.0127917 0.0127939 0.0127974 0.01279 0.0120671
           0.0127981 0.0127978 0.0127976 0.0127974 0.0127973 0.0127969 0.0127807 0.0120887 0.0127981 0.012798 0.012798 0.0127979
@@ -27,7 +27,7 @@
           0.0127981 0.0127891 0.0127791 0.0127656 0.0127551 0.0127453 0.0127276 0.0119784 0.0127981 0.0126677 0.0125701 0.0124765
           0.0124268 0.0123955 0.012367 0.0113245 0.0127981 0.00998371 0.00901531 0.00850094 0.0085519 0.00910854 0.00743797 0.00581896
         </DataArray>
-        <DataArray type="Float32" Name="X_gas^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_gas" NumberOfComponents="1" format="ascii">
           0.008 0.00641071 0.008 0.00793872 0.00911193 0.00795314 0.0107373 0.00800533 0.0108612 0.00803711 0.011026 0.00807159
           0.00901045 0.00807501 0.00632762 0.00738757 0.008 0.00799636 0.00799549 0.00799597 0.00799736 0.0079996 0.00799494 0.00754099
           0.008 0.00799985 0.00799973 0.0079996 0.00799954 0.0079993 0.00798911 0.00755456 0.008 0.00799998 0.00799995 0.00799989
@@ -35,7 +35,7 @@
           0.008 0.00799434 0.00798808 0.0079796 0.00797299 0.00796686 0.00795572 0.00748533 0.008 0.00791811 0.00785683 0.00779803
           0.00776683 0.00774717 0.00772927 0.00707492 0.008 0.0062341 0.00562733 0.00530523 0.00533714 0.00568573 0.00463999 0.00362779
         </DataArray>
-        <DataArray type="Float32" Name="x_gas^Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
           0.987202 0.989735 0.987202 0.9873 0.985433 0.987277 0.982851 0.987193 0.982655 0.987143 0.982393 0.987088
           0.985594 0.987083 0.989867 0.988177 0.987202 0.987208 0.987209 0.987208 0.987206 0.987203 0.98721 0.987933
           0.987202 0.987202 0.987202 0.987203 0.987203 0.987203 0.987219 0.987911 0.987202 0.987202 0.987202 0.987202
@@ -43,7 +43,7 @@
           0.987202 0.987211 0.987221 0.987234 0.987245 0.987255 0.987272 0.988022 0.987202 0.987332 0.98743 0.987523
           0.987573 0.987604 0.987633 0.988676 0.987202 0.990016 0.990985 0.991499 0.991448 0.990891 0.992562 0.994181
         </DataArray>
-        <DataArray type="Float32" Name="X_gas^Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Air_gas" NumberOfComponents="1" format="ascii">
           0.992 0.993589 0.992 0.992061 0.990888 0.992047 0.989263 0.991995 0.989139 0.991963 0.988974 0.991928
           0.99099 0.991925 0.993672 0.992612 0.992 0.992004 0.992005 0.992004 0.992003 0.992 0.992005 0.992459
           0.992 0.992 0.992 0.992 0.992 0.992001 0.992011 0.992445 0.992 0.992 0.992 0.992
diff --git a/test/references/2cstokes2p2c-ff-reference.vtu b/test/references/2cstokes2p2c-ff-reference.vtu
index 717d6ab692491b128b315233bdf6e739361c239e..35f19576cbdbb23989536c95fe38ecfe07d6a72b 100644
--- a/test/references/2cstokes2p2c-ff-reference.vtu
+++ b/test/references/2cstokes2p2c-ff-reference.vtu
@@ -45,7 +45,7 @@
           0 0.0020489 0.00184389 0.001639 0.00143406 0.00122919 0.00102429 0.000819432 0.000614562 0.000409708 0.000204863 0
           0.00204885 0.00184384 0.00163891 0.00143394 0.00122908 0.00102418 0.000819345 0.000614495 0.000409662 0.000204838 0
         </DataArray>
-        <DataArray type="Float32" Name="x_gas^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.031697 0.031697 0.0132323 0.013906 0.031697 0.0145343 0.031697 0.0151204 0.031697 0.0156676 0.031697 0.0161789
           0.031697 0.0166567 0.031697 0.0171037 0.031697 0.0175219 0.031697 0.0179145 0.031697 0.018106 0.0128531 0.0128668
           0.0128884 0.012917 0.012952 0.0129927 0.0130387 0.0130894 0.0131442 0.0132026 0.0132326 0.0128446 0.0128448 0.0128451
@@ -59,7 +59,7 @@
           0.0130297 0.0133177 0.0133176 0.0133174 0.0133173 0.0133171 0.013317 0.0133169 0.0133167 0.0133166 0.0133165 0.0133164
           0.0127981 0.0127982 0.0127984 0.0127987 0.012799 0.0127994 0.0127998 0.0128002 0.0128007 0.0128012 0.0127981
         </DataArray>
-        <DataArray type="Float32" Name="X_gas^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0199569 0.0199569 0.00827283 0.00869625 0.0199569 0.00909131 0.0199569 0.00946002 0.0199569 0.00980444 0.0199569 0.0101263
           0.0199569 0.0104273 0.0199569 0.0107089 0.0199569 0.0109725 0.0199569 0.01122 0.0199569 0.0113408 0.00803457 0.00804319
           0.00805674 0.00807469 0.00809667 0.00812228 0.00815117 0.008183 0.00821748 0.00825415 0.00827299 0.00802925 0.00802934 0.00802951
@@ -73,7 +73,7 @@
           0.00814552 0.00832646 0.00832637 0.00832629 0.0083262 0.00832611 0.00832602 0.00832594 0.00832585 0.00832577 0.00832568 0.00832564
           0.008 0.00800011 0.00800023 0.00800039 0.00800059 0.00800082 0.00800107 0.00800134 0.00800163 0.00800196 0.008
         </DataArray>
-        <DataArray type="Float32" Name="x_gas^Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
           0.968303 0.968303 0.986768 0.986094 0.968303 0.985466 0.968303 0.98488 0.968303 0.984332 0.968303 0.983821
           0.968303 0.983343 0.968303 0.982896 0.968303 0.982478 0.968303 0.982086 0.968303 0.981894 0.987147 0.987133
           0.987112 0.987083 0.987048 0.987007 0.986961 0.986911 0.986856 0.986797 0.986767 0.987155 0.987155 0.987155
@@ -87,7 +87,7 @@
           0.98697 0.986682 0.986682 0.986683 0.986683 0.986683 0.986683 0.986683 0.986683 0.986683 0.986684 0.986684
           0.987202 0.987202 0.987202 0.987201 0.987201 0.987201 0.9872 0.9872 0.987199 0.987199 0.987202
         </DataArray>
-        <DataArray type="Float32" Name="X_gas^Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Air_gas" NumberOfComponents="1" format="ascii">
           0.980043 0.980043 0.991727 0.991304 0.980043 0.990909 0.980043 0.99054 0.980043 0.990196 0.980043 0.989874
           0.980043 0.989573 0.980043 0.989291 0.980043 0.989028 0.980043 0.98878 0.980043 0.988659 0.991965 0.991957
           0.991943 0.991925 0.991903 0.991878 0.991849 0.991817 0.991783 0.991746 0.991727 0.991971 0.991971 0.99197
diff --git a/test/references/2czeroeq2p2c-ff-reference.vtu b/test/references/2czeroeq2p2c-ff-reference.vtu
index b841ce16a9cf2866beed3120491c6a66aeb2d5b1..3caa949b1841ef16ef58ab90259680cd865dc209 100644
--- a/test/references/2czeroeq2p2c-ff-reference.vtu
+++ b/test/references/2czeroeq2p2c-ff-reference.vtu
@@ -31,7 +31,7 @@
           0 12.2119 -12.7234 10.79 -10.8128 8.35168 -8.55151 5.63808 -6.19045 2.8156 -3.74987 0
           12.2053 -12.73 10.7901 -10.8159 8.35075 -8.55364 5.63621 -6.19225 2.81415 -3.75105 0
         </DataArray>
-        <DataArray type="Float32" Name="x_gas^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0127981 0.0100472 0.0142557 0.0138304 0.00954724 0.0135596 0.00866338 0.0132442 0.00808517 0.0129745 0.00798839 0.0127688
           0.0171329 0.0128098 0.0237559 0.0130856 0.0297366 0.0133075 0.0317109 0.0140283 0.0317098 0.0158764 0.0122162 0.0124125
           0.0124835 0.0125301 0.012538 0.0125278 0.012516 0.0125315 0.0125609 0.0126803 0.013574 0.0120347 0.0120912 0.0121341
@@ -45,7 +45,7 @@
           0.0130795 0.0142516 0.0140938 0.0139876 0.0138679 0.0137691 0.0136634 0.0135656 0.0134699 0.0133844 0.0133151 0.01405
           0.0127981 0.0115402 0.011372 0.0109309 0.010739 0.0104392 0.0101481 0.00993143 0.00975593 0.00968505 0.0127981
         </DataArray>
-        <DataArray type="Float32" Name="X_gas^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_gas" NumberOfComponents="1" format="ascii">
           0.008 0.00627391 0.0089161 0.00864869 0.00596057 0.00847847 0.00540694 0.00828029 0.00504496 0.00811086 0.0049844 0.00798162
           0.0107273 0.00800734 0.0149118 0.00818061 0.0187085 0.00832007 0.0199657 0.0087731 0.019965 0.00993585 0.0076346 0.00775784
           0.00780242 0.00783172 0.00783665 0.00783026 0.00782285 0.00783256 0.00785103 0.00792601 0.00848756 0.00752062 0.0075561 0.00758305
@@ -59,7 +59,7 @@
           0.00817682 0.00891355 0.00881428 0.00874754 0.0086723 0.00861018 0.00854371 0.00848222 0.00842213 0.00836835 0.00832485 0.00878678
           0.008 0.00721025 0.00710475 0.00682803 0.00670764 0.00651967 0.00633716 0.00620133 0.00609134 0.00604692 0.008
         </DataArray>
-        <DataArray type="Float32" Name="x_gas^Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
           0.987202 0.989943 0.985744 0.986167 0.990435 0.986436 0.991317 0.98675 0.991895 0.987019 0.992001 0.987224
           0.982577 0.987179 0.975801 0.986896 0.969288 0.986662 0.968302 0.985955 0.968303 0.984117 0.987784 0.987588
           0.987517 0.987469 0.987461 0.987471 0.987482 0.987466 0.987435 0.987315 0.986424 0.987965 0.987909 0.987866
@@ -73,7 +73,7 @@
           0.98692 0.985748 0.985905 0.986011 0.98613 0.986228 0.986333 0.98643 0.986526 0.986611 0.98668 0.985945
           0.987202 0.988455 0.988618 0.989056 0.989244 0.989542 0.989831 0.990049 0.990226 0.990301 0.987202
         </DataArray>
-        <DataArray type="Float32" Name="X_gas^Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Air_gas" NumberOfComponents="1" format="ascii">
           0.992 0.99372 0.991084 0.99135 0.994028 0.991519 0.994581 0.991716 0.994943 0.991885 0.995009 0.992014
           0.98909 0.991986 0.984807 0.991808 0.980671 0.991661 0.980042 0.991216 0.980043 0.99006 0.992365 0.992242
           0.992198 0.992168 0.992163 0.992169 0.992176 0.992166 0.992146 0.992071 0.991511 0.992479 0.992444 0.992417
diff --git a/test/references/2pboxdfm_2d_quads-reference.vtu b/test/references/2pboxdfm_2d_quads-reference.vtu
index 1ab6f0d7bc61dc859405d66dd21d52e296e3fe8c..dcde7792c0c9e67de4ed928587cef895214a24c9 100644
--- a/test/references/2pboxdfm_2d_quads-reference.vtu
+++ b/test/references/2pboxdfm_2d_quads-reference.vtu
@@ -223,7 +223,7 @@
           10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
           10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           0.927609 0.5 0.927605 0.5 0.999929 0.927609 0.999929 0.927605 0.927617 0.5 0.927609 0.5
           0.999929 0.927617 0.999929 0.927609 1 0.999929 1 0.999929 1 1 1 1
           1 1 1 1 1 0.999929 1 0.999929 1 1 1 1
@@ -333,7 +333,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           195976 200000 195974 200000 188216 195976 188213 195974 195980 200000 195976 200000
           188225 195980 188216 195976 182827 188216 182823 188213 177431 182827 177426 182823
           172024 177431 172016 177426 182840 188225 182827 188216 177449 182840 177431 182827
@@ -443,7 +443,7 @@
           122435 122441 116836 116840 116836 116840 111228 111231 111231 111238 105616 105620
           105616 105620 100000 100000 111228 111231 105615 105616 105615 105616 100000 100000
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -553,7 +553,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_aq" NumberOfComponents="1" format="ascii">
           690.943 23.1923 690.929 23.1923 999.652 690.943 999.652 690.929 690.975 23.1923 690.943 23.1923
           999.652 690.975 999.652 690.943 1000 999.652 1000 999.652 1000 1000 1000 1000
           1000 1000 1000 1000 1000 999.652 1000 999.652 1000 1000 1000 1000
@@ -663,7 +663,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0.0723912 0.5 0.072395 0.5 7.13497e-05 0.0723912 7.13685e-05 0.072395 0.0723825 0.5 0.0723912 0.5
           7.13046e-05 0.0723825 7.13497e-05 0.0723912 2.05922e-14 7.13497e-05 2.06123e-14 7.13685e-05 3.40516e-43 2.05922e-14 3.40516e-43 2.06123e-14
           -0 3.40516e-43 -0 3.40516e-43 2.05418e-14 7.13046e-05 2.05922e-14 7.13497e-05 3.40516e-43 2.05418e-14 3.40516e-43 2.05922e-14
@@ -773,7 +773,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="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           206449 216008 206447 216008 198216 206449 198213 206447 206453 216008 206449 216008
           198225 206453 198216 206449 192827 198216 192823 198213 187431 192827 187426 192823
           182024 187431 182016 187426 192840 198225 192827 198216 187449 192840 187431 192827
@@ -883,7 +883,7 @@
           132435 132441 126836 126840 126836 126840 121228 121231 121231 121238 115616 115620
           115616 115620 110000 110000 121228 121231 115615 115616 115615 115616 110000 110000
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -993,7 +993,7 @@
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_napl" NumberOfComponents="1" format="ascii">
           2.30762 552.948 2.30798 552.948 2.31138e-09 2.30762 2.31321e-09 2.30798 2.3068 552.948 2.30762 552.948
           2.307e-09 2.3068 2.31138e-09 2.30762 5.61647e-38 2.31138e-09 5.61647e-38 2.31321e-09 0 5.61647e-38 0 5.61647e-38
           0 0 0 0 5.61647e-38 2.307e-09 5.61647e-38 2.31138e-09 0 5.61647e-38 0 5.61647e-38
diff --git a/test/references/2pboxdfm_2d_trias-reference.vtu b/test/references/2pboxdfm_2d_trias-reference.vtu
index 2ad8ea6d0fb9f32d05ecc8971c769f92286c86d6..be56b54c6b06b62622fde0534ed914a86d35d47d 100644
--- a/test/references/2pboxdfm_2d_trias-reference.vtu
+++ b/test/references/2pboxdfm_2d_trias-reference.vtu
@@ -971,7 +971,7 @@
           10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
           10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           0.5 0.698559 0.857638 0.5 0.5 0.698559 0.857638 0.698559 0.947525 0.9989 0.857638 0.999064
           0.857638 0.947525 0.999064 0.5 0.718691 0.698559 0.947525 0.698559 0.718691 0.947525 0.999975 0.999064
           0.947525 0.718691 0.971638 0.947525 0.971638 0.999975 0.9989 0.999064 1 1 0.9989 1
@@ -1455,7 +1455,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           200000 195689 186128 200000 200000 195689 186128 195689 181535 173108 186128 175493
           186128 181535 175493 200000 194413 195689 181535 195689 194413 181535 174483 175493
           181535 194413 179627 181535 179627 174483 173108 175493 169854 166911 173108 169854
@@ -1939,7 +1939,7 @@
           100000 100000 106148 100000 100000 106681 129636 130131 133294 135047 129636 133294
           129636 123530 124166 123530 116627 124166 116627 108814 114088 100000 106681 108814
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -2423,7 +2423,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_aq" NumberOfComponents="1" format="ascii">
           23.1923 159.932 466.375 23.1923 23.1923 159.932 466.375 159.932 767.563 994.645 466.375 995.444
           466.375 767.563 995.444 23.1923 186.253 159.932 767.563 159.932 186.253 767.563 999.877 995.444
           767.563 186.253 868.661 767.563 868.661 999.877 994.645 995.444 1000 1000 994.645 1000
@@ -2907,7 +2907,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0.5 0.301441 0.142362 0.5 0.5 0.301441 0.142362 0.301441 0.0524754 0.00110005 0.142362 0.000935656
           0.142362 0.0524754 0.000935656 0.5 0.281309 0.301441 0.0524754 0.301441 0.281309 0.0524754 2.52722e-05 0.000935656
           0.0524754 0.281309 0.0283623 0.0524754 0.0283623 2.52722e-05 0.00110005 0.000935656 1.66635e-10 1.02447e-10 0.00110005 1.66635e-10
@@ -3391,7 +3391,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="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           216008 208264 197128 216008 216008 208264 197128 208264 191871 183115 197128 185499
           197128 191871 185499 216008 206750 208264 191871 208264 206750 191871 184483 185499
           191871 206750 189805 191871 189805 184483 183115 185499 179854 176911 183115 179854
@@ -3875,7 +3875,7 @@
           110000 110000 116148 110000 110000 116681 139636 140131 143294 145047 139636 143294
           139636 133530 134166 133530 126627 134166 126627 118814 124088 110000 116681 118814
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -4359,7 +4359,7 @@
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_napl" NumberOfComponents="1" format="ascii">
           552.948 142.271 16.7672 552.948 552.948 142.271 16.7672 142.271 0.890138 8.46564e-06 16.7672 5.20972e-06
           16.7672 0.890138 5.20972e-06 552.948 117.366 142.271 0.890138 142.271 117.366 0.890138 1.02716e-10 5.20972e-06
           0.890138 117.366 0.14268 0.890138 0.14268 1.02716e-10 8.46564e-06 5.20972e-06 2.94449e-26 6.84249e-27 8.46564e-06 2.94449e-26
diff --git a/test/references/2pboxdfm_3d_tets-reference.vtu b/test/references/2pboxdfm_3d_tets-reference.vtu
index 3ae1364d7b26b6d07d93c978cfa291d408e41aee..2fdc8892312b632040b70a714badce2d5a41d422 100644
--- a/test/references/2pboxdfm_3d_tets-reference.vtu
+++ b/test/references/2pboxdfm_3d_tets-reference.vtu
@@ -1457,7 +1457,7 @@
           10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
           10000 10000 10000 10000 10000 10000 10000 10000
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           0.5 0.998846 0.5 0.99884 0.998846 0.5 0.99884 0.9996 0.5 0.5 0.99884 0.5
           0.5 0.99884 0.5 0.5 0.5 0.5 0.998846 0.5 0.5 0.5 0.998846 0.5
           0.5 0.998846 0.99884 0.5 0.998846 0.99884 0.5 0.999555 0.99884 1 0.9996 1
@@ -2184,7 +2184,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           200000 188960 200000 187597 188960 200000 187597 184030 200000 200000 187597 200000
           200000 187597 200000 200000 200000 200000 188960 200000 200000 200000 188960 200000
           200000 188960 187597 200000 188960 187597 200000 177313 187597 178323 184030 172660
@@ -2911,7 +2911,7 @@
           100000 100000 103567 100000 103567 100000 100000 110825 114263 115892 103567 110825
           114263 103567 100000 110825 103567 114263 100000 105024
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -3638,7 +3638,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_aq" NumberOfComponents="1" format="ascii">
           23.1923 994.381 23.1923 994.354 994.381 23.1923 994.354 998.049 23.1923 23.1923 994.354 23.1923
           23.1923 994.354 23.1923 23.1923 23.1923 23.1923 994.381 23.1923 23.1923 23.1923 994.381 23.1923
           23.1923 994.381 994.354 23.1923 994.381 994.354 23.1923 997.831 994.354 1000 998.049 1000
@@ -4365,7 +4365,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0.5 0.00115424 0.5 0.00115986 0.00115424 0.5 0.00115986 0.000400201 0.5 0.5 0.00115986 0.5
           0.5 0.00115986 0.5 0.5 0.5 0.5 0.00115424 0.5 0.5 0.5 0.00115424 0.5
           0.5 0.00115424 0.00115986 0.5 0.00115424 0.00115986 0.5 0.000445006 0.00115986 5.01652e-12 0.000400201 4.69587e-13
@@ -5092,7 +5092,7 @@
           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="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           216008 198967 216008 197604 198967 216008 197604 194032 216008 216008 197604 216008
           216008 197604 216008 216008 216008 216008 198967 216008 216008 216008 198967 216008
           216008 198967 197604 216008 198967 197604 216008 187316 197604 188323 194032 182660
@@ -5819,7 +5819,7 @@
           110000 110000 113567 110000 113567 110000 110000 120825 124263 125892 113567 120825
           124263 113567 110000 120825 113567 124263 110000 115024
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -6546,7 +6546,7 @@
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_napl" NumberOfComponents="1" format="ascii">
           552.948 9.77903e-06 552.948 9.92255e-06 9.77903e-06 552.948 9.92255e-06 4.07795e-07 552.948 552.948 9.92255e-06 552.948
           552.948 9.92255e-06 552.948 552.948 552.948 552.948 9.77903e-06 552.948 552.948 552.948 9.77903e-06 552.948
           552.948 9.77903e-06 9.92255e-06 552.948 9.77903e-06 9.92255e-06 552.948 5.6065e-07 9.92255e-06 8.0345e-31 4.07795e-07 6.59299e-34
diff --git a/test/references/2pdfm-reference.vtu b/test/references/2pdfm-reference.vtu
index 49abdc751fccd8b03b5c64afcff91187bbb7a9a4..f77c53e4e67b3f3efd5b0468efe1c7c89d32ba4b 100644
--- a/test/references/2pdfm-reference.vtu
+++ b/test/references/2pdfm-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="1883" NumberOfPoints="980">
-      <PointData Scalars="S_n">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_napl">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0.0152079 0 5.49811e-07 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0.326542 0.285021 0 0 0 0 0.35585 0 0.216695 0 0
@@ -87,7 +87,7 @@
           7.60108e-16 8.62105e-05 0 0 0.000132628 5.31774e-18 0 0 0 0 0.000481945 1
           0.000288549 1 0 0 1 0.000321633 0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           0.984792 1 0.999999 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 0.673458 0.714979 1 1 1 1 0.64415 1 0.783305 1 1
@@ -171,7 +171,7 @@
           1 0.999914 1 1 0.999867 1 1 1 1 1 0.999518 0
           0.999711 0 1 1 0 0.999678 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           22782.3 22479.9 22766.7 21909.9 11230.2 10971.3 10971.3 10444.4 14860.1 14992.2 14083.8 13853.1
           14706.3 13609.6 13041.2 15769 14615.2 15678.8 13000.3 15477.4 13501.2 12416.5 15591.5 16645.6
           16416.3 15607.3 14564.9 12447.1 12171 14177.3 16595.7 16634.9 12845.7 13557.7 17332.6 17573.1
@@ -255,7 +255,7 @@
           16480.2 18572.4 2443.71 2001 19859.8 21157.8 21094.5 21503.9 2686.06 2001 20389.6 30002
           20187.4 30002 2001 2816.88 30002 18587 4019.1 2001
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           20767 20479.9 20766.7 19909.9 9230.22 8971.3 8971.25 8444.39 12860.1 12992.2 12083.8 11853.1
           12706.3 11609.6 11041.2 13769 12615.2 13678.8 11000.3 13477.4 11501.2 10416.5 13591.5 14645.6
           14416.3 13170.2 12199.6 10447.1 10171 12177.3 14595.7 14142.9 10845.7 11297.9 15332.6 15573.1
@@ -591,7 +591,7 @@
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460
         </DataArray>
-        <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -675,7 +675,7 @@
           1000 999.655 1000 1000 999.47 1000 1000 1000 1000 1000 998.074 0
           998.846 0 1000 1000 0 998.714 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/2pncdiffusioncc-reference.vtu b/test/references/2pncdiffusioncc-reference.vtu
index 5257cb2d8b7951877f783191671800e2af8a0e68..6b40da785824155396d13e96bb51518f445e1ee2 100644
--- a/test/references/2pncdiffusioncc-reference.vtu
+++ b/test/references/2pncdiffusioncc-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="250" NumberOfPoints="306">
-      <CellData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_liq">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           0.974758 0.981796 0.994366 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -26,7 +26,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.0252419 0.0182042 0.00563372 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -49,7 +49,7 @@
           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="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -72,7 +72,7 @@
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100102 100101 100100 100100 100100 100100 100100 100100 100100 100100 100100 100100
           100100 100100 100100 100100 100100 100100 100100 100100 100100 100100 100100 100100
           100100 100100 100100 100100 100100 100100 100100 100100 100100 100100 100100 100100
@@ -118,7 +118,7 @@
           100 100 100 100 100 100 100 100 100 100 100 100
           100 100 100 100 100 100 100 100 100 100
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191
           998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191
           998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191
@@ -141,7 +141,7 @@
           998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191
           998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.14085 1.14085 1.14084 0.949721 0.936339 0.935911 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898
           0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898
           0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898
@@ -164,7 +164,7 @@
           0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898
           0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           885.667 915.685 971.27 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019
           997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019
           997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019
@@ -187,7 +187,7 @@
           997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019
           997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           2.44456 0.922077 0.0276024 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -233,7 +233,7 @@
           0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
           0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999988 0.999988 0.999988 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
           0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
           0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
@@ -256,7 +256,7 @@
           0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
           0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_liq" NumberOfComponents="1" format="ascii">
           1.22313e-05 1.22313e-05 1.22311e-05 1.01505e-05 1.00048e-05 1.00001e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
@@ -279,7 +279,7 @@
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0234767 0.0234768 0.0234771 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772
           0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772
           0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772
@@ -302,7 +302,7 @@
           0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772
           0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_gas" NumberOfComponents="1" format="ascii">
           0.976523 0.976523 0.976523 0.810409 0.798777 0.798405 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394
           0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394
           0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394
@@ -325,7 +325,7 @@
           0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394
           0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_liq" NumberOfComponents="1" format="ascii">
           55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3
           55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3
           55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3
@@ -348,7 +348,7 @@
           55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3
           55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3 55408.3
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_gas" NumberOfComponents="1" format="ascii">
           41.0694 41.0692 41.0687 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686
           41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686
           41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686
@@ -371,7 +371,7 @@
           41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686
           41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686 41.0686
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999981 0.999981 0.999981 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
           0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
           0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
@@ -394,7 +394,7 @@
           0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
           0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
         </DataArray>
-        <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2_liq" NumberOfComponents="1" format="ascii">
           1.90195e-05 1.90194e-05 1.90192e-05 1.57838e-05 1.55573e-05 1.555e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05
           1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05
           1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05
@@ -417,7 +417,7 @@
           1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05
           1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0152252 0.0152253 0.0152255 0.0152513 0.0152534 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535
           0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535
           0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535
@@ -440,7 +440,7 @@
           0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535
           0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535 0.0152535
         </DataArray>
-        <DataArray type="Float32" Name="X^N2_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2_gas" NumberOfComponents="1" format="ascii">
           0.984775 0.984775 0.984775 0.818635 0.807001 0.806629 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618
           0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618
           0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618
diff --git a/test/references/3pniconductionbox-reference.vtu b/test/references/3pniconductionbox-reference.vtu
index 3490330550e0cb63e8725cae747be06dc7417a47..f3e445a6f9b930d2e819cd9af4a10fea7348d362 100644
--- a/test/references/3pniconductionbox-reference.vtu
+++ b/test/references/3pniconductionbox-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="200" NumberOfPoints="402">
-      <PointData Scalars="S_w" Vectors="velocity_w (m/s)">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_aq" Vectors="velocity_aq (m/s)">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -39,7 +39,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           1e-05 1.00893e-05 1e-05 1.00893e-05 1.00829e-05 1.00829e-05 1.00767e-05 1.00767e-05 1.00705e-05 1.00705e-05 1.00646e-05 1.00646e-05
           1.00589e-05 1.00589e-05 1.00535e-05 1.00535e-05 1.00484e-05 1.00484e-05 1.00436e-05 1.00436e-05 1.00391e-05 1.00391e-05 1.00349e-05 1.00349e-05
           1.00311e-05 1.00311e-05 1.00275e-05 1.00275e-05 1.00243e-05 1.00243e-05 1.00214e-05 1.00214e-05 1.00188e-05 1.00188e-05 1.00165e-05 1.00165e-05
@@ -75,7 +75,7 @@
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
         </DataArray>
-        <DataArray type="Float32" Name="S_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           -1e-05 -1.03219e-05 -1e-05 -1.03219e-05 -1.02992e-05 -1.02992e-05 -1.02768e-05 -1.02768e-05 -1.02549e-05 -1.02549e-05 -1.02337e-05 -1.02337e-05
           -1.02133e-05 -1.02133e-05 -1.01939e-05 -1.01939e-05 -1.01754e-05 -1.01754e-05 -1.01581e-05 -1.01581e-05 -1.01419e-05 -1.01419e-05 -1.01268e-05 -1.01268e-05
           -1.0113e-05 -1.0113e-05 -1.01002e-05 -1.01002e-05 -1.00886e-05 -1.00886e-05 -1.00781e-05 -1.00781e-05 -1.00686e-05 -1.00686e-05 -1.00601e-05 -1.00601e-05
@@ -111,7 +111,7 @@
           -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05
           -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
           99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
           99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
@@ -147,7 +147,7 @@
           99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
           99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
           99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
           99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
@@ -183,7 +183,7 @@
           99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
           99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
         </DataArray>
-        <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -219,7 +219,7 @@
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           996.544 996.723 996.544 996.723 996.902 996.902 997.077 997.077 997.232 997.232 997.377 997.377
           997.517 997.517 997.65 997.65 997.777 997.777 997.895 997.895 997.998 997.998 998.085 998.085
           998.166 998.166 998.24 998.24 998.307 998.307 998.368 998.368 998.423 998.423 998.473 998.473
@@ -255,7 +255,7 @@
           998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789
           998.789 998.789 998.789 998.789 998.789 998.789
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           864.863 865.417 864.863 865.417 865.966 865.966 866.506 866.506 867.033 867.033 867.544 867.544
           868.034 868.034 868.502 868.502 868.945 868.945 869.362 869.362 869.751 869.751 870.112 870.112
           870.445 870.445 870.75 870.75 871.028 871.028 871.28 871.28 871.508 871.508 871.712 871.712
@@ -291,7 +291,7 @@
           873.149 873.149 873.149 873.149 873.149 873.149 873.149 873.149 873.149 873.149 873.149 873.149
           873.149 873.149 873.149 873.149 873.149 873.149
         </DataArray>
-        <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.16103 1.16361 1.16103 1.16361 1.16618 1.16618 1.16872 1.16872 1.17121 1.17121 1.17363 1.17363
           1.17598 1.17598 1.17822 1.17822 1.18036 1.18036 1.18237 1.18237 1.18426 1.18426 1.18602 1.18602
           1.18765 1.18765 1.18914 1.18914 1.19051 1.19051 1.19176 1.19176 1.19288 1.19288 1.19389 1.19389
@@ -435,7 +435,7 @@
           290 290 290 290 290 290 290 290 290 290 290 290
           290 290 290 290 290 290
         </DataArray>
-        <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_aq (m/s)" NumberOfComponents="3" format="ascii">
           -1.05621e-09 -4.25604e-19 0 -1.05011e-09 6.29013e-19 0 -1.05621e-09 -4.25604e-19 0 -1.05011e-09 6.29013e-19 0
           -1.03209e-09 1.65322e-18 0 -1.03209e-09 1.65322e-18 0 -1.00278e-09 3.05647e-18 0 -1.00278e-09 3.05647e-18 0
           -9.65784e-10 3.61297e-18 0 -9.65784e-10 3.61297e-18 0 -9.22759e-10 5.93352e-18 0 -9.22759e-10 5.93352e-18 0
@@ -538,7 +538,7 @@
           7.02047e-11 -1.676e-18 0 7.02047e-11 -1.676e-18 0 7.02047e-11 -2.0112e-18 0 7.02047e-11 -2.0112e-18 0
           7.02047e-11 -1.3408e-18 0 7.02047e-11 -1.3408e-18 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_n (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_napl (m/s)" NumberOfComponents="3" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -641,7 +641,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_g (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_gas (m/s)" NumberOfComponents="3" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/3pniconductioncc-reference.vtu b/test/references/3pniconductioncc-reference.vtu
index 624cee4f9a737a3a90c328563d151145e63e0546..5145ca7b564abad27b3dee60cfcc6792a73354f5 100644
--- a/test/references/3pniconductioncc-reference.vtu
+++ b/test/references/3pniconductioncc-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="200" NumberOfPoints="402">
-      <CellData Scalars="S_w" Vectors="velocityW">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_aq" Vectors="velocityW">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -22,7 +22,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           1.00926e-05 1.00861e-05 1.00798e-05 1.00736e-05 1.00675e-05 1.00617e-05 1.00561e-05 1.00509e-05 1.00459e-05 1.00412e-05 1.00369e-05 1.00329e-05
           1.00292e-05 1.00259e-05 1.00228e-05 1.00201e-05 1.00176e-05 1.00154e-05 1.00134e-05 1.00116e-05 1.00101e-05 1.00087e-05 1.00075e-05 1.00065e-05
           1.00056e-05 1.00048e-05 1.00041e-05 1.00035e-05 1.0003e-05 1.00025e-05 1.00021e-05 1.00018e-05 1.00015e-05 1.00013e-05 1.00011e-05 1.00009e-05
@@ -41,7 +41,7 @@
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
         </DataArray>
-        <DataArray type="Float32" Name="S_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           -1.03333e-05 -1.03105e-05 -1.02879e-05 -1.02657e-05 -1.02441e-05 -1.02233e-05 -1.02033e-05 -1.01844e-05 -1.01665e-05 -1.01497e-05 -1.01341e-05 -1.01196e-05
           -1.01063e-05 -1.00942e-05 -1.00831e-05 -1.00731e-05 -1.00641e-05 -1.0056e-05 -1.00488e-05 -1.00425e-05 -1.00368e-05 -1.00318e-05 -1.00275e-05 -1.00237e-05
           -1.00203e-05 -1.00174e-05 -1.00149e-05 -1.00127e-05 -1.00109e-05 -1.00092e-05 -1.00079e-05 -1.00067e-05 -1.00056e-05 -1.00048e-05 -1.0004e-05 -1.00034e-05
@@ -60,7 +60,7 @@
           -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05
           -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
           99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
           99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
@@ -79,7 +79,7 @@
           99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
           99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
           99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
           99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
@@ -98,7 +98,7 @@
           99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
           99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
         </DataArray>
-        <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -117,7 +117,7 @@
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           996.634 996.813 996.99 997.158 997.306 997.448 997.585 997.715 997.838 997.952 998.043 998.127
           998.204 998.275 998.339 998.397 998.449 998.496 998.538 998.575 998.608 998.637 998.661 998.679
           998.694 998.708 998.72 998.73 998.739 998.746 998.753 998.758 998.763 998.767 998.77 998.773
@@ -136,7 +136,7 @@
           998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789
           998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           865.141 865.693 866.239 866.773 867.293 867.794 868.274 868.73 869.16 869.563 869.938 870.285
           870.604 870.896 871.161 871.4 871.616 871.809 871.981 872.133 872.268 872.387 872.492 872.583
           872.663 872.732 872.792 872.844 872.889 872.928 872.961 872.989 873.014 873.034 873.052 873.067
@@ -155,7 +155,7 @@
           873.149 873.149 873.149 873.149 873.149 873.149 873.149 873.149 873.149 873.149 873.149 873.149
           873.149 873.149 873.149 873.149 873.149 873.149 873.149 873.149
         </DataArray>
-        <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.16232 1.1649 1.16746 1.16998 1.17244 1.17483 1.17713 1.17932 1.1814 1.18335 1.18517 1.18687
           1.18843 1.18986 1.19117 1.19235 1.19341 1.19437 1.19523 1.19598 1.19666 1.19725 1.19777 1.19823
           1.19863 1.19897 1.19928 1.19954 1.19976 1.19995 1.20012 1.20026 1.20039 1.20049 1.20058 1.20065
@@ -231,7 +231,7 @@
           290 290 290 290 290 290 290 290 290 290 290 290
           290 290 290 290 290 290 290 290
         </DataArray>
-        <DataArray type="Float32" Name="velocity_w" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_aq" NumberOfComponents="3" format="ascii">
           -1.0499e-09 0 0 -1.03771e-09 0 0 -1.01387e-09 0 0 -9.81573e-10 0 0
           -9.42382e-10 0 0 -8.95523e-10 0 0 -8.42218e-10 0 0 -7.83778e-10 0 0
           -7.21541e-10 0 0 -6.61849e-10 0 0 -6.05993e-10 0 0 -5.50043e-10 0 0
@@ -283,7 +283,7 @@
           7.00058e-11 0 0 7.00058e-11 0 0 7.00058e-11 0 0 7.00058e-11 0 0
           7.00058e-11 0 0 7.00058e-11 0 0 7.00058e-11 0 0 7.00058e-11 0 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_n" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_napl" NumberOfComponents="3" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -335,7 +335,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="velocity_g" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_gas" NumberOfComponents="3" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/3pniconvectionbox-reference.vtu b/test/references/3pniconvectionbox-reference.vtu
index c3778bb138880ab4709c190b11fcb8660cb451ac..25ad5dcdadd45e81e8bc073a72e2d44e2abc91c1 100644
--- a/test/references/3pniconvectionbox-reference.vtu
+++ b/test/references/3pniconvectionbox-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="80" NumberOfPoints="162">
-      <PointData Scalars="S_w" Vectors="velocity_w (m/s)">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_aq" Vectors="velocity_aq (m/s)">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -19,7 +19,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           1.00095e-10 1.00095e-10 1.00095e-10 1.00095e-10 1.00095e-10 1.00095e-10 1.00094e-10 1.00094e-10 1.00094e-10 1.00094e-10 1.00094e-10 1.00094e-10
           1.00094e-10 1.00094e-10 1.00093e-10 1.00093e-10 1.00092e-10 1.00092e-10 1.0009e-10 1.0009e-10 1.00088e-10 1.00088e-10 1.00084e-10 1.00084e-10
           1.00079e-10 1.00079e-10 1.00073e-10 1.00073e-10 1.00067e-10 1.00067e-10 1.00059e-10 1.00059e-10 1.00052e-10 1.00052e-10 1.00045e-10 1.00045e-10
@@ -35,7 +35,7 @@
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
         </DataArray>
-        <DataArray type="Float32" Name="S_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           -8.25349e-11 -8.27141e-11 -8.25349e-11 -8.27141e-11 -8.28945e-11 -8.28945e-11 -8.30759e-11 -8.30759e-11 -8.32585e-11 -8.32585e-11 -8.34409e-11 -8.34409e-11
           -8.36238e-11 -8.36238e-11 -8.38062e-11 -8.38062e-11 -8.39878e-11 -8.39878e-11 -8.41683e-11 -8.41683e-11 -8.43469e-11 -8.43469e-11 -8.45235e-11 -8.45235e-11
           -8.46979e-11 -8.46979e-11 -8.48705e-11 -8.48705e-11 -8.50416e-11 -8.50416e-11 -8.52119e-11 -8.52119e-11 -8.53827e-11 -8.53827e-11 -8.55548e-11 -8.55548e-11
@@ -51,7 +51,7 @@
           -9.78757e-11 -9.78757e-11 -9.81362e-11 -9.81362e-11 -9.83981e-11 -9.83981e-11 -9.86616e-11 -9.86616e-11 -9.89263e-11 -9.89263e-11 -9.91925e-11 -9.91925e-11
           -9.94603e-11 -9.94603e-11 -9.97295e-11 -9.97295e-11 -1e-10 -1e-10
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           121579 121315 121579 121315 121051 121051 120787 120787 120522 120522 120258 120258
           119994 119994 119730 119730 119465 119465 119201 119201 118936 118936 118672 118672
           118407 118407 118141 118141 117876 117876 117610 117610 117343 117343 117075 117075
@@ -67,7 +67,7 @@
           102170 102170 101899 101899 101628 101628 101357 101357 101085 101085 100814 100814
           100543 100543 100271 100271 100000 100000
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           121579 121315 121579 121315 121051 121051 120787 120787 120522 120522 120258 120258
           119994 119994 119730 119730 119465 119465 119201 119201 118936 118936 118672 118672
           118407 118407 118141 118141 117876 117876 117610 117610 117343 117343 117075 117075
@@ -83,7 +83,7 @@
           102170 102170 101899 101899 101628 101628 101357 101357 101085 101085 100814 100814
           100543 100543 100271 100271 100000 100000
         </DataArray>
-        <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           121579 121315 121579 121315 121051 121051 120787 120787 120522 120522 120258 120258
           119994 119994 119730 119730 119465 119465 119201 119201 118936 118936 118672 118672
           118407 118407 118141 118141 117876 117876 117610 117610 117343 117343 117075 117075
@@ -99,7 +99,7 @@
           102170 102170 101899 101899 101628 101628 101357 101357 101085 101085 100814 100814
           100543 100543 100271 100271 100000 100000
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           998.631 998.631 998.631 998.631 998.631 998.631 998.631 998.631 998.631 998.631 998.631 998.631
           998.632 998.632 998.633 998.633 998.635 998.635 998.639 998.639 998.645 998.645 998.653 998.653
           998.663 998.663 998.673 998.673 998.684 998.684 998.696 998.696 998.708 998.708 998.721 998.721
@@ -115,7 +115,7 @@
           998.79 998.79 998.79 998.79 998.79 998.79 998.79 998.79 998.79 998.79 998.789 998.789
           998.789 998.789 998.789 998.789 998.789 998.789
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           872.324 872.324 872.324 872.324 872.324 872.324 872.324 872.324 872.325 872.325 872.326 872.326
           872.329 872.329 872.335 872.335 872.345 872.345 872.361 872.361 872.385 872.385 872.418 872.418
           872.46 872.46 872.51 872.51 872.567 872.567 872.629 872.629 872.694 872.694 872.759 872.759
@@ -131,7 +131,7 @@
           873.148 873.148 873.148 873.148 873.148 873.148 873.148 873.148 873.148 873.148 873.148 873.148
           873.148 873.148 873.148 873.148 873.149 873.149
         </DataArray>
-        <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.45523 1.45206 1.45523 1.45206 1.4489 1.4489 1.44574 1.44574 1.44258 1.44258 1.43942 1.43942
           1.43628 1.43628 1.43315 1.43315 1.43004 1.43004 1.42698 1.42698 1.42395 1.42395 1.42098 1.42098
           1.41805 1.41805 1.41517 1.41517 1.41233 1.41233 1.4095 1.4095 1.40669 1.40669 1.40386 1.40386
@@ -195,7 +195,7 @@
           290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001
           290.001 290.001 290.001 290.001 290 290
         </DataArray>
-        <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_aq (m/s)" NumberOfComponents="3" format="ascii">
           0.0001 -3.44191e-19 0 0.0001 5.16287e-19 0 0.0001 -3.44191e-19 0 0.0001 5.16287e-19 0
           0.0001 1.20467e-18 0 0.0001 1.20467e-18 0 0.0001 1.37676e-18 0 0.0001 1.37676e-18 0
           0.0001 -1.03256e-18 0 0.0001 -1.03256e-18 0 0.0001 1.20461e-18 0 0.0001 1.20461e-18 0
@@ -238,7 +238,7 @@
           9.99936e-05 3.3521e-19 0 9.99936e-05 3.3521e-19 0 9.99937e-05 0 0 9.99937e-05 0 0
           9.99937e-05 0 0 9.99937e-05 0 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_n (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_napl (m/s)" NumberOfComponents="3" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -281,7 +281,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_g (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_gas (m/s)" NumberOfComponents="3" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/3pniconvectioncc-reference.vtu b/test/references/3pniconvectioncc-reference.vtu
index 1bfbaf9acaa20433e2b422f929344002041f8ebb..d1607cb998db3c8a6299f543ed69d0e9446feaa6 100644
--- a/test/references/3pniconvectioncc-reference.vtu
+++ b/test/references/3pniconvectioncc-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="80" NumberOfPoints="162">
-      <CellData Scalars="S_w" Vectors="velocity_w (m/s)">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_aq" Vectors="velocity_aq (m/s)">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -12,7 +12,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           1.00095e-10 1.00095e-10 1.00095e-10 1.00094e-10 1.00094e-10 1.00094e-10 1.00094e-10 1.00093e-10 1.00091e-10 1.00089e-10 1.00086e-10 1.00081e-10
           1.00076e-10 1.0007e-10 1.00063e-10 1.00056e-10 1.00048e-10 1.00041e-10 1.00034e-10 1.00028e-10 1.00022e-10 1.00018e-10 1.00014e-10 1.0001e-10
           1.00008e-10 1.00006e-10 1.00004e-10 1.00003e-10 1.00002e-10 1.00002e-10 1.00001e-10 1.00001e-10 1.00001e-10 1e-10 1e-10 1e-10
@@ -21,7 +21,7 @@
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
         </DataArray>
-        <DataArray type="Float32" Name="S_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           -8.26245e-11 -8.28042e-11 -8.29853e-11 -8.31669e-11 -8.33493e-11 -8.35316e-11 -8.37144e-11 -8.38968e-11 -8.40776e-11 -8.42573e-11 -8.44353e-11 -8.46107e-11
           -8.4784e-11 -8.49557e-11 -8.51263e-11 -8.52972e-11 -8.54686e-11 -8.56413e-11 -8.58167e-11 -8.59952e-11 -8.6177e-11 -8.63622e-11 -8.65512e-11 -8.67439e-11
           -8.69391e-11 -8.71376e-11 -8.7339e-11 -8.75425e-11 -8.77475e-11 -8.7955e-11 -8.81637e-11 -8.8374e-11 -8.85857e-11 -8.87985e-11 -8.90127e-11 -8.92278e-11
@@ -30,7 +30,7 @@
           -9.49755e-11 -9.52206e-11 -9.54674e-11 -9.57154e-11 -9.59647e-11 -9.62149e-11 -9.64667e-11 -9.672e-11 -9.69744e-11 -9.72301e-11 -9.74873e-11 -9.77457e-11
           -9.80056e-11 -9.82668e-11 -9.85296e-11 -9.87938e-11 -9.90593e-11 -9.93263e-11 -9.95948e-11 -9.98645e-11
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           121447 121183 120919 120654 120390 120126 119862 119597 119333 119069 118804 118539
           118274 118009 117743 117476 117209 116942 116673 116405 116136 115866 115596 115326
           115055 114784 114514 114243 113972 113700 113429 113158 112887 112615 112344 112073
@@ -39,7 +39,7 @@
           105290 105019 104748 104476 104205 103934 103663 103391 103120 102849 102577 102306
           102035 101763 101492 101221 100950 100678 100407 100136
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           121447 121183 120919 120654 120390 120126 119862 119597 119333 119069 118804 118539
           118274 118009 117743 117476 117209 116942 116673 116405 116136 115866 115596 115326
           115055 114784 114514 114243 113972 113700 113429 113158 112887 112615 112344 112073
@@ -48,7 +48,7 @@
           105290 105019 104748 104476 104205 103934 103663 103391 103120 102849 102577 102306
           102035 101763 101492 101221 100950 100678 100407 100136
         </DataArray>
-        <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           121447 121183 120919 120654 120390 120126 119862 119597 119333 119069 118804 118539
           118274 118009 117743 117476 117209 116942 116673 116405 116136 115866 115596 115326
           115055 114784 114514 114243 113972 113700 113429 113158 112887 112615 112344 112073
@@ -57,7 +57,7 @@
           105290 105019 104748 104476 104205 103934 103663 103391 103120 102849 102577 102306
           102035 101763 101492 101221 100950 100678 100407 100136
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           998.631 998.631 998.631 998.631 998.631 998.631 998.632 998.634 998.637 998.642 998.649 998.658
           998.668 998.678 998.69 998.702 998.715 998.727 998.738 998.749 998.758 998.766 998.773 998.779
           998.783 998.786 998.789 998.791 998.792 998.793 998.794 998.794 998.794 998.794 998.794 998.794
@@ -66,7 +66,7 @@
           998.792 998.791 998.791 998.791 998.791 998.791 998.791 998.791 998.791 998.79 998.79 998.79
           998.79 998.79 998.79 998.79 998.79 998.789 998.789 998.789
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           872.324 872.324 872.324 872.324 872.325 872.327 872.332 872.34 872.353 872.373 872.401 872.439
           872.485 872.539 872.598 872.662 872.726 872.79 872.849 872.904 872.952 872.994 873.029 873.058
           873.081 873.099 873.112 873.122 873.13 873.135 873.139 873.142 873.144 873.145 873.146 873.147
@@ -75,7 +75,7 @@
           873.148 873.148 873.148 873.148 873.148 873.148 873.148 873.148 873.148 873.148 873.148 873.148
           873.148 873.148 873.148 873.148 873.148 873.148 873.148 873.148
         </DataArray>
-        <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.45364 1.45048 1.44732 1.44416 1.441 1.43785 1.43471 1.4316 1.42851 1.42546 1.42247 1.41951
           1.41661 1.41375 1.41091 1.40809 1.40527 1.40243 1.39957 1.39666 1.39372 1.39072 1.38769 1.38461
           1.38149 1.37835 1.37517 1.37198 1.36876 1.36554 1.3623 1.35906 1.35581 1.35256 1.34931 1.34606
@@ -111,7 +111,7 @@
           290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001
           290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001
         </DataArray>
-        <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_aq (m/s)" NumberOfComponents="3" format="ascii">
           0.0001 0 0 0.0001 0 0 0.0001 0 0 0.0001 0 0
           0.0001 0 0 0.0001 0 0 0.0001 0 0 0.0001 0 0
           9.99999e-05 0 0 9.99997e-05 0 0 9.99995e-05 0 0 9.99991e-05 0 0
@@ -133,7 +133,7 @@
           9.99936e-05 0 0 9.99936e-05 0 0 9.99936e-05 0 0 9.99936e-05 0 0
           9.99936e-05 0 0 9.99936e-05 0 0 9.99937e-05 0 0 9.99937e-05 0 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_n (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_napl (m/s)" NumberOfComponents="3" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -155,7 +155,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="velocity_g (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_gas (m/s)" NumberOfComponents="3" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/3pwateroilbox-reference.vtu b/test/references/3pwateroilbox-reference.vtu
index dfec51dfed80a036c7972d05ba56a60f475c7014..8bb9a595ab92864d331f866eaa71aebfc9f89c82 100644
--- a/test/references/3pwateroilbox-reference.vtu
+++ b/test/references/3pwateroilbox-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="2400" NumberOfPoints="2501">
-      <PointData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_aq">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           0.700844 0.700878 0.700804 0.700852 0.70096 0.700958 0.701052 0.701063 0.701129 0.701142 0.701182 0.701194
           0.701215 0.701224 0.701229 0.701237 0.701231 0.701236 0.701223 0.701227 0.701207 0.70121 0.701187 0.701189
           0.701163 0.701164 0.701136 0.701137 0.701108 0.701109 0.701079 0.70108 0.70105 0.70105 0.70102 0.70102
@@ -214,7 +214,7 @@
           0.700009 0.700008 0.700007 0.700007 0.700006 0.700006 0.700005 0.700005 0.700004 0.700004 0.700003 0.700003
           0.700002 0.700002 0.700001 0.700001 0.7
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0.299156 0.299122 0.299196 0.299148 0.29904 0.299042 0.298948 0.298937 0.298871 0.298858 0.298818 0.298806
           0.298785 0.298776 0.298771 0.298763 0.298769 0.298764 0.298777 0.298773 0.298793 0.29879 0.298813 0.298811
           0.298837 0.298836 0.298864 0.298863 0.298892 0.298891 0.298921 0.29892 0.29895 0.29895 0.29898 0.29898
@@ -425,7 +425,7 @@
           0.299991 0.299992 0.299993 0.299993 0.299994 0.299994 0.299995 0.299995 0.299996 0.299996 0.299997 0.299997
           0.299998 0.299998 0.299999 0.299999 0.3
         </DataArray>
-        <DataArray type="Float32" Name="S_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -636,7 +636,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           4.31845e+06 4.33023e+06 4.29458e+06 4.31129e+06 4.35884e+06 4.34844e+06 4.39106e+06 4.38512e+06 4.41784e+06 4.4126e+06 4.43656e+06 4.43079e+06
           4.44779e+06 4.44122e+06 4.45295e+06 4.44565e+06 4.45348e+06 4.44556e+06 4.45057e+06 4.44217e+06 4.44517e+06 4.4364e+06 4.438e+06 4.42896e+06
           4.4296e+06 4.42035e+06 4.42037e+06 4.41096e+06 4.41059e+06 4.40107e+06 4.40047e+06 4.39086e+06 4.39017e+06 4.3805e+06 4.37979e+06 4.37007e+06
@@ -847,7 +847,7 @@
           3.63587e+06 3.63566e+06 3.63545e+06 3.63525e+06 3.63505e+06 3.63486e+06 3.63467e+06 3.63449e+06 3.6343e+06 3.63412e+06 3.63395e+06 3.63377e+06
           3.6336e+06 3.63343e+06 3.63326e+06 3.6331e+06 3.63302e+06
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           4.31845e+06 4.33023e+06 4.29458e+06 4.31129e+06 4.35884e+06 4.34845e+06 4.39106e+06 4.38512e+06 4.41785e+06 4.41261e+06 4.43656e+06 4.43079e+06
           4.44779e+06 4.44122e+06 4.45295e+06 4.44565e+06 4.45348e+06 4.44556e+06 4.45057e+06 4.44217e+06 4.44517e+06 4.4364e+06 4.438e+06 4.42896e+06
           4.4296e+06 4.42035e+06 4.42037e+06 4.41096e+06 4.41059e+06 4.40107e+06 4.40047e+06 4.39087e+06 4.39017e+06 4.3805e+06 4.37979e+06 4.37008e+06
@@ -1058,7 +1058,7 @@
           3.63587e+06 3.63566e+06 3.63545e+06 3.63525e+06 3.63505e+06 3.63486e+06 3.63467e+06 3.63449e+06 3.63431e+06 3.63413e+06 3.63395e+06 3.63377e+06
           3.6336e+06 3.63343e+06 3.63326e+06 3.6331e+06 3.63302e+06
         </DataArray>
-        <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           4.31845e+06 4.33023e+06 4.29458e+06 4.31129e+06 4.35884e+06 4.34845e+06 4.39106e+06 4.38512e+06 4.41785e+06 4.41261e+06 4.43656e+06 4.43079e+06
           4.44779e+06 4.44122e+06 4.45295e+06 4.44565e+06 4.45348e+06 4.44556e+06 4.45057e+06 4.44217e+06 4.44517e+06 4.4364e+06 4.438e+06 4.42896e+06
           4.4296e+06 4.42035e+06 4.42037e+06 4.41096e+06 4.41059e+06 4.40107e+06 4.40047e+06 4.39087e+06 4.39017e+06 4.3805e+06 4.37979e+06 4.37008e+06
@@ -1269,7 +1269,7 @@
           3.63587e+06 3.63566e+06 3.63545e+06 3.63525e+06 3.63505e+06 3.63486e+06 3.63467e+06 3.63449e+06 3.63431e+06 3.63413e+06 3.63395e+06 3.63377e+06
           3.6336e+06 3.63343e+06 3.63326e+06 3.6331e+06 3.63302e+06
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           999.667 999.672 999.656 999.663 999.684 999.679 999.698 999.695 999.71 999.707 999.718 999.715
           999.722 999.719 999.724 999.721 999.725 999.721 999.724 999.72 999.721 999.717 999.718 999.714
           999.715 999.71 999.711 999.706 999.707 999.702 999.702 999.698 999.698 999.694 999.693 999.689
@@ -1480,7 +1480,7 @@
           999.368 999.367 999.367 999.367 999.367 999.367 999.367 999.367 999.367 999.367 999.367 999.367
           999.367 999.367 999.367 999.366 999.366
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           944.219 944.326 944.003 944.154 944.585 944.491 944.877 944.823 945.12 945.072 945.289 945.237
           945.391 945.331 945.438 945.371 945.442 945.371 945.416 945.34 945.367 945.288 945.302 945.22
           945.226 945.142 945.142 945.057 945.054 944.967 944.962 944.875 944.869 944.781 944.775 944.687
@@ -1691,7 +1691,7 @@
           938.035 938.033 938.031 938.029 938.027 938.026 938.024 938.022 938.021 938.019 938.017 938.016
           938.014 938.013 938.011 938.01 938.009
         </DataArray>
-        <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           0.0195339 0.0195361 0.0195355 0.0195378 0.01954 0.0195411 0.0195436 0.0195446 0.0195466 0.0195474 0.0195487 0.0195493
           0.01955 0.0195505 0.0195506 0.019551 0.0195507 0.019551 0.0195504 0.0195506 0.0195497 0.0195499 0.0195488 0.0195489
           0.0195478 0.0195478 0.0195466 0.0195466 0.0195453 0.0195453 0.019544 0.019544 0.0195426 0.0195426 0.0195412 0.0195413
@@ -1902,7 +1902,7 @@
           0.0194945 0.0194945 0.0194945 0.0194944 0.0194944 0.0194944 0.0194944 0.0194943 0.0194943 0.0194943 0.0194943 0.0194942
           0.0194942 0.0194942 0.0194942 0.0194941 0.0194941
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_aq" NumberOfComponents="1" format="ascii">
           198.575 198.623 198.533 198.598 198.735 198.737 198.857 198.874 198.959 198.977 199.031 199.046
           199.074 199.086 199.093 199.103 199.096 199.103 199.084 199.09 199.064 199.067 199.036 199.039
           199.004 199.005 198.968 198.969 198.93 198.931 198.891 198.891 198.851 198.851 198.81 198.81
@@ -2113,7 +2113,7 @@
           197.425 197.425 197.424 197.423 197.422 197.421 197.421 197.42 197.419 197.419 197.418 197.417
           197.416 197.416 197.415 197.414 197.414
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_napl" NumberOfComponents="1" format="ascii">
           8.91136e-05 8.91177e-05 8.91537e-05 8.91501e-05 8.91119e-05 8.9125e-05 8.90978e-05 8.91015e-05 8.90853e-05 8.90864e-05 8.90771e-05 8.90774e-05
           8.90728e-05 8.90727e-05 8.90711e-05 8.90709e-05 8.90712e-05 8.90709e-05 8.90723e-05 8.90721e-05 8.90741e-05 8.90739e-05 8.90764e-05 8.90762e-05
           8.90788e-05 8.90786e-05 8.90813e-05 8.90811e-05 8.90838e-05 8.90837e-05 8.90863e-05 8.90862e-05 8.90887e-05 8.90887e-05 8.90912e-05 8.90911e-05
@@ -2324,7 +2324,7 @@
           8.91725e-05 8.91726e-05 8.91726e-05 8.91726e-05 8.91727e-05 8.91727e-05 8.91727e-05 8.91728e-05 8.91728e-05 8.91728e-05 8.91728e-05 8.91729e-05
           8.91729e-05 8.91729e-05 8.9173e-05 8.9173e-05 8.9173e-05
         </DataArray>
-        <DataArray type="Float32" Name="mob_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -2535,7 +2535,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="viscos_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="viscos_aq" NumberOfComponents="1" format="ascii">
           0.000954057 0.000954014 0.000954032 0.000953987 0.000953936 0.000953917 0.000953862 0.000953846 0.000953803 0.000953789 0.00095376 0.000953749
           0.000953733 0.000953725 0.00095372 0.000953715 0.000953718 0.000953715 0.000953725 0.000953724 0.000953739 0.000953738 0.000953757 0.000953757
           0.000953778 0.000953779 0.000953802 0.000953803 0.000953827 0.000953829 0.000953854 0.000953856 0.000953881 0.000953883 0.000953909 0.00095391
@@ -2746,7 +2746,7 @@
           0.000954929 0.000954929 0.00095493 0.00095493 0.000954931 0.000954932 0.000954932 0.000954933 0.000954933 0.000954934 0.000954934 0.000954935
           0.000954935 0.000954936 0.000954936 0.000954936 0.000954937
         </DataArray>
-        <DataArray type="Float32" Name="viscos_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="viscos_napl" NumberOfComponents="1" format="ascii">
           1739.16 1738.7 1738.82 1738.36 1737.91 1737.68 1737.17 1736.98 1736.57 1736.4 1736.14 1736
           1735.87 1735.77 1735.74 1735.66 1735.72 1735.66 1735.79 1735.75 1735.92 1735.89 1736.11 1736.09
           1736.33 1736.31 1736.57 1736.56 1736.83 1736.82 1737.1 1737.09 1737.38 1737.37 1737.66 1737.65
@@ -2957,7 +2957,7 @@
           1747.21 1747.22 1747.22 1747.23 1747.24 1747.24 1747.25 1747.25 1747.26 1747.26 1747.27 1747.27
           1747.28 1747.28 1747.29 1747.29 1747.29
         </DataArray>
-        <DataArray type="Float32" Name="viscos_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="viscos_gas" NumberOfComponents="1" format="ascii">
           5.91112e-09 5.89577e-09 5.94453e-09 5.92224e-09 5.85837e-09 5.87276e-09 5.81658e-09 5.82477e-09 5.78228e-09 5.78942e-09 5.75858e-09 5.7663e-09
           5.74447e-09 5.75313e-09 5.73802e-09 5.74757e-09 5.73737e-09 5.74768e-09 5.74101e-09 5.75193e-09 5.74777e-09 5.75918e-09 5.75676e-09 5.76855e-09
           5.76732e-09 5.77942e-09 5.77898e-09 5.79133e-09 5.79138e-09 5.80392e-09 5.80426e-09 5.81697e-09 5.81743e-09 5.83028e-09 5.83077e-09 5.84373e-09
@@ -3168,7 +3168,7 @@
           7.00517e-09 7.00556e-09 7.00595e-09 7.00632e-09 7.00669e-09 7.00705e-09 7.0074e-09 7.00775e-09 7.00809e-09 7.00843e-09 7.00876e-09 7.00909e-09
           7.00941e-09 7.00974e-09 7.01005e-09 7.01035e-09 7.01049e-09
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_aq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -3379,7 +3379,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="x^heavyoil_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^heavyoil_aq" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -3590,7 +3590,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -3801,7 +3801,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="x^heavyoil_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^heavyoil_napl" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -4012,7 +4012,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.000615291 0.00061369 0.000618767 0.000616443 0.00060979 0.000611286 0.000605435 0.000606286 0.00060186 0.000602601 0.000599389 0.000600191
           0.000597919 0.000598819 0.000597246 0.000598239 0.000597178 0.000598251 0.000597557 0.000598694 0.000598262 0.000599449 0.000599199 0.000600426
           0.000600301 0.00060156 0.000601516 0.000602801 0.000602809 0.000604114 0.000604152 0.000605474 0.000605525 0.000606862 0.000606915 0.000608264
@@ -4223,7 +4223,7 @@
           0.000729251 0.000729292 0.000729332 0.000729371 0.000729409 0.000729447 0.000729484 0.00072952 0.000729555 0.00072959 0.000729625 0.000729659
           0.000729693 0.000729727 0.00072976 0.000729791 0.000729806
         </DataArray>
-        <DataArray type="Float32" Name="x^heavyoil_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^heavyoil_gas" NumberOfComponents="1" format="ascii">
           1.53637e-40 1.53661e-40 1.54825e-40 1.54677e-40 1.53425e-40 1.54025e-40 1.53023e-40 1.53421e-40 1.5268e-40 1.53025e-40 1.52454e-40 1.52784e-40
           1.52332e-40 1.52657e-40 1.52282e-40 1.52607e-40 1.52282e-40 1.52607e-40 1.52313e-40 1.52641e-40 1.52367e-40 1.52698e-40 1.52435e-40 1.52768e-40
           1.52512e-40 1.52847e-40 1.52593e-40 1.52931e-40 1.52678e-40 1.53018e-40 1.52765e-40 1.53106e-40 1.52854e-40 1.53196e-40 1.52943e-40 1.53285e-40
diff --git a/test/references/box1pncmin-00042.vtu b/test/references/box1pncmin-00042.vtu
index 813502156ac1c2fdd8f4fee0469e3ec7d244381e..6b6aceb076ba228f4277cc7143e9782ca2ff0599 100644
--- a/test/references/box1pncmin-00042.vtu
+++ b/test/references/box1pncmin-00042.vtu
@@ -55,7 +55,7 @@
           0.605005 0.604598 0.604336 0.604205 0.604133 0.604085 0.604051 0.60403 0.604018 0.604012 0.60401 0.604014
           0.604039 0.653058 0.751006
         </DataArray>
-        <DataArray type="Float32" Name="x_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x_gas" NumberOfComponents="1" format="ascii">
           0.99 0.813249 0.99 0.813249 0.684603 0.684603 0.663337 0.663337 0.658583 0.658583 0.655867 0.655867
           0.653364 0.653364 0.650855 0.650855 0.648319 0.648319 0.645758 0.645758 0.643182 0.643182 0.640603 0.640603
           0.63804 0.63804 0.635516 0.635516 0.633065 0.633065 0.630732 0.630732 0.628576 0.628576 0.626676 0.626676
@@ -81,7 +81,7 @@
           0.370639 0.369453 0.368316 0.367071 0.365525 0.36341 0.360292 0.355455 0.347744 0.335281 0.314971 0.28167
           0.226762 0.135684 0.01
         </DataArray>
-        <DataArray type="Float32" Name="X_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X_gas" NumberOfComponents="1" format="ascii">
           0.993761 0.875098 0.993761 0.875098 0.777396 0.777396 0.760195 0.760195 0.756306 0.756306 0.754077 0.754077
           0.752018 0.752018 0.74995 0.74995 0.747854 0.747854 0.745734 0.745734 0.743597 0.743597 0.741452 0.741452
           0.739315 0.739315 0.737206 0.737206 0.735154 0.735154 0.733197 0.733197 0.731384 0.731384 0.729784 0.729784
diff --git a/test/references/boxtracermaxwellstefan-reference.vtu b/test/references/boxtracermaxwellstefan-reference.vtu
index 1eb09454435ef6b5e24d79ba11b86a8e4079b97d..37b33090391ec75b61736859c7c28182ba5ed2ed 100644
--- a/test/references/boxtracermaxwellstefan-reference.vtu
+++ b/test/references/boxtracermaxwellstefan-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="900" NumberOfPoints="961">
-      <PointData Scalars="x_H2" Vectors="velocity_Gas (m/s)">
-        <DataArray type="Float32" Name="x_H2" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="x^H2" Vectors="velocity_Gas (m/s)">
+        <DataArray type="Float32" Name="x^H2" NumberOfComponents="1" format="ascii">
           0.258921 0.258921 0.258921 0.258921 0.258922 0.258922 0.258923 0.258923 0.258924 0.258924 0.258926 0.258926
           0.258928 0.258928 0.25893 0.25893 0.258933 0.258933 0.258936 0.258936 0.25894 0.25894 0.258943 0.258943
           0.258947 0.258947 0.258951 0.258951 0.258955 0.258955 0.258958 0.258958 0.258962 0.258962 0.258966 0.258966
@@ -86,7 +86,7 @@
           0.25897 0.258974 0.258977 0.258981 0.258984 0.258987 0.258989 0.258991 0.258993 0.258994 0.258995 0.258996
           0.258996
         </DataArray>
-        <DataArray type="Float32" Name="X_H2" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2" NumberOfComponents="1" format="ascii">
           0.0178813 0.0178813 0.0178813 0.0178813 0.0178813 0.0178813 0.0178814 0.0178814 0.0178815 0.0178815 0.0178816 0.0178816
           0.0178818 0.0178818 0.0178819 0.0178819 0.0178821 0.0178821 0.0178823 0.0178823 0.0178826 0.0178826 0.0178828 0.0178828
           0.0178831 0.0178831 0.0178833 0.0178833 0.0178836 0.0178836 0.0178839 0.0178839 0.0178841 0.0178841 0.0178844 0.0178844
@@ -169,7 +169,7 @@
           0.0178847 0.0178849 0.0178852 0.0178854 0.0178856 0.0178858 0.017886 0.0178861 0.0178863 0.0178864 0.0178864 0.0178865
           0.0178865
         </DataArray>
-        <DataArray type="Float32" Name="x_N2" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2" NumberOfComponents="1" format="ascii">
           0.498132 0.498141 0.498132 0.498141 0.498168 0.498168 0.498213 0.498213 0.498275 0.498275 0.498354 0.498354
           0.498448 0.498448 0.498558 0.498558 0.49868 0.49868 0.498815 0.498815 0.498961 0.498961 0.499115 0.499115
           0.499277 0.499277 0.499445 0.499445 0.499616 0.499616 0.49979 0.49979 0.499963 0.499963 0.500135 0.500135
@@ -252,7 +252,7 @@
           0.500303 0.500465 0.50062 0.500766 0.500901 0.501024 0.501133 0.501228 0.501307 0.501369 0.501414 0.501441
           0.50145
         </DataArray>
-        <DataArray type="Float32" Name="X_N2" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2" NumberOfComponents="1" format="ascii">
           0.481619 0.481628 0.481619 0.481628 0.481654 0.481654 0.481698 0.481698 0.481758 0.481758 0.481834 0.481834
           0.481925 0.481925 0.482031 0.482031 0.482149 0.482149 0.48228 0.48228 0.48242 0.48242 0.48257 0.48257
           0.482727 0.482727 0.482889 0.482889 0.483055 0.483055 0.483222 0.483222 0.48339 0.48339 0.483556 0.483556
@@ -335,7 +335,7 @@
           0.483718 0.483875 0.484025 0.484166 0.484296 0.484415 0.484521 0.484612 0.484689 0.484749 0.484793 0.484819
           0.484828
         </DataArray>
-        <DataArray type="Float32" Name="x_CO2" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^CO2" NumberOfComponents="1" format="ascii">
           0.242947 0.242938 0.242947 0.242938 0.24291 0.24291 0.242864 0.242864 0.242801 0.242801 0.24272 0.24272
           0.242624 0.242624 0.242512 0.242512 0.242387 0.242387 0.242249 0.242249 0.2421 0.2421 0.241942 0.241942
           0.241776 0.241776 0.241604 0.241604 0.241429 0.241429 0.241252 0.241252 0.241074 0.241074 0.240899 0.240899
@@ -418,7 +418,7 @@
           0.240727 0.240561 0.240403 0.240254 0.240116 0.23999 0.239878 0.239781 0.2397 0.239637 0.239591 0.239563
           0.239553
         </DataArray>
-        <DataArray type="Float32" Name="X_CO2" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^CO2" NumberOfComponents="1" format="ascii">
           0.369119 0.369105 0.369119 0.369105 0.369062 0.369062 0.368993 0.368993 0.368896 0.368896 0.368774 0.368774
           0.368627 0.368627 0.368457 0.368457 0.368267 0.368267 0.368057 0.368057 0.367831 0.367831 0.367591 0.367591
           0.367339 0.367339 0.367079 0.367079 0.366812 0.366812 0.366543 0.366543 0.366273 0.366273 0.366007 0.366007
diff --git a/test/references/cc1pncmin-00042.vtu b/test/references/cc1pncmin-00042.vtu
index 6dcf4cc4decbf87ec947037285181153e809db03..2be159b47d352df906c538cecd05200ed257d9bf 100644
--- a/test/references/cc1pncmin-00042.vtu
+++ b/test/references/cc1pncmin-00042.vtu
@@ -39,7 +39,7 @@
           0.611396 0.611434 0.611482 0.611539 0.611604 0.611676 0.611752 0.611826 0.61189 0.611932 0.611931 0.611849
           0.611618 0.611067 0.610318 0.609744 0.609625 0.622453 0.708308 0.799829
         </DataArray>
-        <DataArray type="Float32" Name="x_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x_gas" NumberOfComponents="1" format="ascii">
           0.99 0.955329 0.919215 0.90314 0.896951 0.892888 0.889217 0.885655 0.882181 0.878817 0.875594 0.872542
           0.869692 0.867075 0.864719 0.862655 0.860913 0.859522 0.858512 0.857913 0.857755 0.858069 0.858884 0.860233
           0.862144 0.864646 0.867769 0.871538 0.875974 0.881094 0.886906 0.89341 0.900585 0.908385 0.916693 0.925546
@@ -57,7 +57,7 @@
           0.142245 0.141931 0.141116 0.139767 0.137856 0.135354 0.132231 0.128462 0.124026 0.118906 0.113094 0.10659
           0.0994153 0.091615 0.0833068 0.0744539 0.0650189 0.0547821 0.0401436 0.01
         </DataArray>
-        <DataArray type="Float32" Name="X_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X_gas" NumberOfComponents="1" format="ascii">
           0.993761 0.971757 0.948204 0.937506 0.933351 0.930612 0.92813 0.925714 0.923352 0.921059 0.918855 0.916764
           0.914806 0.913004 0.911379 0.909953 0.908747 0.907784 0.907083 0.906667 0.906558 0.906776 0.907342 0.908276
           0.909599 0.911329 0.913483 0.916074 0.919115 0.922612 0.926564 0.930964 0.935793 0.941012 0.946535 0.952382
diff --git a/test/references/cc2pcornerpoint-reference.vtu b/test/references/cc2pcornerpoint-reference.vtu
index a009cc2d792bdf747c221e50e6f40dc7703b2a28..a648f6cf8fd5e3a08665bd1345596081d8a68580 100644
--- a/test/references/cc2pcornerpoint-reference.vtu
+++ b/test/references/cc2pcornerpoint-reference.vtu
@@ -9,28 +9,28 @@
         <DataArray type="Float32" Name="pc" NumberOfComponents="1" format="ascii">
           2614.11 2091.05 2024.13 1414.34
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           0.285556 0.652038 0.702397 0.96918
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           184557 119320 121961 116546
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_aq" NumberOfComponents="1" format="ascii">
           22.5775 249.234 311.805 943.527
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0.714444 0.347962 0.297603 0.0308204
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           187171 121411 123985 117961
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           1460 1460 1460 1460
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_napl" NumberOfComponents="1" format="ascii">
           989.879 243.734 178.199 1.74053
         </DataArray>
         <DataArray type="Float32" Name="process rank" NumberOfComponents="1" format="ascii">
diff --git a/test/references/cctracermaxwellstefan-reference.vtu b/test/references/cctracermaxwellstefan-reference.vtu
index da22d32047ce308d8d115b17fe0b93f161d61c31..211573708e32e9615c438aa7a92991716b03aaa7 100644
--- a/test/references/cctracermaxwellstefan-reference.vtu
+++ b/test/references/cctracermaxwellstefan-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="900" NumberOfPoints="961">
-      <CellData Scalars="x_H2" Vectors="velocity_Gas (m/s)">
-        <DataArray type="Float32" Name="x_H2" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="x^H2" Vectors="velocity_Gas (m/s)">
+        <DataArray type="Float32" Name="x^H2" NumberOfComponents="1" format="ascii">
           0.250566 0.250567 0.250567 0.250569 0.25057 0.250572 0.250575 0.250577 0.25058 0.250584 0.250587 0.250591
           0.250595 0.250599 0.250603 0.250607 0.250611 0.250615 0.250619 0.250623 0.250626 0.25063 0.250633 0.250635
           0.250638 0.25064 0.250641 0.250643 0.250643 0.250644 0.250566 0.250567 0.250567 0.250569 0.25057 0.250572
@@ -80,7 +80,7 @@
           0.250575 0.250577 0.25058 0.250584 0.250587 0.250591 0.250595 0.250599 0.250603 0.250607 0.250611 0.250615
           0.250619 0.250623 0.250626 0.25063 0.250633 0.250635 0.250638 0.25064 0.250641 0.250643 0.250643 0.250644
         </DataArray>
-        <DataArray type="Float32" Name="X_H2" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2" NumberOfComponents="1" format="ascii">
           0.0173043 0.0173043 0.0173044 0.0173045 0.0173046 0.0173047 0.0173049 0.0173051 0.0173053 0.0173055 0.0173058 0.017306
           0.0173063 0.0173066 0.0173068 0.0173071 0.0173074 0.0173077 0.0173079 0.0173082 0.0173084 0.0173087 0.0173089 0.0173091
           0.0173092 0.0173094 0.0173095 0.0173096 0.0173096 0.0173097 0.0173043 0.0173043 0.0173044 0.0173045 0.0173046 0.0173047
@@ -157,7 +157,7 @@
           0.0173049 0.0173051 0.0173053 0.0173055 0.0173058 0.017306 0.0173063 0.0173066 0.0173068 0.0173071 0.0173074 0.0173077
           0.0173079 0.0173082 0.0173084 0.0173087 0.0173089 0.0173091 0.0173092 0.0173094 0.0173095 0.0173096 0.0173096 0.0173097
         </DataArray>
-        <DataArray type="Float32" Name="x_N2" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2" NumberOfComponents="1" format="ascii">
           0.498062 0.498081 0.498119 0.498176 0.498251 0.498344 0.498452 0.498576 0.498713 0.498862 0.499022 0.499191
           0.499367 0.499548 0.499732 0.499917 0.5001 0.500281 0.500457 0.500626 0.500787 0.500937 0.501074 0.501198
           0.501307 0.5014 0.501475 0.501532 0.501571 0.50159 0.498062 0.498081 0.498119 0.498176 0.498251 0.498344
@@ -234,7 +234,7 @@
           0.498452 0.498576 0.498713 0.498862 0.499022 0.499191 0.499367 0.499548 0.499732 0.499917 0.5001 0.500281
           0.500457 0.500626 0.500787 0.500937 0.501074 0.501198 0.501307 0.5014 0.501475 0.501532 0.501571 0.50159
         </DataArray>
-        <DataArray type="Float32" Name="X_N2" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2" NumberOfComponents="1" format="ascii">
           0.481551 0.48157 0.481607 0.481662 0.481735 0.481824 0.481929 0.482048 0.482181 0.482326 0.48248 0.482643
           0.482813 0.482988 0.483166 0.483345 0.483523 0.483698 0.483868 0.484031 0.484186 0.484331 0.484464 0.484584
           0.484689 0.484779 0.484851 0.484907 0.484944 0.484963 0.481551 0.48157 0.481607 0.481662 0.481735 0.481824
@@ -311,7 +311,7 @@
           0.481929 0.482048 0.482181 0.482326 0.48248 0.482643 0.482813 0.482988 0.483166 0.483345 0.483523 0.483698
           0.483868 0.484031 0.484186 0.484331 0.484464 0.484584 0.484689 0.484779 0.484851 0.484907 0.484944 0.484963
         </DataArray>
-        <DataArray type="Float32" Name="x_CO2" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^CO2" NumberOfComponents="1" format="ascii">
           0.251372 0.251352 0.251313 0.251255 0.251178 0.251084 0.250973 0.250847 0.250706 0.250554 0.25039 0.250218
           0.250038 0.249853 0.249665 0.249476 0.249288 0.249104 0.248924 0.248751 0.248587 0.248434 0.248293 0.248167
           0.248055 0.247961 0.247884 0.247825 0.247786 0.247766 0.251372 0.251352 0.251313 0.251255 0.251178 0.251084
@@ -388,7 +388,7 @@
           0.250973 0.250847 0.250706 0.250554 0.25039 0.250218 0.250038 0.249853 0.249665 0.249476 0.249288 0.249104
           0.248924 0.248751 0.248587 0.248434 0.248293 0.248167 0.248055 0.247961 0.247884 0.247825 0.247786 0.247766
         </DataArray>
-        <DataArray type="Float32" Name="X_CO2" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^CO2" NumberOfComponents="1" format="ascii">
           0.381919 0.381889 0.381829 0.381741 0.381624 0.381481 0.381313 0.381121 0.380908 0.380676 0.380427 0.380165
           0.379892 0.379611 0.379326 0.379039 0.378753 0.378472 0.378199 0.377936 0.377687 0.377455 0.377241 0.377049
           0.37688 0.376736 0.376619 0.37653 0.37647 0.37644 0.381919 0.381889 0.381829 0.381741 0.381624 0.381481
diff --git a/test/references/channel-navierstokes-reference.vtu b/test/references/channel-navierstokes-reference.vtu
index 69b0b3b8750e9cb58fe0b752e0393029ed5ec08e..9b1622b3cf8fb291c47444c8f203a67b0bfe6192 100644
--- a/test/references/channel-navierstokes-reference.vtu
+++ b/test/references/channel-navierstokes-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="5000" NumberOfPoints="5151">
-      <CellData Scalars="p" Vectors="velocity_component (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           559848 482345 442069 417370 402656 393407 386538 380543 374876 369386 364047 358858
           353821 348930 344182 339567 335079 330709 326450 322293 318234 314264 310379 306573
@@ -1260,7 +1260,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="velocity_component (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           866.713 26.6574 0 628.25 21.0352 0 451.885 14.2378 0 336.943 8.75054 0
           267.664 5.10536 0 227.07 3.01345 0 202.462 1.908 0 186.29 1.32642 0
           174.66 0.999749 0 165.675 0.797072 0 158.394 0.659182 0 152.304 0.558899 0
diff --git a/test/references/channel-stokes.vtu b/test/references/channel-stokes.vtu
index 57f9454ea79b74bef05f49a30b60700abb27f136..656f127e49866b2d15546e45bc4d823ae9dba1ef 100644
--- a/test/references/channel-stokes.vtu
+++ b/test/references/channel-stokes.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="5000" NumberOfPoints="5151">
-      <CellData Scalars="p" Vectors="velocity_component (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           110146 110121 110117 110116 110114 110113 110112 110111 110110 110109 110107 110106
           110105 110104 110103 110101 110100 110099 110098 110097 110095 110094 110093 110092
@@ -1260,7 +1260,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="velocity_component (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           0.605139 0.0789722 0 0.158106 0.0104344 0 0.0919666 0.00279339 0 0.0726249 0.00107493 0
           0.0650127 0.00044752 0 0.061857 0.000183609 0 0.060585 7.0788e-05 0 0.0601099 2.42347e-05 0
           0.0599568 6.39517e-06 0 0.0599228 4.09296e-07 0 0.0599261 -1.07601e-06 0 0.0599369 -1.08676e-06 0
diff --git a/test/references/co2box-reference.vtu b/test/references/co2box-reference.vtu
index 452684b97aa2219233e8a64ce9d897745a57c412..cc906ffcbce5988a0c58329de7f7b59360d228f9 100644
--- a/test/references/co2box-reference.vtu
+++ b/test/references/co2box-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="3667" NumberOfPoints="3794">
-      <PointData Scalars="S_n">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_gas">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0.24004 0.0309938 0 0 0 0
           0 0 0 0 0 0 0.338733 0.174925 0 0.357728 0.215148 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -322,7 +322,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 0.75996 0.969006 1 1 1 1
           1 1 1 1 1 1 0.661267 0.825075 1 0.642272 0.784852 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -641,7 +641,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           1.39004e+07 1.38741e+07 1.39017e+07 1.38781e+07 1.38709e+07 1.38854e+07 1.39051e+07 1.38759e+07 1.38432e+07 1.38532e+07 1.38532e+07 1.38645e+07
           1.38509e+07 1.3833e+07 1.38369e+07 1.38131e+07 1.38145e+07 1.38598e+07 1.38936e+07 1.38759e+07 1.38459e+07 1.38819e+07 1.38669e+07 1.38299e+07
           1.38128e+07 1.37898e+07 1.37877e+07 1.37621e+07 1.38184e+07 1.37905e+07 1.37997e+07 1.37689e+07 1.37803e+07 1.37535e+07 1.37611e+07 1.37391e+07
@@ -960,7 +960,7 @@
           1.16705e+07 1.169e+07 1.17094e+07 1.1699e+07 1.16783e+07 1.1668e+07 1.16621e+07 1.16563e+07 1.16594e+07 1.16579e+07 1.16419e+07 1.16365e+07
           1.16232e+07 1.1627e+07
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           1.38904e+07 1.38641e+07 1.38917e+07 1.38681e+07 1.38609e+07 1.38754e+07 1.38935e+07 1.38658e+07 1.38332e+07 1.38432e+07 1.38432e+07 1.38545e+07
           1.38409e+07 1.3823e+07 1.38269e+07 1.38031e+07 1.38045e+07 1.38498e+07 1.38811e+07 1.38648e+07 1.38359e+07 1.38693e+07 1.38556e+07 1.38199e+07
           1.38028e+07 1.37798e+07 1.37777e+07 1.37521e+07 1.38084e+07 1.37805e+07 1.37897e+07 1.37589e+07 1.37703e+07 1.37435e+07 1.37511e+07 1.37291e+07
@@ -1598,7 +1598,7 @@
           10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
           10000 10000
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           1066.37 1066.12 1073.05 1066.94 1066.04 1066.04 1073.65 1073.66 1066.06 1066.03 1066.18 1066.01
           1066.01 1066.03 1066 1066.02 1066.05 1067.35 1073.68 1073.68 1071.02 1073.7 1073.7 1066.48
           1066.1 1066.04 1066.07 1066.07 1066 1066.02 1065.99 1066.01 1065.98 1066 1065.97 1065.99
@@ -1917,7 +1917,7 @@
           1066.43 1066.41 1066.39 1066.38 1066.4 1066.39 1066.36 1066.38 1066.39 1066.42 1066.42 1066.38
           1066.41 1066.41
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           710.106 709.952 710.139 710.249 709.69 709.728 710.932 710.58 709.667 709.391 710.14 709.205
           708.861 708.966 708.493 708.52 709.093 710.458 711.231 711.055 710.527 711.527 711.353 710.124
           709.646 708.585 709.115 708.599 708.004 708.004 707.511 707.478 707.001 706.968 706.493 706.526
@@ -2236,7 +2236,7 @@
           672.367 672.234 672.121 671.659 671.739 671.243 670.052 670.385 670.761 671.868 671.229 670.013
           670.47 670.636
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           1250.86 1249.92 1250.86 1249.56 1250.26 1250.86 389.756 1093.67 1249 1249.99 1248.61 1250.86
           1250.86 1249.79 1250.86 1249.66 1248.67 1248.33 213.995 552.947 1247.55 188.446 446.45 1247.52
           1247.58 1248.42 1247.36 1247.08 1250.86 1249.52 1250.86 1249.44 1250.86 1249.63 1250.86 1249.75
@@ -2555,7 +2555,7 @@
           1198.95 1200.14 1201.3 1201.35 1200.17 1200.28 1201.51 1200.78 1200.46 1198.95 1198.95 1200.23
           1198.95 1198.95
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 487.471 1.18248 0 0 0 0
           0 0 0 0 0 0 1287.57 196.003 0 1497.14 355.958 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -2874,7 +2874,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_liq" NumberOfComponents="1" format="ascii">
           55051.4 55074.5 54478.2 55005.7 55080 55078.6 54429.9 54430.3 55081.1 55080.6 55072.3 55079.7
           55079.5 55080.5 55079.2 55080.3 55081.5 54973.5 54430.7 54431 54659.7 54431.6 54431.8 55049
           55080.6 55081.4 55082.6 55082.5 55078.8 55080 55078.5 55079.7 55078.1 55079.1 55077.7 55078.7
@@ -3193,7 +3193,7 @@
           55101.2 55100.1 55099 55098.7 55099.8 55099.4 55097.8 55098.6 55099 55100.9 55100.6 55098.8
           55100.2 55100.3
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_gas" NumberOfComponents="1" format="ascii">
           16189.2 16185.6 16190 16192.4 16179.6 16180.6 16208 16199.9 16179 16172.8 16189.8 16168.6
           16160.7 16163.1 16152.3 16152.9 16165.9 16197 16214.7 16210.7 16198.5 16221.4 16217.4 16189.3
           16178.4 16154.2 16166.3 16154.4 16141.2 16141 16129.9 16129 16118.2 16117.4 16106.6 16107.3
@@ -3512,7 +3512,7 @@
           15322.6 15319.7 15317.2 15306.6 15308.4 15297 15269.9 15277.5 15286 15311.2 15296.6 15268.9
           15279.3 15283.1
         </DataArray>
-        <DataArray type="Float32" Name="X^Brine_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Brine_liq" NumberOfComponents="1" format="ascii">
           0.998484 0.999653 0.968921 0.996052 0.999967 0.999915 0.966381 0.966386 0.999968 0.999997 0.999474 0.999995
           1 1 1 1 0.999998 0.994322 0.966372 0.966373 0.978095 0.966362 0.966364 0.998216
           0.999878 1 0.999992 1 1 1 1 1 1 1 1 1
@@ -3831,7 +3831,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1
         </DataArray>
-        <DataArray type="Float32" Name="X^CO2_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^CO2_liq" NumberOfComponents="1" format="ascii">
           0.00151614 0.000346671 0.031079 0.00394791 3.32095e-05 8.52462e-05 0.033619 0.0336142 3.23535e-05 2.56344e-06 0.00052603 4.6514e-06
           3.2163e-07 1.76947e-07 2.03484e-08 1.13546e-08 1.93779e-06 0.00567766 0.0336281 0.0336266 0.0219049 0.0336377 0.0336357 0.00178438
           0.000121638 1.14902e-07 8.0218e-06 4.95541e-07 1.16657e-09 6.54024e-10 6.82231e-11 3.71317e-11 4.229e-12 2.47189e-12 2.53631e-13 1.7358e-13
@@ -4150,7 +4150,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0
         </DataArray>
-        <DataArray type="Float32" Name="X^Brine_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Brine_gas" NumberOfComponents="1" format="ascii">
           0.00245413 0.00244968 0.00245422 0.00244899 0.00245037 0.00245305 0.00245087 0.00244688 0.00244496 0.00244839 0.00244464 0.00245156
           0.00245058 0.00244636 0.00244954 0.00244451 0.00244195 0.00244433 0.00244708 0.00244448 0.00244122 0.00244329 0.00244123 0.00243997
           0.00243888 0.00243946 0.00243642 0.0024338 0.00244815 0.00244245 0.00244676 0.00244064 0.00244531 0.00244 0.00244386 0.00243923
@@ -4469,7 +4469,7 @@
           0.00213444 0.00213876 0.00214305 0.00214198 0.00213751 0.00213655 0.00213811 0.00213614 0.00213591 0.00213304 0.00213126 0.00213294
           0.00212914 0.0021296
         </DataArray>
-        <DataArray type="Float32" Name="X^CO2_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^CO2_gas" NumberOfComponents="1" format="ascii">
           0.997546 0.99755 0.997546 0.997551 0.99755 0.997547 0.997549 0.997553 0.997555 0.997552 0.997555 0.997548
           0.997549 0.997554 0.99755 0.997555 0.997558 0.997556 0.997553 0.997555 0.997559 0.997557 0.997559 0.99756
           0.997561 0.997561 0.997564 0.997566 0.997552 0.997558 0.997553 0.997559 0.997555 0.99756 0.997556 0.997561
@@ -4788,7 +4788,7 @@
           0.997866 0.997861 0.997857 0.997858 0.997863 0.997863 0.997862 0.997864 0.997864 0.997867 0.997869 0.997867
           0.997871 0.99787
         </DataArray>
-        <DataArray type="Float32" Name="x^Brine_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Brine_liq" NumberOfComponents="1" format="ascii">
           0.999333 0.999847 0.986087 0.99826 0.999985 0.999963 0.984928 0.984931 0.999986 0.999999 0.999769 0.999998
           1 1 1 1 0.999999 0.997495 0.984924 0.984925 0.990245 0.98492 0.984921 0.999214
           0.999946 1 0.999996 1 1 1 1 1 1 1 1 1
@@ -5107,7 +5107,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1
         </DataArray>
-        <DataArray type="Float32" Name="x^CO2_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^CO2_liq" NumberOfComponents="1" format="ascii">
           0.000667463 0.000152517 0.0139127 0.00174039 1.46079e-05 3.74985e-05 0.0150716 0.0150694 1.42314e-05 1.12756e-06 0.00023145 2.04598e-06
           1.41473e-07 7.78326e-08 8.95053e-09 4.99446e-09 8.52366e-07 0.00250536 0.0150757 0.015075 0.00975487 0.0150801 0.0150792 0.000785668
           5.35078e-05 5.05414e-08 3.52851e-06 2.1797e-07 5.13132e-10 2.87681e-10 3.00089e-11 1.63329e-11 1.86018e-12 1.08729e-12 1.11563e-13 7.63514e-14
@@ -5426,7 +5426,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0
         </DataArray>
-        <DataArray type="Float32" Name="x^Brine_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Brine_gas" NumberOfComponents="1" format="ascii">
           0.00556192 0.00555187 0.00556213 0.0055503 0.00555343 0.00555949 0.00555456 0.00554555 0.0055412 0.00554896 0.00554048 0.00555611
           0.0055539 0.00554436 0.00555155 0.0055402 0.00553441 0.00553977 0.00554599 0.00554012 0.00553276 0.00553743 0.00553278 0.00552993
           0.00552747 0.00552877 0.00552192 0.00551598 0.00554842 0.00553554 0.00554526 0.00553144 0.00554199 0.00553 0.00553872 0.00552827
@@ -5745,7 +5745,7 @@
           0.00483935 0.00484913 0.00485883 0.0048564 0.0048463 0.00484413 0.00484764 0.00484319 0.00484267 0.0048362 0.00483216 0.00483596
           0.00482737 0.0048284
         </DataArray>
-        <DataArray type="Float32" Name="x^CO2_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^CO2_gas" NumberOfComponents="1" format="ascii">
           0.994438 0.994448 0.994438 0.99445 0.994447 0.99444 0.994445 0.994454 0.994459 0.994451 0.99446 0.994444
           0.994446 0.994456 0.994448 0.99446 0.994466 0.99446 0.994454 0.99446 0.994467 0.994463 0.994467 0.99447
           0.994473 0.994471 0.994478 0.994484 0.994452 0.994464 0.994455 0.994469 0.994458 0.99447 0.994461 0.994472
diff --git a/test/references/co2cc-reference.vtu b/test/references/co2cc-reference.vtu
index 61d41e463e3459deb733e45237965282b2e2215a..e4728c28522ad46936976c3230bf7a8bd313d135 100644
--- a/test/references/co2cc-reference.vtu
+++ b/test/references/co2cc-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="3667" NumberOfPoints="3794">
-      <CellData Scalars="S_n">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_gas">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0.00632624 0 0 0 0 0 0 0 0.255683 0.0809946
           0.280594 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0.122964 0.315788
@@ -311,7 +311,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 0.993674 1 1 1 1 1 1 1 0.744317 0.919005
           0.719406 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 0.877036 0.684212
@@ -619,7 +619,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           1.39144e+07 1.39205e+07 1.39106e+07 1.3895e+07 1.38893e+07 1.39098e+07 1.38856e+07 1.38676e+07 1.38674e+07 1.38903e+07 1.39214e+07 1.38947e+07
           1.39226e+07 1.38724e+07 1.38617e+07 1.38463e+07 1.3846e+07 1.38248e+07 1.38522e+07 1.38375e+07 1.38248e+07 1.38119e+07 1.37959e+07 1.37774e+07
           1.38272e+07 1.3796e+07 1.38086e+07 1.38038e+07 1.37888e+07 1.37757e+07 1.37529e+07 1.37639e+07 1.37613e+07 1.37349e+07 1.38947e+07 1.39213e+07
@@ -927,7 +927,7 @@
           1.17296e+07 1.17167e+07 1.17005e+07 1.16865e+07 1.16738e+07 1.17256e+07 1.17166e+07 1.17102e+07 1.17009e+07 1.16908e+07 1.16819e+07 1.16767e+07
           1.16782e+07 1.16781e+07 1.16633e+07 1.16524e+07 1.16503e+07 1.16503e+07 1.1648e+07
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           1.39044e+07 1.39105e+07 1.39006e+07 1.3885e+07 1.38793e+07 1.38998e+07 1.38756e+07 1.38576e+07 1.38574e+07 1.38803e+07 1.39097e+07 1.38842e+07
           1.39107e+07 1.38624e+07 1.38517e+07 1.38363e+07 1.3836e+07 1.38148e+07 1.38422e+07 1.38275e+07 1.38148e+07 1.38019e+07 1.37859e+07 1.37674e+07
           1.38172e+07 1.3786e+07 1.37986e+07 1.37938e+07 1.37788e+07 1.37657e+07 1.37429e+07 1.37539e+07 1.37513e+07 1.37249e+07 1.3884e+07 1.39091e+07
@@ -1543,7 +1543,7 @@
           10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
           10000 10000 10000 10000 10000 10000 10000
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           1066.64 1066.09 1073.65 1066.06 1066.17 1066.04 1066.03 1066.03 1066.05 1067.38 1073.68 1073.69
           1073.71 1067.47 1066.19 1066.05 1066.08 1066.07 1066.02 1066.02 1066.01 1066.01 1066 1066
           1066.05 1066.04 1066.04 1066.07 1066.03 1066.02 1066.02 1066.04 1066.05 1066.04 1073.71 1073.74
@@ -1851,7 +1851,7 @@
           1066.44 1066.43 1066.42 1066.42 1066.41 1066.38 1066.37 1066.37 1066.4 1066.39 1066.39 1066.36
           1066.38 1066.37 1066.41 1066.4 1066.38 1066.4 1066.4
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           710.759 710.818 710.986 710.546 710.683 710.54 709.994 709.589 710.085 710.946 711.793 711.411
           712.362 710.947 710.586 709.674 710.2 709.794 709.239 708.883 708.533 708.152 707.73 707.281
           709.289 708.518 708.915 709.407 708.14 707.79 707.373 707.927 708.234 707.543 711.927 712.837
@@ -2159,7 +2159,7 @@
           674.262 673.735 673.091 672.545 672.045 672.311 671.942 671.589 672.226 671.801 671.37 670.401
           671.081 670.851 671.617 671.152 670.464 670.918 670.921
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           1250.3 1250.47 1216.74 1249.79 1249.27 1250.49 1250.38 1250.29 1249.36 1248.83 356.282 873.915
           307.591 1248 1248.18 1249.14 1248.15 1247.88 1250.22 1250.17 1250.2 1250.27 1250.28 1250.21
           1248.93 1248.84 1248.72 1247.59 1249.19 1249.2 1248.87 1248.39 1247.71 1247.71 716.384 247.642
@@ -2467,7 +2467,7 @@
           1199.55 1199.57 1199.57 1199.55 1199.54 1201.9 1201.91 1202.04 1200.72 1200.74 1200.83 1201.82
           1201.02 1201.31 1199.55 1199.58 1200.37 1199.78 1199.66
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           0 0 0.0101786 0 0 0 0 0 0 0 582.445 20.4998
           757.19 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 69.9974 1054.78
@@ -2775,7 +2775,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_liq" NumberOfComponents="1" format="ascii">
           55030.3 55077.6 54429.8 55081.1 55073.5 55080.9 55080.8 55080.6 55081.7 54971.1 54430.8 54431
           54431.7 54964.6 55073.9 55081.6 55082.2 55082.7 55080.3 55080.1 55079.8 55079.5 55079.1 55078.9
           55081.5 55081 55081.4 55082.7 55080.4 55080.1 55080.1 55080.9 55081.7 55081.2 54431.9 54432.5
@@ -3083,7 +3083,7 @@
           55101.6 55101.3 55101 55100.7 55100.5 55098.6 55098.4 55098.1 55099.6 55099.3 55099 55097.7
           55098.7 55098.3 55100.3 55100 55099 55099.7 55099.8
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_gas" NumberOfComponents="1" format="ascii">
           16204.1 16205.5 16209.2 16199.2 16202.2 16199.1 16186.6 16177.3 16188.6 16208.2 16227.6 16218.8
           16240.5 16208.2 16199.9 16179.2 16191.1 16181.8 16169.3 16161.2 16153.2 16144.5 16134.9 16124.6
           16170.4 16152.7 16161.8 16173 16144.1 16136.1 16126.6 16139.2 16146.1 16130.3 16230.5 16251.3
@@ -3391,7 +3391,7 @@
           15365.9 15353.9 15339.2 15326.7 15315.3 15321.6 15313.1 15305.1 15319.5 15309.8 15300 15277.9
           15293.4 15288.2 15305.5 15294.9 15279.2 15289.6 15289.6
         </DataArray>
-        <DataArray type="Float32" Name="X^Brine_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Brine_liq" NumberOfComponents="1" format="ascii">
           0.99734 0.999802 0.96638 0.999965 0.999542 0.999988 0.999999 1 0.999998 0.994201 0.96636 0.966366
           0.966345 0.993828 0.999519 1 0.999966 0.999998 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 0.966352 0.966332
@@ -3699,7 +3699,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="X^CO2_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^CO2_liq" NumberOfComponents="1" format="ascii">
           0.00266011 0.000198277 0.0336205 3.4906e-05 0.000458354 1.15547e-05 7.00595e-07 4.37592e-08 2.1941e-06 0.00579899 0.03364 0.0336339
           0.0336551 0.00617171 0.000481025 1.40729e-07 3.35622e-05 2.31733e-06 2.15486e-09 9.95381e-11 4.75417e-12 2.47353e-13 1.19586e-14 5.42073e-16
           7.7333e-09 1.82352e-11 3.60229e-10 1.37881e-07 1.1122e-12 9.42793e-14 7.82968e-15 1.56694e-12 2.50317e-11 2.40839e-13 0.0336478 0.0336681
@@ -4007,7 +4007,7 @@
           0 0 0 0 -0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="X^Brine_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Brine_gas" NumberOfComponents="1" format="ascii">
           0.0024536 0.00245451 0.00245169 0.00245083 0.002449 0.0024538 0.00245175 0.00245024 0.0024477 0.00244788 0.00244972 0.00244637
           0.00244705 0.00244434 0.00244407 0.00244556 0.00244287 0.00244058 0.00244895 0.00244771 0.00244684 0.00244609 0.00244491 0.00244333
           0.00244358 0.00244103 0.00244163 0.00243823 0.00244144 0.00244049 0.00243792 0.00243743 0.00243542 0.00243347 0.00244377 0.00244437
@@ -4315,7 +4315,7 @@
           0.0021421 0.00214071 0.00213891 0.00213731 0.00213588 0.002146 0.002145 0.0021445 0.00214104 0.00213994 0.00213911 0.0021403
           0.00213903 0.00213954 0.00213472 0.00213356 0.00213473 0.00213369 0.0021332
         </DataArray>
-        <DataArray type="Float32" Name="X^CO2_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^CO2_gas" NumberOfComponents="1" format="ascii">
           0.997546 0.997545 0.997548 0.997549 0.997551 0.997546 0.997548 0.99755 0.997552 0.997552 0.99755 0.997554
           0.997553 0.997556 0.997556 0.997554 0.997557 0.997559 0.997551 0.997552 0.997553 0.997554 0.997555 0.997557
           0.997556 0.997559 0.997558 0.997562 0.997559 0.997559 0.997562 0.997563 0.997565 0.997567 0.997556 0.997556
@@ -4623,7 +4623,7 @@
           0.997858 0.997859 0.997861 0.997863 0.997864 0.997854 0.997855 0.997855 0.997859 0.99786 0.997861 0.99786
           0.997861 0.99786 0.997865 0.997866 0.997865 0.997866 0.997867
         </DataArray>
-        <DataArray type="Float32" Name="x^Brine_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Brine_liq" NumberOfComponents="1" format="ascii">
           0.998828 0.999913 0.984928 0.999985 0.999798 0.999995 1 1 0.999999 0.997441 0.984919 0.984922
           0.984912 0.997276 0.999788 1 0.999985 0.999999 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 0.984915 0.984906
@@ -4931,7 +4931,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="x^CO2_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^CO2_liq" NumberOfComponents="1" format="ascii">
           0.00117183 8.72245e-05 0.0150723 1.53542e-05 0.000201665 5.08253e-06 3.08166e-07 1.92481e-08 9.65105e-07 0.00255908 0.0150812 0.0150784
           0.0150881 0.00272412 0.000211642 6.19017e-08 1.4763e-05 1.01931e-06 9.47846e-10 4.37832e-11 2.09119e-12 1.08801e-13 5.26016e-15 2.38438e-16
           3.40159e-09 8.021e-12 1.58452e-10 6.06488e-08 4.89216e-13 4.147e-14 3.44399e-15 6.89238e-13 1.10105e-11 1.05936e-13 0.0150847 0.015094
@@ -5239,7 +5239,7 @@
           0 0 0 0 -0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="x^Brine_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Brine_gas" NumberOfComponents="1" format="ascii">
           0.00556072 0.00556278 0.00555641 0.00555447 0.00555033 0.00556117 0.00555655 0.00555314 0.00554739 0.00554781 0.00555195 0.0055444
           0.00554593 0.0055398 0.00553919 0.00554256 0.00553647 0.0055313 0.00555021 0.00554741 0.00554545 0.00554375 0.00554108 0.00553753
           0.00553809 0.00553232 0.00553369 0.005526 0.00553324 0.00553109 0.00552529 0.00552419 0.00551964 0.00551525 0.00553851 0.00553988
@@ -5547,7 +5547,7 @@
           0.00485668 0.00485352 0.00484945 0.00484585 0.00484261 0.00486548 0.00486323 0.0048621 0.00485427 0.00485179 0.00484992 0.00485261
           0.00484974 0.00485089 0.00483999 0.00483737 0.00484001 0.00483765 0.00483655
         </DataArray>
-        <DataArray type="Float32" Name="x^CO2_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^CO2_gas" NumberOfComponents="1" format="ascii">
           0.994439 0.994437 0.994444 0.994446 0.99445 0.994439 0.994443 0.994447 0.994453 0.994452 0.994448 0.994456
           0.994454 0.99446 0.994461 0.994457 0.994464 0.994469 0.99445 0.994453 0.994455 0.994456 0.994459 0.994462
           0.994462 0.994468 0.994466 0.994474 0.994467 0.994469 0.994475 0.994476 0.99448 0.994485 0.994461 0.99446
diff --git a/test/references/co2nibox-reference.vtu b/test/references/co2nibox-reference.vtu
index 7b4426b48baacfb1503b3844e6fbffa54391d627..521debe2964aba8b485658027b1dde2f77fc1a00 100644
--- a/test/references/co2nibox-reference.vtu
+++ b/test/references/co2nibox-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="3667" NumberOfPoints="3794">
-      <PointData Scalars="S_n">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_gas">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0.241166 0.0303768 0 0 0 0
           0 0 0 0 0 0 0.339238 0.176353 0 0.358135 0.216743 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -322,7 +322,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 0.758834 0.969623 1 1 1 1
           1 1 1 1 1 1 0.660762 0.823647 1 0.641865 0.783257 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -641,7 +641,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           1.39005e+07 1.38742e+07 1.39018e+07 1.38783e+07 1.38711e+07 1.38856e+07 1.39049e+07 1.38759e+07 1.38434e+07 1.38535e+07 1.38533e+07 1.38648e+07
           1.38512e+07 1.38333e+07 1.38374e+07 1.38136e+07 1.38148e+07 1.38598e+07 1.38934e+07 1.38756e+07 1.38458e+07 1.38815e+07 1.38664e+07 1.38299e+07
           1.3813e+07 1.37903e+07 1.37881e+07 1.37625e+07 1.38189e+07 1.3791e+07 1.38003e+07 1.37695e+07 1.3781e+07 1.37542e+07 1.37618e+07 1.37398e+07
@@ -960,7 +960,7 @@
           1.16707e+07 1.16903e+07 1.17096e+07 1.16991e+07 1.16785e+07 1.16681e+07 1.16621e+07 1.16563e+07 1.16595e+07 1.16581e+07 1.1642e+07 1.16365e+07
           1.16232e+07 1.1627e+07
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           1.38905e+07 1.38642e+07 1.38918e+07 1.38683e+07 1.38611e+07 1.38756e+07 1.38933e+07 1.38657e+07 1.38334e+07 1.38435e+07 1.38433e+07 1.38548e+07
           1.38412e+07 1.38233e+07 1.38274e+07 1.38036e+07 1.38048e+07 1.38498e+07 1.38809e+07 1.38645e+07 1.38358e+07 1.38689e+07 1.3855e+07 1.38199e+07
           1.3803e+07 1.37803e+07 1.37781e+07 1.37525e+07 1.38089e+07 1.3781e+07 1.37903e+07 1.37595e+07 1.3771e+07 1.37442e+07 1.37518e+07 1.37298e+07
@@ -1598,7 +1598,7 @@
           10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
           10000 10000
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           1066.31 1066.1 1072.62 1066.9 1066.03 1066.04 1073.55 1073.3 1066.05 1066.03 1066.15 1066.02
           1066.01 1066.02 1066 1066.02 1066.04 1067.25 1073.93 1073.41 1070.68 1074.03 1073.46 1066.43
           1066.09 1066.04 1066.06 1066.06 1066 1066.01 1065.99 1066 1065.98 1065.99 1065.97 1065.99
@@ -1917,7 +1917,7 @@
           1066.42 1066.4 1066.39 1066.38 1066.4 1066.39 1066.36 1066.38 1066.38 1066.41 1066.4 1066.38
           1066.4 1066.4
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           709.214 709.663 702.858 709.149 709.579 709.799 708.952 703.473 709.498 709.279 709.577 709.283
           708.908 708.844 708.528 708.396 708.947 708.359 716.298 705.559 705.145 718.067 706.424 709.46
           709.462 708.445 708.967 708.457 708.03 707.879 707.536 707.353 707.046 706.857 706.557 706.426
@@ -2236,7 +2236,7 @@
           672.022 672.2 672.126 671.662 671.705 671.214 670.052 670.374 670.738 671.519 670.886 670.013
           670.23 670.334
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           1252.49 1250.44 1264.28 1251.57 1250.45 1250.71 388.415 1108.13 1249.3 1250.19 1249.63 1250.7
           1250.76 1250.01 1250.79 1249.88 1248.94 1252.17 211.666 553.338 1257.43 186.079 445.798 1248.73
           1247.92 1248.69 1247.64 1247.36 1250.81 1249.75 1250.81 1249.68 1250.78 1249.85 1250.75 1249.94
@@ -2555,7 +2555,7 @@
           1199.38 1200.17 1201.29 1201.34 1200.2 1200.3 1201.5 1200.78 1200.47 1199.39 1199.37 1200.21
           1199.23 1199.32
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 496.194 1.13122 0 0 0 0
           0 0 0 0 0 0 1278.49 203.128 0 1480.25 367.565 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -2874,7 +2874,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_liq" NumberOfComponents="1" format="ascii">
           55050.3 55073.8 54471.8 55002.3 55079.8 55078.8 54426.5 54418.2 55080.7 55080.3 55071.2 55079.8
           55079.6 55080.2 55079.3 55079.9 55081.2 54968.9 54439.3 54421.8 54656.6 54442.7 54423.6 55049.2
           55080.3 55081 55082.2 55082.2 55078.9 55079.7 55078.5 55079.3 55078.1 55078.8 55077.8 55078.4
@@ -3193,7 +3193,7 @@
           55100.6 55100 55099 55098.7 55099.7 55099.4 55097.8 55098.5 55099 55100.3 55100 55098.8
           55099.8 55099.8
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_gas" NumberOfComponents="1" format="ascii">
           16169 16179 16025 16167.4 16177.1 16182.2 16163.1 16038.6 16175.2 16170.2 16177 16170.4
           16161.8 16160.3 16153.1 16150 16162.6 16149.4 16329.9 16085.9 16076.4 16370 16105.6 16174.2
           16174.2 16151.1 16162.9 16151.2 16141.8 16138.2 16130.5 16126.2 16119.3 16114.9 16108.1 16105
@@ -3512,7 +3512,7 @@
           15314.8 15318.9 15317.3 15306.7 15307.6 15296.4 15269.9 15277.2 15285.5 15303.3 15288.8 15268.9
           15273.8 15276.2
         </DataArray>
-        <DataArray type="Float32" Name="X^Brine_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Brine_liq" NumberOfComponents="1" format="ascii">
           0.998537 0.999656 0.969382 0.996008 0.999968 0.99992 0.966434 0.966575 0.999969 0.999998 0.999486 0.999996
           1 1 1 1 0.999998 0.99434 0.966234 0.96652 0.978552 0.966184 0.966496 0.998309
           0.999888 1 0.999993 1 1 1 1 1 1 1 1 1
@@ -3831,7 +3831,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1
         </DataArray>
-        <DataArray type="Float32" Name="X^CO2_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^CO2_liq" NumberOfComponents="1" format="ascii">
           0.001463 0.000344476 0.0306177 0.00399192 3.19636e-05 8.0304e-05 0.0335658 0.0334255 3.06173e-05 2.35693e-06 0.000514277 4.25707e-06
           2.84739e-07 1.55572e-07 1.73434e-08 9.52275e-09 1.75701e-06 0.00565984 0.0337662 0.0334798 0.0214482 0.0338164 0.0335038 0.00169146
           0.00011185 9.94884e-08 7.13372e-06 4.24183e-07 9.5317e-10 5.22007e-10 5.32587e-11 2.81724e-11 3.1462e-12 1.78184e-12 1.79415e-13 1.18646e-13
@@ -4150,7 +4150,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0
         </DataArray>
-        <DataArray type="Float32" Name="X^Brine_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Brine_gas" NumberOfComponents="1" format="ascii">
           0.00245869 0.00245118 0.00249104 0.00245457 0.00245098 0.00245274 0.0024609 0.00248273 0.00244585 0.00244901 0.00244748 0.00245123
           0.00245042 0.00244704 0.00244946 0.00244522 0.00244274 0.00245487 0.002421 0.00247219 0.00246815 0.00240948 0.00246594 0.00244329
           0.00243984 0.00244023 0.00243722 0.00243457 0.00244813 0.00244317 0.00244676 0.00244138 0.00244523 0.00244068 0.00244371 0.00243987
@@ -4469,7 +4469,7 @@
           0.00213529 0.00213889 0.00214309 0.00214201 0.00213763 0.00213665 0.00213811 0.00213617 0.00213598 0.00213389 0.00213207 0.00213294
           0.00212969 0.0021303
         </DataArray>
-        <DataArray type="Float32" Name="X^CO2_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^CO2_gas" NumberOfComponents="1" format="ascii">
           0.997541 0.997549 0.997509 0.997545 0.997549 0.997547 0.997539 0.997517 0.997554 0.997551 0.997553 0.997549
           0.99755 0.997553 0.997551 0.997555 0.997557 0.997545 0.997579 0.997528 0.997532 0.997591 0.997534 0.997557
           0.99756 0.99756 0.997563 0.997565 0.997552 0.997557 0.997553 0.997559 0.997555 0.997559 0.997556 0.99756
@@ -4788,7 +4788,7 @@
           0.997865 0.997861 0.997857 0.997858 0.997862 0.997863 0.997862 0.997864 0.997864 0.997866 0.997868 0.997867
           0.99787 0.99787
         </DataArray>
-        <DataArray type="Float32" Name="x^Brine_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Brine_liq" NumberOfComponents="1" format="ascii">
           0.999356 0.999848 0.986297 0.99824 0.999986 0.999965 0.984953 0.985017 0.999987 0.999999 0.999774 0.999998
           1 1 1 1 0.999999 0.997503 0.984861 0.984992 0.990451 0.984838 0.984981 0.999255
           0.999951 1 0.999997 1 1 1 1 1 1 1 1 1
@@ -5107,7 +5107,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1
         </DataArray>
-        <DataArray type="Float32" Name="x^CO2_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^CO2_liq" NumberOfComponents="1" format="ascii">
           0.000644047 0.000151552 0.0137026 0.00175984 1.40599e-05 3.53244e-05 0.0150473 0.0149832 1.34677e-05 1.03673e-06 0.000226277 1.87253e-06
           1.25246e-07 6.84305e-08 7.62872e-09 4.18871e-09 7.72844e-07 0.00249747 0.0151388 0.015008 0.00954899 0.0151618 0.0150189 0.000744717
           4.92019e-05 4.37613e-08 3.13787e-06 1.86583e-07 4.19264e-10 2.29612e-10 2.34265e-11 1.2392e-11 1.3839e-12 7.83767e-13 7.89181e-14 5.21878e-14
@@ -5426,7 +5426,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0
         </DataArray>
-        <DataArray type="Float32" Name="x^Brine_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Brine_gas" NumberOfComponents="1" format="ascii">
           0.00557222 0.00555526 0.0056453 0.00556292 0.0055548 0.00555878 0.00557722 0.00562654 0.0055432 0.00555036 0.0055469 0.00555536
           0.00555354 0.00554591 0.00555136 0.00554179 0.00553619 0.0055636 0.00548707 0.00560271 0.0055936 0.00546105 0.00558861 0.00553742
           0.00552963 0.00553052 0.00552371 0.00551774 0.00554836 0.00553717 0.00554526 0.0055331 0.0055418 0.00553154 0.00553838 0.00552971
@@ -5745,7 +5745,7 @@
           0.00484129 0.00484942 0.00485891 0.00485647 0.00484656 0.00484434 0.00484764 0.00484326 0.00484283 0.00483811 0.00483399 0.00483596
           0.00482862 0.00482998
         </DataArray>
-        <DataArray type="Float32" Name="x^CO2_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^CO2_gas" NumberOfComponents="1" format="ascii">
           0.994428 0.994445 0.994355 0.994437 0.994445 0.994441 0.994423 0.994373 0.994457 0.99445 0.994453 0.994445
           0.994446 0.994454 0.994449 0.994458 0.994464 0.994436 0.994513 0.994397 0.994406 0.994539 0.994411 0.994463
           0.99447 0.994469 0.994476 0.994482 0.994452 0.994463 0.994455 0.994467 0.994458 0.994468 0.994462 0.99447
diff --git a/test/references/co2nicc-reference.vtu b/test/references/co2nicc-reference.vtu
index d2492adfe51c285169aacfadeb30f74e8020fb60..4abc9a9b2156172465daa906b2b903e652ccc530 100644
--- a/test/references/co2nicc-reference.vtu
+++ b/test/references/co2nicc-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="3667" NumberOfPoints="3794">
-      <CellData Scalars="S_n">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_gas">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0.00651901 0 0 0 0 0 0 0 0.255911 0.0820775
           0.280682 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0.123969 0.315685
@@ -311,7 +311,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 0.993481 1 1 1 1 1 1 1 0.744089 0.917922
           0.719318 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 0.876031 0.684315
@@ -619,7 +619,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           1.39162e+07 1.39223e+07 1.39124e+07 1.38969e+07 1.38911e+07 1.39116e+07 1.38874e+07 1.38695e+07 1.38693e+07 1.38921e+07 1.39229e+07 1.38964e+07
           1.3924e+07 1.38742e+07 1.38636e+07 1.38481e+07 1.38478e+07 1.38267e+07 1.3854e+07 1.38393e+07 1.38266e+07 1.38137e+07 1.37977e+07 1.37792e+07
           1.38291e+07 1.37978e+07 1.38104e+07 1.38056e+07 1.37906e+07 1.37774e+07 1.37547e+07 1.37656e+07 1.37631e+07 1.37367e+07 1.38962e+07 1.39226e+07
@@ -927,7 +927,7 @@
           1.17298e+07 1.17169e+07 1.17007e+07 1.16867e+07 1.1674e+07 1.17257e+07 1.17167e+07 1.17103e+07 1.1701e+07 1.16909e+07 1.16819e+07 1.16767e+07
           1.16783e+07 1.16781e+07 1.16634e+07 1.16524e+07 1.16503e+07 1.16504e+07 1.1648e+07
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           1.39062e+07 1.39123e+07 1.39023e+07 1.38869e+07 1.38811e+07 1.39016e+07 1.38774e+07 1.38595e+07 1.38593e+07 1.38821e+07 1.39112e+07 1.38859e+07
           1.39121e+07 1.38642e+07 1.38536e+07 1.38381e+07 1.38378e+07 1.38167e+07 1.3844e+07 1.38293e+07 1.38166e+07 1.38037e+07 1.37877e+07 1.37692e+07
           1.38191e+07 1.37878e+07 1.38004e+07 1.37956e+07 1.37806e+07 1.37674e+07 1.37447e+07 1.37556e+07 1.37531e+07 1.37267e+07 1.38855e+07 1.39104e+07
@@ -1543,7 +1543,7 @@
           10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
           10000 10000 10000 10000 10000 10000 10000
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           1066.59 1066.08 1073.26 1066.05 1066.15 1066.04 1066.03 1066.03 1066.05 1067.3 1073.64 1073.37
           1073.73 1067.41 1066.18 1066.04 1066.07 1066.07 1066.02 1066.02 1066.01 1066 1066 1065.99
           1066.04 1066.03 1066.04 1066.06 1066.02 1066.01 1066.01 1066.03 1066.05 1066.04 1073.37 1073.89
@@ -1851,7 +1851,7 @@
           1066.43 1066.42 1066.42 1066.41 1066.41 1066.38 1066.37 1066.37 1066.39 1066.39 1066.39 1066.36
           1066.38 1066.37 1066.4 1066.4 1066.38 1066.39 1066.4
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           709.741 710.686 703.09 710.43 710.399 710.524 709.995 709.584 709.991 709.144 710.883 705.168
           712.733 709.425 710.374 709.583 710.092 709.682 709.221 708.856 708.51 708.144 707.727 707.27
           709.194 708.4 708.804 709.292 708.043 707.7 707.269 707.838 708.135 707.453 705.135 715.889
@@ -2159,7 +2159,7 @@
           674.062 673.552 672.932 672.379 671.876 672.302 671.934 671.585 672.2 671.776 671.362 670.381
           671.063 670.797 671.444 670.992 670.332 670.674 670.753
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           1252.25 1250.78 1230.01 1250.07 1249.86 1250.58 1250.43 1250.36 1249.61 1252.23 356.311 877.685
           307.276 1250.87 1248.64 1249.38 1248.43 1248.17 1250.32 1250.28 1250.3 1250.35 1250.34 1250.29
           1249.17 1249.12 1248.99 1247.88 1249.43 1249.43 1249.13 1248.62 1247.96 1247.95 720.144 246.677
@@ -2467,7 +2467,7 @@
           1199.81 1199.8 1199.76 1199.75 1199.74 1201.91 1201.92 1202.04 1200.74 1200.76 1200.83 1201.83
           1201.03 1201.37 1199.76 1199.77 1200.52 1200.08 1199.85
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           0 0 0.0113321 0 0 0 0 0 0 0 585.098 21.6161
           757.237 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 72.7699 1046.7
@@ -2775,7 +2775,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_liq" NumberOfComponents="1" format="ascii">
           55027.9 55077.2 54416.3 55080.7 55072.7 55080.8 55080.7 55080.5 55081.4 54966.6 54429.2 54420.4
           54432.3 54960.3 55073.3 55081.3 55081.9 55082.4 55080.2 55080 55079.7 55079.3 55079 55078.7
           55081.2 55080.6 55081 55082.4 55080.1 55079.8 55079.7 55080.6 55081.4 55080.9 54420.3 54437.6
@@ -3083,7 +3083,7 @@
           55101.2 55101 55100.7 55100.4 55100.2 55098.5 55098.4 55098.1 55099.5 55099.3 55099 55097.6
           55098.7 55098.2 55099.9 55099.7 55098.7 55099.3 55099.5
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_gas" NumberOfComponents="1" format="ascii">
           16181 16202.5 16030 16196.5 16195.8 16198.7 16186.6 16177.2 16186.5 16167.3 16207 16077.1
           16249.1 16173.6 16195.1 16177.1 16188.7 16179.3 16168.9 16160.6 16152.7 16144.3 16134.8 16124.3
           16168.2 16150.1 16159.3 16170.3 16141.9 16134.1 16124.2 16137.2 16143.9 16128.3 16076.4 16320.7
@@ -3391,7 +3391,7 @@
           15361.4 15349.8 15335.6 15322.9 15311.5 15321.3 15313 15305 15318.9 15309.2 15299.8 15277.5
           15293 15286.9 15301.6 15291.2 15276.2 15284 15285.8
         </DataArray>
-        <DataArray type="Float32" Name="X^Brine_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Brine_liq" NumberOfComponents="1" format="ascii">
           0.997347 0.999802 0.96659 0.999965 0.99954 0.999988 0.999999 1 0.999998 0.994192 0.966385 0.966533
           0.966335 0.993793 0.999516 1 0.999966 0.999998 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 0.966534 0.966249
@@ -3699,7 +3699,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="X^CO2_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^CO2_liq" NumberOfComponents="1" format="ascii">
           0.00265271 0.000198319 0.0334104 3.50669e-05 0.000459645 1.15862e-05 7.04087e-07 4.40702e-08 2.21073e-06 0.00580776 0.0336152 0.0334671
           0.033665 0.0062067 0.000483948 1.42153e-07 3.38155e-05 2.33878e-06 2.17466e-09 1.00656e-10 4.8168e-12 2.5107e-13 1.21623e-14 5.52522e-16
           7.82884e-09 1.85343e-11 3.65436e-10 1.39401e-07 1.13265e-12 9.61675e-14 8.00408e-15 1.59533e-12 2.54426e-11 2.45797e-13 0.0334661 0.0337512
@@ -4007,7 +4007,7 @@
           -0 -0 -0 -0 0 -0 -0 -0 -0 -0 -0 -0
           -0 -0 -0 -0 -0 -0 -0
         </DataArray>
-        <DataArray type="Float32" Name="X^Brine_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Brine_gas" NumberOfComponents="1" format="ascii">
           0.00245916 0.00245555 0.00249206 0.00245178 0.0024508 0.00245425 0.00245211 0.00245063 0.00244854 0.00245737 0.00245467 0.00247843
           0.00244544 0.00245237 0.0024455 0.00244639 0.00244378 0.00244151 0.0024494 0.00244822 0.00244733 0.00244649 0.00244528 0.00244375
           0.00244443 0.00244198 0.00244255 0.00243918 0.00244228 0.00244129 0.00243878 0.00243822 0.00243626 0.00243427 0.00247857 0.00242887
@@ -4315,7 +4315,7 @@
           0.00214264 0.00214119 0.00213932 0.00213774 0.0021363 0.00214604 0.00214504 0.00214453 0.00214113 0.00214002 0.00213915 0.00214035
           0.00213909 0.00213968 0.00213515 0.00213395 0.00213504 0.00213426 0.00213359
         </DataArray>
-        <DataArray type="Float32" Name="X^CO2_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^CO2_gas" NumberOfComponents="1" format="ascii">
           0.997541 0.997544 0.997508 0.997548 0.997549 0.997546 0.997548 0.997549 0.997551 0.997543 0.997545 0.997522
           0.997555 0.997548 0.997554 0.997554 0.997556 0.997558 0.997551 0.997552 0.997553 0.997554 0.997555 0.997556
           0.997556 0.997558 0.997557 0.997561 0.997558 0.997559 0.997561 0.997562 0.997564 0.997566 0.997521 0.997571
@@ -4623,7 +4623,7 @@
           0.997857 0.997859 0.997861 0.997862 0.997864 0.997854 0.997855 0.997855 0.997859 0.99786 0.997861 0.99786
           0.997861 0.99786 0.997865 0.997866 0.997865 0.997866 0.997866
         </DataArray>
-        <DataArray type="Float32" Name="x^Brine_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Brine_liq" NumberOfComponents="1" format="ascii">
           0.998831 0.999913 0.985024 0.999985 0.999798 0.999995 1 1 0.999999 0.997437 0.98493 0.984998
           0.984907 0.99726 0.999787 1 0.999985 0.999999 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 0.984998 0.984868
@@ -4931,7 +4931,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="x^CO2_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^CO2_liq" NumberOfComponents="1" format="ascii">
           0.00116857 8.72431e-05 0.0149763 1.54249e-05 0.000202233 5.09639e-06 3.09702e-07 1.93849e-08 9.72422e-07 0.00256296 0.0150698 0.0150022
           0.0150926 0.00273963 0.000212929 6.2528e-08 1.48745e-05 1.02874e-06 9.56554e-10 4.42747e-11 2.11873e-12 1.10437e-13 5.34976e-15 2.43034e-16
           3.44362e-09 8.15255e-12 1.60742e-10 6.13174e-08 4.98209e-13 4.23005e-14 3.5207e-15 7.01728e-13 1.11913e-11 1.08117e-13 0.0150017 0.015132
@@ -5239,7 +5239,7 @@
           -0 -0 -0 -0 0 -0 -0 -0 -0 -0 -0 -0
           -0 -0 -0 -0 -0 -0 -0
         </DataArray>
-        <DataArray type="Float32" Name="x^Brine_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Brine_gas" NumberOfComponents="1" format="ascii">
           0.00557328 0.00556514 0.00564761 0.00555662 0.0055544 0.00556219 0.00555736 0.00555401 0.00554929 0.00556924 0.00556314 0.00561681
           0.00554228 0.00555794 0.00554241 0.00554444 0.00553855 0.00553341 0.00555122 0.00554856 0.00554655 0.00554467 0.00554193 0.00553846
           0.00554 0.00553446 0.00553576 0.00552813 0.00553514 0.0055329 0.00552724 0.00552598 0.00552154 0.00551704 0.00561713 0.00550484
@@ -5547,7 +5547,7 @@
           0.00485789 0.00485461 0.00485039 0.00484681 0.00484356 0.00486559 0.00486332 0.00486216 0.00485447 0.00485198 0.00485 0.00485272
           0.00484986 0.00485119 0.00484095 0.00483824 0.00484071 0.00483894 0.00483744
         </DataArray>
-        <DataArray type="Float32" Name="x^CO2_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^CO2_gas" NumberOfComponents="1" format="ascii">
           0.994427 0.994435 0.994352 0.994443 0.994446 0.994438 0.994443 0.994446 0.994451 0.994431 0.994437 0.994383
           0.994458 0.994442 0.994458 0.994456 0.994461 0.994467 0.994449 0.994451 0.994453 0.994455 0.994458 0.994462
           0.99446 0.994466 0.994464 0.994472 0.994465 0.994467 0.994473 0.994474 0.994478 0.994483 0.994383 0.994495
diff --git a/test/references/column3p3cnibox-reference.vtu b/test/references/column3p3cnibox-reference.vtu
index 295b8855d051e493d824b9ee4eee53f4c26a5885..f65e60e4d10429e9ea1418e0b054137e6c799799 100644
--- a/test/references/column3p3cnibox-reference.vtu
+++ b/test/references/column3p3cnibox-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="120" NumberOfPoints="242">
-      <PointData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_aq">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005
           0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005
           0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005
@@ -26,7 +26,7 @@
           0.00500072 0.00500072 0.00500906 0.00500906 0.00522205 0.00522205 0.033731 0.033731 0.0757099 0.0757099 0.14603 0.14603
           0.165966 0.165966
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0.0001 0.0001 0.0001 0.0001 0.0001 0.0001 0.0001 0.0001 9.99999e-05 9.99999e-05 9.99999e-05 9.99999e-05
           9.99998e-05 9.99998e-05 9.99997e-05 9.99997e-05 9.99997e-05 9.99997e-05 9.99996e-05 9.99996e-05 9.99996e-05 9.99996e-05 9.99995e-05 9.99995e-05
           9.99994e-05 9.99994e-05 9.99994e-05 9.99994e-05 9.99993e-05 9.99993e-05 9.99993e-05 9.99993e-05 9.99992e-05 9.99992e-05 9.99991e-05 9.99991e-05
@@ -49,7 +49,7 @@
           0.138104 0.138104 0.130326 0.130326 0.155334 0.155334 0.207207 0.207207 0.145383 0.145383 0 0
           0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949
           0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949
           0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949
@@ -72,7 +72,7 @@
           0.856896 0.856896 0.864665 0.864665 0.839444 0.839444 0.759062 0.759062 0.778907 0.778907 0.85397 0.85397
           0.834034 0.834034
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           99947.1 99947.1 99947 99947 99946.9 99946.9 99946.8 99946.8 99946.6 99946.6 99946.5 99946.5
           99946.4 99946.4 99946.3 99946.3 99946.2 99946.2 99946.1 99946.1 99945.9 99945.9 99945.8 99945.8
           99945.7 99945.7 99945.6 99945.6 99945.5 99945.5 99945.4 99945.4 99945.2 99945.2 99945.1 99945.1
@@ -95,7 +95,7 @@
           40416.2 40416.2 39429.5 39429.5 41655 41655 53447.5 53447.5 68069 68069 93722 93722
           94949.9 94949.9
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           99947.1 99947.1 99947 99947 99946.9 99946.9 99946.8 99946.8 99946.6 99946.6 99946.5 99946.5
           99946.4 99946.4 99946.3 99946.3 99946.2 99946.2 99946.1 99946.1 99945.9 99945.9 99945.8 99945.8
           99945.7 99945.7 99945.6 99945.6 99945.5 99945.5 99945.4 99945.4 99945.2 99945.2 99945.1 99945.1
@@ -118,7 +118,7 @@
           93297 93297 92307.4 92307.4 94457.9 94457.9 96209.4 96209.4 96045.8 96045.8 93722 93722
           94949.9 94949.9
         </DataArray>
-        <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100000 100000 99999.9 99999.9 99999.8 99999.8 99999.6 99999.6 99999.5 99999.5 99999.4 99999.4
           99999.3 99999.3 99999.2 99999.2 99999.1 99999.1 99998.9 99998.9 99998.8 99998.8 99998.7 99998.7
           99998.6 99998.6 99998.5 99998.5 99998.4 99998.4 99998.2 99998.2 99998.1 99998.1 99998 99998
@@ -141,7 +141,7 @@
           100013 100013 100013 100013 100013 100013 100014 100014 100101 100101 100174 100174
           100274 100274
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661
           997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661
           997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661
@@ -164,7 +164,7 @@
           997.625 997.625 997.519 997.519 996.217 996.217 980.936 980.936 967.239 967.239 964.715 964.715
           958.813 958.813
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465
           860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465
           860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465
@@ -187,7 +187,7 @@
           860.428 860.428 860.036 860.036 855.637 855.637 822.241 822.241 798.951 798.951 796.369 796.369
           791.297 791.297
         </DataArray>
-        <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.19439 1.19439 1.19439 1.19439 1.19439 1.19439 1.19439 1.19439 1.19439 1.19439 1.19438 1.19438
           1.19438 1.19438 1.19438 1.19438 1.19438 1.19438 1.19438 1.19438 1.19438 1.19438 1.19438 1.19438
           1.19437 1.19437 1.19437 1.19437 1.19437 1.19437 1.19437 1.19437 1.19437 1.19437 1.19437 1.19437
@@ -210,7 +210,7 @@
           1.19442 1.19442 1.19308 1.19308 1.17919 1.17919 1.16093 1.16093 1.28186 1.28186 1.11332 1.11332
           0.611265 0.611265
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_aq" NumberOfComponents="1" format="ascii">
           0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996
           0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996
           0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996
@@ -233,7 +233,7 @@
           0.99996 0.99996 0.999959 0.999959 0.999951 0.999951 0.999762 0.999762 0.999383 0.999383 0.999523 0.999523
           0.999982 0.999982
         </DataArray>
-        <DataArray type="Float32" Name="x^xylene_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^xylene_aq" NumberOfComponents="1" format="ascii">
           2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05
           2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05
           2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05
@@ -256,7 +256,7 @@
           2.6324e-05 2.6324e-05 2.70474e-05 2.70474e-05 3.63521e-05 3.63521e-05 0.000231338 0.000231338 0.000616789 0.000616789 0.000477095 0.000477095
           1.8023e-05 1.8023e-05
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_aq" NumberOfComponents="1" format="ascii">
           1.37483e-05 1.37483e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05
           1.37482e-05 1.37482e-05 1.37481e-05 1.37481e-05 1.37481e-05 1.37481e-05 1.37481e-05 1.37481e-05 1.37481e-05 1.37481e-05 1.37481e-05 1.37481e-05
           1.37481e-05 1.37481e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.3748e-05
@@ -279,7 +279,7 @@
           1.3739e-05 1.3739e-05 1.36218e-05 1.36218e-05 1.2432e-05 1.2432e-05 6.307e-06 6.307e-06 2.61175e-07 2.61175e-07 1.35611e-08 1.35611e-08
           3.01356e-10 3.01356e-10
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_napl" NumberOfComponents="1" format="ascii">
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -302,7 +302,7 @@
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10
         </DataArray>
-        <DataArray type="Float32" Name="x^xylene_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^xylene_napl" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -325,7 +325,7 @@
           1 1 1 1 1 1 1 1 1 1 0.702178 0.702178
           0.0220678 0.0220678
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_napl" NumberOfComponents="1" format="ascii">
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -348,7 +348,7 @@
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0282497 0.0282497 0.0282498 0.0282498 0.0282498 0.0282498 0.0282498 0.0282498 0.0282499 0.0282499 0.0282499 0.0282499
           0.0282499 0.0282499 0.02825 0.02825 0.02825 0.02825 0.02825 0.02825 0.0282501 0.0282501 0.0282501 0.0282501
           0.0282501 0.0282501 0.0282502 0.0282502 0.0282502 0.0282502 0.0282502 0.0282502 0.0282503 0.0282503 0.0282503 0.0282503
@@ -371,7 +371,7 @@
           0.0283195 0.0283195 0.0290981 0.0290981 0.0392447 0.0392447 0.265854 0.265854 0.740684 0.740684 0.819991 0.819991
           0.993229 0.993229
         </DataArray>
-        <DataArray type="Float32" Name="x^xylene_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^xylene_gas" NumberOfComponents="1" format="ascii">
           0.00984259 0.00984259 0.0098426 0.0098426 0.00984261 0.00984261 0.00984262 0.00984262 0.00984264 0.00984264 0.00984265 0.00984265
           0.00984266 0.00984266 0.00984267 0.00984267 0.00984268 0.00984268 0.00984269 0.00984269 0.0098427 0.0098427 0.00984272 0.00984272
           0.00984273 0.00984273 0.00984274 0.00984274 0.00984275 0.00984275 0.00984276 0.00984276 0.00984277 0.00984277 0.00984279 0.00984279
@@ -394,7 +394,7 @@
           0.00986655 0.00986655 0.0101377 0.0101377 0.0136252 0.0136252 0.0867073 0.0867073 0.230976 0.230976 0.178534 0.178534
           0.00673766 0.00673766
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
           0.961908 0.961908 0.961908 0.961908 0.961908 0.961908 0.961908 0.961908 0.961908 0.961908 0.961907 0.961907
           0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907
           0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907
diff --git a/test/references/column3p3cnicc-reference.vtu b/test/references/column3p3cnicc-reference.vtu
index 185f78c2e7a789e54f079595a421a57f4c8a31ac..bd77922a68b46cfe9247666f2dcabeee7d8a2850 100644
--- a/test/references/column3p3cnicc-reference.vtu
+++ b/test/references/column3p3cnicc-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="120" NumberOfPoints="242">
-      <CellData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_aq">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005
           0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005
           0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005
@@ -15,7 +15,7 @@
           0.005 0.005 0.00500001 0.00500001 0.00500001 0.00500001 0.00500001 0.00500001 0.005 0.00500001 0.00500001 0.00500001
           0.00500001 0.00500001 0.00500001 0.00500001 0.00500003 0.00500023 0.00500246 0.0050325 0.00759219 0.0625084 0.120604 0.150832
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0.0001 0.0001 0.0001 0.0001 9.99999e-05 9.99998e-05 9.99998e-05 9.99997e-05 9.99997e-05 9.99996e-05 9.99995e-05 9.99995e-05
           9.99994e-05 9.99994e-05 9.99993e-05 9.99992e-05 9.99992e-05 9.99991e-05 9.99991e-05 9.9999e-05 9.99989e-05 9.99989e-05 9.99988e-05 9.99988e-05
           9.99987e-05 9.99987e-05 9.99986e-05 9.99985e-05 9.99985e-05 9.99984e-05 9.99984e-05 9.99983e-05 9.99982e-05 9.99982e-05 9.99981e-05 9.99981e-05
@@ -27,7 +27,7 @@
           0.707095 0.667772 0.626895 0.584499 0.540551 0.494987 0.447792 0.399167 0.349857 0.301726 0.258414 0.224775
           0.202168 0.186288 0.173436 0.162081 0.151753 0.142526 0.133945 0.128229 0.168423 0.171855 0.0632864 0
         </DataArray>
-        <DataArray type="Float32" Name="S_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949
           0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949
           0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949
@@ -39,7 +39,7 @@
           0.287905 0.327228 0.368105 0.410501 0.454449 0.500013 0.547208 0.595833 0.645143 0.693274 0.736586 0.770225
           0.792832 0.808712 0.821564 0.832919 0.843247 0.852474 0.861053 0.866739 0.823984 0.765637 0.81611 0.849168
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           99947.1 99946.9 99946.8 99946.7 99946.6 99946.5 99946.4 99946.2 99946.1 99946 99945.9 99945.8
           99945.7 99945.5 99945.4 99945.3 99945.2 99945.1 99945 99944.8 99944.7 99944.6 99944.5 99944.4
           99944.3 99944.1 99944 99943.9 99943.8 99943.7 99943.6 99943.4 99943.3 99943.2 99943.1 99943
@@ -51,7 +51,7 @@
           45320.7 45223.9 45121.6 45011.8 44891.4 44756.4 44601 44416.6 44192 43914.2 43579.1 43217.7
           42884.8 42576 42252.1 41877 41414.6 40826.5 39981.2 39080.9 43095.5 63575.1 85085.3 94263.8
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           99947.1 99946.9 99946.8 99946.7 99946.6 99946.5 99946.4 99946.2 99946.1 99946 99945.9 99945.8
           99945.7 99945.5 99945.4 99945.3 99945.2 99945.1 99945 99944.8 99944.7 99944.6 99944.5 99944.4
           99944.3 99944.1 99944 99943.9 99943.8 99943.7 99943.6 99943.4 99943.3 99943.2 99943.1 99943
@@ -63,7 +63,7 @@
           98201.8 98105 98002.7 97892.9 97772.5 97637.5 97482.1 97297.8 97073.2 96795.3 96460.2 96098.8
           95765.9 95457.1 95133.3 94758.2 94295.7 93707.6 92861.4 91950.5 95063.7 96201.5 92784 94263.8
         </DataArray>
-        <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           99999.9 99999.8 99999.7 99999.6 99999.5 99999.4 99999.2 99999.1 99999 99998.9 99998.8 99998.7
           99998.5 99998.4 99998.3 99998.2 99998.1 99998 99997.8 99997.7 99997.6 99997.5 99997.4 99997.3
           99997.1 99997 99996.9 99996.8 99996.7 99996.6 99996.4 99996.3 99996.2 99996.1 99996 99995.9
@@ -75,7 +75,7 @@
           100029 100030 100032 100033 100034 100035 100035 100036 100037 100037 100037 100038
           100038 100038 100039 100039 100039 100040 100040 100040 100041 100083 100261 100358
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661
           997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661
           997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661
@@ -87,7 +87,7 @@
           997.637 997.637 997.637 997.637 997.637 997.637 997.636 997.636 997.636 997.636 997.636 997.636
           997.636 997.635 997.635 997.635 997.635 997.632 997.603 997.304 993.633 968.606 966.822 958.85
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465
           860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465
           860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465
@@ -99,7 +99,7 @@
           860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465
           860.465 860.465 860.465 860.465 860.464 860.454 860.347 859.226 848.469 801.198 798.254 791.319
         </DataArray>
-        <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.19439 1.19439 1.19439 1.19439 1.19439 1.19438 1.19438 1.19438 1.19438 1.19438 1.19438 1.19438
           1.19437 1.19437 1.19437 1.19437 1.19437 1.19437 1.19437 1.19436 1.19436 1.19436 1.19436 1.19436
           1.19436 1.19436 1.19435 1.19435 1.19435 1.19435 1.19435 1.19435 1.19435 1.19435 1.19434 1.19434
@@ -111,7 +111,7 @@
           1.19473 1.19475 1.19477 1.19478 1.19479 1.1948 1.19481 1.19482 1.19482 1.19483 1.19483 1.19483
           1.19484 1.19484 1.19485 1.19485 1.19485 1.19482 1.19445 1.19071 1.16157 1.26379 1.28932 0.616499
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_aq" NumberOfComponents="1" format="ascii">
           0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996
           0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996
           0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996
@@ -123,7 +123,7 @@
           0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996
           0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.999958 0.999932 0.999433 0.999367 0.999978
         </DataArray>
-        <DataArray type="Float32" Name="x^xylene_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^xylene_aq" NumberOfComponents="1" format="ascii">
           2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05
           2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05
           2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05
@@ -135,7 +135,7 @@
           2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05
           2.62566e-05 2.62567e-05 2.62567e-05 2.62568e-05 2.62584e-05 2.62764e-05 2.6472e-05 2.85912e-05 5.7154e-05 0.000565966 0.000633245 2.2444e-05
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_aq" NumberOfComponents="1" format="ascii">
           1.37483e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37481e-05 1.37481e-05 1.37481e-05 1.37481e-05 1.37481e-05
           1.37481e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.37479e-05 1.37479e-05 1.37479e-05 1.37479e-05 1.37479e-05 1.37479e-05
           1.37478e-05 1.37478e-05 1.37478e-05 1.37478e-05 1.37478e-05 1.37478e-05 1.37477e-05 1.37477e-05 1.37477e-05 1.37477e-05 1.37477e-05 1.37477e-05
@@ -147,7 +147,7 @@
           1.37524e-05 1.37526e-05 1.37528e-05 1.3753e-05 1.37531e-05 1.37532e-05 1.37533e-05 1.37534e-05 1.37535e-05 1.37535e-05 1.37536e-05 1.37536e-05
           1.37537e-05 1.37537e-05 1.37538e-05 1.37538e-05 1.37536e-05 1.37506e-05 1.37184e-05 1.33911e-05 1.08612e-05 1.02556e-06 3.0255e-08 6.16671e-10
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_napl" NumberOfComponents="1" format="ascii">
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -159,7 +159,7 @@
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
         </DataArray>
-        <DataArray type="Float32" Name="x^xylene_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^xylene_napl" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -171,7 +171,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 0.0275024
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_napl" NumberOfComponents="1" format="ascii">
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -183,7 +183,7 @@
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0282497 0.0282498 0.0282498 0.0282498 0.0282499 0.0282499 0.0282499 0.02825 0.02825 0.02825 0.0282501 0.0282501
           0.0282501 0.0282502 0.0282502 0.0282502 0.0282503 0.0282503 0.0282503 0.0282504 0.0282504 0.0282504 0.0282505 0.0282505
           0.0282505 0.0282506 0.0282506 0.0282506 0.0282507 0.0282507 0.0282507 0.0282508 0.0282508 0.0282508 0.0282509 0.0282509
@@ -195,7 +195,7 @@
           0.0282416 0.0282412 0.0282408 0.0282404 0.0282401 0.0282399 0.0282397 0.0282395 0.0282394 0.0282393 0.0282392 0.0282391
           0.028239 0.0282389 0.0282389 0.0282389 0.0282406 0.0282601 0.0284727 0.0306931 0.0625632 0.677068 0.759958 0.991549
         </DataArray>
-        <DataArray type="Float32" Name="x^xylene_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^xylene_gas" NumberOfComponents="1" format="ascii">
           0.0098426 0.00984261 0.00984262 0.00984263 0.00984264 0.00984265 0.00984266 0.00984268 0.00984269 0.0098427 0.00984271 0.00984272
           0.00984273 0.00984275 0.00984276 0.00984277 0.00984278 0.00984279 0.0098428 0.00984281 0.00984283 0.00984284 0.00984285 0.00984286
           0.00984287 0.00984288 0.00984289 0.00984291 0.00984292 0.00984293 0.00984294 0.00984295 0.00984296 0.00984298 0.00984299 0.009843
@@ -207,7 +207,7 @@
           0.00983977 0.0098396 0.00983947 0.00983935 0.00983925 0.00983917 0.00983909 0.00983904 0.00983899 0.00983895 0.00983892 0.00983889
           0.00983886 0.00983883 0.00983881 0.00983883 0.0098394 0.0098461 0.0099194 0.0107135 0.0214161 0.211982 0.236761 0.00838334
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
           0.961908 0.961908 0.961908 0.961908 0.961908 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907
           0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907
           0.961907 0.961907 0.961906 0.961906 0.961906 0.961906 0.961906 0.961906 0.961906 0.961906 0.961906 0.961906
diff --git a/test/references/combustion-reference.vtp b/test/references/combustion-reference.vtp
index ccdd59325bb992af6b0d0c82e6cb74cd30c39255..b34bba86f202619af83ea92978689c7d828c1151 100644
--- a/test/references/combustion-reference.vtp
+++ b/test/references/combustion-reference.vtp
@@ -2,8 +2,8 @@
 <VTKFile type="PolyData" version="0.1" byte_order="LittleEndian">
   <PolyData>
     <Piece NumberOfLines="199" NumberOfPoints="200">
-      <PointData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_liq">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -22,7 +22,7 @@
           0.00174423 0.00174317 0.00174206 0.00174089 0.00173966 0.00173836 0.00173696 0.00173543 0.00173365 0.00173139 0.00172811 0.00172271
           0.0017129 0.00169447 0.00166027 0.00159955 0.00149836 0.00134248 0.0011336 0.001
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -41,7 +41,7 @@
           0.998256 0.998257 0.998258 0.998259 0.99826 0.998262 0.998263 0.998265 0.998266 0.998269 0.998272 0.998277
           0.998287 0.998305 0.99834 0.9984 0.998502 0.998658 0.998866 0.999
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           100273 100262 100251 100240 100229 100218 100207 100196 100185 100174 100163 100152
           100141 100130 100119 100107 100096 100085 100074 100063 100052 100041 100030 100019
           100008 99997.1 99986.1 99975 99964 99952.9 99941.9 99930.9 99919.8 99908.8 99897.8 99886.7
@@ -60,7 +60,7 @@
           98623.1 98619.1 98614.9 98610.5 98605.9 98601.1 98596.1 98590.8 98585.3 98579.5 98573.4 98567
           98560.4 98553.3 98545.9 98538.1 98529.8 98521 98511.7 98502.1
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100273 100262 100251 100240 100229 100218 100207 100196 100185 100174 100163 100152
           100141 100130 100119 100107 100096 100085 100074 100063 100052 100041 100030 100019
           100008 99997.1 99986.1 99975 99964 99952.9 99941.9 99930.9 99919.8 99908.8 99897.8 99886.7
@@ -79,7 +79,7 @@
           100119 100115 100111 100106 100102 100097 100092 100087 100081 100075 100069 100063
           100056 100049 100042 100034 100026 100018 100009 100000
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           1044 1044 1044 1044 1044 1044 1044 1044 1044 1044 1044 1044
           1044 1044 1044 1044 1044 1044 1044 1044 1044 1044 1044 1044
           1044 1044 1044 1044 1044 1044 1044 1044 1044 1044 1044 1044
@@ -98,7 +98,7 @@
           1044 1044 1044 1044 1044 1044 1044 1044 1044 1044 1044 1044
           1044 1044 1044 1044 1044 1044 1044 1044
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679
           1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679
           1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679
@@ -117,7 +117,7 @@
           1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679
           1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679
         </DataArray>
-        <DataArray type="Float32" Name="lambda_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51
           3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51
           3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51
@@ -136,7 +136,7 @@
           1.88676e-05 1.88332e-05 1.87971e-05 1.87593e-05 1.87195e-05 1.86775e-05 1.86326e-05 1.85832e-05 1.85261e-05 1.84537e-05 1.83493e-05 1.81776e-05
           1.7869e-05 1.72984e-05 1.62719e-05 1.45512e-05 1.19604e-05 8.60249e-06 5.17936e-06 3.55551e-06
         </DataArray>
-        <DataArray type="Float32" Name="lambda_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -174,7 +174,7 @@
           0.35 0.35 0.35 0.35 0.35 0.35 0.35 0.35 0.35 0.35 0.35 0.35
           0.35 0.35 0.35 0.35 0.35 0.35 0.35 0.35
         </DataArray>
-        <DataArray type="Float32" Name="x^SimpleH2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^SimpleH2O_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -193,7 +193,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 0.406912
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_liq" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           -0 -0 -0 -0 -0 -0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -212,7 +212,7 @@
           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="x^SimpleH2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^SimpleH2O_gas" NumberOfComponents="1" format="ascii">
           0.03529 0.0352982 0.0353048 0.0353116 0.0353187 0.0353262 0.035334 0.0353423 0.035351 0.0353603 0.0353701 0.0353805
           0.0353917 0.0354036 0.0354164 0.0354301 0.0354449 0.0354608 0.0354781 0.0354967 0.0355169 0.0355389 0.0355628 0.0355889
           0.0356173 0.0356483 0.0356822 0.0357194 0.0357601 0.0358048 0.0358539 0.0359078 0.0359671 0.0360324 0.0361043 0.0361836
@@ -231,7 +231,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           -0 -0 -0 -0 -0 -0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -250,7 +250,7 @@
           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="T_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T_liq" NumberOfComponents="1" format="ascii">
           300.01 300.012 300.013 300.015 300.016 300.018 300.02 300.022 300.024 300.027 300.03 300.033
           300.036 300.04 300.044 300.049 300.054 300.06 300.067 300.074 300.081 300.09 300.1 300.11
           300.122 300.135 300.149 300.165 300.183 300.202 300.223 300.247 300.273 300.302 300.335 300.37
@@ -269,7 +269,7 @@
           372.789 372.788 372.787 372.786 372.784 372.783 372.782 372.78 372.779 372.777 372.775 372.774
           372.772 372.77 372.768 372.766 372.763 372.761 372.758 400
         </DataArray>
-        <DataArray type="Float32" Name="T_solid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T_Solid" NumberOfComponents="1" format="ascii">
           300.011 300.012 300.013 300.015 300.016 300.018 300.02 300.022 300.024 300.027 300.03 300.033
           300.037 300.04 300.045 300.049 300.055 300.061 300.067 300.074 300.082 300.091 300.1 300.111
           300.123 300.136 300.15 300.166 300.184 300.203 300.225 300.249 300.275 300.304 300.337 300.372
@@ -288,7 +288,7 @@
           372.789 372.788 372.787 372.786 372.784 372.783 372.782 372.78 372.779 372.777 372.775 372.774
           372.772 372.77 372.768 372.766 372.763 372.761 372.758 400
         </DataArray>
-        <DataArray type="Float32" Name="reynoldsNumber_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="reynoldsNumber_liq" NumberOfComponents="1" format="ascii">
           0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878
           0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878
           0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878
@@ -307,7 +307,7 @@
           0.000357284 0.000356599 0.000355882 0.000355128 0.000354331 0.000353478 0.000352542 0.000351459 0.000350085 0.000348104 0.000344847 0.000338991
           0.000328164 0.000308687 0.00027604 0.000226887 0.000163183 9.82459e-05 6.74467e-05 6.74467e-05
         </DataArray>
-        <DataArray type="Float32" Name="nusseltNumber_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="nusseltNumber_liq" NumberOfComponents="1" format="ascii">
           3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375
           3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375
           3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375
@@ -326,7 +326,7 @@
           2.01132 2.0113 2.01129 2.01128 2.01126 2.01124 2.01123 2.01121 2.01118 2.01114 2.01108 2.01097
           2.01075 2.01037 2.00969 2.00862 2.00707 2.00522 2.00416 2.00416
         </DataArray>
-        <DataArray type="Float32" Name="prandtlNumber_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="prandtlNumber_liq" NumberOfComponents="1" format="ascii">
           1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419
           1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419
           1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419
@@ -345,7 +345,7 @@
           1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419
           1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419
         </DataArray>
-        <DataArray type="Float32" Name="reynoldsNumber_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="reynoldsNumber_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -364,7 +364,7 @@
           20.8219 20.8219 20.8219 20.8219 20.822 20.822 20.822 20.822 20.8221 20.8221 20.8221 20.8222
           20.8222 20.8222 20.8223 20.8223 20.8224 20.8224 20.8225 20.8225
         </DataArray>
-        <DataArray type="Float32" Name="nusseltNumber_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="nusseltNumber_gas" NumberOfComponents="1" format="ascii">
           2 2 2 2 2 2 2 2 2 2 2 2
           2 2 2 2 2 2 2 2 2 2 2 2
           2 2 2 2 2 2 2 2 2 2 2 2
@@ -383,7 +383,7 @@
           8.76243 8.76243 8.76244 8.76244 8.76245 8.76245 8.76245 8.76246 8.76247 8.76247 8.76248 8.76249
           8.76249 8.7625 8.76251 8.76251 8.76252 8.76253 8.76256 8.76256
         </DataArray>
-        <DataArray type="Float32" Name="prandtlNumber_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="prandtlNumber_gas" NumberOfComponents="1" format="ascii">
           0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545
           0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545
           0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545
@@ -403,8 +403,8 @@
           0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545
         </DataArray>
       </PointData>
-      <CellData Scalars="velocity_w (m/s)">
-        <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="velocity_liq (m/s)">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="1" format="ascii">
           0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927
           0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927
           0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927
@@ -423,7 +423,7 @@
           -1.92505e-07 -1.92136e-07 -1.91749e-07 -1.91343e-07 -1.90913e-07 -1.90454e-07 -1.8995e-07 -1.89366e-07 -1.88626e-07 -1.87558e-07 -1.85803e-07 -1.82648e-07
           -1.76815e-07 -1.6632e-07 -1.4873e-07 -1.22247e-07 -8.79229e-08 -5.29349e-08 -3.63403e-08
         </DataArray>
-        <DataArray type="Float32" Name="velocity_n (m/s)" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/el2p_2p_reference.vtu b/test/references/el2p_2p_reference.vtu
index e0a279f254a2023ea81c0e142294102db84a6d94..9c5680a80352681899e2e829288235a780ef98fe 100644
--- a/test/references/el2p_2p_reference.vtu
+++ b/test/references/el2p_2p_reference.vtu
@@ -19,7 +19,7 @@
           17569.9 17569.9 17569.9 17569.9 17569.9 17569.9 17569.9 17569.9 17569.9 17569.9 17569.9 17569.9
           17569.9 17569.9 17569.9 17569.9
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 0.999993 0.999993 1
           1 0.999993 0.999993 1 1 1 1 1 1 1 1 1
@@ -27,7 +27,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07
           1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.50158e+07 1.50158e+07 1.5e+07
           1.5e+07 1.50158e+07 1.50158e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07
@@ -35,7 +35,7 @@
           1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07 1.5e+07
           1.5e+07 1.5e+07 1.5e+07 1.5e+07
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           1077.65 1077.65 1077.65 1077.65 1077.65 1077.65 1077.65 1077.65 1077.65 1077.65 1077.65 1077.65
           1077.65 1077.65 1077.65 1077.65 1077.65 1077.65 1077.65 1077.65 1077.65 1077.66 1077.66 1077.65
           1077.65 1077.66 1077.66 1077.65 1077.65 1077.65 1077.65 1077.65 1077.65 1077.65 1077.65 1077.65
@@ -43,7 +43,7 @@
           1077.65 1077.65 1077.65 1077.65 1077.65 1077.65 1077.65 1077.65 1077.65 1077.65 1077.65 1077.65
           1077.65 1077.65 1077.65 1077.65
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           692.437 692.437 692.437 692.437 692.437 692.437 692.437 692.437 692.437 692.437 692.437 692.437
           692.437 692.437 692.437 692.437 692.437 692.437 692.437 692.437 692.437 692.437 692.437 692.437
           692.437 692.437 692.437 692.437 692.437 692.437 692.437 692.437 692.437 692.437 692.437 692.437
@@ -51,7 +51,7 @@
           692.437 692.437 692.437 692.437 692.437 692.437 692.437 692.437 692.437 692.437 692.437 692.437
           692.437 692.437 692.437 692.437
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 6.78881e-06 6.78881e-06 0
           0 6.78881e-06 6.78881e-06 0 0 0 0 0 0 0 0 0
@@ -59,7 +59,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07
           1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50333e+07 1.50334e+07 1.50176e+07
           1.50176e+07 1.50334e+07 1.50334e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07
@@ -67,7 +67,7 @@
           1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07 1.50175e+07 1.50176e+07
           1.50176e+07 1.50176e+07 1.50176e+07 1.50176e+07
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           920.518 920.518 920.518 920.518 920.518 920.518 920.518 920.518 920.518 920.518 920.518 920.518
           920.518 920.518 920.518 920.518 920.518 920.518 920.518 920.518 920.518 920.629 920.629 920.518
           920.518 920.629 920.629 920.518 920.518 920.518 920.518 920.518 920.518 920.518 920.518 920.518
@@ -75,7 +75,7 @@
           920.518 920.518 920.518 920.518 920.518 920.518 920.518 920.518 920.518 920.518 920.518 920.518
           920.518 920.518 920.518 920.518
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/evaporationatmosphere-reference.vtu b/test/references/evaporationatmosphere-reference.vtu
index 2a749f8f1e75da6b1062773da2e7e5eeaf6f40d5..d7f9bf72e553d4bb7766adc262a784bba058f2c8 100644
--- a/test/references/evaporationatmosphere-reference.vtu
+++ b/test/references/evaporationatmosphere-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="420" NumberOfPoints="465">
-      <PointData Scalars="S_w" Vectors="velocity_w (m/s)">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_liq" Vectors="velocity_liq (m/s)">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           0.826778 0.826778 0.802471 0.802471 0.826778 0.802471 0.826778 0.802471 0.826777 0.80247 0.826777 0.80247
           0.826776 0.802469 0.826776 0.802468 0.826775 0.802468 0.826774 0.802467 0.826774 0.802467 0.826773 0.802466
           0.826773 0.802466 0.826773 0.802466 0.826773 0.802465 0.800574 0.800574 0.800574 0.800573 0.800573 0.800572
@@ -44,7 +44,7 @@
           0.0001 0.0001 0.0001 0.0001 0.0001 0.0001 9.99972e-05 9.99972e-05 9.99972e-05 9.99972e-05 9.99972e-05 9.99972e-05
           9.99972e-05 9.99972e-05 9.99972e-05 9.99972e-05 9.99972e-05 9.99972e-05 9.99972e-05 9.99972e-05 0.0001
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.173222 0.173222 0.197529 0.197529 0.173222 0.197529 0.173222 0.197529 0.173223 0.19753 0.173223 0.19753
           0.173224 0.197531 0.173224 0.197532 0.173225 0.197532 0.173226 0.197533 0.173226 0.197533 0.173227 0.197534
           0.173227 0.197534 0.173227 0.197534 0.173227 0.197535 0.199426 0.199426 0.199426 0.199427 0.199427 0.199428
@@ -85,7 +85,7 @@
           0.9999 0.9999 0.9999 0.9999 0.9999 0.9999 0.9999 0.9999 0.9999 0.9999 0.9999 0.9999
           0.9999 0.9999 0.9999 0.9999 0.9999 0.9999 0.9999 0.9999 0.9999
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           98451.4 98451.3 98230.6 98230.5 98450.9 98230.1 98450.4 98229.6 98449.7 98228.9 98449 98228.2
           98448.2 98227.4 98447.4 98226.5 98446.5 98225.7 98445.7 98224.9 98444.9 98224.1 98444.2 98223.3
           98443.6 98222.7 98443.1 98222.3 98443 98222.1 98092.4 98092.2 98091.8 98091.3 98090.6 98089.8
@@ -126,7 +126,7 @@
           100004 100003 100002 100001 100000 100000 100012 100011 100010 100009 100008 100007
           100006 100005 100004 100003 100002 100001 100001 100000 100000
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100906 100906 100712 100712 100906 100712 100905 100711 100904 100710 100904 100710
           100903 100709 100902 100708 100901 100707 100900 100706 100900 100706 100899 100705
           100898 100704 100898 100704 100898 100704 100576 100576 100575 100575 100574 100573
@@ -167,7 +167,7 @@
           100004 100003 100002 100001 100000 100000 100012 100011 100010 100009 100008 100007
           100006 100005 100004 100003 100002 100001 100001 100000 100000
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232
           998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232
           998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232
@@ -208,7 +208,7 @@
           998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232
           998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.1508 1.1508 1.14857 1.14857 1.1508 1.14857 1.15079 1.14856 1.15079 1.14855 1.15078 1.14855
           1.15077 1.14854 1.15076 1.14853 1.15075 1.14852 1.15074 1.14851 1.15073 1.1485 1.15072 1.14849
           1.15071 1.14848 1.15071 1.14848 1.15071 1.14848 1.14701 1.14701 1.147 1.147 1.14699 1.14698
@@ -249,7 +249,7 @@
           1.149 1.14899 1.14898 1.14897 1.14896 1.14896 1.1491 1.14908 1.14907 1.14906 1.14905 1.14904
           1.14903 1.14902 1.149 1.14899 1.14898 1.14897 1.14896 1.14896 1.14896
         </DataArray>
-        <DataArray type="Float32" Name="lambda_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           489.117 489.117 437.596 437.596 489.116 437.596 489.115 437.595 489.114 437.594 489.113 437.593
           489.112 437.592 489.111 437.591 489.109 437.59 489.108 437.588 489.107 437.587 489.106 437.586
           489.105 437.586 489.104 437.585 489.104 437.585 433.75 433.75 433.749 433.749 433.748 433.746
@@ -290,7 +290,7 @@
           6.41311e-10 6.41311e-10 6.41311e-10 6.41311e-10 6.41311e-10 6.41311e-10 6.41255e-10 6.41255e-10 6.41255e-10 6.41255e-10 6.41255e-10 6.41255e-10
           6.41255e-10 6.41255e-10 6.41255e-10 6.41255e-10 6.41255e-10 6.41255e-10 6.41255e-10 6.41255e-10 6.41311e-10
         </DataArray>
-        <DataArray type="Float32" Name="lambda_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           483.894 483.895 710.469 710.47 483.896 710.472 483.899 710.476 483.903 710.48 483.907 710.486
           483.912 710.492 483.917 710.498 483.922 710.505 483.926 710.511 483.931 710.517 483.935 710.522
           483.938 710.525 483.94 710.528 483.941 710.528 730.569 730.57 730.573 730.577 730.583 730.589
@@ -372,7 +372,7 @@
           0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99
           0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988
           0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988
           0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988
@@ -413,7 +413,7 @@
           0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988
           0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_liq" NumberOfComponents="1" format="ascii">
           1.22764e-05 1.22764e-05 1.22735e-05 1.22735e-05 1.22764e-05 1.22735e-05 1.22764e-05 1.22735e-05 1.22763e-05 1.22734e-05 1.22763e-05 1.22734e-05
           1.22763e-05 1.22734e-05 1.22763e-05 1.22734e-05 1.22763e-05 1.22733e-05 1.22762e-05 1.22733e-05 1.22762e-05 1.22733e-05 1.22762e-05 1.22733e-05
           1.22762e-05 1.22733e-05 1.22762e-05 1.22732e-05 1.22762e-05 1.22732e-05 1.22695e-05 1.22695e-05 1.22695e-05 1.22695e-05 1.22694e-05 1.22694e-05
@@ -454,7 +454,7 @@
           1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05
           1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0229976 0.0229976 0.0230419 0.0230419 0.0229977 0.023042 0.0229978 0.0230421 0.022998 0.0230423 0.0229982 0.0230424
           0.0229983 0.0230426 0.0229985 0.0230428 0.0229987 0.023043 0.0229989 0.0230432 0.0229991 0.0230434 0.0229993 0.0230435
           0.0229994 0.0230437 0.0229995 0.0230438 0.0229995 0.0230438 0.023073 0.0230731 0.0230732 0.0230733 0.0230735 0.0230736
@@ -495,7 +495,7 @@
           0.00232059 0.00232059 0.00232059 0.00232059 0.00232059 0.00232059 0.00232059 0.00232059 0.00232059 0.00232059 0.00232059 0.00232059
           0.00232059 0.00232059 0.00232059 0.00232059 0.00232059 0.00232059 0.00232059 0.00232059 0.00232059
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_gas" NumberOfComponents="1" format="ascii">
           0.977002 0.977002 0.976958 0.976958 0.977002 0.976958 0.977002 0.976958 0.977002 0.976958 0.977002 0.976958
           0.977002 0.976957 0.977001 0.976957 0.977001 0.976957 0.977001 0.976957 0.977001 0.976957 0.977001 0.976956
           0.977001 0.976956 0.977001 0.976956 0.977 0.976956 0.976927 0.976927 0.976927 0.976927 0.976927 0.976926
@@ -536,7 +536,7 @@
           0.997679 0.997679 0.997679 0.997679 0.997679 0.997679 0.997679 0.997679 0.997679 0.997679 0.997679 0.997679
           0.997679 0.997679 0.997679 0.997679 0.997679 0.997679 0.997679 0.997679 0.997679
         </DataArray>
-        <DataArray type="Float32" Name="T_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T_liq" NumberOfComponents="1" format="ascii">
           293 293 293 293 293 293 293 293 293 293 293 293
           293 293 293 293 293 293 293 293 293 293 293 293
           293 293 293 293 293 293 293 293 293 293 293 293
@@ -577,7 +577,7 @@
           293 293 293 293 293 293 293 293 293 293 293 293
           293 293 293 293 293 293 293 293 293
         </DataArray>
-        <DataArray type="Float32" Name="T_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T_gas" NumberOfComponents="1" format="ascii">
           293 293 293 293 293 293 293 293 293 293 293 293
           293 293 293 293 293 293 293 293 293 293 293 293
           293 293 293 293 293 293 293 293 293 293 293 293
@@ -659,7 +659,7 @@
           293 293 293 293 293 293 293 293 293 293 293 293
           293 293 293 293 293 293 293 293 293
         </DataArray>
-        <DataArray type="Float32" Name="reynoldsNumber_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="reynoldsNumber_liq" NumberOfComponents="1" format="ascii">
           0.00210154 0.0021015 0.00235722 0.00235713 0.0021014 0.00235694 0.00210129 0.00235674 0.00210121 0.00235658 0.00210114 0.00235647
           0.0021011 0.00235638 0.00210106 0.00235631 0.00210102 0.00235624 0.00210098 0.00235616 0.00210091 0.00235603 0.00210081 0.00235585
           0.00210065 0.00235557 0.00210049 0.00235527 0.00210042 0.00235512 0.0026347 0.00263452 0.00263414 0.00263377 0.00263347 0.00263325
@@ -700,7 +700,7 @@
           6.22631e-08 6.22639e-08 6.22658e-08 6.22706e-08 6.22861e-08 6.23236e-08 6.23051e-08 6.22685e-08 6.2261e-08 6.22604e-08 6.22601e-08 6.226e-08
           6.226e-08 6.226e-08 6.226e-08 6.22602e-08 6.22606e-08 6.22617e-08 6.22643e-08 6.22757e-08 6.23212e-08
         </DataArray>
-        <DataArray type="Float32" Name="nusseltNumber_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="nusseltNumber_liq" NumberOfComponents="1" format="ascii">
           2.05213 2.05213 2.05585 2.05585 2.05213 2.05584 2.05213 2.05584 2.05213 2.05584 2.05212 2.05584
           2.05212 2.05584 2.05212 2.05583 2.05212 2.05583 2.05212 2.05583 2.05212 2.05583 2.05212 2.05583
           2.05212 2.05582 2.05211 2.05582 2.05211 2.05582 2.0597 2.0597 2.0597 2.05969 2.05969 2.05968
@@ -741,7 +741,7 @@
           2.0001 2.0001 2.0001 2.0001 2.0001 2.0001 2.0001 2.0001 2.0001 2.0001 2.0001 2.0001
           2.0001 2.0001 2.0001 2.0001 2.0001 2.0001 2.0001 2.0001 2.0001
         </DataArray>
-        <DataArray type="Float32" Name="prandtlNumber_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="prandtlNumber_liq" NumberOfComponents="1" format="ascii">
           7.02294 7.02294 7.02295 7.02295 7.02294 7.02295 7.02294 7.02295 7.02294 7.02295 7.02294 7.02295
           7.02294 7.02295 7.02294 7.02295 7.02294 7.02295 7.02294 7.02295 7.02294 7.02295 7.02294 7.02295
           7.02294 7.02295 7.02294 7.02295 7.02294 7.02295 7.02295 7.02295 7.02295 7.02295 7.02295 7.02295
@@ -782,7 +782,7 @@
           7.02293 7.02293 7.02293 7.02293 7.02293 7.02293 7.02293 7.02293 7.02293 7.02293 7.02293 7.02293
           7.02293 7.02293 7.02293 7.02293 7.02293 7.02293 7.02293 7.02293 7.02293
         </DataArray>
-        <DataArray type="Float32" Name="reynoldsNumber_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="reynoldsNumber_gas" NumberOfComponents="1" format="ascii">
           0.000138994 0.000138997 0.000155125 0.000155134 0.000139004 0.000155153 0.000139012 0.000155172 0.000139019 0.000155188 0.000139023 0.000155199
           0.000139027 0.000155208 0.000139029 0.000155214 0.000139032 0.000155221 0.000139035 0.000155228 0.000139039 0.00015524 0.000139047 0.000155257
           0.000139057 0.000155284 0.000139069 0.000155313 0.000139074 0.000155327 0.000172335 0.000172355 0.000172396 0.000172438 0.00017247 0.000172493
@@ -823,7 +823,7 @@
           488.125 480.112 460.251 410.541 323.864 408.653 741.767 611.777 517.472 502.51 496.772 494.578
           493.522 492.611 491.006 487.235 477.855 454.201 395.929 222.451 337.512
         </DataArray>
-        <DataArray type="Float32" Name="nusseltNumber_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="nusseltNumber_gas" NumberOfComponents="1" format="ascii">
           2.00474 2.00474 2.00506 2.00506 2.00474 2.00506 2.00474 2.00506 2.00474 2.00506 2.00474 2.00506
           2.00474 2.00506 2.00474 2.00506 2.00474 2.00506 2.00474 2.00506 2.00474 2.00507 2.00474 2.00507
           2.00474 2.00507 2.00474 2.00507 2.00474 2.00507 2.00539 2.00539 2.00539 2.00539 2.0054 2.0054
@@ -864,7 +864,7 @@
           41.9185 41.524 40.5347 37.9807 33.2085 37.8813 53.3116 47.71 43.3416 42.6202 42.3412 42.2343
           42.1827 42.1382 42.0597 41.8748 41.4124 40.23 37.2067 26.9113 33.9911
         </DataArray>
-        <DataArray type="Float32" Name="prandtlNumber_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="prandtlNumber_gas" NumberOfComponents="1" format="ascii">
           0.701122 0.701122 0.701142 0.701142 0.701122 0.701142 0.701122 0.701142 0.701122 0.701142 0.701122 0.701142
           0.701122 0.701142 0.701122 0.701142 0.701122 0.701142 0.701122 0.701142 0.701122 0.701142 0.701122 0.701142
           0.701122 0.701142 0.701122 0.701142 0.701122 0.701142 0.701156 0.701156 0.701156 0.701156 0.701156 0.701156
@@ -905,7 +905,7 @@
           0.691811 0.691811 0.691811 0.691811 0.691811 0.691811 0.691811 0.691811 0.691811 0.691811 0.691811 0.691811
           0.691811 0.691811 0.691811 0.691811 0.691811 0.691811 0.691811 0.691811 0.691811
         </DataArray>
-        <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           8.67434e-09 -2.1172e-05 0 1.6596e-08 -2.11716e-05 0 8.04171e-09 -2.37478e-05 0 1.52964e-08 -2.37469e-05 0
           3.07023e-08 -2.11705e-05 0 2.80863e-08 -2.3745e-05 0 4.12191e-08 -2.11694e-05 0 3.74271e-08 -2.3743e-05 0
           4.83799e-08 -2.11686e-05 0 4.36927e-08 -2.37414e-05 0 5.29412e-08 -2.11679e-05 0 4.76527e-08 -2.37402e-05 0
@@ -1024,7 +1024,7 @@
           8.06468e-15 -6.27244e-12 0 7.66374e-15 -6.27255e-12 0 6.66777e-15 -6.27281e-12 0 3.3973e-15 -6.27397e-12 0
           8.35171e-16 -6.27855e-12 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_n (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_gas (m/s)" NumberOfComponents="3" format="ascii">
           8.57643e-09 2.10005e-05 0 1.64083e-08 2.1001e-05 0 1.30484e-08 2.34834e-05 0 2.4819e-08 2.34847e-05 0
           3.0354e-08 2.10022e-05 0 4.5569e-08 2.34876e-05 0 4.07501e-08 2.10035e-05 0 6.07216e-08 2.34907e-05 0
           4.78284e-08 2.10046e-05 0 7.08847e-08 2.34932e-05 0 5.23371e-08 2.10055e-05 0 7.7308e-08 2.34951e-05 0
diff --git a/test/references/forchheimer1p-reference.vtp b/test/references/forchheimer1p-reference.vtp
index e33689f7fd6f388cb87f5d84c56c9f1de4bc8858..d426affc8bb404d01b53c7e968c1c12169705bb5 100644
--- a/test/references/forchheimer1p-reference.vtp
+++ b/test/references/forchheimer1p-reference.vtp
@@ -2,8 +2,8 @@
 <VTKFile type="PolyData" version="0.1" byte_order="LittleEndian">
   <PolyData>
     <Piece NumberOfLines="100" NumberOfPoints="101">
-      <PointData Scalars="S_liquid">
-        <DataArray type="Float32" Name="S_liquid" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_liq">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -25,7 +25,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="p_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           4.2e+06 4.159e+06 4.118e+06 4.077e+06 4.036e+06 3.995e+06 3.954e+06 3.913e+06 3.872e+06 3.831e+06 3.79e+06 3.749e+06
           3.708e+06 3.667e+06 3.626e+06 3.585e+06 3.544e+06 3.503e+06 3.462e+06 3.421e+06 3.38e+06 3.339e+06 3.298e+06 3.257e+06
           3.216e+06 3.175e+06 3.134e+06 3.093e+06 3.052e+06 3.011e+06 2.97e+06 2.929e+06 2.888e+06 2.847e+06 2.806e+06 2.765e+06
@@ -47,7 +47,7 @@
           756000 715000 674000 633000 592000 551000 510000 469000 428000 387000 346000 305000
           264000 223000 182000 141000 100000
         </DataArray>
-        <DataArray type="Float32" Name="rho_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -69,7 +69,7 @@
           8.69134 8.21999 7.74863 7.27727 6.80592 6.33456 5.86321 5.39185 4.9205 4.44914 3.97778 3.50643
           3.03507 2.56372 2.09236 1.621 1.14965
         </DataArray>
-        <DataArray type="Float32" Name="lambda_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="lambda_liq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -102,7 +102,7 @@
           0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3
           0.3 0.3 0.3 0.3 0.3
         </DataArray>
-        <DataArray type="Float32" Name="x_liquid^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
           0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
           0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
@@ -113,7 +113,7 @@
           0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
           0.99999 0.99999 0.99999 0.99999 0.99999
         </DataArray>
-        <DataArray type="Float32" Name="x_liquid^Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_liq" NumberOfComponents="1" format="ascii">
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
@@ -124,7 +124,7 @@
           1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
           1e-05 1e-05 1e-05 1e-05 1e-05
         </DataArray>
-        <DataArray type="Float32" Name="x_gas^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.000754694 0.000762134 0.000769722 0.000777463 0.000785361 0.000793421 0.000801648 0.000810047 0.000818625 0.000827386 0.000836336 0.000845483
           0.000854831 0.000864389 0.000874163 0.00088416 0.000894389 0.000904857 0.000915573 0.000926546 0.000937786 0.000949301 0.000961102 0.000973201
           0.000985608 0.000998335 0.0010114 0.0010248 0.00103857 0.00105271 0.00106724 0.00108218 0.00109755 0.00111335 0.00112962 0.00114637
@@ -135,7 +135,7 @@
           0.00419274 0.00443317 0.00470284 0.00500745 0.00535425 0.00575266 0.00621513 0.00675845 0.00740588 0.00819048 0.00916103 0.0103925
           0.0120065 0.014214 0.017416 0.0224802 0.0316972
         </DataArray>
-        <DataArray type="Float32" Name="x_gas^Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
           0.0172002 0.0173698 0.0175427 0.0177192 0.0178992 0.0180829 0.0182704 0.0184618 0.0186573 0.018857 0.019061 0.0192694
           0.0194825 0.0197003 0.0199231 0.0201509 0.020384 0.0206226 0.0208668 0.0211169 0.0213731 0.0216355 0.0219045 0.0221802
           0.022463 0.0227531 0.0230507 0.0233563 0.0236701 0.0239924 0.0243236 0.0246641 0.0250142 0.0253744 0.0257452 0.026127
@@ -146,7 +146,7 @@
           0.0955569 0.101036 0.107183 0.114125 0.122029 0.131109 0.141649 0.154032 0.168787 0.186669 0.208789 0.236856
           0.27364 0.323951 0.396929 0.512348 0.72241
         </DataArray>
-        <DataArray type="Float32" Name="velocity_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq" NumberOfComponents="1" format="ascii">
           0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908
           0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908
           0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908
diff --git a/test/references/forchheimer2p-reference.vtu b/test/references/forchheimer2p-reference.vtu
index 3f3b745a0e09754810d3b100868326f5add7b65c..8c25365e6b89af2596ae94f9881b1a37f24e2385 100644
--- a/test/references/forchheimer2p-reference.vtu
+++ b/test/references/forchheimer2p-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="384" NumberOfPoints="425">
-      <PointData Scalars="S_w" Vectors="velocity_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_liq" Vectors="velocity_liq">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 0.995833 0.994734 0.345468 0.327863 0.00191966 0.00193312
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -41,7 +41,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0.00416677 0.00526642 0.654532 0.672137 0.99808 0.998067
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -79,7 +79,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           4.2e+06 3.21646e+06 4.2e+06 3.19932e+06 2.21034e+06 2.19108e+06 1.19287e+06 1.17294e+06 190282 192864 166611 167072
           150604 150718 136555 136576 125111 125100 116438 116416 110310 110285 106246 106220
           103689 103663 102145 102120 101243 101217 100727 100702 100437 100412 100277 100252
@@ -117,7 +117,7 @@
           124865 116165 110050 106008 103470 101941 101048 100538 100253 100096 100011 99967.1
           99946.4 99940 99944.4 99960.1 100000
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           4.2e+06 3.21646e+06 4.2e+06 3.19932e+06 2.21034e+06 2.19108e+06 1.19287e+06 1.17294e+06 190282 192864 166611 167072
           150604 150718 136555 136576 125111 125100 116438 116416 110310 110285 106246 106220
           103689 103663 102145 102120 101243 101217 100727 100702 100437 100412 100277 100252
@@ -155,7 +155,7 @@
           124865 116165 110050 106008 103470 101941 101048 100538 100253 100096 100011 99967.1
           99946.4 99940 99944.4 99960.1 100000
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           998.893 998.45 998.893 998.443 997.998 997.989 997.54 997.531 997.088 997.089 997.078 997.078
           997.07 997.07 997.064 997.064 997.059 997.059 997.055 997.055 997.052 997.052 997.05 997.05
           997.049 997.049 997.049 997.049 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048
@@ -193,7 +193,7 @@
           997.059 997.055 997.052 997.05 997.049 997.049 997.048 997.048 997.048 997.048 997.048 997.048
           997.048 997.048 997.048 997.048 997.048
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           30.5224 36.2557 30.5224 36.0623 24.9539 24.7369 13.4672 13.242 2.13749 2.16666 1.86999 1.87521
           1.69229 1.69356 1.53642 1.53664 1.40849 1.40837 1.31107 1.31083 1.2421 1.24182 1.19634 1.19605
           1.16755 1.16726 1.15017 1.14988 1.14001 1.13972 1.1342 1.13392 1.13094 1.13066 1.12913 1.12885
@@ -231,7 +231,7 @@
           1.40572 1.308 1.23917 1.19366 1.16509 1.14787 1.13781 1.13207 1.12886 1.12709 1.12614 1.12564
           1.12541 1.12534 1.12539 1.12556 1.12601
         </DataArray>
-        <DataArray type="Float32" Name="lambda_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="lambda_liq" NumberOfComponents="1" format="ascii">
           1124.29 1124.11 1124.29 1124.11 1123.94 1123.93 1123.58 1123.47 378.516 357.636 0.0369811 0.0375027
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -269,7 +269,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="lambda_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="lambda_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 8.84889 14.1742 37629.7 38684.3 56744.9 56744.8
           56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7
           56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7
@@ -345,7 +345,7 @@
           0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3
           0.3 0.3 0.3 0.3 0.3
         </DataArray>
-        <DataArray type="Float32" Name="x_w^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           1 0.999948 1 0.999949 0.999864 0.999861 0.999862 0.999864 0.999978 0.999978 0.999981 0.999981
           0.751833 0.753531 0.525737 0.526604 0.415831 0.416002 0.370333 0.370295 0.348268 0.348192 0.3352 0.335119
           0.32712 0.327039 0.322251 0.32217 0.319403 0.319323 0.317776 0.317697 0.316863 0.316784 0.316356 0.316278
@@ -383,7 +383,7 @@
           0.415482 0.369515 0.347449 0.334449 0.326431 0.321606 0.318788 0.31718 0.31628 0.315785 0.315518 0.315379
           0.315313 0.315293 0.315307 0.315357 0.315483
         </DataArray>
-        <DataArray type="Float32" Name="x_w^N2" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_liq" NumberOfComponents="1" format="ascii">
           0 5.15619e-05 0 5.13812e-05 0.000136269 0.000139217 0.000137862 0.000135553 2.16825e-05 2.19817e-05 1.89395e-05 1.8993e-05
           1.71759e-05 1.71885e-05 1.56309e-05 1.5633e-05 1.43451e-05 1.43438e-05 1.33568e-05 1.33543e-05 1.26548e-05 1.26519e-05 1.21886e-05 1.21857e-05
           1.18953e-05 1.18923e-05 1.17182e-05 1.17153e-05 1.16147e-05 1.16118e-05 1.15555e-05 1.15526e-05 1.15223e-05 1.15194e-05 1.15039e-05 1.1501e-05
@@ -421,7 +421,7 @@
           1.43168e-05 1.33255e-05 1.2625e-05 1.21613e-05 1.18702e-05 1.16948e-05 1.15923e-05 1.15338e-05 1.15011e-05 1.14831e-05 1.14734e-05 1.14683e-05
           1.1466e-05 1.14652e-05 1.14657e-05 1.14675e-05 1.14721e-05
         </DataArray>
-        <DataArray type="Float32" Name="x_n^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.000754702 0.000985426 0.000754702 0.000990704 0.00143386 0.00144646 0.00265688 0.00270202 0.0166578 0.0164348 0.0190245 0.018972
           0.0158237 0.0158474 0.0122035 0.0122217 0.0105353 0.0105405 0.0100814 0.0100823 0.0100074 0.0100075 0.0100004 0.0100004
           0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01
@@ -459,7 +459,7 @@
           0.0105472 0.0100828 0.0100075 0.0100004 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01
           0.01 0.01 0.01 0.01 0.01
         </DataArray>
-        <DataArray type="Float32" Name="x_n^N2" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_gas" NumberOfComponents="1" format="ascii">
           0 0.138338 0 0.138592 0.532023 0.548309 0.997343 0.997298 0.983342 0.983565 0.980976 0.981028
           0.984176 0.984153 0.987796 0.987778 0.989465 0.989459 0.989919 0.989918 0.989993 0.989992 0.99 0.99
           0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99
@@ -497,7 +497,7 @@
           0.989453 0.989917 0.989992 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99
           0.99 0.99 0.99 0.99 0.99
         </DataArray>
-        <DataArray type="Float32" Name="velocity_w" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq" NumberOfComponents="3" format="ascii">
           0.000444116 -9.08794e-06 0 0.000448313 -4.14778e-06 0 0.000449334 -9.64723e-06 0 0.000451311 -6.07357e-06 0
           0.000454942 -2.42576e-06 0 0.000455376 -4.50869e-06 0 0.000452659 -3.3411e-06 0 0.000449267 -5.41456e-06 0
           0.000225804 -3.42705e-06 0 0.00022236 -3.36177e-06 0 1.8322e-06 -3.77074e-10 0 1.8245e-06 -3.65022e-10 0
@@ -606,7 +606,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_n" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_gas" NumberOfComponents="3" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 1.76439e-06 5.91112e-08 0 2.78312e-06 5.07413e-08 0
           0.000183895 6.21075e-06 0 0.000200115 8.3314e-06 0 0.000364768 -1.65469e-05 0 0.00038288 -1.43219e-05 0
diff --git a/test/references/fracturebox2p-reference.vtu b/test/references/fracturebox2p-reference.vtu
index c863d3de6508b980e219ad30c9fee88cda1ef827..e4ea658d3fae7db5d002392f58611d356ec9b6bd 100644
--- a/test/references/fracturebox2p-reference.vtu
+++ b/test/references/fracturebox2p-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="1670" NumberOfPoints="911">
-      <PointData Scalars="S_n">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_napl">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0.778389 0.771142 0.770769 0.835725 0.822641 0.836217 0.822475 0.691403 0.691088 0.718574 0.691575 0.719125
           0.718643 0.71905 0.835559 0.836051 0.822441 0.691188 0.822277 0.762152 0.798585 0.794582 0.789227 0.759674
           0.753064 0.748061 0.779304 0.766754 0.786095 0.778296 0.790016 0.807905 0.805752 0.741771 0.779231 0.778465
@@ -81,7 +81,7 @@
           0.606908 0.668479 0.668571 0.596279 0.641588 0.620107 0.597574 0.667041 0.586604 0.680184 0.597205 0.667403
           0.667498 0.597236 0.680296 0.586645 0.605886 0.585055 0.647215 0.614923 0.681927 0.601 0.607809
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           0.221611 0.228857 0.229231 0.164275 0.177359 0.163783 0.177525 0.308597 0.308912 0.281426 0.308425 0.280875
           0.281357 0.28095 0.164441 0.163949 0.177559 0.308812 0.177723 0.237848 0.201415 0.205418 0.210773 0.240326
           0.246936 0.251939 0.220696 0.233246 0.213905 0.221704 0.209984 0.192095 0.194248 0.258229 0.220769 0.221535
@@ -159,7 +159,7 @@
           0.393092 0.331521 0.331429 0.403721 0.358412 0.379893 0.402426 0.332959 0.413396 0.319816 0.402795 0.332597
           0.332502 0.402764 0.319704 0.413355 0.394114 0.414945 0.352785 0.385077 0.318073 0.399 0.392191
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           100514 100501 100500 100610 100592 100610 100592 100409 100408 100431 100409 100431
           100431 100431 100610 100610 100592 100408 100592 100486 100552 100545 100535 100481
           100472 100464 100516 100494 100528 100514 100536 100569 100565 100456 100516 100514
@@ -237,7 +237,7 @@
           100368 100400 100400 100362 100387 100376 100362 100399 100356 100404 100362 100399
           100399 100362 100404 100356 100367 100355 100390 100373 100405 100364 100368
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           100096 100088 100088 100138 100135 100138 100135 100041 100041 100050 100041 100050
           100050 100050 100138 100138 100135 100041 100135 100079 100118 100114 100108 100076
           100071 100067 100097 100084 100104 100096 100109 100126 100124 100062 100097 100096
@@ -393,7 +393,7 @@
           332.447 356.77 356.81 328.664 345.58 337.295 329.119 356.145 325.304 361.976 328.989 356.302
           356.343 329 362.026 325.319 332.079 324.774 347.841 335.37 362.77 330.332 332.773
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -471,7 +471,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -549,7 +549,7 @@
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_aq" NumberOfComponents="1" format="ascii">
           3.49546 3.96948 3.99501 1.00467 1.40006 0.9915 1.40567 12.3886 12.4353 8.78542 12.363 8.72094
           8.77732 8.72964 1.00914 0.995942 1.40681 12.4205 1.41237 4.61613 2.37957 2.57797 2.86055 4.8062
           5.33908 5.76827 3.43848 4.27685 3.03521 3.50124 2.81765 1.95822 2.05066 6.3404 3.443 3.49067
@@ -627,7 +627,7 @@
           29.8913 16.1262 16.1099 32.8917 21.4237 26.4373 32.5154 16.3838 35.8 14.1332 32.6225 16.3186
           16.3017 32.6133 14.115 35.7872 30.1711 36.2817 20.2285 27.7588 13.8518 31.5343 29.646
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_napl" NumberOfComponents="1" format="ascii">
           1357.4 1338.46 1337.48 1504.94 1471.78 1506.17 1471.36 1129.2 1128.38 1200.41 1129.65 1201.85
           1200.59 1201.66 1504.52 1505.76 1471.27 1128.64 1470.86 1314.9 1409.95 1399.57 1385.66 1308.4
           1291.05 1277.91 1359.79 1326.96 1377.5 1357.16 1387.71 1434.02 1428.47 1261.38 1359.6 1357.6
diff --git a/test/references/fracturebox2p_gravity-reference.vtu b/test/references/fracturebox2p_gravity-reference.vtu
index 559a51f516f24f01a0567ff28ac36ff14506cf4c..0159ea4660164c71ce7e4bfca577ca16a338cf48 100644
--- a/test/references/fracturebox2p_gravity-reference.vtu
+++ b/test/references/fracturebox2p_gravity-reference.vtu
@@ -159,7 +159,7 @@
           0 84.4586 0 0 0 668.623 0 0 0 111.917 0 419.154
           0 273.647 0 0 0 0 0 370.189 0.0184311 0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           0.985911 0.991023 0.994774 0.064309 0.0710217 0.0721382 0.0628829 0.0724153 0.301859 0.151616 1 1
           1 0.0666443 0.881175 0.797098 0.933311 1 0.998527 0.996558 0.940496 0.937048 0.974003 0.998074
           0.998601 0.999671 0.969717 0.932984 0.99032 0.996164 0.991409 0.903548 0.884529 0.999599 0.999887 0.353607
@@ -237,7 +237,7 @@
           1 0.994536 1 1 1 0.0829154 1 1 1 0.988303 1 0.22048
           1 0.587802 1 1 1 1 1 0.302348 0.999999 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           96470.1 97035.4 95856.9 101208 99844.3 99879 101159 100518 99467.2 99491.6 90727.9 90713.4
           91690.9 100593 90685 91665.9 91664.8 91705.8 90685.1 96239.1 96291.3 96986.2 95941.4 95008.6
           95625.5 94553.3 97502.3 97980.1 94112.1 93653.1 93183 95654.6 96822.4 95549.2 92797 98376.6
@@ -315,7 +315,7 @@
           92641.2 98769.9 92360 98703.4 90663.2 100430 96209.1 94856.7 92406.9 98675.8 91429.3 99670.2
           91474.6 99599.3 92466.5 98592.5 94554.7 94030 91319.4 99765.8 97016 93943 93538.6
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -393,7 +393,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_aq" NumberOfComponents="1" format="ascii">
           982.073 992.479 997.391 0.00178831 0.00576332 0.00674626 0.00129942 0.00700648 11.4152 0.7016 1000 1000
           1000 0.00283248 552.044 375.292 736.091 1000 999.788 998.855 774.908 756.117 943.697 999.638
           999.809 999.989 925.917 734.358 991.293 998.582 993.095 610.902 560.487 999.984 999.999 20.4
@@ -471,7 +471,7 @@
           1000 997.152 1000 1000 1000 0.0225595 1000 1000 1000 987.449 1000 3.42512
           1000 124.807 1000 1000 1000 1000 1000 11.484 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0.0140886 0.00897702 0.00522575 0.935691 0.928978 0.927862 0.937117 0.927585 0.698141 0.848384 0 0
           0 0.933356 0.118825 0.202902 0.0666888 0 0.00147278 0.00344235 0.0595043 0.0629519 0.0259972 0.0019264
           0.00139872 0.000329274 0.0302833 0.0670164 0.00968001 0.00383611 0.00859094 0.0964522 0.115471 0.000401127 0.000113032 0.646393
@@ -549,7 +549,7 @@
           0 0.0054639 0 -0 0 0.917085 -0 -3.22299e-44 0 0.0116972 0 0.77952
           0 0.412198 0 -0 0 0 0 0.697652 8.18167e-07 0 0
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           96586.6 97141 95939.1 102047 100600 100624 102022 101261 99837.6 99979.8 90727.9 90713.4
           91690.9 101398 90873.8 91883 91829.2 91705.8 90715.2 96300.7 96451.5 97148.5 96074.5 95046.9
           95654.3 94560.5 97640 98144.7 94219.5 93719.9 93287.2 95834 97009.8 95558 92799.5 98724.1
@@ -627,7 +627,7 @@
           92641.2 98854.4 92360 98703.4 90663.2 101099 96209.1 94856.7 92406.9 98787.7 91429.3 100089
           91474.6 99872.9 92466.5 98592.5 94554.7 94030 91319.4 100136 97016 93943 93538.6
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -705,7 +705,7 @@
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_napl" NumberOfComponents="1" format="ascii">
           0.826486 0.350197 0.124847 1746.73 1738.41 1736.77 1748.14 1736.36 1146.82 1536.59 0 0
           0 1744.15 47.128 128.071 15.8525 0 0.0111541 0.056322 12.7756 14.2134 2.65247 0.0186145
           0.0101085 0.000640271 3.54541 16.0002 0.404308 0.069243 0.322053 31.826 44.6589 0.000933045 8.32691e-05 1012.5
diff --git a/test/references/fracturecc2p-reference.vtu b/test/references/fracturecc2p-reference.vtu
index 91a85d2b0e68a8955591cf46498d28520adeff4e..5d69c4beeff1fbf96f8352b06952db891286c94a 100644
--- a/test/references/fracturecc2p-reference.vtu
+++ b/test/references/fracturecc2p-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="1670" NumberOfPoints="911">
-      <CellData Scalars="S_n">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_napl">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0.778646 0.834371 0.830443 0.713123 0.721337 0.72128 0.833145 0.713475 0.829149 0.774262 0.799415 0.760491
           0.778773 0.789675 0.809597 0.755067 0.787629 0.781259 0.795456 0.766771 0.746669 0.814005 0.764422 0.753679
           0.809423 0.747969 0.767384 0.799651 0.770311 0.836065 0.787679 0.709736 0.781657 0.832833 0.716202 0.776503
@@ -145,7 +145,7 @@
           0.673126 0.639305 0.637896 0.641723 0.635404 0.601482 0.681793 0.648165 0.629384 0.611466 0.62567 0.651793
           0.633841 0.64348
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           0.221354 0.165629 0.169557 0.286877 0.278663 0.27872 0.166855 0.286525 0.170851 0.225738 0.200585 0.239509
           0.221227 0.210325 0.190403 0.244933 0.212371 0.218741 0.204544 0.233229 0.253331 0.185995 0.235578 0.246322
           0.190577 0.252031 0.232617 0.200349 0.229689 0.163935 0.212321 0.290264 0.218343 0.167167 0.283798 0.223497
@@ -287,7 +287,7 @@
           0.326874 0.360695 0.362104 0.358277 0.364596 0.398518 0.318207 0.351835 0.370616 0.388534 0.37433 0.348207
           0.366159 0.35652
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           100524 100629 100623 100433 100441 100441 100626 100434 100620 100516 100567 100491
           100524 100548 100587 100482 100544 100528 100559 100502 100470 100596 100498 100480
           100588 100472 100501 100569 100509 100631 100544 100431 100529 100626 100437 100518
@@ -429,7 +429,7 @@
           100412 100395 100394 100396 100393 100371 100416 100400 100389 100377 100387 100402
           100392 100397
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           100106 100158 100158 100055 100059 100058 100157 100056 100156 100100 100132 100085
           100105 100121 100143 100080 100119 100108 100127 100093 100073 100147 100090 100078
           100143 100074 100091 100134 100096 100159 100119 100055 100108 100158 100057 100101
@@ -713,7 +713,7 @@
           358.81 344.674 344.118 345.634 343.141 330.503 362.709 348.226 340.809 334.102 339.391 349.71
           342.531 346.336
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -855,7 +855,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -997,7 +997,7 @@
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_aq" NumberOfComponents="1" format="ascii">
           3.4794 1.04155 1.15369 9.44122 8.46526 8.47171 1.07573 9.39792 1.19233 3.76039 2.33979 4.74293
           3.47142 2.83613 1.88763 5.17358 2.94878 3.31886 2.53376 4.27564 5.89174 1.71176 4.44658 5.28794
           1.89478 5.77635 4.23178 2.32855 4.0265 0.995555 2.946 9.86524 3.29483 1.08454 9.06681 3.61486
@@ -1139,7 +1139,7 @@
           15.3134 21.9221 22.2339 21.3944 22.7925 31.3979 13.8733 20.0313 24.1822 28.665 25.0683 19.2907
           23.1479 21.0164
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_napl" NumberOfComponents="1" format="ascii">
           1358.08 1501.52 1491.6 1186.1 1207.66 1207.52 1498.43 1187.02 1488.32 1346.62 1412.09 1310.55
           1358.41 1386.82 1438.38 1296.31 1381.5 1364.9 1401.84 1327.01 1274.25 1449.7 1320.85 1292.66
           1437.93 1277.67 1328.62 1412.71 1336.28 1505.79 1381.63 1177.21 1365.94 1497.64 1194.18 1352.48
diff --git a/test/references/fracturecc2p_gravity-reference.vtu b/test/references/fracturecc2p_gravity-reference.vtu
index 734246274ca2e8e01d9fee5eb44947c8d685b6aa..c0cc500c1f434002ca5fdae151b6f87c7a79ccb8 100644
--- a/test/references/fracturecc2p_gravity-reference.vtu
+++ b/test/references/fracturecc2p_gravity-reference.vtu
@@ -287,7 +287,7 @@
           0 0 0 0 0 0 0 0 517.957 0 0 65.5156
           0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           0.983346 0.0694469 0.0654786 0.160098 1 0.0915447 0.881106 1 0.999335 0.991878 0.97976 1
           0.779975 1 0.94747 1 1 0.384588 0.963715 1 1 0.937967 1 0.997906
           0.97496 1 0.213893 1 0.99959 0.71777 1 1 0.0649224 0.751339 1 0.0673584
@@ -429,7 +429,7 @@
           1 1 1 1 1 1 1 1 0.132562 1 1 0.996259
           1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           96196.7 100767 101134 99961 90881.1 100287 91223.3 91179.8 90920.5 96204.8 96256.4 94995.6
           97399 93454.5 96120.2 95113 93018.3 97869.8 96455.6 92397 97070.4 93850.4 92860.3 97264.2
           93640 93861.5 98485.7 92453.2 95511.3 95162.6 90619.2 95021.9 100933 94675.5 94569.4 100552
@@ -571,7 +571,7 @@
           94315.5 94936.1 96008.1 94411.1 96531.4 94384.3 96391.8 91620.5 99315.9 93455.4 92436.3 98524.7
           95658.8 95284.2
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -713,7 +713,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_aq" NumberOfComponents="1" format="ascii">
           975.367 0.00454761 0.00227112 0.896514 1000 0.0458381 551.873 1000 999.957 993.81 964.486 1000
           346.097 1000 813.248 1000 1000 27.6321 898.294 1000 1000 761.102 1000 999.573
           947.412 1000 3.03454 1000 999.983 255.137 1000 1000 0.00203189 301.457 1000 0.00321862
@@ -855,7 +855,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 0.372036 1000 1000 998.651
           1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0.0166543 0.930553 0.934521 0.839902 0 0.908455 0.118894 0 0.000664982 0.0081222 0.0202395 0
           0.220025 0 0.0525296 0 0 0.615412 0.0362854 0 0 0.0620329 0 0.00209423
           0.0250403 0 0.786107 0 0.000409858 0.28223 0 0 0.935078 0.248661 0 0.932642
@@ -997,7 +997,7 @@
           0 0 0 0 0 0 0 0 0.867438 0 0 0.00374064
           0 0
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           96317.5 101539 101955 100438 90881.1 100914 91412 91179.8 90934.8 96307.1 96382.5 94995.6
           97621.1 93454.5 96275.9 95113 93018.3 98205.3 96598.9 92397 97070.4 94012.2 92860.3 97305.3
           93772 93861.5 98909.9 92453.2 95520.3 95401.9 90619.2 95021.9 101762 94905.7 94569.4 101348
@@ -1139,7 +1139,7 @@
           94315.5 94936.1 96008.1 94411.1 96531.4 94384.3 96391.8 91620.5 99833.8 93455.4 92436.3 98590.2
           95658.8 95284.2
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -1281,7 +1281,7 @@
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_napl" NumberOfComponents="1" format="ascii">
           1.13658 1740.61 1745.48 1515.43 0 1698.62 47.179 0 0.00244733 0.289391 1.64736 0
           148.812 0 10.0877 0 0 933.574 4.99906 0 0 13.8232 0 0.0218297
           2.46986 0 1377.54 0 0.00097217 235.32 0 0 1746.08 186.514 0 1743.29
diff --git a/test/references/fractureccmpfa2p-reference.vtu b/test/references/fractureccmpfa2p-reference.vtu
index 384b36223c45577fff95b666684ebab1c5f1def7..e08ac081c2349cf4e00ef03069cc68bd93abc130 100644
--- a/test/references/fractureccmpfa2p-reference.vtu
+++ b/test/references/fractureccmpfa2p-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="1670" NumberOfPoints="911">
-      <CellData Scalars="S_n">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_napl">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0.778061 0.833388 0.829036 0.707431 0.716741 0.716748 0.833148 0.707455 0.828789 0.772948 0.798128 0.758793
           0.777067 0.788852 0.807821 0.753149 0.786494 0.779483 0.794014 0.765253 0.744935 0.813829 0.762288 0.752574
           0.808729 0.745278 0.765482 0.798811 0.769107 0.833495 0.787638 0.70813 0.778246 0.830795 0.715073 0.772905
@@ -145,7 +145,7 @@
           0.671501 0.638354 0.637066 0.640953 0.634507 0.600968 0.679418 0.64707 0.628694 0.610802 0.625715 0.650308
           0.632679 0.642851
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           0.221939 0.166612 0.170964 0.292569 0.283259 0.283252 0.166852 0.292545 0.171211 0.227052 0.201872 0.241207
           0.222933 0.211148 0.192179 0.246851 0.213506 0.220517 0.205986 0.234747 0.255065 0.186171 0.237712 0.247426
           0.191271 0.254722 0.234518 0.201189 0.230893 0.166505 0.212362 0.29187 0.221754 0.169205 0.284927 0.227095
@@ -287,7 +287,7 @@
           0.328499 0.361646 0.362934 0.359047 0.365493 0.399032 0.320582 0.35293 0.371306 0.389198 0.374285 0.349692
           0.367321 0.357149
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           100511 100609 100603 100422 100430 100430 100608 100422 100602 100502 100550 100478
           100510 100532 100568 100470 100528 100514 100542 100489 100460 100578 100484 100470
           100570 100460 100489 100551 100495 100609 100530 100423 100512 100605 100429 100502
@@ -429,7 +429,7 @@
           100404 100388 100387 100389 100386 100365 100408 100393 100382 100371 100380 100394
           100385 100390
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           100093 100139 100139 100047 100050 100050 100139 100047 100139 100087 100116 100074
           100092 100106 100125 100069 100103 100095 100111 100080 100064 100130 100077 100069
           100126 100064 100080 100117 100084 100139 100105 100048 100093 100139 100050 100088
@@ -713,7 +713,7 @@
           358.093 344.299 343.792 345.327 342.791 330.32 361.628 347.782 340.544 333.86 339.408 349.101
           342.08 346.084
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -855,7 +855,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -997,7 +997,7 @@
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_aq" NumberOfComponents="1" format="ascii">
           3.516 1.0689 1.19574 10.1611 9.00231 9.00152 1.07564 10.1579 1.20324 3.84755 2.40168 4.87503
           3.57887 2.88112 1.96177 5.33197 3.01255 3.42737 2.60701 4.38556 6.04802 1.71856 4.60584 5.38013
           1.92363 6.01689 4.36884 2.36868 4.11007 1.06589 2.94827 10.0707 3.50442 1.14332 9.20294 3.85038
@@ -1139,7 +1139,7 @@
           15.5944 22.1323 22.4189 21.5616 22.996 31.5434 14.2582 20.2587 24.3452 28.8414 25.0575 19.5914
           23.4146 21.1513
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_napl" NumberOfComponents="1" format="ascii">
           1356.55 1499.04 1488.04 1171.16 1195.59 1195.61 1498.44 1171.23 1487.41 1343.18 1408.76 1306.09
           1353.95 1384.68 1433.8 1291.27 1378.54 1360.26 1398.1 1323.03 1269.69 1449.25 1315.26 1289.76
           1436.14 1270.59 1323.63 1410.53 1333.13 1499.31 1381.52 1173 1357.03 1492.49 1191.21 1343.07
diff --git a/test/references/fractureccmpfa2p_gravity-reference.vtu b/test/references/fractureccmpfa2p_gravity-reference.vtu
index a47d62de5fb86fe852274f4abffa4281fb240079..9bfec93373b54212b83ea663e56f3c7d1e5d9f05 100644
--- a/test/references/fractureccmpfa2p_gravity-reference.vtu
+++ b/test/references/fractureccmpfa2p_gravity-reference.vtu
@@ -287,7 +287,7 @@
           0 0 0 0 0 0 0 0 77.6412 0 0 0
           0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           1 0.0671304 0.0637442 0.122357 1 0.0765336 0.854272 1 0.997466 1 0.988668 1
           0.998907 1 0.959554 1 1 0.980272 0.990862 1 1 0.94712 1 1
           0.993477 1 0.661825 1 1 0.72274 1 1 0.06482 0.754 1 0.0688473
@@ -429,7 +429,7 @@
           1 1 1 1 1 1 1 1 0.995225 1 1 1
           1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           96414.9 100223 100639 99743.7 91012.9 100091 91300.9 91344.6 90974 96337.8 96367.3 95024.3
           97466.4 93611.9 96217.2 95204.4 93173.8 97912.9 96589.3 92631.8 97070.2 94006.4 93093.9 97289.8
           93781.7 94028.6 98429.3 92653.5 95662.7 95112.6 91009.8 95085.6 100316 94648.2 94623.1 99983.8
@@ -571,7 +571,7 @@
           94492.2 94988.5 96031.2 94553 96466.8 94522 96379.3 91941.1 99082.7 93560.1 92532.7 98488.1
           95720.6 95298.9
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -713,7 +713,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_aq" NumberOfComponents="1" format="ascii">
           1000 0.00309175 0.00158213 0.248711 1000 0.0117062 488.633 1000 999.376 1000 988.194 1000
           999.883 1000 877.642 1000 1000 966.141 992.214 1000 1000 811.324 1000 1000
           995.967 1000 190.432 1000 1000 261.615 1000 1000 0.00198974 305.398 1000 0.00413428
@@ -855,7 +855,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 997.816 1000 1000 1000
           1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           1.21917e-07 0.93287 0.936256 0.877643 0 0.923466 0.145728 0 0.00253412 1.32125e-11 0.0113316 0
           0.00109315 0 0.040446 0 0 0.0197279 0.0091384 0 0 0.0528803 0 2.0299e-38
           0.0065235 0 0.338175 0 1.52847e-10 0.27726 0 0 0.93518 0.246 0 0.931153
@@ -997,7 +997,7 @@
           0 0 0 0 0 0 0 0 0.00477465 0 0 0
           0 0
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           96414.9 101022 101487 100281 91012.9 100801 91499.6 91344.6 91022.3 96337.8 96478.5 95024.3
           97489.3 93611.9 96364 95204.4 93173.8 98038.3 96695.4 92631.8 97070.2 94162.3 93093.9 97289.8
           93874.8 94028.6 98683.4 92653.5 95662.7 95350.6 91009.8 95085.6 101147 94877.7 94623.1 100762
@@ -1139,7 +1139,7 @@
           94492.2 94988.5 96031.2 94553 96466.8 94522 96379.3 91941.1 99160.4 93560.1 92532.7 98488.1
           95720.6 95298.9
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -1281,7 +1281,7 @@
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_napl" NumberOfComponents="1" format="ascii">
           1.81882e-10 1743.57 1747.3 1615.37 0 1729.67 69.105 0 0.0314033 4.95689e-18 0.545847 0
           0.0063167 0 6.14345 0 0 1.56901 0.362292 0 0 10.2157 0 0
           0.19056 0 327.049 0 5.29318e-16 227.789 0 0 1746.19 182.854 0 1741.4
diff --git a/test/references/fuelcell2pncbox-reference.vtu b/test/references/fuelcell2pncbox-reference.vtu
index ae77b532c8600651d2c89f8a5100385aed3b236c..7346852896d90db754b7ce2c42e2b89d00d85674 100644
--- a/test/references/fuelcell2pncbox-reference.vtu
+++ b/test/references/fuelcell2pncbox-reference.vtu
@@ -33,7 +33,7 @@
           14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3
           14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           0.30002 0.30002 0.300017 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017
           0.30002 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017
           0.30002 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017
@@ -48,7 +48,7 @@
           0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3
           0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
           114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
           114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
@@ -63,7 +63,7 @@
           114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
           114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403
           993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403
           993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403
@@ -78,7 +78,7 @@
           993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404
           993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           302.595 302.595 302.589 302.589 302.595 302.589 302.595 302.589 302.595 302.589 302.595 302.589
           302.595 302.589 302.595 302.589 302.595 302.589 302.595 302.589 302.595 302.589 302.595 302.589
           302.595 302.589 302.595 302.589 302.595 302.589 302.595 302.589 302.595 302.589 302.595 302.589
@@ -93,7 +93,7 @@
           302.561 302.561 302.561 302.561 302.561 302.561 302.561 302.561 302.561 302.561 302.561 302.561
           302.561 302.561 302.561 302.561 302.561 302.561 302.561 302.561 302.561 302.561
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.69998 0.69998 0.699983 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983
           0.69998 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983
           0.69998 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983
@@ -108,7 +108,7 @@
           0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7
           0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           99999.6 99999.6 99999.7 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7
           99999.6 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7
           99999.6 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7
@@ -123,7 +123,7 @@
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.0976 1.0976 1.10151 1.10151 1.0976 1.10151 1.0976 1.10151 1.0976 1.10151 1.0976 1.10151
           1.0976 1.10151 1.0976 1.10151 1.0976 1.10151 1.0976 1.10151 1.0976 1.10151 1.0976 1.10151
           1.0976 1.10151 1.0976 1.10151 1.0976 1.10151 1.0976 1.10151 1.0976 1.10151 1.0976 1.10151
@@ -138,7 +138,7 @@
           1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907
           1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           9071.99 9071.99 9035.61 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61
           9071.99 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61
           9071.99 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61
@@ -153,7 +153,7 @@
           8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85
           8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999989 0.999989 0.999988 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988
           0.999989 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988
           0.999989 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988
@@ -168,7 +168,7 @@
           0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987
           0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_liq" NumberOfComponents="1" format="ascii">
           7.16836e-06 7.16836e-06 6.91411e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06
           7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06
           7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06
@@ -183,7 +183,7 @@
           5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06
           5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06
         </DataArray>
-        <DataArray type="Float32" Name="x^O2_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^O2_liq" NumberOfComponents="1" format="ascii">
           4.3001e-06 4.3001e-06 4.78303e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06
           4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06
           4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06
@@ -198,7 +198,7 @@
           6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06
           6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063
           0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063
           0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063
@@ -213,7 +213,7 @@
           0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306
           0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_gas" NumberOfComponents="1" format="ascii">
           0.712624 0.712624 0.687348 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348
           0.712624 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348
           0.712624 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348
@@ -228,7 +228,7 @@
           0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799
           0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799
         </DataArray>
-        <DataArray type="Float32" Name="x^O2_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^O2_gas" NumberOfComponents="1" format="ascii">
           0.225069 0.225069 0.250346 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346
           0.225069 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346
           0.225069 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346
@@ -243,7 +243,7 @@
           0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895
           0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_liq" NumberOfComponents="1" format="ascii">
           55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1
           55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1
           55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1
@@ -258,7 +258,7 @@
           55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1
           55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_gas" NumberOfComponents="1" format="ascii">
           38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034
           38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034
           38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034
diff --git a/test/references/fuelcell2pncboxni-reference.vtu b/test/references/fuelcell2pncboxni-reference.vtu
index 8af36216f00c797eff40919d26f364342a41f3b1..42a8894e209e5a9b0aa44695d65b185771aea0c9 100644
--- a/test/references/fuelcell2pncboxni-reference.vtu
+++ b/test/references/fuelcell2pncboxni-reference.vtu
@@ -33,7 +33,7 @@
           14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3
           14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           0.300014 0.300014 0.300012 0.300012 0.300014 0.300012 0.300014 0.300012 0.300014 0.300012 0.300014 0.300012
           0.300014 0.300012 0.300014 0.300012 0.300014 0.300012 0.300014 0.300012 0.300014 0.300012 0.300014 0.300012
           0.300014 0.300012 0.300014 0.300012 0.300014 0.300012 0.300014 0.300012 0.300014 0.300012 0.300014 0.300012
@@ -48,7 +48,7 @@
           0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3
           0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
           114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
           114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
@@ -63,7 +63,7 @@
           114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
           114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           997.63 997.63 997.74 997.74 997.63 997.74 997.63 997.74 997.63 997.74 997.63 997.74
           997.63 997.74 997.63 997.74 997.63 997.74 997.63 997.74 997.63 997.74 997.63 997.74
           997.63 997.74 997.63 997.74 997.63 997.74 997.63 997.74 997.63 997.74 997.63 997.74
@@ -78,7 +78,7 @@
           998.253 998.253 998.253 998.253 998.253 998.253 998.253 998.253 998.253 998.253 998.253 998.253
           998.253 998.253 998.253 998.253 998.253 998.253 998.253 998.253 998.253 998.253
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           223.39 223.39 220.912 220.912 223.39 220.912 223.39 220.912 223.39 220.912 223.39 220.912
           223.39 220.912 223.39 220.912 223.39 220.912 223.39 220.912 223.39 220.912 223.39 220.912
           223.39 220.912 223.39 220.912 223.39 220.912 223.39 220.912 223.39 220.912 223.39 220.912
@@ -93,7 +93,7 @@
           208.672 208.672 208.672 208.672 208.672 208.672 208.672 208.672 208.672 208.672 208.672 208.672
           208.672 208.672 208.672 208.672 208.672 208.672 208.672 208.672 208.672 208.672
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.699986 0.699986 0.699988 0.699988 0.699986 0.699988 0.699986 0.699988 0.699986 0.699988 0.699986 0.699988
           0.699986 0.699988 0.699986 0.699988 0.699986 0.699988 0.699986 0.699988 0.699986 0.699988 0.699986 0.699988
           0.699986 0.699988 0.699986 0.699988 0.699986 0.699988 0.699986 0.699988 0.699986 0.699988 0.699986 0.699988
@@ -108,7 +108,7 @@
           0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7
           0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           99999.7 99999.7 99999.8 99999.8 99999.7 99999.8 99999.7 99999.8 99999.7 99999.8 99999.7 99999.8
           99999.7 99999.8 99999.7 99999.8 99999.7 99999.8 99999.7 99999.8 99999.7 99999.8 99999.7 99999.8
           99999.7 99999.8 99999.7 99999.8 99999.7 99999.8 99999.7 99999.8 99999.7 99999.8 99999.7 99999.8
@@ -123,7 +123,7 @@
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.15146 1.15146 1.15754 1.15754 1.15146 1.15754 1.15146 1.15754 1.15146 1.15754 1.15146 1.15754
           1.15146 1.15754 1.15146 1.15754 1.15146 1.15754 1.15146 1.15754 1.15146 1.15754 1.15146 1.15754
           1.15146 1.15754 1.15146 1.15754 1.15146 1.15754 1.15146 1.15754 1.15146 1.15754 1.15146 1.15754
@@ -138,7 +138,7 @@
           1.18659 1.18659 1.18659 1.18659 1.18659 1.18659 1.18659 1.18659 1.18659 1.18659 1.18659 1.18659
           1.18659 1.18659 1.18659 1.18659 1.18659 1.18659 1.18659 1.18659 1.18659 1.18659
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           9373.5 9373.5 9346.09 9346.09 9373.5 9346.09 9373.5 9346.09 9373.5 9346.09 9373.5 9346.09
           9373.5 9346.09 9373.5 9346.09 9373.5 9346.09 9373.5 9346.09 9373.5 9346.09 9373.5 9346.09
           9373.5 9346.09 9373.5 9346.09 9373.5 9346.09 9373.5 9346.09 9373.5 9346.09 9373.5 9346.09
@@ -153,7 +153,7 @@
           9228.05 9228.05 9228.05 9228.05 9228.05 9228.05 9228.05 9228.05 9228.05 9228.05 9228.05 9228.05
           9228.05 9228.05 9228.05 9228.05 9228.05 9228.05 9228.05 9228.05 9228.05 9228.05
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999987 0.999987 0.999986 0.999986 0.999987 0.999986 0.999987 0.999986 0.999987 0.999986 0.999987 0.999986
           0.999987 0.999986 0.999987 0.999986 0.999987 0.999986 0.999987 0.999986 0.999987 0.999986 0.999987 0.999986
           0.999987 0.999986 0.999987 0.999986 0.999987 0.999986 0.999987 0.999986 0.999987 0.999986 0.999987 0.999986
@@ -168,7 +168,7 @@
           0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
           0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_liq" NumberOfComponents="1" format="ascii">
           9.90458e-06 9.90458e-06 9.69383e-06 9.69383e-06 9.90458e-06 9.69383e-06 9.90458e-06 9.69383e-06 9.90458e-06 9.69383e-06 9.90458e-06 9.69383e-06
           9.90458e-06 9.69383e-06 9.90458e-06 9.69383e-06 9.90458e-06 9.69383e-06 9.90458e-06 9.69383e-06 9.90458e-06 9.69383e-06 9.90458e-06 9.69383e-06
           9.90458e-06 9.69383e-06 9.90458e-06 9.69383e-06 9.90458e-06 9.69383e-06 9.90458e-06 9.69383e-06 9.90458e-06 9.69383e-06 9.90458e-06 9.69383e-06
@@ -183,7 +183,7 @@
           8.71418e-06 8.71418e-06 8.71418e-06 8.71418e-06 8.71418e-06 8.71418e-06 8.71418e-06 8.71418e-06 8.71418e-06 8.71418e-06 8.71418e-06 8.71418e-06
           8.71418e-06 8.71418e-06 8.71418e-06 8.71418e-06 8.71418e-06 8.71418e-06 8.71418e-06 8.71418e-06 8.71418e-06 8.71418e-06
         </DataArray>
-        <DataArray type="Float32" Name="x^O2_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^O2_liq" NumberOfComponents="1" format="ascii">
           3.43148e-06 3.43148e-06 4.03106e-06 4.03106e-06 3.43148e-06 4.03106e-06 3.43148e-06 4.03106e-06 3.43148e-06 4.03106e-06 3.43148e-06 4.03106e-06
           3.43148e-06 4.03106e-06 3.43148e-06 4.03106e-06 3.43148e-06 4.03106e-06 3.43148e-06 4.03106e-06 3.43148e-06 4.03106e-06 3.43148e-06 4.03106e-06
           3.43148e-06 4.03106e-06 3.43148e-06 4.03106e-06 3.43148e-06 4.03106e-06 3.43148e-06 4.03106e-06 3.43148e-06 4.03106e-06 3.43148e-06 4.03106e-06
@@ -198,7 +198,7 @@
           6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06
           6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0275715 0.0275715 0.0267924 0.0267924 0.0275715 0.0267924 0.0275715 0.0267924 0.0275715 0.0267924 0.0275715 0.0267924
           0.0275715 0.0267924 0.0275715 0.0267924 0.0275715 0.0267924 0.0275715 0.0267924 0.0275715 0.0267924 0.0275715 0.0267924
           0.0275715 0.0267924 0.0275715 0.0267924 0.0275715 0.0267924 0.0275715 0.0267924 0.0275715 0.0267924 0.0275715 0.0267924
@@ -213,7 +213,7 @@
           0.0231753 0.0231753 0.0231753 0.0231753 0.0231753 0.0231753 0.0231753 0.0231753 0.0231753 0.0231753 0.0231753 0.0231753
           0.0231753 0.0231753 0.0231753 0.0231753 0.0231753 0.0231753 0.0231753 0.0231753 0.0231753 0.0231753
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_gas" NumberOfComponents="1" format="ascii">
           0.825985 0.825985 0.802572 0.802572 0.825985 0.802572 0.825985 0.802572 0.825985 0.802572 0.825985 0.802572
           0.825985 0.802572 0.825985 0.802572 0.825985 0.802572 0.825985 0.802572 0.825985 0.802572 0.825985 0.802572
           0.825985 0.802572 0.825985 0.802572 0.825985 0.802572 0.825985 0.802572 0.825985 0.802572 0.825985 0.802572
@@ -228,7 +228,7 @@
           0.694706 0.694706 0.694706 0.694706 0.694706 0.694706 0.694706 0.694706 0.694706 0.694706 0.694706 0.694706
           0.694706 0.694706 0.694706 0.694706 0.694706 0.694706 0.694706 0.694706 0.694706 0.694706
         </DataArray>
-        <DataArray type="Float32" Name="x^O2_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^O2_gas" NumberOfComponents="1" format="ascii">
           0.146444 0.146444 0.170635 0.170635 0.146444 0.170635 0.146444 0.170635 0.146444 0.170635 0.146444 0.170635
           0.146444 0.170635 0.146444 0.170635 0.146444 0.170635 0.146444 0.170635 0.146444 0.170635 0.146444 0.170635
           0.146444 0.170635 0.146444 0.170635 0.146444 0.170635 0.146444 0.170635 0.146444 0.170635 0.146444 0.170635
@@ -243,7 +243,7 @@
           0.282119 0.282119 0.282119 0.282119 0.282119 0.282119 0.282119 0.282119 0.282119 0.282119 0.282119 0.282119
           0.282119 0.282119 0.282119 0.282119 0.282119 0.282119 0.282119 0.282119 0.282119 0.282119
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_liq" NumberOfComponents="1" format="ascii">
           55374.7 55374.7 55380.8 55380.8 55374.7 55380.8 55374.7 55380.8 55374.7 55380.8 55374.7 55380.8
           55374.7 55380.8 55374.7 55380.8 55374.7 55380.8 55374.7 55380.8 55374.7 55380.8 55374.7 55380.8
           55374.7 55380.8 55374.7 55380.8 55374.7 55380.8 55374.7 55380.8 55374.7 55380.8 55374.7 55380.8
@@ -258,7 +258,7 @@
           55409.5 55409.5 55409.5 55409.5 55409.5 55409.5 55409.5 55409.5 55409.5 55409.5 55409.5 55409.5
           55409.5 55409.5 55409.5 55409.5 55409.5 55409.5 55409.5 55409.5 55409.5 55409.5
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_gas" NumberOfComponents="1" format="ascii">
           40.6358 40.6358 40.7007 40.7007 40.6358 40.7007 40.6358 40.7007 40.6358 40.7007 40.6358 40.7007
           40.6358 40.7007 40.6358 40.7007 40.6358 40.7007 40.6358 40.7007 40.6358 40.7007 40.6358 40.7007
           40.6358 40.7007 40.6358 40.7007 40.6358 40.7007 40.6358 40.7007 40.6358 40.7007 40.6358 40.7007
diff --git a/test/references/fuelcell2pnccc-reference.vtu b/test/references/fuelcell2pnccc-reference.vtu
index 496fc6b80012de59e8fd89c52273d6131c952870..ac09b8346df3ae91f3bfe6a8497e4a8adffe7a43 100644
--- a/test/references/fuelcell2pnccc-reference.vtu
+++ b/test/references/fuelcell2pnccc-reference.vtu
@@ -29,7 +29,7 @@
           14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4
           14005.4 14005.4 14005.4 14005.4 14005.4 14005.4
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019
           0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300015 0.300015 0.300015
           0.300015 0.300015 0.300015 0.300015 0.300015 0.300015 0.300015 0.300015 0.300015 0.300015 0.300015 0.300015
@@ -42,7 +42,7 @@
           0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002
           0.300002 0.300002 0.300002 0.300002 0.300002 0.300002
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
           114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
           114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
@@ -55,7 +55,7 @@
           114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
           114005 114005 114005 114005 114005 114005
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403
           993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403
           993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403
@@ -68,7 +68,7 @@
           993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404
           993.404 993.404 993.404 993.404 993.404 993.404
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           302.592 302.592 302.592 302.592 302.592 302.592 302.592 302.592 302.592 302.592 302.592 302.592
           302.592 302.592 302.592 302.592 302.592 302.592 302.592 302.592 302.592 302.587 302.587 302.587
           302.587 302.587 302.587 302.587 302.587 302.587 302.587 302.587 302.587 302.587 302.587 302.587
@@ -81,7 +81,7 @@
           302.564 302.564 302.564 302.564 302.564 302.564 302.564 302.564 302.564 302.564 302.564 302.564
           302.564 302.564 302.564 302.564 302.564 302.564
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981
           0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699985 0.699985 0.699985
           0.699985 0.699985 0.699985 0.699985 0.699985 0.699985 0.699985 0.699985 0.699985 0.699985 0.699985 0.699985
@@ -94,7 +94,7 @@
           0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998
           0.699998 0.699998 0.699998 0.699998 0.699998 0.699998
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6
           99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.7 99999.7 99999.7
           99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.7
@@ -107,7 +107,7 @@
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.09924
           1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.10315 1.10315 1.10315
           1.10315 1.10315 1.10315 1.10315 1.10315 1.10315 1.10315 1.10315 1.10315 1.10315 1.10315 1.10315
@@ -120,7 +120,7 @@
           1.11742 1.11742 1.11742 1.11742 1.11742 1.11742 1.11742 1.11742 1.11742 1.11742 1.11742 1.11742
           1.11742 1.11742 1.11742 1.11742 1.11742 1.11742
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67
           9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9020.45 9020.45 9020.45
           9020.45 9020.45 9020.45 9020.45 9020.45 9020.45 9020.45 9020.45 9020.45 9020.45 9020.45 9020.45
@@ -133,7 +133,7 @@
           8890.66 8890.66 8890.66 8890.66 8890.66 8890.66 8890.66 8890.66 8890.66 8890.66 8890.66 8890.66
           8890.66 8890.66 8890.66 8890.66 8890.66 8890.66
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988
           0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988
           0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988
@@ -146,7 +146,7 @@
           0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987
           0.999987 0.999987 0.999987 0.999987 0.999987 0.999987
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_liq" NumberOfComponents="1" format="ascii">
           7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06
           7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 6.80754e-06 6.80754e-06 6.80754e-06
           6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06
@@ -159,7 +159,7 @@
           5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06
           5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06
         </DataArray>
-        <DataArray type="Float32" Name="x^O2_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^O2_liq" NumberOfComponents="1" format="ascii">
           4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06
           4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.98544e-06 4.98544e-06 4.98544e-06
           4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06
@@ -172,7 +172,7 @@
           6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06
           6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063
           0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623062 0.0623062 0.0623062
           0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062
@@ -185,7 +185,7 @@
           0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306
           0.062306 0.062306 0.062306 0.062306 0.062306 0.062306
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_gas" NumberOfComponents="1" format="ascii">
           0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008
           0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.676753 0.676753 0.676753
           0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.676753
@@ -198,7 +198,7 @@
           0.584504 0.584504 0.584504 0.584504 0.584504 0.584504 0.584504 0.584504 0.584504 0.584504 0.584504 0.584504
           0.584504 0.584504 0.584504 0.584504 0.584504 0.584504
         </DataArray>
-        <DataArray type="Float32" Name="x^O2_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^O2_gas" NumberOfComponents="1" format="ascii">
           0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686
           0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.26094 0.26094 0.26094
           0.26094 0.26094 0.26094 0.26094 0.26094 0.26094 0.26094 0.26094 0.26094 0.26094 0.26094 0.26094
@@ -211,7 +211,7 @@
           0.35319 0.35319 0.35319 0.35319 0.35319 0.35319 0.35319 0.35319 0.35319 0.35319 0.35319 0.35319
           0.35319 0.35319 0.35319 0.35319 0.35319 0.35319
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_l" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_liq" NumberOfComponents="1" format="ascii">
           55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1
           55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1
           55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1
@@ -224,7 +224,7 @@
           55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1 55142.1
           55142.1 55142.1 55142.1 55142.1 55142.1 55142.1
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_gas" NumberOfComponents="1" format="ascii">
           38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034
           38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8034 38.8035 38.8035 38.8035
           38.8035 38.8035 38.8035 38.8035 38.8035 38.8035 38.8035 38.8035 38.8035 38.8035 38.8035 38.8035
diff --git a/test/references/generalizeddirichlet-reference.vtp b/test/references/generalizeddirichlet-reference.vtp
index 1144931578b01c983a676f67208f26eec725f4dd..984552d4363dd05fe1cd6cd7b744156095d91764 100644
--- a/test/references/generalizeddirichlet-reference.vtp
+++ b/test/references/generalizeddirichlet-reference.vtp
@@ -2,8 +2,8 @@
 <VTKFile type="PolyData" version="0.1" byte_order="LittleEndian">
   <PolyData>
     <Piece NumberOfLines="100" NumberOfPoints="101">
-      <PointData Scalars="S_n">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_napl">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0.21989 0.232707 0.243682 0.253351 0.262038 0.269954 0.277249 0.284031 0.290382 0.296366 0.302033 0.307425
           0.312575 0.317513 0.322262 0.326844 0.331275 0.335573 0.33975 0.343819 0.347793 0.35168 0.35549 0.359232
           0.362914 0.366543 0.370127 0.373673 0.377187 0.380677 0.384147 0.387606 0.391059 0.394514 0.397976 0.401453
@@ -14,7 +14,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           0.78011 0.767293 0.756318 0.746649 0.737962 0.730046 0.722751 0.715969 0.709618 0.703634 0.697967 0.692575
           0.687425 0.682487 0.677738 0.673156 0.668725 0.664427 0.66025 0.656181 0.652207 0.64832 0.64451 0.640768
           0.637086 0.633457 0.629873 0.626327 0.622813 0.619323 0.615853 0.612394 0.608941 0.605486 0.602024 0.598547
@@ -25,7 +25,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           201197 201196 201195 201192 201190 201186 201182 201178 201173 201168 201163 201157
           201151 201145 201138 201131 201124 201116 201109 201101 201093 201084 201075 201067
           201057 201048 201038 201029 201019 201008 200998 200987 200976 200965 200954 200942
@@ -36,7 +36,7 @@
           200192 200180 200168 200156 200144 200132 200120 200108 200096 200084 200072 200060
           200048 200036 200024 200012 200000
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           200631 200625 200620 200614 200608 200601 200594 200587 200580 200572 200564 200556
           200548 200539 200531 200522 200512 200503 200493 200484 200473 200463 200453 200442
           200431 200420 200408 200397 200385 200373 200361 200348 200335 200322 200309 200296
@@ -80,7 +80,7 @@
           890 890 890 890 890 890 890 890 890 890 890 890
           890 890 890 890 890
         </DataArray>
-        <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_aq" NumberOfComponents="1" format="ascii">
           283.624 265.439 250.574 238.004 227.12 217.53 208.965 201.231 194.186 187.719 181.744 176.193
           171.009 166.149 161.572 157.247 153.147 149.248 145.53 141.975 138.568 135.294 132.141 129.099
           126.157 123.307 120.54 117.848 115.226 112.665 110.161 107.707 105.298 102.929 100.595 98.2905
@@ -91,7 +91,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_napl" NumberOfComponents="1" format="ascii">
           2.36578 2.78387 3.17677 3.55047 3.90879 4.2544 4.58927 4.91493 5.23261 5.54332 5.84792 6.14716
           6.44167 6.73204 7.0188 7.30242 7.58336 7.86202 8.13882 8.41413 8.68832 8.96176 9.23481 9.50783
           9.78119 10.0552 10.3304 10.607 10.8855 11.1664 11.45 11.7369 12.0276 12.3226 12.6226 12.9283
diff --git a/test/references/generallens_box-reference.vtu b/test/references/generallens_box-reference.vtu
index 997850e8de2d7af1bd4f7efad21e70f52ec7e897..dbdcc576a537e4d38ab927301ae1279b218c5aa6 100644
--- a/test/references/generallens_box-reference.vtu
+++ b/test/references/generallens_box-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="1536" NumberOfPoints="1617">
-      <PointData Scalars="S_n">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_napl">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -140,7 +140,7 @@
           5.89372e-19 -5.13402e-30 -9.4627e-38 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -277,7 +277,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           153955 152689 152269 151338 151813 150518 151091 149818 150467 149206 149913 148660
           149415 148167 148960 147716 148542 147301 148153 146915 147790 146553 147448 146213
           147124 145890 146815 145582 146519 145287 146234 145003 145959 144728 145691 144461
@@ -414,7 +414,7 @@
           101723 101646 101569 101492 101414 101336 101257 101176 101095 101012 100927 100841
           100753 100663 100572 100479 100385 100289 100193 100097 100000
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           153955 152689 152269 151338 151813 150518 151091 149818 150467 149206 149913 148660
           149415 148167 148960 147716 148542 147301 148153 146915 147790 146553 147448 146213
           147124 145890 146815 145582 146519 145287 146234 145003 145959 144728 145691 144461
@@ -962,7 +962,7 @@
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460
         </DataArray>
-        <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -1099,7 +1099,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/generallens_cc-reference.vtu b/test/references/generallens_cc-reference.vtu
index b373ae66f7e09dcb876a1787534b7945f345c235..bd438978591c8747c6fb059326301015c4c1c188 100644
--- a/test/references/generallens_cc-reference.vtu
+++ b/test/references/generallens_cc-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="1536" NumberOfPoints="1617">
-      <CellData Scalars="S_n">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_napl">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -133,7 +133,7 @@
           0.00384322 3.15868e-05 1.65407e-09 1.10416e-17 3.26868e-28 -2.56401e-36 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -263,7 +263,7 @@
           0.996157 0.999968 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           152499 151566 150798 150139 149559 149038 148566 148133 147733 147359 147009 146677
           146362 146061 145772 145493 145222 144958 144701 144449 144202 143959 143720 143484
           143252 143022 142796 142572 142352 142135 141920 141709 141501 141297 141095 140897
@@ -393,7 +393,7 @@
           102652 102512 102437 102362 102286 102210 102134 102057 101979 101901 101821 101741
           101659 101576 101491 101405 101316 101226 101135 101042 100948 100853 100757 100661
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           152499 151566 150798 150139 149559 149038 148566 148133 147733 147359 147009 146677
           146362 146061 145772 145493 145222 144958 144701 144449 144202 143959 143720 143484
           143252 143022 142796 142572 142352 142135 141920 141709 141501 141297 141095 140897
@@ -913,7 +913,7 @@
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
         </DataArray>
-        <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -1043,7 +1043,7 @@
           998.577 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/infiltration3pbox-reference.vtu b/test/references/infiltration3pbox-reference.vtu
index 5ccc1ca0962831ff9b7a3223818e146044f7e965..a986cd48fd7d6c817b5a333621f6d49741b67f93 100644
--- a/test/references/infiltration3pbox-reference.vtu
+++ b/test/references/infiltration3pbox-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="500" NumberOfPoints="561">
-      <PointData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_aq">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           0.97 0.970013 0.97 0.970015 0.970023 0.970025 0.970032 0.970035 0.970042 0.970046 0.970052 0.970056
           0.970061 0.970066 0.970071 0.970077 0.970081 0.970087 0.970091 0.970098 0.970101 0.970109 0.970111 0.97012
           0.970122 0.970131 0.970133 0.970143 0.970144 0.970155 0.970156 0.970167 0.970167 0.970179 0.970177 0.97019
@@ -52,7 +52,7 @@
           0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12
           0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -101,7 +101,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="S_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.03 0.0299868 0.03 0.0299851 0.0299769 0.0299747 0.0299675 0.0299647 0.0299579 0.0299544 0.0299483 0.0299441
           0.0299386 0.0299337 0.0299288 0.0299232 0.029919 0.0299127 0.029909 0.029902 0.0298989 0.0298912 0.0298886 0.0298801
           0.029878 0.0298688 0.0298672 0.0298572 0.029856 0.0298453 0.0298444 0.0298329 0.0298329 0.0298206 0.0298233 0.0298103
@@ -150,7 +150,7 @@
           0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88
           0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           148117 148134 138307 138327 148134 138327 148132 138324 148130 138323 148129 138322
           148128 138321 148128 138321 148128 138321 148129 138321 148130 138323 148132 138325
           148136 138328 148141 138333 148147 138340 148156 138349 148164 138357 148163 138356
@@ -199,7 +199,7 @@
           87571.1 87570.7 87570.4 87570.2 87570 87569.9 87569.9 87569.9 87569.9 87570 87570.1 87570.4
           87570.7 87571.2 87571.8 87572.7 87573.8 87575.3 87578.2 87578.1 87622.4
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           148117 148134 138307 138327 148134 138327 148132 138324 148130 138323 148129 138322
           148128 138321 148128 138321 148128 138321 148129 138321 148130 138323 148132 138325
           148136 138328 148141 138333 148147 138340 148156 138349 148164 138357 148163 138356
@@ -248,7 +248,7 @@
           87571.1 87570.7 87570.4 87570.2 87570 87569.9 87569.9 87569.9 87569.9 87570 87570.1 87570.4
           87570.7 87571.2 87571.8 87572.7 87573.8 87575.3 87578.2 87578.1 87622.4
         </DataArray>
-        <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           149050 149067 139240 139260 149067 139259 149064 139257 149063 139256 149062 139254
           149061 139254 149060 139253 149060 139253 149061 139253 149062 139255 149064 139257
           149068 139260 149072 139265 149079 139272 149087 139280 149096 139288 149094 139287
@@ -297,7 +297,7 @@
           99948.7 99948.3 99948 99947.8 99947.6 99947.5 99947.5 99947.4 99947.5 99947.6 99947.7 99947.9
           99948.3 99948.8 99949.4 99950.3 99951.4 99952.9 99955.8 99955.7 100000
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           999.724 999.724 999.719 999.719 999.724 999.719 999.724 999.719 999.724 999.719 999.724 999.719
           999.724 999.719 999.724 999.719 999.724 999.719 999.724 999.719 999.724 999.719 999.724 999.719
           999.724 999.719 999.724 999.719 999.724 999.719 999.724 999.719 999.724 999.719 999.724 999.719
@@ -346,7 +346,7 @@
           999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695
           999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
           878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
           878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
@@ -395,7 +395,7 @@
           878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
           878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
         </DataArray>
-        <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.83349 1.8337 1.71282 1.71306 1.8337 1.71306 1.83367 1.71303 1.83365 1.71301 1.83364 1.713
           1.83363 1.71298 1.83362 1.71298 1.83362 1.71298 1.83362 1.71298 1.83364 1.713 1.83367 1.71303
           1.83371 1.71307 1.83377 1.71313 1.83385 1.71321 1.83395 1.71331 1.83405 1.71341 1.83404 1.7134
diff --git a/test/references/infiltration3pcc-reference.vtu b/test/references/infiltration3pcc-reference.vtu
index b6e9cc957fdda3dc36e8b3e497c35d126071ab88..d800aaf6d0fd2669a563fcc65475239b39972ab3 100644
--- a/test/references/infiltration3pcc-reference.vtu
+++ b/test/references/infiltration3pcc-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="500" NumberOfPoints="561">
-      <CellData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_aq">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97
           0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97
           0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97
@@ -47,7 +47,7 @@
           0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12
           0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -91,7 +91,7 @@
           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="S_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.0299999 0.0299997 0.0299996 0.0299996 0.0299996 0.0299997 0.0299997 0.0299997 0.0299997 0.0299998 0.0299998 0.0299998
           0.0299998 0.0299999 0.0299999 0.0299999 0.0299999 0.0299999 0.0299999 0.0299999 0.0299999 0.03 0.03 0.03
           0.03 0.03 0.03 0.03 0.03 0.03 0.03 0.03 0.03 0.03 0.03 0.03
@@ -135,7 +135,7 @@
           0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88
           0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           143184 143136 143087 143038 142989 142940 142891 142841 142792 142743 142694 142644
           142595 142546 142497 142448 142398 142349 142300 142251 142202 142153 142104 142054
           142005 141956 141907 141858 141809 141760 141711 141662 141613 141564 141515 141465
@@ -179,7 +179,7 @@
           87599.9 87599.5 87599.1 87598.9 87598.8 87598.7 87598.6 87598.5 87598.5 87598.5 87598.4 87598.4
           87598.4 87598.4 87598.4 87598.4 87598.4 87598.4 87598.4 87599.5
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           143184 143136 143087 143038 142989 142940 142891 142841 142792 142743 142694 142644
           142595 142546 142497 142448 142398 142349 142300 142251 142202 142153 142104 142054
           142005 141956 141907 141858 141809 141760 141711 141662 141613 141564 141515 141465
@@ -223,7 +223,7 @@
           87599.9 87599.5 87599.1 87598.9 87598.8 87598.7 87598.6 87598.5 87598.5 87598.5 87598.4 87598.4
           87598.4 87598.4 87598.4 87598.4 87598.4 87598.4 87598.4 87599.5
         </DataArray>
-        <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           144117 144069 144020 143971 143922 143873 143823 143774 143725 143676 143626 143577
           143528 143479 143430 143380 143331 143282 143233 143184 143135 143086 143036 142987
           142938 142889 142840 142791 142742 142693 142644 142595 142546 142496 142447 142398
@@ -267,7 +267,7 @@
           99977.5 99977 99976.7 99976.5 99976.3 99976.2 99976.2 99976.1 99976.1 99976 99976 99976
           99976 99976 99976 99976 99976 99976 99976 99977.1
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           999.722 999.722 999.722 999.722 999.722 999.722 999.722 999.722 999.722 999.722 999.722 999.721
           999.721 999.721 999.721 999.721 999.721 999.721 999.721 999.721 999.721 999.721 999.721 999.721
           999.721 999.721 999.721 999.721 999.721 999.721 999.721 999.721 999.721 999.721 999.721 999.721
@@ -311,7 +311,7 @@
           999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695
           999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
           878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
           878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
@@ -355,7 +355,7 @@
           878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
           878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
         </DataArray>
-        <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.77281 1.77222 1.77162 1.77102 1.77041 1.76981 1.7692 1.76859 1.76799 1.76738 1.76678 1.76617
           1.76557 1.76496 1.76436 1.76375 1.76315 1.76254 1.76194 1.76133 1.76073 1.76012 1.75952 1.75892
           1.75831 1.75771 1.7571 1.7565 1.7559 1.75529 1.75469 1.75408 1.75348 1.75288 1.75227 1.75167
diff --git a/test/references/infiltrationbox-reference.vtu b/test/references/infiltrationbox-reference.vtu
index 18fdd77e20f251a5ee13c50d330fa530ac3ad233..c9979e119e289a2efb7aa381125c5e84936df933 100644
--- a/test/references/infiltrationbox-reference.vtu
+++ b/test/references/infiltrationbox-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="160" NumberOfPoints="205">
-      <PointData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_aq">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           0.97 0.970035 0.97 0.97004 0.970056 0.97007 0.970081 0.970099 0.970109 0.970114 0.970228 0.970298
           0.97025 0.970325 0.970176 0.970194 0.970194 0.970235 0.970214 0.970259 0.970234 0.970283 0.970255 0.970308
           0.970275 0.970333 0.970296 0.970358 0.970316 0.970383 0.970334 0.970408 0.970341 0.970415 0.970342 0.970414
@@ -23,7 +23,7 @@
           0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12
           0.12
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -43,7 +43,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0
         </DataArray>
-        <DataArray type="Float32" Name="S_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.03 0.0299654 0.03 0.0299603 0.0299437 0.0299302 0.0299191 0.0299006 0.0298913 0.0298862 0.0297724 0.029702
           0.02975 0.0296752 0.029824 0.0298057 0.0298059 0.0297648 0.0297862 0.0297411 0.0297662 0.0297171 0.0297455 0.0296922
           0.0297246 0.029667 0.0297041 0.0296418 0.0296843 0.0296168 0.0296661 0.0295923 0.0296591 0.0295854 0.0296578 0.0295857
@@ -63,7 +63,7 @@
           0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88
           0.88
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           148117 148128 123592 123611 148142 123624 148150 123632 148171 123648 148353 123840
           148354 123841 148174 123650 148157 123639 148154 123635 148149 123631 148145 123627
           148141 123622 148134 123615 148122 123604 148100 123582 148064 123546 148014 123496
@@ -83,7 +83,7 @@
           87570.6 87569.1 87567.7 87566.4 87565.3 87564.4 87563.6 87563 87562.9 87563.6 87567.2 87569.9
           87622.4
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           148117 148128 123592 123611 148142 123624 148150 123632 148171 123648 148353 123840
           148354 123841 148174 123650 148157 123639 148154 123635 148149 123631 148145 123627
           148141 123622 148134 123615 148122 123604 148100 123582 148064 123546 148014 123496
@@ -103,7 +103,7 @@
           87570.6 87569.1 87567.7 87566.4 87565.3 87564.4 87563.6 87563 87562.9 87563.6 87567.2 87569.9
           87622.4
         </DataArray>
-        <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           149050 149060 124525 124543 149075 124556 149082 124564 149103 124579 149284 124770
           149285 124771 149105 124581 149088 124570 149085 124566 149080 124562 149076 124557
           149071 124552 149064 124545 149052 124533 149030 124512 148994 124475 148944 124425
@@ -123,7 +123,7 @@
           99948.1 99946.6 99945.3 99944 99942.9 99942 99941.2 99940.6 99940.5 99941.2 99944.8 99947.4
           100000
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           999.741 999.741 999.726 999.726 999.741 999.726 999.741 999.726 999.741 999.726 999.741 999.727
           999.741 999.727 999.741 999.726 999.741 999.726 999.741 999.726 999.741 999.726 999.741 999.726
           999.741 999.726 999.741 999.726 999.741 999.726 999.741 999.726 999.741 999.726 999.741 999.726
@@ -143,7 +143,7 @@
           999.706 999.706 999.706 999.706 999.706 999.706 999.706 999.706 999.706 999.706 999.706 999.706
           999.706
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
           878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
           878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
@@ -163,7 +163,7 @@
           878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
           878.771
         </DataArray>
-        <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.8278 1.82793 1.52611 1.52633 1.8281 1.52649 1.8282 1.52659 1.82845 1.52678 1.83068 1.52918
           1.83069 1.52918 1.82848 1.5268 1.82827 1.52666 1.82823 1.52662 1.82817 1.52656 1.82812 1.5265
           1.82806 1.52644 1.82797 1.52636 1.82782 1.52621 1.82756 1.52595 1.82711 1.5255 1.8265 1.52488
@@ -183,7 +183,7 @@
           1.22378 1.22377 1.22375 1.22373 1.22372 1.22371 1.2237 1.22369 1.22369 1.2237 1.22374 1.22378
           1.22442
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_aq" NumberOfComponents="1" format="ascii">
           0.999973 0.999973 0.999977 0.999977 0.999973 0.999977 0.999973 0.999977 0.999973 0.999977 0.999973 0.999977
           0.999973 0.999977 0.999973 0.999977 0.999973 0.999977 0.999973 0.999977 0.999973 0.999977 0.999973 0.999977
           0.999973 0.999977 0.999973 0.999977 0.999973 0.999977 0.999973 0.999977 0.999973 0.999977 0.999973 0.999977
@@ -203,7 +203,7 @@
           0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982
           0.999982
         </DataArray>
-        <DataArray type="Float32" Name="x^mesitylene_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^mesitylene_aq" NumberOfComponents="1" format="ascii">
           4.50629e-09 4.50282e-09 3.76482e-09 3.76216e-09 4.50206e-09 3.76064e-09 4.50028e-09 3.75909e-09 4.50026e-09 4.01389e-09 4.71233e-09 4.2464e-08
           4.70988e-09 4.24118e-08 4.49474e-09 4.0061e-09 4.49106e-09 3.74981e-09 4.48947e-09 3.748e-09 4.4877e-09 3.74625e-09 4.48584e-09 3.74438e-09
           4.48393e-09 3.74243e-09 4.48194e-09 3.74036e-09 4.47971e-09 3.73797e-09 4.47715e-09 3.73504e-09 4.47569e-09 3.73378e-09 4.4744e-09 3.73275e-09
@@ -223,7 +223,7 @@
           3.02211e-09 3.02208e-09 3.02205e-09 3.02202e-09 3.02199e-09 3.02197e-09 3.02195e-09 3.02194e-09 3.02193e-09 3.02193e-09 3.02198e-09 3.02186e-09
           3.02334e-09
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_aq" NumberOfComponents="1" format="ascii">
           2.72214e-05 2.72233e-05 2.27051e-05 2.27084e-05 2.72259e-05 2.27108e-05 2.72273e-05 2.27124e-05 2.72312e-05 2.27151e-05 2.72645e-05 2.275e-05
           2.72646e-05 2.27501e-05 2.72316e-05 2.27155e-05 2.72284e-05 2.27134e-05 2.72279e-05 2.27127e-05 2.7227e-05 2.27118e-05 2.72262e-05 2.2711e-05
           2.72253e-05 2.27101e-05 2.7224e-05 2.27089e-05 2.72218e-05 2.27067e-05 2.72178e-05 2.27026e-05 2.7211e-05 2.26959e-05 2.72019e-05 2.26867e-05
@@ -243,7 +243,7 @@
           1.81793e-05 1.8179e-05 1.81787e-05 1.81785e-05 1.81783e-05 1.81781e-05 1.8178e-05 1.81779e-05 1.81779e-05 1.8178e-05 1.81787e-05 1.81791e-05
           1.81888e-05
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_napl" NumberOfComponents="1" format="ascii">
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -263,7 +263,7 @@
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10
         </DataArray>
-        <DataArray type="Float32" Name="x^mesitylene_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^mesitylene_napl" NumberOfComponents="1" format="ascii">
           0.00132302 0.00132201 0.00110533 0.00110455 0.00132178 0.00110411 0.00132126 0.00110365 0.00132125 0.00117846 0.00138352 0.0124672
           0.0013828 0.0124519 0.00131963 0.00117617 0.00131855 0.00110093 0.00131809 0.00110039 0.00131757 0.00109988 0.00131702 0.00109933
           0.00131646 0.00109876 0.00131587 0.00109815 0.00131522 0.00109745 0.00131447 0.00109659 0.00131404 0.00109622 0.00131366 0.00109592
@@ -283,7 +283,7 @@
           0.000887276 0.000887266 0.000887257 0.000887249 0.000887242 0.000887236 0.00088723 0.000887225 0.000887224 0.000887225 0.000887238 0.000887202
           0.000887638
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_napl" NumberOfComponents="1" format="ascii">
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -303,7 +303,7 @@
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.00824008 0.0082395 0.00986295 0.00986152 0.00823871 0.00986049 0.00823829 0.00985983 0.00823713 0.00985864 0.00822714 0.00984356
           0.00822711 0.00984352 0.00823703 0.0098585 0.00823796 0.00985938 0.00823814 0.00985968 0.0082384 0.00986006 0.00823864 0.00986041
           0.00823891 0.00986079 0.00823929 0.00986134 0.00823996 0.00986228 0.00824116 0.00986401 0.00824319 0.00986691 0.00824593 0.00987085
@@ -323,7 +323,7 @@
           0.0122882 0.0122884 0.0122886 0.0122887 0.0122889 0.012289 0.0122891 0.0122891 0.0122892 0.0122891 0.0122886 0.0122883
           0.0122818
         </DataArray>
-        <DataArray type="Float32" Name="x^mesitylene_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^mesitylene_gas" NumberOfComponents="1" format="ascii">
           1e-06 9.9916e-07 1e-06 9.99149e-07 9.98895e-07 9.98643e-07 9.9845e-07 9.98164e-07 9.98305e-07 1.06569e-06 1.04408e-06 1.1257e-05
           1.04353e-06 1.12431e-05 9.97068e-07 1.06361e-06 9.96365e-07 9.95655e-07 9.96034e-07 9.95204e-07 9.95673e-07 9.94777e-07 9.95289e-07 9.94316e-07
           9.94898e-07 9.93836e-07 9.94501e-07 9.93341e-07 9.94087e-07 9.92802e-07 9.93664e-07 9.92198e-07 9.93583e-07 9.92154e-07 9.93629e-07 9.92278e-07
@@ -343,7 +343,7 @@
           1.00011e-06 1.00012e-06 1.00012e-06 1.00012e-06 1.00013e-06 1.00013e-06 1.00013e-06 1.00013e-06 1.00013e-06 1.00012e-06 1.0001e-06 1.00003e-06
           1e-06
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
           0.991759 0.991759 0.990136 0.990137 0.99176 0.990139 0.991761 0.990139 0.991762 0.99014 0.991772 0.990145
           0.991772 0.990145 0.991762 0.99014 0.991761 0.99014 0.991761 0.990139 0.991761 0.990139 0.99176 0.990139
           0.99176 0.990138 0.99176 0.990138 0.991759 0.990137 0.991758 0.990135 0.991756 0.990132 0.991753 0.990128
diff --git a/test/references/infiltrationcc-reference.vtu b/test/references/infiltrationcc-reference.vtu
index 75f09eff69b7d44c42ce1237c4b2bb69f65efd34..2127f24978e2ba1aabe7dbf8f5a15b40140661fd 100644
--- a/test/references/infiltrationcc-reference.vtu
+++ b/test/references/infiltrationcc-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="160" NumberOfPoints="205">
-      <CellData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_aq">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           0.97 0.97 0.97 0.97 0.969999 0.969999 0.969999 0.969999 0.969999 0.969999 0.969999 0.969999
           0.969999 0.969999 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97
           0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97
@@ -19,7 +19,7 @@
           0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12
           0.12 0.12 0.12 0.12
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -35,7 +35,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.0300001 0.0300002 0.0300003 0.0300005 0.0300006 0.0300007 0.0300006 0.0300006 0.0300006 0.0300006 0.0300006 0.0300005
           0.0300005 0.0300005 0.0300005 0.0300005 0.0300004 0.0300004 0.0300004 0.0300004 0.0300004 0.0300003 0.0300003 0.0300003
           0.0300003 0.0300003 0.0300002 0.0300002 0.0300002 0.0300002 0.0300002 0.0300002 0.0300001 0.0300001 0.0300001 0.0300001
@@ -51,7 +51,7 @@
           0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88
           0.88 0.88 0.88 0.88
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           135795 135682 135569 135456 135344 135262 135209 135156 135103 135050 134997 134944
           134890 134837 134783 134730 134676 134622 134568 134514 134460 134406 134352 134298
           134244 134189 134135 134081 134026 133972 133917 133863 133808 133754 133699 133645
@@ -67,7 +67,7 @@
           87619.3 87618.5 87617.8 87617.1 87616.3 87615.5 87614.8 87614 87613.2 87612.5 87611.7 87610.9
           87610.1 87609.4 87608.6 87608.4
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           135795 135682 135569 135456 135344 135262 135209 135156 135103 135050 134997 134944
           134890 134837 134783 134730 134676 134622 134568 134514 134460 134406 134352 134298
           134244 134189 134135 134081 134026 133972 133917 133863 133808 133754 133699 133645
@@ -83,7 +83,7 @@
           87619.3 87618.5 87617.8 87617.1 87616.3 87615.5 87614.8 87614 87613.2 87612.5 87611.7 87610.9
           87610.1 87609.4 87608.6 87608.4
         </DataArray>
-        <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           136728 136615 136502 136389 136277 136195 136142 136089 136036 135983 135930 135876
           135823 135770 135716 135662 135609 135555 135501 135447 135393 135339 135285 135231
           135177 135122 135068 135014 134959 134905 134850 134796 134741 134687 134632 134578
@@ -99,7 +99,7 @@
           99996.9 99996.1 99995.4 99994.6 99993.9 99993.1 99992.4 99991.6 99990.8 99990 99989.3 99988.5
           99987.7 99986.9 99986.2 99985.9
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           999.733 999.733 999.733 999.733 999.733 999.733 999.733 999.733 999.733 999.733 999.733 999.733
           999.733 999.733 999.733 999.733 999.733 999.733 999.733 999.733 999.733 999.733 999.733 999.733
           999.732 999.732 999.732 999.732 999.732 999.732 999.732 999.732 999.732 999.732 999.732 999.732
@@ -115,7 +115,7 @@
           999.706 999.706 999.706 999.706 999.706 999.706 999.706 999.706 999.706 999.706 999.706 999.706
           999.706 999.706 999.706 999.706
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
           878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
           878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
@@ -131,7 +131,7 @@
           878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
           878.771 878.771 878.771 878.771
         </DataArray>
-        <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.67622 1.67483 1.67344 1.67205 1.67067 1.66967 1.66901 1.66836 1.66771 1.66706 1.6664 1.66575
           1.66509 1.66443 1.66377 1.66311 1.66245 1.66179 1.66113 1.66047 1.6598 1.65914 1.65847 1.6578
           1.65714 1.65647 1.6558 1.65513 1.65446 1.65379 1.65312 1.65245 1.65178 1.65111 1.65044 1.64977
@@ -147,7 +147,7 @@
           1.22438 1.22437 1.22436 1.22436 1.22435 1.22434 1.22433 1.22432 1.22431 1.2243 1.22429 1.22428
           1.22427 1.22426 1.22425 1.22425
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_aq" NumberOfComponents="1" format="ascii">
           0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975
           0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975
           0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975
@@ -163,7 +163,7 @@
           0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982
           0.999982 0.999982 0.999982 0.999982
         </DataArray>
-        <DataArray type="Float32" Name="x^mesitylene_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^mesitylene_aq" NumberOfComponents="1" format="ascii">
           4.13455e-09 4.13268e-09 4.1308e-09 4.12893e-09 4.12718e-09 4.12541e-09 4.12334e-09 4.12149e-09 4.11964e-09 4.11779e-09 4.11594e-09 4.11409e-09
           4.11224e-09 4.11039e-09 4.10854e-09 4.10669e-09 4.10484e-09 4.10298e-09 4.10113e-09 4.09928e-09 4.09743e-09 4.09558e-09 4.09373e-09 4.09188e-09
           4.09003e-09 4.08818e-09 4.08633e-09 4.08448e-09 4.08263e-09 4.08078e-09 4.07893e-09 4.07708e-09 4.07522e-09 4.07337e-09 4.07152e-09 4.06967e-09
@@ -179,7 +179,7 @@
           3.02315e-09 3.02313e-09 3.02312e-09 3.0231e-09 3.02309e-09 3.02307e-09 3.02306e-09 3.02304e-09 3.02303e-09 3.02301e-09 3.023e-09 3.02298e-09
           3.02297e-09 3.02295e-09 3.02294e-09 3.02293e-09
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_aq" NumberOfComponents="1" format="ascii">
           2.49523e-05 2.49315e-05 2.49107e-05 2.48899e-05 2.48692e-05 2.48542e-05 2.48444e-05 2.48346e-05 2.48249e-05 2.48151e-05 2.48053e-05 2.47955e-05
           2.47857e-05 2.47758e-05 2.4766e-05 2.47561e-05 2.47462e-05 2.47363e-05 2.47264e-05 2.47164e-05 2.47065e-05 2.46965e-05 2.46866e-05 2.46766e-05
           2.46666e-05 2.46566e-05 2.46466e-05 2.46366e-05 2.46266e-05 2.46165e-05 2.46065e-05 2.45965e-05 2.45864e-05 2.45764e-05 2.45663e-05 2.45563e-05
@@ -195,7 +195,7 @@
           1.81882e-05 1.81881e-05 1.8188e-05 1.81878e-05 1.81877e-05 1.81876e-05 1.81874e-05 1.81873e-05 1.81871e-05 1.8187e-05 1.81869e-05 1.81867e-05
           1.81866e-05 1.81864e-05 1.81863e-05 1.81862e-05
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_napl" NumberOfComponents="1" format="ascii">
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -211,7 +211,7 @@
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10
         </DataArray>
-        <DataArray type="Float32" Name="x^mesitylene_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^mesitylene_napl" NumberOfComponents="1" format="ascii">
           0.00121388 0.00121333 0.00121278 0.00121223 0.00121172 0.0012112 0.00121059 0.00121005 0.0012095 0.00120896 0.00120842 0.00120788
           0.00120733 0.00120679 0.00120625 0.0012057 0.00120516 0.00120462 0.00120407 0.00120353 0.00120299 0.00120244 0.0012019 0.00120136
           0.00120081 0.00120027 0.00119973 0.00119918 0.00119864 0.0011981 0.00119755 0.00119701 0.00119647 0.00119592 0.00119538 0.00119484
@@ -227,7 +227,7 @@
           0.000887581 0.000887577 0.000887572 0.000887568 0.000887563 0.000887559 0.000887555 0.00088755 0.000887546 0.000887541 0.000887537 0.000887532
           0.000887527 0.000887523 0.000887518 0.000887518
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_napl" NumberOfComponents="1" format="ascii">
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -243,7 +243,7 @@
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.00898269 0.00899012 0.00899756 0.00900501 0.00901244 0.00901781 0.00902135 0.00902485 0.00902837 0.00903189 0.00903543 0.00903897
           0.00904252 0.00904609 0.00904965 0.00905323 0.00905682 0.00906041 0.00906401 0.00906762 0.00907124 0.00907486 0.00907849 0.00908213
           0.00908577 0.00908942 0.00909308 0.00909674 0.00910041 0.00910408 0.00910776 0.00911144 0.00911513 0.00911882 0.00912252 0.00912622
@@ -259,7 +259,7 @@
           0.0122822 0.0122823 0.0122824 0.0122825 0.0122826 0.0122827 0.0122828 0.0122829 0.012283 0.0122831 0.0122832 0.0122833
           0.0122833 0.0122834 0.0122835 0.0122836
         </DataArray>
-        <DataArray type="Float32" Name="x^mesitylene_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^mesitylene_gas" NumberOfComponents="1" format="ascii">
           1.00019e-06 1.00057e-06 1.00094e-06 1.00132e-06 1.00172e-06 1.00188e-06 1.00177e-06 1.00171e-06 1.00165e-06 1.0016e-06 1.00154e-06 1.00148e-06
           1.00142e-06 1.00137e-06 1.00131e-06 1.00125e-06 1.0012e-06 1.00115e-06 1.00109e-06 1.00104e-06 1.00099e-06 1.00093e-06 1.00088e-06 1.00083e-06
           1.00078e-06 1.00073e-06 1.00068e-06 1.00063e-06 1.00058e-06 1.00053e-06 1.00048e-06 1.00043e-06 1.00038e-06 1.00033e-06 1.00028e-06 1.00023e-06
@@ -275,7 +275,7 @@
           9.99968e-07 9.9997e-07 9.99973e-07 9.99975e-07 9.99978e-07 9.9998e-07 9.99983e-07 9.99985e-07 9.99988e-07 9.99991e-07 9.99993e-07 9.99996e-07
           9.99999e-07 1e-06 1e-06 1.00001e-06
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
           0.991016 0.991009 0.991001 0.990994 0.990987 0.990981 0.990978 0.990974 0.990971 0.990967 0.990964 0.99096
           0.990956 0.990953 0.990949 0.990946 0.990942 0.990939 0.990935 0.990931 0.990928 0.990924 0.99092 0.990917
           0.990913 0.99091 0.990906 0.990902 0.990899 0.990895 0.990891 0.990888 0.990884 0.99088 0.990876 0.990873
diff --git a/test/references/injection2pnibox-cube-reference.vtu b/test/references/injection2pnibox-cube-reference.vtu
index 0a52c815382885c8489191aaae80daaa45cbc295..f5cf637414b8cedf0421f0a6813e7ee249d1b12f 100644
--- a/test/references/injection2pnibox-cube-reference.vtu
+++ b/test/references/injection2pnibox-cube-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="384" NumberOfPoints="425">
-      <PointData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_liq">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -41,7 +41,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -79,7 +79,7 @@
           0 0 0 0 0 0 0 0 0 -0 -0 -0
           -0 -0 -0 -0 -0
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           2.6587e+07 2.6587e+07 2.65625e+07 2.65629e+07 2.65874e+07 2.65634e+07 2.6588e+07 2.6564e+07 2.65887e+07 2.65648e+07 2.65895e+07 2.65656e+07
           2.65904e+07 2.65664e+07 2.65912e+07 2.65673e+07 2.65921e+07 2.65681e+07 2.6593e+07 2.6569e+07 2.65939e+07 2.65699e+07 2.65948e+07 2.65708e+07
           2.65958e+07 2.65718e+07 2.65968e+07 2.65729e+07 2.65979e+07 2.65739e+07 2.65989e+07 2.6575e+07 2.66e+07 2.6576e+07 2.6601e+07 2.65771e+07
@@ -117,7 +117,7 @@
           2.62079e+07 2.62091e+07 2.62102e+07 2.62112e+07 2.62121e+07 2.6213e+07 2.62138e+07 2.62146e+07 2.62154e+07 2.62161e+07 2.62168e+07 2.62174e+07
           2.62178e+07 2.62182e+07 2.62185e+07 2.62187e+07 2.62188e+07
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           2.6597e+07 2.6597e+07 2.65725e+07 2.65729e+07 2.65974e+07 2.65734e+07 2.6598e+07 2.6574e+07 2.65987e+07 2.65748e+07 2.65995e+07 2.65756e+07
           2.66004e+07 2.65764e+07 2.66012e+07 2.65773e+07 2.66021e+07 2.65781e+07 2.6603e+07 2.6579e+07 2.66039e+07 2.65799e+07 2.66048e+07 2.65808e+07
           2.66058e+07 2.65818e+07 2.66068e+07 2.65829e+07 2.66079e+07 2.65839e+07 2.66089e+07 2.6585e+07 2.661e+07 2.6586e+07 2.6611e+07 2.65871e+07
@@ -193,7 +193,7 @@
           10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
           10000 10000 10000 10000 10000
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           976.461 976.461 976.499 976.499 976.461 976.5 976.462 976.5 976.462 976.5 976.462 976.5
           976.463 976.501 976.463 976.501 976.463 976.502 976.464 976.502 976.464 976.502 976.464 976.503
           976.465 976.503 976.465 976.503 976.466 976.504 976.466 976.504 976.466 976.505 976.467 976.505
@@ -231,7 +231,7 @@
           977.077 977.078 977.078 977.079 977.079 977.079 977.08 977.08 977.08 977.081 977.081 977.081
           977.081 977.082 977.082 977.082 977.082
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           246.185 246.185 246.009 246.013 246.189 246.017 246.195 246.023 246.202 246.03 246.209 246.038
           246.217 246.045 246.224 246.053 246.232 246.061 246.241 246.069 246.249 246.078 246.258 246.086
           246.267 246.096 246.276 246.105 246.286 246.115 246.296 246.125 246.305 246.134 246.315 246.144
@@ -269,7 +269,7 @@
           243.479 243.49 243.5 243.509 243.518 243.526 243.534 243.541 243.548 243.555 243.561 243.566
           243.571 243.575 243.577 243.579 243.58
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           3141.32 3141.32 3138.74 3138.75 3141.31 3138.74 3141.31 3138.74 3141.31 3138.74 3141.31 3138.74
           3141.31 3138.74 3141.31 3138.74 3141.31 3138.74 3141.31 3138.73 3141.3 3138.73 3141.3 3138.73
           3141.3 3138.73 3141.3 3138.73 3141.3 3138.73 3141.3 3138.72 3141.29 3138.72 3141.29 3138.72
@@ -307,7 +307,7 @@
           3100.58 3100.58 3100.58 3100.58 3100.58 3100.58 3100.57 3100.57 3100.57 3100.57 3100.57 3100.57
           3100.57 3100.57 3100.57 3100.57 3100.57
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/injection2pnibox-simplex-reference.vtu b/test/references/injection2pnibox-simplex-reference.vtu
index 9431df94843a43444304722014aa7c3844e13ae9..2a4c1f5044ea693d3bb91c8338c53f8c79e23ecd 100644
--- a/test/references/injection2pnibox-simplex-reference.vtu
+++ b/test/references/injection2pnibox-simplex-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="768" NumberOfPoints="425">
-      <PointData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_liq">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -41,7 +41,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -79,7 +79,7 @@
           0 0 0 0 0 0 0 0 0 -0 -0 -0
           -0 -0 -0 -0 -0
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           2.6587e+07 2.6587e+07 2.65629e+07 2.65625e+07 2.65874e+07 2.65634e+07 2.6588e+07 2.6564e+07 2.65888e+07 2.65648e+07 2.65896e+07 2.65656e+07
           2.65904e+07 2.65664e+07 2.65912e+07 2.65673e+07 2.65921e+07 2.65681e+07 2.6593e+07 2.6569e+07 2.65939e+07 2.65699e+07 2.65948e+07 2.65708e+07
           2.65958e+07 2.65719e+07 2.65968e+07 2.65729e+07 2.65979e+07 2.65739e+07 2.65989e+07 2.6575e+07 2.65999e+07 2.6576e+07 2.6601e+07 2.6577e+07
@@ -117,7 +117,7 @@
           2.62079e+07 2.62091e+07 2.62102e+07 2.62112e+07 2.62121e+07 2.6213e+07 2.62138e+07 2.62146e+07 2.62154e+07 2.62161e+07 2.62168e+07 2.62174e+07
           2.62179e+07 2.62183e+07 2.62186e+07 2.62187e+07 2.62188e+07
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           2.6597e+07 2.6597e+07 2.65729e+07 2.65725e+07 2.65974e+07 2.65734e+07 2.6598e+07 2.6574e+07 2.65988e+07 2.65748e+07 2.65996e+07 2.65756e+07
           2.66004e+07 2.65764e+07 2.66012e+07 2.65773e+07 2.66021e+07 2.65781e+07 2.6603e+07 2.6579e+07 2.66039e+07 2.65799e+07 2.66048e+07 2.65808e+07
           2.66058e+07 2.65819e+07 2.66068e+07 2.65829e+07 2.66079e+07 2.65839e+07 2.66089e+07 2.6585e+07 2.66099e+07 2.6586e+07 2.6611e+07 2.6587e+07
@@ -193,7 +193,7 @@
           10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
           10000 10000 10000 10000 10000
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           976.461 976.461 976.499 976.499 976.461 976.5 976.462 976.5 976.462 976.5 976.462 976.5
           976.463 976.501 976.463 976.501 976.464 976.501 976.464 976.502 976.464 976.502 976.465 976.503
           976.465 976.503 976.465 976.503 976.466 976.504 976.466 976.504 976.467 976.505 976.467 976.505
@@ -231,7 +231,7 @@
           977.077 977.078 977.078 977.079 977.079 977.079 977.08 977.08 977.08 977.081 977.081 977.081
           977.081 977.082 977.082 977.082 977.082
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           246.185 246.186 246.013 246.009 246.19 246.018 246.195 246.024 246.202 246.03 246.209 246.038
           246.217 246.046 246.225 246.053 246.233 246.061 246.241 246.069 246.249 246.078 246.258 246.087
           246.267 246.096 246.277 246.105 246.286 246.115 246.296 246.124 246.305 246.134 246.315 246.144
@@ -269,7 +269,7 @@
           243.479 243.49 243.5 243.509 243.518 243.526 243.534 243.541 243.548 243.555 243.561 243.566
           243.571 243.575 243.578 243.579 243.58
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           3141.32 3141.31 3138.75 3138.74 3141.31 3138.74 3141.3 3138.74 3141.3 3138.74 3141.3 3138.74
           3141.3 3138.74 3141.3 3138.74 3141.29 3138.74 3141.29 3138.74 3141.29 3138.73 3141.29 3138.73
           3141.29 3138.73 3141.28 3138.73 3141.28 3138.73 3141.28 3138.72 3141.28 3138.72 3141.28 3138.72
@@ -307,7 +307,7 @@
           3100.59 3100.58 3100.58 3100.58 3100.58 3100.58 3100.58 3100.57 3100.57 3100.57 3100.57 3100.57
           3100.57 3100.57 3100.57 3100.57 3100.57
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/injection2pnicc-cube-reference.vtu b/test/references/injection2pnicc-cube-reference.vtu
index 8c1e918945d9d5f74c8ab4851f884a17f4c868f8..818f7e99777f8fb6e2502aaf39af63bc3cea3fbc 100644
--- a/test/references/injection2pnicc-cube-reference.vtu
+++ b/test/references/injection2pnicc-cube-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="384" NumberOfPoints="425">
-      <CellData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_liq">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -37,7 +37,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -71,7 +71,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="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           2.65747e+07 2.65751e+07 2.65757e+07 2.65764e+07 2.65771e+07 2.65779e+07 2.65787e+07 2.65795e+07 2.65804e+07 2.65812e+07 2.65821e+07 2.65831e+07
           2.65841e+07 2.65851e+07 2.65862e+07 2.65872e+07 2.65883e+07 2.65893e+07 2.65903e+07 2.65913e+07 2.65922e+07 2.65931e+07 2.65938e+07 2.65941e+07
           2.65504e+07 2.6551e+07 2.65516e+07 2.65523e+07 2.65531e+07 2.65539e+07 2.65548e+07 2.65556e+07 2.65564e+07 2.65572e+07 2.65581e+07 2.65591e+07
@@ -105,7 +105,7 @@
           2.62081e+07 2.62101e+07 2.6212e+07 2.62136e+07 2.62152e+07 2.62167e+07 2.62181e+07 2.62195e+07 2.62207e+07 2.62218e+07 2.62229e+07 2.62238e+07
           2.62246e+07 2.62255e+07 2.62263e+07 2.62271e+07 2.62278e+07 2.62285e+07 2.62291e+07 2.62297e+07 2.62301e+07 2.62305e+07 2.62307e+07 2.62308e+07
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           2.65847e+07 2.65851e+07 2.65857e+07 2.65864e+07 2.65871e+07 2.65879e+07 2.65887e+07 2.65895e+07 2.65904e+07 2.65912e+07 2.65921e+07 2.65931e+07
           2.65941e+07 2.65951e+07 2.65962e+07 2.65972e+07 2.65983e+07 2.65993e+07 2.66003e+07 2.66013e+07 2.66022e+07 2.66031e+07 2.66038e+07 2.66041e+07
           2.65604e+07 2.6561e+07 2.65616e+07 2.65623e+07 2.65631e+07 2.65639e+07 2.65648e+07 2.65656e+07 2.65664e+07 2.65672e+07 2.65681e+07 2.65691e+07
@@ -173,7 +173,7 @@
           10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
           10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           976.48 976.48 976.481 976.481 976.481 976.482 976.482 976.482 976.482 976.483 976.483 976.484
           976.484 976.484 976.485 976.485 976.486 976.486 976.487 976.487 976.487 976.488 976.488 976.488
           976.518 976.519 976.519 976.519 976.519 976.52 976.52 976.52 976.509 976.51 976.51 976.511
@@ -207,7 +207,7 @@
           977.053 977.054 977.055 977.056 977.056 977.057 977.057 977.058 977.059 977.059 977.059 977.06
           977.06 977.06 977.061 977.061 977.061 977.062 977.062 977.062 977.062 977.062 977.063 977.063
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           246.097 246.101 246.106 246.112 246.119 246.127 246.134 246.142 246.149 246.157 246.165 246.174
           246.184 246.194 246.203 246.213 246.222 246.232 246.241 246.25 246.259 246.267 246.273 246.277
           245.923 245.928 245.934 245.941 245.948 245.955 245.963 245.971 245.966 245.974 245.982 245.991
@@ -241,7 +241,7 @@
           243.455 243.474 243.492 243.507 243.522 243.536 243.549 243.561 243.573 243.583 243.592 243.601
           243.609 243.617 243.624 243.632 243.638 243.645 243.65 243.656 243.66 243.663 243.665 243.667
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           3140.03 3140.03 3140.03 3140.03 3140.03 3140.02 3140.02 3140.02 3140.02 3140.02 3140.02 3140.02
           3140.01 3140.01 3140.01 3140.01 3140.01 3140 3140 3140 3140 3139.99 3139.99 3139.99
           3137.47 3137.46 3137.46 3137.46 3137.45 3137.45 3137.45 3137.45 3138.06 3138.06 3138.06 3138.05
@@ -275,7 +275,7 @@
           3101.86 3101.86 3101.85 3101.85 3101.85 3101.84 3101.84 3101.84 3101.84 3101.84 3101.83 3101.83
           3101.83 3101.83 3101.83 3101.83 3101.83 3101.82 3101.82 3101.82 3101.82 3101.82 3101.82 3101.82
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/injection2pnicc-simplex-reference.vtu b/test/references/injection2pnicc-simplex-reference.vtu
index adc0c23c57f8c520b9a3eb9ba6de2dca6123898d..486850980b71f50aed51337305989e6b12a429a6 100644
--- a/test/references/injection2pnicc-simplex-reference.vtu
+++ b/test/references/injection2pnicc-simplex-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="768" NumberOfPoints="425">
-      <CellData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_liq">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -69,7 +69,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -135,7 +135,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="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           2.65871e+07 2.65777e+07 2.65997e+07 2.65907e+07 2.66109e+07 2.66022e+07 2.66214e+07 2.66128e+07 2.66315e+07 2.6623e+07 2.66412e+07 2.66328e+07
           2.66508e+07 2.66424e+07 2.66602e+07 2.66518e+07 2.66695e+07 2.66612e+07 2.66788e+07 2.66704e+07 2.6688e+07 2.66797e+07 2.66972e+07 2.66889e+07
           2.67065e+07 2.66982e+07 2.67158e+07 2.67074e+07 2.6725e+07 2.67167e+07 2.67342e+07 2.67259e+07 2.67435e+07 2.67351e+07 2.67527e+07 2.67443e+07
@@ -201,7 +201,7 @@
           2.62866e+07 2.62786e+07 2.62948e+07 2.62868e+07 2.63032e+07 2.62951e+07 2.63116e+07 2.63035e+07 2.63201e+07 2.6312e+07 2.63287e+07 2.63205e+07
           2.63372e+07 2.63291e+07 2.63458e+07 2.63376e+07 2.63543e+07 2.63461e+07 2.63627e+07 2.63546e+07 2.6371e+07 2.6363e+07 2.63792e+07 2.63712e+07
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           2.65971e+07 2.65877e+07 2.66097e+07 2.66007e+07 2.66209e+07 2.66122e+07 2.66314e+07 2.66228e+07 2.66415e+07 2.6633e+07 2.66512e+07 2.66428e+07
           2.66608e+07 2.66524e+07 2.66702e+07 2.66618e+07 2.66795e+07 2.66712e+07 2.66888e+07 2.66804e+07 2.6698e+07 2.66897e+07 2.67072e+07 2.66989e+07
           2.67165e+07 2.67082e+07 2.67258e+07 2.67174e+07 2.6735e+07 2.67267e+07 2.67442e+07 2.67359e+07 2.67535e+07 2.67451e+07 2.67627e+07 2.67543e+07
@@ -333,7 +333,7 @@
           10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
           10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           976.478 976.49 976.483 976.495 976.488 976.499 976.492 976.504 976.496 976.508 976.5 976.512
           976.504 976.516 976.508 976.52 976.511 976.523 976.515 976.527 976.519 976.531 976.523 976.535
           976.527 976.539 976.53 976.542 976.534 976.546 976.538 976.55 976.542 976.554 976.546 976.557
@@ -399,7 +399,7 @@
           977.078 977.09 977.081 977.094 977.084 977.097 977.088 977.1 977.091 977.104 977.095 977.107
           977.098 977.111 977.102 977.114 977.105 977.118 977.109 977.121 977.112 977.125 977.116 977.128
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           246.205 246.134 246.32 246.253 246.424 246.359 246.521 246.457 246.614 246.551 246.704 246.642
           246.792 246.731 246.879 246.818 246.965 246.904 247.05 246.989 247.136 247.075 247.221 247.16
           247.307 247.246 247.392 247.331 247.478 247.417 247.563 247.502 247.648 247.587 247.733 247.672
@@ -465,7 +465,7 @@
           244.175 244.117 244.251 244.193 244.329 244.27 244.407 244.348 244.486 244.427 244.565 244.506
           244.644 244.585 244.723 244.664 244.802 244.743 244.88 244.822 244.958 244.899 245.033 244.975
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           3140.39 3139.57 3140.38 3139.57 3140.37 3139.56 3140.36 3139.55 3140.35 3139.53 3140.33 3139.51
           3140.32 3139.5 3140.3 3139.48 3140.29 3139.47 3140.27 3139.45 3140.26 3139.44 3140.24 3139.42
           3140.23 3139.41 3140.21 3139.39 3140.19 3139.37 3140.18 3139.36 3140.16 3139.34 3140.15 3139.33
@@ -531,7 +531,7 @@
           3102.15 3101.32 3102.13 3101.31 3102.12 3101.29 3102.11 3101.28 3102.09 3101.27 3102.08 3101.25
           3102.06 3101.24 3102.05 3101.22 3102.04 3101.21 3102.02 3101.2 3102.01 3101.18 3102 3101.17
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/injectionbox-reference.vtu b/test/references/injectionbox-reference.vtu
index e6c916a8c81a0bef2fe21e3bbb3ed97fe0738da8..431d7160ebc24357a96822f3bd423ec8ac0f0f81 100644
--- a/test/references/injectionbox-reference.vtu
+++ b/test/references/injectionbox-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="384" NumberOfPoints="425">
-      <PointData Scalars="S_n">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_gas">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -41,7 +41,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -79,7 +79,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           2.6391e+07 2.63933e+07 2.63667e+07 2.63688e+07 2.63953e+07 2.63708e+07 2.63973e+07 2.63727e+07 2.63992e+07 2.63746e+07 2.64011e+07 2.63765e+07
           2.64029e+07 2.63783e+07 2.64048e+07 2.63802e+07 2.64066e+07 2.6382e+07 2.64084e+07 2.63838e+07 2.64102e+07 2.63856e+07 2.6412e+07 2.63874e+07
           2.64138e+07 2.63892e+07 2.64157e+07 2.6391e+07 2.64175e+07 2.63929e+07 2.64193e+07 2.63947e+07 2.64212e+07 2.63965e+07 2.6423e+07 2.63984e+07
@@ -117,7 +117,7 @@
           2.60131e+07 2.60146e+07 2.60162e+07 2.60178e+07 2.60193e+07 2.60208e+07 2.60223e+07 2.60237e+07 2.6025e+07 2.60263e+07 2.60274e+07 2.60285e+07
           2.60293e+07 2.603e+07 2.60306e+07 2.60309e+07 2.6031e+07
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           2.6381e+07 2.63833e+07 2.63567e+07 2.63588e+07 2.63853e+07 2.63608e+07 2.63873e+07 2.63627e+07 2.63892e+07 2.63646e+07 2.63911e+07 2.63665e+07
           2.63929e+07 2.63683e+07 2.63948e+07 2.63702e+07 2.63966e+07 2.6372e+07 2.63984e+07 2.63738e+07 2.64002e+07 2.63756e+07 2.6402e+07 2.63774e+07
           2.64038e+07 2.63792e+07 2.64057e+07 2.6381e+07 2.64075e+07 2.63829e+07 2.64093e+07 2.63847e+07 2.64112e+07 2.63865e+07 2.6413e+07 2.63884e+07
@@ -193,7 +193,7 @@
           10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
           10000 10000 10000 10000 10000
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           1003.43 1003.43 1003.42 1003.42 1003.43 1003.42 1003.43 1003.42 1003.43 1003.42 1003.43 1003.42
           1003.43 1003.42 1003.43 1003.42 1003.43 1003.42 1003.43 1003.42 1003.44 1003.43 1003.44 1003.43
           1003.44 1003.43 1003.44 1003.43 1003.44 1003.43 1003.44 1003.43 1003.44 1003.43 1003.44 1003.43
@@ -231,7 +231,7 @@
           1003.27 1003.27 1003.27 1003.27 1003.27 1003.27 1003.27 1003.27 1003.28 1003.28 1003.28 1003.28
           1003.28 1003.28 1003.28 1003.28 1003.28
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           269.697 269.697 269.448 269.448 269.697 269.448 269.697 269.448 269.697 269.448 269.697 269.448
           269.697 269.448 269.697 269.448 269.697 269.448 269.697 269.448 269.697 269.448 269.697 269.448
           269.697 269.448 269.697 269.448 269.697 269.448 269.697 269.448 269.697 269.448 269.697 269.448
@@ -269,7 +269,7 @@
           265.717 265.717 265.717 265.717 265.717 265.717 265.717 265.717 265.717 265.717 265.717 265.717
           265.717 265.717 265.717 265.717 265.717
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           1523.32 1523.32 1523.33 1523.33 1523.32 1523.33 1523.32 1523.33 1523.32 1523.33 1523.32 1523.33
           1523.32 1523.33 1523.32 1523.33 1523.32 1523.33 1523.32 1523.32 1523.32 1523.32 1523.31 1523.32
           1523.31 1523.32 1523.31 1523.32 1523.31 1523.32 1523.31 1523.32 1523.31 1523.32 1523.31 1523.32
@@ -307,7 +307,7 @@
           1523.46 1523.46 1523.46 1523.46 1523.46 1523.46 1523.46 1523.46 1523.46 1523.46 1523.46 1523.46
           1523.46 1523.46 1523.45 1523.45 1523.45
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -345,7 +345,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_liq" NumberOfComponents="1" format="ascii">
           55699 55699.1 55698.4 55698.5 55699.1 55698.5 55699.1 55698.6 55699.2 55698.6 55699.2 55698.7
           55699.3 55698.7 55699.3 55698.8 55699.4 55698.8 55699.4 55698.8 55699.4 55698.9 55699.5 55698.9
           55699.5 55699 55699.6 55699 55699.6 55699 55699.7 55699.1 55699.7 55699.1 55699.7 55699.2
@@ -383,7 +383,7 @@
           55690.3 55690.3 55690.4 55690.4 55690.4 55690.5 55690.5 55690.5 55690.6 55690.6 55690.6 55690.6
           55690.7 55690.7 55690.7 55690.7 55690.7
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_gas" NumberOfComponents="1" format="ascii">
           10136.1 10136.9 10126.7 10127.5 10137.7 10128.3 10138.5 10129 10139.2 10129.8 10139.9 10130.5
           10140.6 10131.2 10141.3 10131.9 10142 10132.6 10142.7 10133.3 10143.4 10134 10144.1 10134.7
           10144.8 10135.4 10145.5 10136.1 10146.2 10136.8 10146.9 10137.5 10147.6 10138.2 10148.3 10138.9
@@ -421,7 +421,7 @@
           9990.9 9991.5 9992.11 9992.71 9993.3 9993.88 9994.44 9994.98 9995.49 9995.97 9996.41 9996.81
           9997.14 9997.41 9997.61 9997.73 9997.77
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           0.996198 0.996198 0.996202 0.996202 0.996198 0.996202 0.996198 0.996202 0.996198 0.996202 0.996198 0.996202
           0.996198 0.996202 0.996198 0.996202 0.996198 0.996202 0.996198 0.996202 0.996198 0.996202 0.996198 0.996202
           0.996198 0.996202 0.996198 0.996202 0.996198 0.996202 0.996198 0.996202 0.996198 0.996202 0.996198 0.996202
@@ -459,7 +459,7 @@
           0.996254 0.996254 0.996254 0.996254 0.996254 0.996254 0.996254 0.996254 0.996254 0.996254 0.996254 0.996254
           0.996254 0.996254 0.996254 0.996254 0.996254
         </DataArray>
-        <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2_liq" NumberOfComponents="1" format="ascii">
           0.00380198 0.00380198 0.00379848 0.00379847 0.00380198 0.00379848 0.00380198 0.00379848 0.00380198 0.00379848 0.00380198 0.00379848
           0.00380198 0.00379848 0.00380198 0.00379848 0.00380198 0.00379848 0.00380198 0.00379848 0.00380198 0.00379848 0.00380198 0.00379848
           0.00380198 0.00379848 0.00380198 0.00379848 0.00380198 0.00379848 0.00380198 0.00379848 0.00380198 0.00379848 0.00380198 0.00379848
@@ -497,7 +497,7 @@
           0.00374594 0.00374594 0.00374594 0.00374594 0.00374594 0.00374594 0.00374594 0.00374594 0.00374594 0.00374594 0.00374594 0.00374594
           0.00374594 0.00374594 0.00374594 0.00374594 0.00374594
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_gas" NumberOfComponents="1" format="ascii">
           0.000179521 0.000179505 0.000179687 0.000179673 0.000179491 0.000179659 0.000179478 0.000179646 0.000179465 0.000179633 0.000179452 0.00017962
           0.00017944 0.000179607 0.000179427 0.000179595 0.000179415 0.000179583 0.000179403 0.00017957 0.00017939 0.000179558 0.000179378 0.000179546
           0.000179366 0.000179533 0.000179353 0.000179521 0.000179341 0.000179508 0.000179328 0.000179496 0.000179316 0.000179484 0.000179303 0.000179471
@@ -535,7 +535,7 @@
           0.000182136 0.000182125 0.000182114 0.000182103 0.000182092 0.000182082 0.000182071 0.000182061 0.000182052 0.000182043 0.000182035 0.000182028
           0.000182022 0.000182017 0.000182014 0.000182011 0.000182011
         </DataArray>
-        <DataArray type="Float32" Name="X^N2_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2_gas" NumberOfComponents="1" format="ascii">
           0.94974 0.949657 0.949739 0.949664 0.949584 0.949592 0.949514 0.949522 0.949445 0.949454 0.949378 0.949387
           0.949312 0.949321 0.949246 0.949255 0.94918 0.949189 0.949115 0.949124 0.94905 0.949059 0.948985 0.948994
           0.94892 0.948929 0.948854 0.948863 0.948789 0.948798 0.948723 0.948732 0.948657 0.948666 0.948591 0.948599
@@ -573,7 +573,7 @@
           0.94932 0.949263 0.949205 0.949148 0.949092 0.949037 0.948984 0.948933 0.948884 0.948838 0.948796 0.948759
           0.948727 0.948702 0.948683 0.948671 0.948667
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.997552 0.997552 0.997554 0.997554 0.997552 0.997554 0.997552 0.997554 0.997552 0.997554 0.997552 0.997554
           0.997552 0.997554 0.997552 0.997554 0.997552 0.997554 0.997552 0.997554 0.997552 0.997554 0.997552 0.997554
           0.997552 0.997554 0.997552 0.997554 0.997552 0.997554 0.997552 0.997554 0.997552 0.997554 0.997552 0.997554
@@ -611,7 +611,7 @@
           0.997588 0.997588 0.997588 0.997588 0.997588 0.997588 0.997588 0.997588 0.997588 0.997588 0.997588 0.997588
           0.997588 0.997588 0.997588 0.997588 0.997588
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_liq" NumberOfComponents="1" format="ascii">
           0.00244834 0.00244834 0.00244609 0.00244608 0.00244834 0.00244608 0.00244834 0.00244608 0.00244834 0.00244608 0.00244834 0.00244609
           0.00244834 0.00244609 0.00244834 0.00244609 0.00244834 0.00244609 0.00244834 0.00244609 0.00244834 0.00244609 0.00244834 0.00244609
           0.00244834 0.00244609 0.00244834 0.00244609 0.00244834 0.00244609 0.00244834 0.00244609 0.00244834 0.00244609 0.00244834 0.00244609
@@ -649,7 +649,7 @@
           0.00241221 0.00241221 0.00241221 0.00241221 0.00241221 0.00241221 0.00241221 0.00241221 0.00241221 0.00241221 0.00241221 0.00241221
           0.00241221 0.00241221 0.00241221 0.00241221 0.00241221
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.000279123 0.000279099 0.000279381 0.000279359 0.000279078 0.000279338 0.000279057 0.000279318 0.000279037 0.000279298 0.000279017 0.000279278
           0.000278997 0.000279258 0.000278978 0.000279239 0.000278959 0.00027922 0.00027894 0.0002792 0.00027892 0.000279181 0.000278901 0.000279162
           0.000278882 0.000279143 0.000278863 0.000279124 0.000278844 0.000279104 0.000278824 0.000279085 0.000278805 0.000279066 0.000278785 0.000279046
@@ -687,7 +687,7 @@
           0.000283189 0.000283172 0.000283155 0.000283138 0.000283121 0.000283105 0.000283089 0.000283073 0.000283059 0.000283045 0.000283033 0.000283022
           0.000283012 0.000283004 0.000282999 0.000282995 0.000282994
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_gas" NumberOfComponents="1" format="ascii">
           0.94964 0.949557 0.94964 0.949564 0.949484 0.949492 0.949414 0.949423 0.949346 0.949354 0.949279 0.949287
           0.949212 0.949221 0.949146 0.949155 0.949081 0.94909 0.949016 0.949024 0.94895 0.948959 0.948885 0.948894
           0.94882 0.948829 0.948755 0.948764 0.948689 0.948698 0.948624 0.948632 0.948557 0.948566 0.948491 0.9485
diff --git a/test/references/injectioncc-reference.vtu b/test/references/injectioncc-reference.vtu
index e28a90bc63204f50bf0f2385b0fd51fa0514a59c..9a06ac0e3d30d5b0d4478809a415fc8440e68f9a 100644
--- a/test/references/injectioncc-reference.vtu
+++ b/test/references/injectioncc-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="384" NumberOfPoints="425">
-      <CellData Scalars="S_n">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_gas">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -37,7 +37,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="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -71,7 +71,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           2.638e+07 2.63821e+07 2.6384e+07 2.63859e+07 2.63878e+07 2.63897e+07 2.63915e+07 2.63933e+07 2.63951e+07 2.63969e+07 2.63987e+07 2.64005e+07
           2.64023e+07 2.64041e+07 2.64059e+07 2.64077e+07 2.64095e+07 2.64113e+07 2.64131e+07 2.64148e+07 2.64164e+07 2.64179e+07 2.64191e+07 2.64198e+07
           2.63556e+07 2.63575e+07 2.63595e+07 2.63614e+07 2.63632e+07 2.63651e+07 2.63669e+07 2.63687e+07 2.63705e+07 2.63723e+07 2.63741e+07 2.63759e+07
@@ -105,7 +105,7 @@
           2.60144e+07 2.60157e+07 2.6017e+07 2.60185e+07 2.60199e+07 2.60215e+07 2.6023e+07 2.60246e+07 2.60262e+07 2.60277e+07 2.60293e+07 2.60309e+07
           2.60324e+07 2.60339e+07 2.60353e+07 2.60367e+07 2.60381e+07 2.60393e+07 2.60404e+07 2.60414e+07 2.60422e+07 2.60428e+07 2.60433e+07 2.60435e+07
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           2.637e+07 2.63721e+07 2.6374e+07 2.63759e+07 2.63778e+07 2.63797e+07 2.63815e+07 2.63833e+07 2.63851e+07 2.63869e+07 2.63887e+07 2.63905e+07
           2.63923e+07 2.63941e+07 2.63959e+07 2.63977e+07 2.63995e+07 2.64013e+07 2.64031e+07 2.64048e+07 2.64064e+07 2.64079e+07 2.64091e+07 2.64098e+07
           2.63456e+07 2.63475e+07 2.63495e+07 2.63514e+07 2.63532e+07 2.63551e+07 2.63569e+07 2.63587e+07 2.63605e+07 2.63623e+07 2.63641e+07 2.63659e+07
@@ -173,7 +173,7 @@
           10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
           10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           1003.42 1003.42 1003.42 1003.43 1003.43 1003.43 1003.43 1003.43 1003.43 1003.43 1003.43 1003.43
           1003.43 1003.43 1003.43 1003.43 1003.44 1003.44 1003.44 1003.44 1003.44 1003.44 1003.44 1003.44
           1003.41 1003.41 1003.41 1003.42 1003.42 1003.42 1003.42 1003.42 1003.42 1003.42 1003.42 1003.42
@@ -207,7 +207,7 @@
           1003.27 1003.27 1003.27 1003.27 1003.27 1003.27 1003.27 1003.28 1003.28 1003.28 1003.28 1003.28
           1003.28 1003.28 1003.28 1003.28 1003.28 1003.28 1003.28 1003.28 1003.28 1003.28 1003.28 1003.28
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           269.572 269.573 269.573 269.573 269.573 269.573 269.573 269.573 269.573 269.573 269.573 269.573
           269.573 269.573 269.573 269.573 269.573 269.573 269.573 269.573 269.572 269.572 269.572 269.571
           269.324 269.324 269.324 269.324 269.324 269.324 269.324 269.324 269.324 269.324 269.324 269.324
@@ -241,7 +241,7 @@
           265.842 265.842 265.842 265.842 265.842 265.842 265.842 265.842 265.842 265.842 265.842 265.842
           265.842 265.842 265.842 265.842 265.842 265.842 265.842 265.842 265.842 265.842 265.842 265.842
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           1523.33 1523.33 1523.32 1523.32 1523.32 1523.32 1523.32 1523.32 1523.32 1523.32 1523.32 1523.32
           1523.32 1523.32 1523.32 1523.32 1523.32 1523.31 1523.31 1523.31 1523.31 1523.31 1523.31 1523.31
           1523.34 1523.33 1523.33 1523.33 1523.33 1523.33 1523.33 1523.33 1523.33 1523.33 1523.33 1523.33
@@ -275,7 +275,7 @@
           1523.46 1523.46 1523.46 1523.46 1523.46 1523.46 1523.46 1523.46 1523.46 1523.46 1523.46 1523.45
           1523.45 1523.45 1523.45 1523.45 1523.45 1523.45 1523.45 1523.45 1523.45 1523.45 1523.45 1523.45
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -309,7 +309,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="rhoMolar_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_liq" NumberOfComponents="1" format="ascii">
           55698.8 55698.8 55698.8 55698.9 55698.9 55699 55699 55699.1 55699.1 55699.1 55699.2 55699.2
           55699.3 55699.3 55699.3 55699.4 55699.4 55699.5 55699.5 55699.6 55699.6 55699.6 55699.7 55699.7
           55698.2 55698.2 55698.3 55698.3 55698.4 55698.4 55698.4 55698.5 55698.5 55698.6 55698.6 55698.7
@@ -343,7 +343,7 @@
           55690.3 55690.3 55690.4 55690.4 55690.4 55690.5 55690.5 55690.6 55690.6 55690.6 55690.7 55690.7
           55690.7 55690.8 55690.8 55690.8 55690.9 55690.9 55690.9 55690.9 55691 55691 55691 55691
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_gas" NumberOfComponents="1" format="ascii">
           10131.8 10132.6 10133.4 10134.1 10134.8 10135.5 10136.2 10136.9 10137.6 10138.3 10139 10139.7
           10140.4 10141.1 10141.8 10142.5 10143.2 10143.8 10144.5 10145.2 10145.8 10146.4 10146.8 10147.1
           10122.4 10123.2 10123.9 10124.7 10125.4 10126.1 10126.8 10127.5 10128.2 10128.9 10129.6 10130.2
@@ -377,7 +377,7 @@
           9991.41 9991.89 9992.42 9992.97 9993.54 9994.12 9994.72 9995.32 9995.92 9996.53 9997.13 9997.73
           9998.32 9998.9 9999.45 9999.99 10000.5 10001 10001.4 10001.8 10002.1 10002.3 10002.5 10002.6
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           0.9962 0.9962 0.9962 0.9962 0.9962 0.9962 0.9962 0.9962 0.9962 0.9962 0.9962 0.9962
           0.9962 0.9962 0.9962 0.9962 0.9962 0.9962 0.9962 0.9962 0.9962 0.9962 0.9962 0.9962
           0.996203 0.996203 0.996203 0.996203 0.996203 0.996203 0.996203 0.996203 0.996203 0.996203 0.996203 0.996203
@@ -411,7 +411,7 @@
           0.996252 0.996252 0.996252 0.996252 0.996252 0.996252 0.996252 0.996252 0.996252 0.996252 0.996252 0.996252
           0.996252 0.996252 0.996252 0.996252 0.996252 0.996252 0.996252 0.996252 0.996252 0.996252 0.996252 0.996252
         </DataArray>
-        <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2_liq" NumberOfComponents="1" format="ascii">
           0.00380023 0.00380023 0.00380023 0.00380023 0.00380023 0.00380023 0.00380023 0.00380023 0.00380023 0.00380023 0.00380023 0.00380023
           0.00380023 0.00380023 0.00380023 0.00380023 0.00380023 0.00380023 0.00380023 0.00380023 0.00380023 0.00380022 0.00380022 0.00380021
           0.00379672 0.00379672 0.00379673 0.00379673 0.00379673 0.00379673 0.00379673 0.00379673 0.00379673 0.00379673 0.00379673 0.00379673
@@ -445,7 +445,7 @@
           0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477
           0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_gas" NumberOfComponents="1" format="ascii">
           0.000179596 0.000179582 0.000179568 0.000179555 0.000179543 0.00017953 0.000179518 0.000179505 0.000179493 0.000179481 0.000179469 0.000179456
           0.000179444 0.000179432 0.00017942 0.000179407 0.000179395 0.000179383 0.000179371 0.000179359 0.000179348 0.000179338 0.00017933 0.000179325
           0.000179763 0.000179749 0.000179736 0.000179723 0.000179711 0.000179698 0.000179686 0.000179673 0.000179661 0.000179649 0.000179636 0.000179624
@@ -479,7 +479,7 @@
           0.000182126 0.000182117 0.000182108 0.000182098 0.000182087 0.000182077 0.000182066 0.000182055 0.000182044 0.000182033 0.000182022 0.000182011
           0.000182 0.00018199 0.00018198 0.00018197 0.000181961 0.000181952 0.000181944 0.000181938 0.000181932 0.000181927 0.000181924 0.000181923
         </DataArray>
-        <DataArray type="Float32" Name="X^N2_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2_gas" NumberOfComponents="1" format="ascii">
           0.949698 0.949624 0.949554 0.949485 0.949418 0.949351 0.949285 0.94922 0.949155 0.94909 0.949026 0.948961
           0.948897 0.948832 0.948767 0.948703 0.948638 0.948574 0.94851 0.948447 0.948388 0.948333 0.948289 0.948263
           0.949701 0.94963 0.949561 0.949493 0.949426 0.94936 0.949294 0.949229 0.949164 0.949099 0.949035 0.94897
@@ -513,7 +513,7 @@
           0.949716 0.94967 0.94962 0.949568 0.949513 0.949458 0.949402 0.949345 0.949287 0.949229 0.949172 0.949115
           0.949059 0.949005 0.948952 0.948901 0.948853 0.948808 0.948768 0.948732 0.948702 0.948679 0.948663 0.948655
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.997553 0.997553 0.997553 0.997553 0.997553 0.997553 0.997553 0.997553 0.997553 0.997553 0.997553 0.997553
           0.997553 0.997553 0.997553 0.997553 0.997553 0.997553 0.997553 0.997553 0.997553 0.997553 0.997553 0.997553
           0.997555 0.997555 0.997555 0.997555 0.997555 0.997555 0.997555 0.997555 0.997555 0.997555 0.997555 0.997555
@@ -547,7 +547,7 @@
           0.997587 0.997587 0.997587 0.997587 0.997587 0.997587 0.997587 0.997587 0.997587 0.997587 0.997587 0.997587
           0.997587 0.997587 0.997587 0.997587 0.997587 0.997587 0.997587 0.997587 0.997587 0.997587 0.997587 0.997587
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_liq" NumberOfComponents="1" format="ascii">
           0.00244721 0.00244721 0.00244721 0.00244721 0.00244721 0.00244721 0.00244721 0.00244721 0.00244721 0.00244722 0.00244722 0.00244722
           0.00244722 0.00244722 0.00244722 0.00244722 0.00244721 0.00244721 0.00244721 0.00244721 0.00244721 0.00244721 0.00244721 0.0024472
           0.00244495 0.00244495 0.00244495 0.00244496 0.00244496 0.00244496 0.00244496 0.00244496 0.00244496 0.00244496 0.00244496 0.00244496
@@ -581,7 +581,7 @@
           0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334
           0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.00027924 0.000279218 0.000279198 0.000279177 0.000279158 0.000279138 0.000279119 0.000279099 0.00027908 0.000279061 0.000279042 0.000279023
           0.000279004 0.000278985 0.000278966 0.000278947 0.000278928 0.000278909 0.000278891 0.000278872 0.000278855 0.000278839 0.000278827 0.000278819
           0.0002795 0.000279479 0.000279458 0.000279438 0.000279419 0.000279399 0.00027938 0.000279361 0.000279341 0.000279322 0.000279303 0.000279284
@@ -615,7 +615,7 @@
           0.000283174 0.00028316 0.000283146 0.00028313 0.000283114 0.000283097 0.00028308 0.000283063 0.000283046 0.000283029 0.000283012 0.000282995
           0.000282978 0.000282962 0.000282946 0.000282931 0.000282917 0.000282904 0.000282891 0.000282881 0.000282872 0.000282865 0.00028286 0.000282858
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_gas" NumberOfComponents="1" format="ascii">
           0.949598 0.949525 0.949454 0.949385 0.949318 0.949252 0.949186 0.949121 0.949056 0.948991 0.948926 0.948862
           0.948797 0.948732 0.948668 0.948603 0.948539 0.948474 0.94841 0.948348 0.948288 0.948234 0.94819 0.948163
           0.949601 0.94953 0.949461 0.949393 0.949326 0.94926 0.949194 0.949129 0.949064 0.949 0.948935 0.94887
diff --git a/test/references/kuevette3p3cnibox-reference.vtu b/test/references/kuevette3p3cnibox-reference.vtu
index 402ad0171c87e812cd94378eb38cfc2b96ca9dbd..b38fc32af714ce3ea80e87e4781a917778135c7f 100644
--- a/test/references/kuevette3p3cnibox-reference.vtu
+++ b/test/references/kuevette3p3cnibox-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="120" NumberOfPoints="144">
-      <PointData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_aq">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           0.342731 0.335966 0.190201 0.187499 0.278052 0.177556 0.198895 0.131652 0.126982 0.120626 0.120051 0.120052
           0.120004 0.120004 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12
           0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.185017 0.178971 0.17791 0.134204
@@ -17,7 +17,7 @@
           0.12 0.119999 0.12 0.12 0.12 0.12 0.12 0.12 0.148373 0.154518 0.160019 0.135266
           0.121538 0.120142 0.120014 0.120001 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -31,7 +31,7 @@
           0.0699505 0 0 0 0 0 0 0 0 0 0 0
           9.85531e-05 5.33018e-05 4.46501e-06 2.88161e-07 6.31619e-10 0 0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.657269 0.664034 0.809799 0.812501 0.721948 0.822444 0.801105 0.868348 0.873018 0.879374 0.879949 0.879948
           0.879996 0.879996 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88
           0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.814983 0.821029 0.82209 0.865796
@@ -45,7 +45,7 @@
           0.81005 0.880001 0.88 0.88 0.88 0.88 0.88 0.88 0.851627 0.845482 0.839981 0.864734
           0.878363 0.879805 0.879982 0.879998 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           99801.4 99784.8 99641.6 99624.1 99735.2 99586.7 99631.2 99227.9 99076.5 98851.8 98827.7 98826.7
           98821.2 98820.1 98816.2 98815.1 98811.4 98810.3 98806.8 98805.6 98802.9 98801.2 98800.3 98798.2
           87652.7 87649.5 87640.9 87638.7 87631.6 87630.5 87622.4 87622.4 99630.2 99602.8 99587.8 99281.3
@@ -59,7 +59,7 @@
           98338.9 98793.2 98787.3 98781.2 98775.4 98769.1 98765.2 98762.2 99478.6 99507.3 99522.3 99297.9
           98878.5 98822.8 98811.9 98805.1 98798.7 98792.4 98786.2 98780.2 98774.3 98768.8 98764.7 98762.2
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           99801.4 99784.8 99641.6 99624.1 99735.2 99586.7 99631.2 99227.9 99076.5 98851.8 98827.7 98826.7
           98821.2 98820.1 98816.2 98815.1 98811.4 98810.3 98806.8 98805.6 98802.9 98801.2 98800.3 98798.2
           87652.7 87649.5 87640.9 87638.7 87631.6 87630.5 87622.4 87622.4 99630.2 99602.8 99587.8 99281.3
@@ -73,7 +73,7 @@
           99575.8 98793.2 98787.3 98781.2 98775.4 98769.1 98765.2 98762.2 99478.6 99507.3 99522.3 99297.9
           98878.5 98822.8 98811.9 98805.1 98798.7 98792.4 98786.2 98780.2 98774.3 98768.8 98764.7 98762.2
         </DataArray>
-        <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100104 100091 100102 100091 100080 100080 100074 100073 100068 100067 100064 100063
           100059 100058 100054 100053 100049 100048 100045 100043 100041 100039 100038 100036
           100030 100027 100018 100016 100009 100008 100000 100000 100103 100092 100080 100072
@@ -87,7 +87,7 @@
           100037 100031 100025 100019 100013 100007 100003 100000 100105 100094 100080 100070
           100062 100056 100049 100043 100036 100030 100024 100018 100012 100007 100002 100000
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           974.289 977.587 974.267 976.628 989.112 987.93 996.666 996.702 998.086 998.088 998.217 998.217
           998.228 998.228 998.229 998.229 998.229 998.229 998.229 998.229 998.229 998.229 998.229 998.229
           998.224 998.224 998.224 998.224 998.224 998.224 998.224 998.224 974.275 976.877 986.932 996.373
@@ -101,7 +101,7 @@
           998.268 998.268 998.268 998.267 998.267 998.268 998.267 998.229 974.264 976.398 984.969 995.37
           997.957 998.237 998.266 998.269 998.269 998.269 998.269 998.269 998.269 998.269 998.268 998.229
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           822.703 827.649 822.67 826.194 847.368 845.087 865.217 865.328 870.08 870.089 870.622 870.62
           870.669 870.669 870.673 870.673 870.673 870.673 870.673 870.673 870.673 870.673 870.673 870.673
           870.673 870.673 870.673 870.673 870.673 870.673 870.673 870.673 822.681 826.57 843.225 864.312
@@ -115,7 +115,7 @@
           870.674 870.672 870.67 870.67 870.67 870.671 870.67 870.673 822.665 825.846 839.616 861.323
           869.395 870.543 870.664 870.675 870.676 870.677 870.676 870.676 870.676 870.676 870.674 870.673
         </DataArray>
-        <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           0.849255 0.894979 0.84892 0.881832 1.04201 1.02717 1.14835 1.14897 1.17581 1.17586 1.1788 1.17878
           1.179 1.179 1.17897 1.17896 1.17891 1.17891 1.17886 1.17885 1.17881 1.1788 1.17878 1.17876
           1.17869 1.17866 1.17855 1.17853 1.17844 1.17843 1.17833 1.17833 0.849036 0.885285 1.01473 1.14324
@@ -129,7 +129,7 @@
           1.18731 1.18721 1.18712 1.18703 1.18696 1.18688 1.18676 1.17833 0.848902 0.878842 0.998729 1.1375
           1.18132 1.18687 1.1874 1.18738 1.18731 1.18723 1.18716 1.18708 1.18701 1.18694 1.1868 1.17833
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_aq" NumberOfComponents="1" format="ascii">
           0.999994 0.999993 0.999994 0.999994 0.99999 0.999991 0.999987 0.999987 0.999985 0.999985 0.999985 0.999985
           0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985
           0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999994 0.999994 0.999991 0.999987
@@ -143,7 +143,7 @@
           0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999985 0.999994 0.999994 0.999983 0.999978
           0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999985
         </DataArray>
-        <DataArray type="Float32" Name="x^mesitylene_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^mesitylene_aq" NumberOfComponents="1" format="ascii">
           2.08448e-12 1.22675e-10 1.75938e-11 1.1111e-09 7.63694e-10 3.81439e-09 1.39276e-09 5.93258e-09 1.85415e-09 6.8391e-09 2.04346e-09 7.29939e-09
           2.13314e-09 7.48588e-09 2.21242e-09 7.60206e-09 2.29158e-09 7.64691e-09 2.36919e-09 7.49368e-09 2.44429e-09 6.91015e-09 2.55385e-09 5.79007e-09
           4.37969e-09 7.46323e-09 6.10234e-09 9.17925e-09 6.33041e-09 8.97294e-09 3.02334e-09 3.02334e-09 6.98242e-11 6.63323e-09 1.69605e-08 2.53094e-08
@@ -157,7 +157,7 @@
           6.9018e-06 6.89529e-06 6.88521e-06 6.87541e-06 6.86842e-06 6.86781e-06 6.80909e-06 3.02334e-09 8.51315e-10 1.58222e-07 8.2412e-06 9.5667e-06
           7.66875e-06 6.9776e-06 6.90778e-06 6.90107e-06 6.90051e-06 6.89974e-06 6.89856e-06 6.89683e-06 6.89444e-06 6.89089e-06 6.83048e-06 3.02334e-09
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_aq" NumberOfComponents="1" format="ascii">
           5.66748e-06 6.57401e-06 5.66097e-06 6.31502e-06 9.58505e-06 9.2423e-06 1.30856e-05 1.31153e-05 1.45445e-05 1.45475e-05 1.47278e-05 1.4727e-05
           1.47431e-05 1.47429e-05 1.47437e-05 1.47435e-05 1.47431e-05 1.47429e-05 1.47424e-05 1.47422e-05 1.47418e-05 1.47415e-05 1.47414e-05 1.47411e-05
           1.47402e-05 1.47397e-05 1.47384e-05 1.47381e-05 1.4737e-05 1.47368e-05 1.47356e-05 1.47356e-05 5.66319e-06 6.38302e-06 8.96753e-06 1.28485e-05
@@ -171,7 +171,7 @@
           1.47073e-05 1.47055e-05 1.47042e-05 1.47032e-05 1.47024e-05 1.47017e-05 1.47011e-05 1.47356e-05 5.66025e-06 6.25202e-06 8.41407e-06 1.20857e-05
           1.42811e-05 1.46645e-05 1.47055e-05 1.47085e-05 1.47079e-05 1.4707e-05 1.4706e-05 1.4705e-05 1.47041e-05 1.47032e-05 1.47022e-05 1.47356e-05
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_napl" NumberOfComponents="1" format="ascii">
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -185,7 +185,7 @@
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
         </DataArray>
-        <DataArray type="Float32" Name="x^mesitylene_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^mesitylene_napl" NumberOfComponents="1" format="ascii">
           1.36916e-08 1.03792e-06 1.15374e-07 8.7152e-06 2.02398e-05 8.75223e-05 0.000130118 0.00055907 0.00025575 0.00094409 0.000294804 0.0010529
           0.000308934 0.00108413 0.000320518 0.00110133 0.000331995 0.00110785 0.000343238 0.00108565 0.000354118 0.00100111 0.000369987 0.000838839
           0.000634502 0.00108123 0.000884069 0.00132984 0.00091711 0.00129995 0.000438002 0.000438002 4.58134e-07 5.30501e-05 0.000346836 0.00220441
@@ -199,7 +199,7 @@
           1 0.998852 0.997285 0.995835 0.99483 0.994797 0.986211 0.000438002 5.58117e-06 0.00121893 0.13566 0.664355
           1 1 1 1 1 0.999899 0.999707 0.999439 0.999077 0.998531 0.989614 0.000438002
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_napl" NumberOfComponents="1" format="ascii">
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -213,7 +213,7 @@
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.401819 0.316577 0.402441 0.340287 0.109762 0.12527 0.0346303 0.0343576 0.0242832 0.0242671 0.023361 0.0233644
           0.0232828 0.0232834 0.0232774 0.0232777 0.023278 0.0232782 0.023279 0.0232793 0.02328 0.0232804 0.0232808 0.0232811
           0.0232827 0.0232834 0.0232855 0.0232859 0.0232876 0.0232878 0.0232898 0.0232898 0.402231 0.334004 0.139297 0.0368506
@@ -227,7 +227,7 @@
           0.0232788 0.0232844 0.023288 0.0232901 0.0232913 0.0232916 0.0232942 0.0232898 0.402528 0.346105 0.170091 0.0452885
           0.0255009 0.0234986 0.0232938 0.0232754 0.0232752 0.0232764 0.0232783 0.02328 0.0232817 0.0232836 0.023288 0.0232898
         </DataArray>
-        <DataArray type="Float32" Name="x^mesitylene_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^mesitylene_gas" NumberOfComponents="1" format="ascii">
           6.88747e-10 4.05391e-08 5.81339e-09 3.67174e-07 2.52397e-07 1.26064e-06 4.60331e-07 1.96084e-06 6.1286e-07 2.26058e-06 6.75466e-07 2.41284e-06
           7.05144e-07 2.4746e-06 7.31385e-07 2.51313e-06 7.57591e-07 2.52808e-06 7.83283e-07 2.47753e-06 8.08145e-07 2.28471e-06 8.44388e-07 1.91443e-06
           1.44819e-06 2.46787e-06 2.01804e-06 3.03563e-06 2.09365e-06 2.96765e-06 1e-06 1e-06 2.30713e-08 2.192e-06 5.60537e-06 8.36531e-06
@@ -241,7 +241,7 @@
           0.00228198 0.00227998 0.00227678 0.00227368 0.0022715 0.00227144 0.00225211 1e-06 2.81285e-07 5.22843e-05 0.00272367 0.00316208
           0.00253494 0.00230663 0.00228369 0.00228162 0.00228158 0.00228147 0.00228122 0.00228079 0.00228013 0.00227908 0.00225919 1e-06
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
           0.598181 0.683423 0.597559 0.659713 0.890238 0.874729 0.965369 0.96564 0.975716 0.975731 0.976638 0.976633
           0.976716 0.976714 0.976722 0.97672 0.976721 0.976719 0.97672 0.976718 0.976719 0.976717 0.976718 0.976717
           0.976716 0.976714 0.976713 0.976711 0.97671 0.976709 0.976709 0.976709 0.597769 0.665994 0.860698 0.963141
diff --git a/test/references/kuevette3p3cnicc-reference.vtu b/test/references/kuevette3p3cnicc-reference.vtu
index e0d3f2b8799d13a2617fd339b89632077bcee2a8..a738c7d2a96a80f117520cce9387ba8a89c3586c 100644
--- a/test/references/kuevette3p3cnicc-reference.vtu
+++ b/test/references/kuevette3p3cnicc-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="120" NumberOfPoints="144">
-      <CellData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_aq">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           0.299058 0.269131 0.197939 0.131121 0.120225 0.120019 0.120001 0.12 0.12 0.12 0.12 0.12
           0.12 0.12 0.12 0.193424 0.184726 0.157538 0.12416 0.120271 0.120023 0.120002 0.12 0.12
           0.12 0.12 0.12 0.12 0.12 0.12 0.18752 0.171477 0.156963 0.125386 0.120356 0.120029
@@ -15,7 +15,7 @@
           0.120004 0.12 0.119998 0.12 0.12 0.12 0.12 0.12 0.12 0.160048 0.168989 0.15684
           0.126925 0.120597 0.120058 0.120005 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -27,7 +27,7 @@
           0.0699676 0.0699371 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="S_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.700942 0.730869 0.802061 0.868879 0.879775 0.879981 0.879999 0.88 0.88 0.88 0.88 0.88
           0.88 0.88 0.88 0.806576 0.815274 0.842462 0.87584 0.879729 0.879977 0.879998 0.88 0.88
           0.88 0.88 0.88 0.88 0.88 0.88 0.81248 0.828523 0.843037 0.874614 0.879644 0.879971
@@ -39,7 +39,7 @@
           0.810029 0.810063 0.880002 0.88 0.88 0.88 0.88 0.88 0.88 0.839952 0.831011 0.84316
           0.873075 0.879403 0.879942 0.879995 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           99776.7 99740.2 99638.5 99218.6 98841.9 98829.8 98824.4 98819.6 98814.9 98810.4 98806.4 98803.7
           87654 87639.6 87628.1 99653.2 99619.3 99511.8 98984.5 98842.5 98828.9 98823.3 98818.5 98813.7
           98808.9 98804.3 98800.4 87648.5 87636.1 87627 99643.8 99581.3 99508.2 99026.7 98844.4 98828
@@ -51,7 +51,7 @@
           98347.7 98341.6 98796.1 98790.2 98784.3 98778.2 98772 98767.7 98764 99543 99565.4 99499
           99070.2 98840.7 98815.6 98807.6 98801.3 98795.1 98789.2 98783.2 98777.4 98771.8 98767.3 98763.6
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           99776.7 99740.2 99638.5 99218.6 98841.9 98829.8 98824.4 98819.6 98814.9 98810.4 98806.4 98803.7
           87654 87639.6 87628.1 99653.2 99619.3 99511.8 98984.5 98842.5 98828.9 98823.3 98818.5 98813.7
           98808.9 98804.3 98800.4 87648.5 87636.1 87627 99643.8 99581.3 99508.2 99026.7 98844.4 98828
@@ -63,7 +63,7 @@
           99584.8 99578.2 98796.1 98790.2 98784.3 98778.2 98772 98767.7 98764 99543 99565.4 99499
           99070.2 98840.7 98815.6 98807.6 98801.3 98795.1 98789.2 98783.2 98777.4 98771.8 98767.3 98763.6
         </DataArray>
-        <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100106 100093 100083 100077 100072 100067 100062 100057 100053 100048 100044 100041
           100032 100017 100006 100107 100093 100082 100076 100071 100066 100061 100056 100051
           100047 100042 100038 100026 100014 100005 100111 100094 100081 100075 100070 100065
@@ -75,7 +75,7 @@
           100046 100040 100034 100028 100022 100016 100010 100005 100002 100101 100086 100073
           100064 100057 100051 100045 100039 100033 100027 100021 100015 100010 100005 100001
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           975.16 981.367 993.283 997.652 998.177 998.225 998.229 998.229 998.229 998.229 998.229 998.229
           998.224 998.224 998.224 975.062 979.552 992.144 997.529 998.166 998.224 998.229 998.229 998.229
           998.229 998.229 998.229 998.224 998.224 998.224 975.198 978.393 990.621 997.324 998.15 998.223
@@ -87,7 +87,7 @@
           998.267 998.268 998.267 998.266 998.266 998.264 998.262 998.259 998.255 974.987 978.271 989.656
           996.976 998.117 998.233 998.245 998.246 998.246 998.246 998.246 998.246 998.246 998.246 998.245
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           823.982 833.621 856.245 868.48 870.458 870.654 870.671 870.673 870.673 870.673 870.673 870.673
           870.673 870.673 870.673 823.839 830.71 853.654 868.049 870.413 870.65 870.671 870.673 870.673
           870.673 870.673 870.673 870.673 870.673 870.673 824.037 828.903 850.404 867.331 870.345 870.646
@@ -99,7 +99,7 @@
           870.669 870.674 870.671 870.669 870.669 870.669 870.67 870.671 870.669 823.728 828.714 848.4
           866.119 870.14 870.621 870.671 870.675 870.676 870.676 870.676 870.675 870.675 870.675 870.673
         </DataArray>
-        <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           0.861745 0.944794 1.09665 1.16685 1.17797 1.17902 1.17906 1.17901 1.17895 1.1789 1.17885 1.17882
           1.17871 1.17854 1.1784 0.860347 0.921179 1.08118 1.1644 1.17771 1.17899 1.17905 1.17901 1.17895
           1.17889 1.17884 1.17879 1.17865 1.17851 1.17841 0.862331 0.905736 1.06128 1.16041 1.17741 1.17906
@@ -111,7 +111,7 @@
           1.18739 1.18734 1.18708 1.18691 1.18673 1.1864 1.18565 1.18495 1.18417 0.85921 0.904052 1.05174
           1.15697 1.17968 1.1823 1.18248 1.18241 1.18233 1.18224 1.18215 1.18206 1.18197 1.18188 1.18173
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_aq" NumberOfComponents="1" format="ascii">
           0.999994 0.999992 0.999989 0.999986 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985
           0.999985 0.999985 0.999985 0.999994 0.999993 0.999989 0.999986 0.999985 0.999985 0.999985 0.999985 0.999985
           0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999994 0.999993 0.99999 0.999986 0.999985 0.999985
@@ -123,7 +123,7 @@
           0.999978 0.999978 0.999979 0.999979 0.999979 0.999979 0.999979 0.99998 0.999981 0.999994 0.999993 0.999987
           0.999984 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999983
         </DataArray>
-        <DataArray type="Float32" Name="x^mesitylene_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^mesitylene_aq" NumberOfComponents="1" format="ascii">
           1.08406e-10 3.41182e-10 6.78031e-10 8.72625e-10 9.60789e-10 1.00605e-09 1.05633e-09 1.11232e-09 1.17331e-09 1.2365e-09 1.29692e-09 1.38008e-09
           3.82849e-09 7.22517e-09 8.24558e-09 7.37023e-10 1.69159e-09 4.0991e-09 5.45829e-09 6.22711e-09 6.87165e-09 7.59904e-09 8.34481e-09 8.91829e-09
           8.93013e-09 7.82912e-09 5.56102e-09 1.20022e-08 1.86701e-08 2.0786e-08 1.97416e-09 6.44421e-09 3.15057e-08 5.6646e-08 7.67159e-08 9.55248e-08
@@ -135,7 +135,7 @@
           6.90493e-06 6.90197e-06 6.76907e-06 6.69476e-06 6.60405e-06 6.39952e-06 5.84332e-06 5.31923e-06 4.72968e-06 1.39964e-09 2.36645e-08 2.75485e-06
           2.96524e-06 2.97194e-06 2.95531e-06 2.93722e-06 2.91981e-06 2.90579e-06 2.89192e-06 2.87827e-06 2.86402e-06 2.84619e-06 2.82069e-06 2.73927e-06
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_aq" NumberOfComponents="1" format="ascii">
           5.91776e-06 7.54601e-06 1.10768e-05 1.40279e-05 1.46727e-05 1.47392e-05 1.47445e-05 1.47443e-05 1.47436e-05 1.4743e-05 1.47423e-05 1.47419e-05
           1.47404e-05 1.47382e-05 1.47364e-05 5.88959e-06 7.085e-06 1.06067e-05 1.38949e-05 1.46572e-05 1.47377e-05 1.47443e-05 1.47441e-05 1.47434e-05
           1.47427e-05 1.4742e-05 1.47414e-05 1.47395e-05 1.47376e-05 1.47362e-05 5.92901e-06 6.78263e-06 1.00615e-05 1.36799e-05 1.46338e-05 1.47356e-05
@@ -147,7 +147,7 @@
           1.47067e-05 1.47076e-05 1.47063e-05 1.47052e-05 1.47046e-05 1.47048e-05 1.47071e-05 1.47092e-05 1.47111e-05 5.86735e-06 6.75013e-06 9.73569e-06
           1.33182e-05 1.45483e-05 1.47109e-05 1.4727e-05 1.47278e-05 1.47271e-05 1.47263e-05 1.47254e-05 1.47245e-05 1.47237e-05 1.47229e-05 1.47223e-05
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_napl" NumberOfComponents="1" format="ascii">
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -159,7 +159,7 @@
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
         </DataArray>
-        <DataArray type="Float32" Name="x^mesitylene_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^mesitylene_napl" NumberOfComponents="1" format="ascii">
           7.59362e-07 3.98428e-06 3.25983e-05 0.000105621 0.000136733 0.000145521 0.000153017 0.000161147 0.000169984 0.000179139 0.000187891 0.000199938
           0.000554648 0.00104674 0.00119457 5.12538e-06 1.68428e-05 0.000164651 0.000638073 0.000882898 0.000993654 0.00110076 0.00120896 0.00129206
           0.00129377 0.00113426 0.000805661 0.00173882 0.00270482 0.00301136 1.38671e-05 5.82497e-05 0.00101714 0.00625156 0.0108166 0.0138081
@@ -171,7 +171,7 @@
           1 1 0.980495 0.969613 0.956439 0.926835 0.846368 0.770493 0.685007 9.6792e-06 0.000211768 0.0780206
           0.297291 0.411964 0.426325 0.425446 0.423094 0.421078 0.419063 0.417081 0.41501 0.412417 0.408705 0.39686
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_napl" NumberOfComponents="1" format="ascii">
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -183,7 +183,7 @@
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.377667 0.234147 0.0634704 0.0273767 0.023639 0.0233064 0.0232777 0.0232763 0.0232772 0.0232782 0.0232792 0.02328
           0.0232824 0.0232857 0.0232884 0.380375 0.271852 0.0748324 0.0282608 0.0237159 0.0233129 0.0232783 0.0232764 0.0232773
           0.0232784 0.0232795 0.0232805 0.0232835 0.0232865 0.0232886 0.376611 0.298062 0.0915019 0.0297321 0.0238307 0.0233205
@@ -195,7 +195,7 @@
           0.023286 0.0232787 0.0232853 0.0232892 0.0232914 0.0232924 0.0232918 0.0232918 0.0232953 0.382482 0.300883 0.103048
           0.0324184 0.0241838 0.0233653 0.023283 0.0232763 0.023277 0.0232786 0.0232802 0.0232818 0.0232836 0.0232855 0.0232888
         </DataArray>
-        <DataArray type="Float32" Name="x^mesitylene_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^mesitylene_gas" NumberOfComponents="1" format="ascii">
           3.58184e-08 1.12745e-07 2.2408e-07 2.88408e-07 3.17563e-07 3.32538e-07 3.49175e-07 3.677e-07 3.87879e-07 4.08787e-07 4.28778e-07 4.56286e-07
           1.26591e-06 2.38938e-06 2.72715e-06 2.43518e-07 5.58991e-07 1.35471e-06 1.80402e-06 2.05822e-06 2.27137e-06 2.51193e-06 2.75858e-06 2.9483e-06
           2.95235e-06 2.58847e-06 1.83866e-06 3.96882e-06 6.17449e-06 6.87487e-06 6.52251e-07 2.12949e-06 1.04123e-05 1.87222e-05 2.53569e-05 3.15753e-05
@@ -207,7 +207,7 @@
           0.00228282 0.00228198 0.00223818 0.00221374 0.00218388 0.00211637 0.00193255 0.00175929 0.00156436 4.62478e-07 7.82051e-06 0.000910532
           0.000980154 0.000982435 0.000976998 0.000971075 0.000965378 0.000960804 0.000956274 0.000951818 0.000947159 0.000941316 0.000932923 0.000906028
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_g" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
           0.622333 0.765852 0.936529 0.972623 0.976361 0.976693 0.976722 0.976723 0.976722 0.976721 0.97672 0.97672
           0.976716 0.976712 0.976709 0.619625 0.728147 0.925166 0.971737 0.976282 0.976685 0.976719 0.976721 0.97672
           0.976719 0.976718 0.976718 0.976713 0.976707 0.976704 0.623388 0.701936 0.908488 0.970249 0.976144 0.976648
diff --git a/test/references/lensbox-reference.vtu b/test/references/lensbox-reference.vtu
index 6dcb24b845d02ee3373e721b93214d9fd6264b73..e1fb9bf426be3b9d633c4c3cbce059b4c4167f9b 100644
--- a/test/references/lensbox-reference.vtu
+++ b/test/references/lensbox-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="1536" NumberOfPoints="1617">
-      <PointData Scalars="S_n">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_napl">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -140,7 +140,7 @@
           3.4929e-05 3.91854e-08 6.66701e-14 5.416e-25 -1.54724e-33 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -277,7 +277,7 @@
           0.999965 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           153955 152690 152269 151338 151814 150519 151092 149819 150468 149207 149915 148662
           149417 148169 148963 147719 148544 147303 148156 146918 147793 146556 147451 146216
           147128 145894 146819 145586 146523 145291 146238 145007 145963 144733 145695 144466
@@ -414,7 +414,7 @@
           101658 101585 101512 101439 101365 101291 101216 101139 101061 100982 100901 100817
           100732 100645 100557 100466 100375 100282 100189 100094 100000
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           153955 152690 152269 151338 151814 150519 151092 149819 150468 149207 149915 148662
           149417 148169 148963 147719 148544 147303 148156 146918 147793 146556 147451 146216
           147128 145894 146819 145586 146523 145291 146238 145007 145963 144733 145695 144466
@@ -688,7 +688,7 @@
           0.785143 0.000882787 1.49885e-09 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -825,7 +825,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -962,7 +962,7 @@
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -1099,7 +1099,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/lensbox_ifsolver-reference.vtu b/test/references/lensbox_ifsolver-reference.vtu
index 5aa498b53dc9addfac59896b8ad62f887cffe454..c0b3644223c39693986c7689f5d90be7a2872647 100644
--- a/test/references/lensbox_ifsolver-reference.vtu
+++ b/test/references/lensbox_ifsolver-reference.vtu
@@ -1031,7 +1031,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="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -1545,7 +1545,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           153955 152692 152269 151340 152692 151818 151340 150523 151818 151099 150523 149826
           151099 150477 149826 149217 150477 149927 149217 148674 149927 149431 148674 148183
           149431 148979 148183 147735 148979 148563 147735 147322 148563 148178 147322 146939
@@ -2059,7 +2059,7 @@
           101760 101673 100533 100446 101673 101586 100446 100359 101586 101497 100359 100270
           101497 101407 100270 100181 101407 101317 100181 100090 101317 101226 100090 100000
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -2573,7 +2573,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -3087,7 +3087,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -3601,7 +3601,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="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           153955 152692 152269 151340 152692 151818 151340 150523 151818 151099 150523 149826
           151099 150477 149826 149217 150477 149927 149217 148674 149927 149431 148674 148183
           149431 148979 148183 147735 148979 148563 147735 147322 148563 148178 147322 146939
@@ -4115,7 +4115,7 @@
           101760 101673 100533 100446 101673 101586 100446 100359 101586 101497 100359 100270
           101497 101407 100270 100181 101407 101317 100181 100090 101317 101226 100090 100000
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -4629,7 +4629,7 @@
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/lensboxadaptive-reference.vtu b/test/references/lensboxadaptive-reference.vtu
index 56798c2d2a2740ac9f01c7ff31d99f941d1d95a4..92991963fed638d85231f0ee62f71f930ba68df6 100644
--- a/test/references/lensboxadaptive-reference.vtu
+++ b/test/references/lensboxadaptive-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="5055" NumberOfPoints="5069">
-      <PointData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_aq">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -428,7 +428,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 -0 -0 -0 0 -0 0 -0 0
           0 0 -0 0 -0 0 -0 0 -0 -0 0 0
           -0 0 -0 -0 -0 -0 -0 0 0 -0 0 -0
@@ -853,7 +853,7 @@
           0 1.4013e-44 0 -0 -0 4.90771e-20 2.57608e-23 0 -0 -0 0 -0
           1.11723e-09 8.04505e-11 2.27727e-12 2.50368e-11 9.15436e-23
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           153955 152690 152269 151338 151814 150519 151093 149820 150469 149208 149916 148663
           149418 148170 148964 147720 148546 147305 148158 146920 147795 146559 147454 146219
           147130 145896 146822 145589 146526 145294 146241 145010 145966 144736 145699 144469
@@ -1278,7 +1278,7 @@
           104003 103981 104891 104585 104271 103380 102731 102769 102749 103653 103349 103037
           102550 102225 101576 101927 101504
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           153955 152690 152269 151338 151814 150519 151093 149820 150469 149208 149916 148663
           149418 148170 148964 147720 148546 147305 148158 146920 147795 146559 147454 146219
           147130 145896 146822 145589 146526 145294 146241 145010 145966 144736 145699 144469
@@ -2128,7 +2128,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           2.51696e-05 1.81243e-06 5.13101e-08 5.64047e-07 0
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -2553,7 +2553,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -2978,7 +2978,7 @@
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -3403,7 +3403,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/lenscc-reference.vtu b/test/references/lenscc-reference.vtu
index c553bc1e7407689d684719739f5b76e728c68fc5..67c33c02bdddd17fbc67d5d91012b9ba5f4a62c1 100644
--- a/test/references/lenscc-reference.vtu
+++ b/test/references/lenscc-reference.vtu
@@ -263,7 +263,7 @@
           131.039 105.413 60.0852 13.2658 0.254795 7.88749e-05 1.42535e-11 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -393,7 +393,7 @@
           0.975821 0.991067 0.996666 0.999387 0.999989 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           152500 151568 150802 150144 149565 149047 148576 148144 147745 147373 147024 146694
           146381 146081 145793 145515 145246 144983 144727 144477 144230 143989 143750 143515
           143284 143055 142828 142605 142385 142167 141952 141740 141531 141325 141122 140922
@@ -523,7 +523,7 @@
           102497 102420 102346 102273 102199 102125 102051 101976 101902 101827 101752 101676
           101599 101521 101441 101360 101277 101192 101106 101018 100929 100840 100749 100659
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -653,7 +653,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -783,7 +783,7 @@
           950.67 992.551 998.926 999.963 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 -0 -0 -0 -0 -0 -0 -0 -0 -0
           -0 -0 -0 -0 -0 -0 0 0 0 7.1918e-38 3.78599e-33 -1.74859e-32
@@ -913,7 +913,7 @@
           0.0241793 0.00893257 0.00333371 0.000612571 1.13181e-05 3.50111e-09 6.21494e-16 6.44906e-29 -4.10091e-38 8.40779e-45 0 0
           0 0 -0 -0 0 0 0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           152500 151568 150802 150144 149565 149047 148576 148144 147745 147373 147024 146694
           146381 146081 145793 145515 145246 144983 144727 144477 144230 143989 143750 143515
           143284 143055 142828 142605 142385 142167 141952 141740 141531 141325 141122 140922
@@ -1043,7 +1043,7 @@
           102628 102526 102406 102286 102199 102125 102051 101976 101902 101827 101752 101676
           101599 101521 101441 101360 101277 101192 101106 101018 100929 100840 100749 100659
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -1173,7 +1173,7 @@
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/lenscc_oilwet-reference.vtu b/test/references/lenscc_oilwet-reference.vtu
index 9f7a25a444e94a66886d538a95408627f35f8f9b..611444b0357537fd4485b7a6f0067fe9e5200d00 100644
--- a/test/references/lenscc_oilwet-reference.vtu
+++ b/test/references/lenscc_oilwet-reference.vtu
@@ -263,7 +263,7 @@
           339.578 321.623 307.089 294.526 283.054 272.068 261.083 249.633 237.204 223.165 206.711 186.85
           162.321 131.541 86.5034 12.6536 0.0461824 4.26058e-07 0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -393,7 +393,7 @@
           0.373837 0.424257 0.469718 0.512128 0.553035 0.593718 0.635332 0.678982 0.725711 0.776266 0.830468 0.885934
           0.937011 0.975395 0.994308 0.999417 0.999998 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           100004 100011 100018 100025 100031 100038 100045 100051 100057 100063 100068 100074
           100079 100083 100087 100091 100094 100097 100099 100101 100102 100103 100104 100104
           100103 100102 100101 100099 100096 100094 100091 100087 100084 100080 100075 100071
@@ -523,7 +523,7 @@
           100385 100354 100327 100301 100277 100254 100232 100211 100190 100170 100151 100133
           100117 100105 100094 100084 100074 100064 100054 100044 100034 100024 100015 100005
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -653,7 +653,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -783,7 +783,7 @@
           24.9495 39.2735 56.4049 76.6141 100.559 129.322 164.56 208.753 265.549 340.027 438.23 564.063
           755.917 949.07 996.913 999.967 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 -0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 -0 -0 0
@@ -913,7 +913,7 @@
           0.626163 0.575743 0.530282 0.487871 0.446965 0.406282 0.364668 0.321017 0.274289 0.223734 0.169532 0.114066
           0.0629887 0.0246049 0.00569207 0.000583186 2.05022e-06 1.8912e-11 4.63362e-21 -4.60826e-34 1.84535e-38 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           100004 100011 100018 100025 100031 100038 100045 100051 100057 100063 100068 100074
           100079 100083 100087 100091 100094 100097 100099 100101 100102 100103 100104 100104
           100103 100102 100101 100099 100096 100094 100091 100087 100084 100080 100075 100071
@@ -1043,7 +1043,7 @@
           100724 100676 100634 100596 100560 100527 100493 100461 100427 100393 100357 100320
           100280 100236 100180 100096 100074 100064 100054 100044 100034 100024 100015 100005
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -1173,7 +1173,7 @@
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/lensccadaptive-reference.vtu b/test/references/lensccadaptive-reference.vtu
index bd13334661d7a58f51809333241581b64639533e..c80e0f1fd7d8985b198b1728a47f367b67570ad2 100644
--- a/test/references/lensccadaptive-reference.vtu
+++ b/test/references/lensccadaptive-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="5448" NumberOfPoints="5705">
-      <CellData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_aq">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -459,7 +459,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -915,7 +915,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="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           152501 151571 150807 150982 150179 149472 150152 149575 149058 148847 148288 147784
           149380 148691 148055 147747 147149 146581 147475 146948 146465 146052 145562 145108
           148590 148161 147764 147325 146902 146510 147394 147047 146719 146145 145802 145477
@@ -1371,7 +1371,7 @@
           104782 104696 104608 103550 103465 103378 104518 104428 104337 103289 103200 103111
           102320 102235 102149 101092 101008 100922 102061 101973 101884 100834 100746 100658
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           152501 151571 150807 150982 150179 149472 150152 149575 149058 148847 148288 147784
           149380 148691 148055 147747 147149 146581 147475 146948 146465 146052 145562 145108
           148590 148161 147764 147325 146902 146510 147394 147047 146719 146145 145802 145477
@@ -2283,7 +2283,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="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -2739,7 +2739,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -3195,7 +3195,7 @@
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -3651,7 +3651,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/lensccadaptivepointsource-reference.vtu b/test/references/lensccadaptivepointsource-reference.vtu
index 9cf2f03499b35742eac14c50b04505dc8d7b167b..5c58b177c699d20ba29af250f523022527b65627 100644
--- a/test/references/lensccadaptivepointsource-reference.vtu
+++ b/test/references/lensccadaptivepointsource-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="5457" NumberOfPoints="5718">
-      <CellData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_aq">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -460,7 +460,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 -0 0 0 0 -0 -0 -0 -0
           0 0 0 0 -0 -0 -0 -0 -0 -0 0 0
           -0 -0 -0 0 -0 -0 0 0 -0 0 0 -0
@@ -917,7 +917,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="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           152501 151573 150810 150983 150181 149475 150156 149580 149064 148851 148293 147790
           149381 148692 148058 147748 147151 146585 147479 146953 146471 146056 145567 145114
           148597 148168 147772 147331 146909 146518 147402 147056 146728 146153 145810 145486
@@ -1374,7 +1374,7 @@
           103550 103464 103378 104518 104428 104337 103289 103200 103111 102320 102235 102149
           101092 101007 100921 102061 101973 101884 100834 100746 100658
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           152501 151573 150810 150983 150181 149475 150156 149580 149064 148851 148293 147790
           149381 148692 148058 147748 147151 146585 147479 146953 146471 146056 145567 145114
           148597 148168 147772 147331 146909 146518 147402 147056 146728 146153 145810 145486
@@ -2288,7 +2288,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="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -2745,7 +2745,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -3202,7 +3202,7 @@
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -3659,7 +3659,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/lensccmpfaadaptive-reference.vtu b/test/references/lensccmpfaadaptive-reference.vtu
index 50828b1f368a218fa74dc8c6bddacb5eb381f1e6..285b56430d57a4d60f9021158c197278100ad9d2 100644
--- a/test/references/lensccmpfaadaptive-reference.vtu
+++ b/test/references/lensccmpfaadaptive-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="5448" NumberOfPoints="5705">
-      <CellData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_aq">
+        <DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -459,7 +459,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           -0 -0 -0 -0 0 0 0 0 -0 -0 -0 -0
           -0 0 0 0 0 -0 -0 -0 0 0 0 0
           0 0 0 -0 -0 0 -0 -0 0 0 -0 0
@@ -915,7 +915,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="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           152500 151570 150805 150982 150178 149470 150149 149571 149054 148844 148285 147780
           149380 148689 148053 147747 147148 146579 147473 146944 146461 146049 145558 145103
           148585 148155 147757 147319 146896 146504 147386 147039 146710 146137 145793 145468
@@ -1371,7 +1371,7 @@
           104786 104698 104609 103555 103468 103380 104519 104429 104338 103291 103201 103111
           102326 102240 102152 101098 101012 100925 102063 101974 101884 100836 100747 100658
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           152500 151570 150805 150982 150178 149470 150149 149571 149054 148844 148285 147780
           149380 148689 148053 147747 147148 146579 147473 146944 146461 146049 145558 145103
           148585 148155 147757 147319 146896 146504 147386 147039 146710 146137 145793 145468
@@ -2283,7 +2283,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="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -2739,7 +2739,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -3195,7 +3195,7 @@
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
           1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_aq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -3651,7 +3651,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_napl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/liddrivencavity-high-re-reference.vtu b/test/references/liddrivencavity-high-re-reference.vtu
index b9d11796a88a9252fe3f56cefb989830f45320ea..74fe5858432279d39fdfe254398ebe9e9d10848a 100644
--- a/test/references/liddrivencavity-high-re-reference.vtu
+++ b/test/references/liddrivencavity-high-re-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="4096" NumberOfPoints="4225">
-      <CellData Scalars="p" Vectors="velocity_component (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000
           110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000
@@ -1035,7 +1035,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="velocity_component (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           5.09804e-05 -5.09804e-05 0 0.000272798 -0.000170837 0 0.000672021 -0.000228387 0 0.00113052 -0.000230113 0
           0.00155607 -0.000195434 0 0.00189274 -0.00014124 0 0.00211349 -7.95089e-05 0 0.00221055 -1.75529e-05 0
           0.00218688 4.12232e-05 0 0.00204924 9.64187e-05 0 0.00180317 0.000149651 0 0.00144994 0.000203575 0
diff --git a/test/references/liddrivencavity-low-re-reference.vtu b/test/references/liddrivencavity-low-re-reference.vtu
index 9d34f70931849de80e5fe6ad33c3a79fd78b32bf..5e45b1c61f7de766ac400c183e8bf6fe41d87953 100644
--- a/test/references/liddrivencavity-low-re-reference.vtu
+++ b/test/references/liddrivencavity-low-re-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="4096" NumberOfPoints="4225">
-      <CellData Scalars="p" Vectors="velocity_component (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000
           110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000
@@ -1035,7 +1035,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="velocity_component (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           1.44626e-05 -1.44626e-05 0 5.09109e-05 -2.19858e-05 0 8.70543e-05 -1.41577e-05 0 9.95851e-05 1.62684e-06 0
           7.71918e-05 2.07665e-05 0 1.56966e-05 4.07287e-05 0 -8.5178e-05 6.01459e-05 0 -0.000223596 7.82719e-05 0
           -0.000396562 9.46945e-05 0 -0.000600446 0.000109189 0 -0.000831277 0.000121642 0 -0.00108492 0.000132006 0
diff --git a/test/references/md-boundary-1p2p-injection-2p-reference.vtu b/test/references/md-boundary-1p2p-injection-2p-reference.vtu
index 9ba7e63706cc3cf9d59a774bbfa7f3da6b1be4fd..1f5cab5e6ec5410d8eb8c84146d22daf98c4f892 100644
--- a/test/references/md-boundary-1p2p-injection-2p-reference.vtu
+++ b/test/references/md-boundary-1p2p-injection-2p-reference.vtu
@@ -89,7 +89,7 @@
           4.46405 1.59476 1.59963 1.60995 1.62234 1.63664 1.6362 1.62659 1.61918 1.61413 1.71018 1.71018
           1.61413 1.61918 1.62659 1.6362
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 0.999999 0.999999 1 1 1 1 1 1
           1 1 1 1 1 1 0.999987 0.999793 0.999793 0.999987 1 1
@@ -132,7 +132,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           3.55303e+06 3.65278e+06 3.73199e+06 3.7872e+06 3.81555e+06 3.81555e+06 3.7872e+06 3.73199e+06 3.65278e+06 3.55303e+06 3.54852e+06 3.69791e+06
           3.83361e+06 3.95121e+06 4.04586e+06 4.11259e+06 4.14704e+06 4.14704e+06 4.11259e+06 4.04586e+06 3.95121e+06 3.83361e+06 3.69791e+06 3.54852e+06
           3.61882e+06 3.80041e+06 3.97308e+06 4.1323e+06 4.2726e+06 4.38764e+06 4.47039e+06 4.51416e+06 4.51416e+06 4.47039e+06 4.38764e+06 4.2726e+06
@@ -175,7 +175,7 @@
           4.11259e+06 4.04586e+06 3.95121e+06 3.83361e+06 3.69791e+06 3.54852e+06 3.55303e+06 3.65278e+06 3.73199e+06 3.7872e+06 3.81555e+06 3.81555e+06
           3.7872e+06 3.73199e+06 3.65278e+06 3.55303e+06
         </DataArray>
-        <DataArray type="Float32" Name="rhoW" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -218,7 +218,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 999.967 999.967 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 999.993 999.632 996.73 996.73 999.632 999.993 1000
@@ -261,7 +261,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           2.8145e-11 2.73765e-11 2.67954e-11 2.64051e-11 3.46472e-11 3.46472e-11 2.64051e-11 2.67954e-11 2.73765e-11 2.8145e-11 2.81808e-11 2.70424e-11
           2.60851e-11 2.53087e-11 2.49487e-11 3.14847e-09 6.16888e-07 6.16888e-07 3.14847e-09 2.49487e-11 2.53087e-11 2.60851e-11 2.70424e-11 2.81808e-11
           2.76333e-11 2.6313e-11 2.51694e-11 2.41997e-11 3.35482e-11 9.23913e-08 1.31528e-05 0.000207004 0.000207004 1.31528e-05 9.23913e-08 3.35482e-11
@@ -304,7 +304,7 @@
           3.14847e-09 2.49487e-11 2.53087e-11 2.60851e-11 2.70424e-11 2.81808e-11 2.8145e-11 2.73765e-11 2.67954e-11 2.64051e-11 3.46472e-11 3.46472e-11
           2.64051e-11 2.67954e-11 2.73765e-11 2.8145e-11
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           3.55303e+06 3.65278e+06 3.732e+06 3.7872e+06 3.81556e+06 3.81556e+06 3.7872e+06 3.732e+06 3.65278e+06 3.55303e+06 3.54852e+06 3.69791e+06
           3.83361e+06 3.95121e+06 4.04586e+06 4.11259e+06 4.14706e+06 4.14706e+06 4.11259e+06 4.04586e+06 3.95121e+06 3.83361e+06 3.69791e+06 3.54852e+06
           3.61883e+06 3.80041e+06 3.97308e+06 4.1323e+06 4.2726e+06 4.38765e+06 4.47042e+06 4.51421e+06 4.51421e+06 4.47042e+06 4.38765e+06 4.2726e+06
@@ -347,7 +347,7 @@
           4.11259e+06 4.04586e+06 3.95121e+06 3.83361e+06 3.69791e+06 3.54852e+06 3.55303e+06 3.65278e+06 3.732e+06 3.7872e+06 3.81556e+06 3.81556e+06
           3.7872e+06 3.732e+06 3.65278e+06 3.55303e+06
         </DataArray>
-        <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           24.2122 24.8919 25.4317 25.8079 26.0011 26.0011 25.8079 25.4317 24.8919 24.2122 24.1814 25.1994
           26.1242 26.9256 27.5705 28.0253 28.2601 28.2601 28.0253 27.5705 26.9256 26.1242 25.1994 24.1814
           24.6605 25.8979 27.0746 28.1596 29.1157 29.8997 30.4637 30.7621 30.7621 30.4637 29.8997 29.1157
@@ -390,7 +390,7 @@
           28.0253 27.5705 26.9256 26.1242 25.1994 24.1814 24.2122 24.8919 25.4317 25.8079 26.0011 26.0011
           25.8079 25.4317 24.8919 24.2122
         </DataArray>
-        <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           1.12103e-15 1.06334e-15 1.0207e-15 9.92528e-16 1.66658e-15 1.66658e-15 9.92528e-16 1.0207e-15 1.06334e-15 1.12103e-15 1.12374e-15 1.03873e-15
           9.69707e-16 9.15392e-16 8.90704e-16 9.0808e-12 2.14293e-07 2.14293e-07 9.0808e-12 8.90704e-16 9.15392e-16 9.69707e-16 1.03873e-15 1.12374e-15
           1.08247e-15 9.85935e-16 9.05802e-16 8.40383e-16 1.56717e-15 5.72641e-09 7.34708e-05 0.0141143 0.0141143 7.34708e-05 5.72641e-09 1.56717e-15
diff --git a/test/references/mpnc_2p2c_box-reference.vtu b/test/references/mpnc_2p2c_box-reference.vtu
index ed5058ffe7500c8023e25e37cb5c01f913aca026..d20b07c3abf3c1330d0cf1eb2395fd2f90e8fd5f 100644
--- a/test/references/mpnc_2p2c_box-reference.vtu
+++ b/test/references/mpnc_2p2c_box-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="384" NumberOfPoints="425">
-      <PointData Scalars="S_n">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_gas">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.2 0.133819 0.2 0.19564 0.131111 0.193806 0.130149 0.193145 0.129709 0.192847 0.129497 0.192706
           0.129389 0.192635 0.129318 0.19259 0.129236 0.192538 0.129078 0.192439 0.128721 0.192213 0.127896 0.191691
           0.126003 0.190516 0.121707 0.187977 0.112638 0.183074 0.0980953 0.176024 0.0845145 0.170236 0.082409 0.169419
@@ -41,7 +41,7 @@
           0.263503 0.263502 0.263487 0.26374 0.200114 0.200093 0.200093 0.200093 0.200093 0.200093 0.200093 0.200093
           0.200112 0.263245 0.262928 0.262915 0.262906
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           0.8 0.866181 0.8 0.80436 0.868889 0.806194 0.869851 0.806855 0.870291 0.807153 0.870503 0.807294
           0.870611 0.807365 0.870682 0.80741 0.870764 0.807462 0.870922 0.807561 0.871279 0.807787 0.872104 0.808309
           0.873997 0.809484 0.878293 0.812023 0.887362 0.816926 0.901905 0.823976 0.915486 0.829764 0.917591 0.830581
@@ -79,7 +79,7 @@
           0.736497 0.736498 0.736513 0.73626 0.799886 0.799907 0.799907 0.799907 0.799907 0.799907 0.799907 0.799907
           0.799888 0.736755 0.737072 0.737085 0.737094
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100000 109654 100000 102761 113070 104819 114556 105929 115254 106496 115589 106782
           115759 106930 115867 107027 115990 107141 116226 107362 116763 107872 118003 109062
           120813 111782 126989 117801 140025 130516 165527 155330 208669 197660 270090 258345
@@ -117,7 +117,7 @@
           91445.6 91422.8 91366.8 91207.1 99906.2 99957.8 99957.9 99957.9 99957.9 99957.9 99957.9 99957.8
           99911.6 92864.8 93114.1 93236.5 93275.6
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           88453 98695.2 88453 91256.1 102134 93331.6 103628 94447 104329 95017.4 104666 95304.4
           104837 95453.7 104945 95551.1 105069 95664.7 105307 95886.9 105846 96398.8 107093 97593.7
           109918 100325 116128 106368 129237 119128 154852 144007 198095 186389 259532 247082
@@ -155,7 +155,7 @@
           79234.3 79211.5 79155.7 78993.2 88358.1 88409.9 88410 88410 88410 88410 88410 88409.9
           88363.5 80656.4 80909.4 81031.9 81071.1
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           997.042 997.047 997.042 997.044 997.049 997.045 997.049 997.045 997.05 997.045 997.05 997.046
           997.05 997.046 997.05 997.046 997.05 997.046 997.05 997.046 997.05 997.046 997.051 997.047
           997.052 997.048 997.055 997.051 997.061 997.056 997.072 997.068 997.092 997.087 997.12 997.114
@@ -193,7 +193,7 @@
           997.038 997.038 997.038 997.038 997.042 997.042 997.042 997.042 997.042 997.042 997.042 997.042
           997.042 997.039 997.039 997.039 997.039
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.11726 1.22635 1.11726 1.14847 1.26496 1.17172 1.28175 1.18426 1.28963 1.19067 1.29343 1.1939
           1.29535 1.19558 1.29657 1.19668 1.29796 1.19795 1.30063 1.20045 1.30669 1.20621 1.32071 1.21966
           1.35246 1.2504 1.42225 1.31842 1.56956 1.4621 1.85775 1.74252 2.34527 2.22087 3.03936 2.90664
@@ -231,7 +231,7 @@
           1.02059 1.02034 1.0197 1.0179 1.1162 1.11678 1.11679 1.11679 1.11679 1.11679 1.11679 1.11679
           1.11626 1.03663 1.03945 1.04083 1.04127
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           355.503 540.266 355.503 365.95 549.104 370.412 552.271 372.029 553.722 372.761 554.423 373.108
           554.782 373.283 555.016 373.394 555.288 373.521 555.811 373.766 556.996 374.322 559.74 375.608
           566.07 378.519 580.645 384.866 612.328 397.351 665.818 415.829 718.868 431.477 727.374 433.723
@@ -269,7 +269,7 @@
           227.252 227.254 227.278 226.85 355.232 355.284 355.284 355.284 355.284 355.284 355.284 355.284
           355.237 227.688 228.227 228.25 228.265
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           1551.67 486.768 1551.67 1456.9 458.658 1418.17 448.928 1404.38 444.526 1398.18 442.414 1395.25
           441.335 1393.77 440.633 1392.84 439.819 1391.77 438.256 1389.71 434.733 1385.05 426.665 1374.32
           408.531 1350.32 369.218 1299.39 294.475 1204.5 196.412 1075.96 126.744 977.228 117.668 963.783
@@ -307,7 +307,7 @@
           3387.7 3387.66 3387.14 3396.26 1554.21 1553.72 1553.72 1553.72 1553.72 1553.72 1553.72 1553.72
           1554.16 3378.43 3367.04 3366.55 3366.23
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999983 0.999981 0.999983 0.999982 0.99998 0.999982 0.99998 0.999981 0.99998 0.999981 0.99998 0.999981
           0.99998 0.999981 0.99998 0.999981 0.99998 0.999981 0.99998 0.999981 0.99998 0.999981 0.999979 0.999981
           0.999979 0.99998 0.999978 0.999979 0.999975 0.999977 0.999971 0.999973 0.999963 0.999965 0.999952 0.999954
@@ -345,7 +345,7 @@
           0.999984 0.999984 0.999984 0.999984 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983
           0.999983 0.999984 0.999984 0.999984 0.999984
         </DataArray>
-        <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2_liq" NumberOfComponents="1" format="ascii">
           1.74479e-05 1.91874e-05 1.74479e-05 1.79455e-05 1.98031e-05 1.83163e-05 2.00708e-05 1.85162e-05 2.01965e-05 1.86185e-05 2.02569e-05 1.86699e-05
           2.02875e-05 1.86967e-05 2.0307e-05 1.87142e-05 2.03292e-05 1.87346e-05 2.03717e-05 1.87744e-05 2.04685e-05 1.88663e-05 2.0692e-05 1.90807e-05
           2.11982e-05 1.95708e-05 2.2311e-05 2.06555e-05 2.466e-05 2.29465e-05 2.92553e-05 2.74178e-05 3.70288e-05 3.50452e-05 4.80961e-05 4.59798e-05
@@ -383,7 +383,7 @@
           1.59065e-05 1.59024e-05 1.58923e-05 1.58635e-05 1.7431e-05 1.74403e-05 1.74403e-05 1.74403e-05 1.74403e-05 1.74403e-05 1.74403e-05 1.74403e-05
           1.7432e-05 1.61622e-05 1.62072e-05 1.62292e-05 1.62363e-05
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0206174 0.0187833 0.0206174 0.0200572 0.01821 0.0196591 0.0179715 0.019451 0.0178616 0.0193462 0.0178093 0.0192939
           0.0177829 0.0192668 0.0177661 0.0192492 0.0177471 0.0192286 0.0177107 0.0191886 0.0176284 0.0190969 0.0174414 0.0188864
           0.0170319 0.0184221 0.0161962 0.0174716 0.014676 0.0157547 0.0123993 0.0132193 0.00982178 0.010372 0.00757875 0.00792483
@@ -421,7 +421,7 @@
           0.0225703 0.022576 0.02259 0.02263 0.020637 0.0206262 0.0206262 0.0206262 0.0206262 0.0206262 0.0206262 0.0206262
           0.0206358 0.0222211 0.0221608 0.0221314 0.022122
         </DataArray>
-        <DataArray type="Float32" Name="X^N2_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2_gas" NumberOfComponents="1" format="ascii">
           0.979383 0.981217 0.979383 0.979943 0.98179 0.980341 0.982029 0.980549 0.982138 0.980654 0.982191 0.980706
           0.982217 0.980733 0.982234 0.980751 0.982253 0.980771 0.982289 0.980811 0.982372 0.980903 0.982559 0.981114
           0.982968 0.981578 0.983804 0.982528 0.985324 0.984245 0.987601 0.986781 0.990178 0.989628 0.992421 0.992075
@@ -459,7 +459,7 @@
           0.97743 0.977424 0.97741 0.97737 0.979363 0.979374 0.979374 0.979374 0.979374 0.979374 0.979374 0.979374
           0.979364 0.977779 0.977839 0.977869 0.977878
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999989 0.999988 0.999989 0.999988 0.999987 0.999988 0.999987 0.999988 0.999987 0.999988 0.999987 0.999988
           0.999987 0.999988 0.999987 0.999988 0.999987 0.999988 0.999987 0.999988 0.999987 0.999988 0.999987 0.999988
           0.999986 0.999987 0.999986 0.999987 0.999984 0.999985 0.999981 0.999982 0.999976 0.999977 0.999969 0.99997
@@ -497,7 +497,7 @@
           0.99999 0.99999 0.99999 0.99999 0.999989 0.999989 0.999989 0.999989 0.999989 0.999989 0.999989 0.999989
           0.999989 0.99999 0.99999 0.99999 0.99999
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_liq" NumberOfComponents="1" format="ascii">
           1.12207e-05 1.23393e-05 1.12207e-05 1.15407e-05 1.27353e-05 1.17792e-05 1.29075e-05 1.19077e-05 1.29883e-05 1.19735e-05 1.30272e-05 1.20066e-05
           1.30468e-05 1.20238e-05 1.30594e-05 1.2035e-05 1.30736e-05 1.20481e-05 1.3101e-05 1.20738e-05 1.31632e-05 1.21328e-05 1.33069e-05 1.22707e-05
           1.36325e-05 1.25859e-05 1.43481e-05 1.32835e-05 1.58588e-05 1.47568e-05 1.8814e-05 1.76323e-05 2.38132e-05 2.25376e-05 3.09307e-05 2.95697e-05
@@ -535,7 +535,7 @@
           1.02294e-05 1.02268e-05 1.02203e-05 1.02018e-05 1.12098e-05 1.12158e-05 1.12158e-05 1.12158e-05 1.12158e-05 1.12158e-05 1.12158e-05 1.12158e-05
           1.12104e-05 1.03939e-05 1.04227e-05 1.04369e-05 1.04415e-05
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0316971 0.0289065 0.0316971 0.0308453 0.028033 0.0302397 0.0276694 0.0299231 0.027502 0.0297636 0.0274222 0.029684
           0.027382 0.0296427 0.0273564 0.0296158 0.0273274 0.0295846 0.0272718 0.0295236 0.0271464 0.0293841 0.0268611 0.0290635
           0.0262365 0.0283563 0.0249605 0.0269073 0.0226367 0.024286 0.019149 0.0204061 0.01519 0.016036 0.0117355 0.0122691
@@ -573,7 +573,7 @@
           0.0346623 0.0346709 0.0346922 0.0347529 0.0317269 0.0317105 0.0317105 0.0317105 0.0317105 0.0317105 0.0317105 0.0317105
           0.0317252 0.0341326 0.0340412 0.0339965 0.0339822
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_gas" NumberOfComponents="1" format="ascii">
           0.968303 0.971093 0.968303 0.969155 0.971967 0.96976 0.972331 0.970077 0.972498 0.970236 0.972578 0.970316
           0.972618 0.970357 0.972644 0.970384 0.972673 0.970415 0.972728 0.970476 0.972854 0.970616 0.973139 0.970937
           0.973764 0.971644 0.975039 0.973093 0.977363 0.975714 0.980851 0.979594 0.98481 0.983964 0.988265 0.987731
diff --git a/test/references/mpnc_2p2c_tpfa-reference.vtu b/test/references/mpnc_2p2c_tpfa-reference.vtu
index 63aa164b178c521bf5a14cad9453b75551d94db6..be1fa53242272f18df18ff35495a9eefa46d4777 100644
--- a/test/references/mpnc_2p2c_tpfa-reference.vtu
+++ b/test/references/mpnc_2p2c_tpfa-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="384" NumberOfPoints="425">
-      <CellData Scalars="S_n">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_gas">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.164716 0.162215 0.161231 0.160743 0.160501 0.160379 0.160307 0.160243 0.16014 0.159925 0.159441 0.15835
           0.155881 0.150352 0.139995 0.12839 0.124611 0.131639 0.145596 0.16298 0.182878 0.206514 0.237739 0.288432
           0.19856 0.197331 0.196711 0.196397 0.19624 0.196159 0.196112 0.196068 0.195997 0.195846 0.195507 0.19475
@@ -37,7 +37,7 @@
           0.236349 0.236349 0.236349 0.236349 0.236349 0.236349 0.236349 0.236349 0.236349 0.236349 0.236349 0.236341
           0.200067 0.200046 0.200046 0.200046 0.200046 0.200046 0.200046 0.200064 0.235723 0.235704 0.235668 0.235641
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           0.835284 0.837785 0.838769 0.839257 0.839499 0.839621 0.839693 0.839757 0.83986 0.840075 0.840559 0.84165
           0.844119 0.849648 0.860005 0.87161 0.875389 0.868361 0.854404 0.83702 0.817122 0.793486 0.762261 0.711568
           0.80144 0.802669 0.803289 0.803603 0.80376 0.803841 0.803888 0.803932 0.804003 0.804154 0.804493 0.80525
@@ -71,7 +71,7 @@
           0.763651 0.763651 0.763651 0.763651 0.763651 0.763651 0.763651 0.763651 0.763651 0.763651 0.763651 0.763659
           0.799933 0.799954 0.799954 0.799954 0.799954 0.799954 0.799954 0.799936 0.764277 0.764296 0.764332 0.764359
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           103625 107218 108988 109864 110296 110513 110639 110750 110928 111302 112139 114012
           118121 126914 145060 179326 233840 305121 384931 465781 542818 613042 673856 721002
           101308 103171 104290 104911 105241 105417 105524 105626 105795 106159 106984 108853
@@ -105,7 +105,7 @@
           92516.5 92516.5 92516.5 92516.4 92516.2 92516 92515.8 92515.6 92515.8 92516.8 92519.5 92525.5
           99931 99978.8 99978.9 99978.9 99978.9 99978.9 99978.8 99936.1 94276.9 94330.8 94411.6 94470.1
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           92403.2 96017.9 97797 98677.2 99111.4 99329.7 99455.5 99567.9 99746.4 100122 100964 102846
           106977 115817 134050 168412 222956 294180 373875 454574 531432 601432 661928 708497
           89775.3 91649.5 92774.7 93398.7 93730.1 93906.4 94014 94116.5 94286.5 94651.3 95479.8 97356
@@ -139,7 +139,7 @@
           80603 80603 80602.9 80602.9 80602.7 80602.5 80602.3 80602.1 80602.2 80603.2 80606 80612
           88383.4 88431.3 88431.4 88431.4 88431.4 88431.4 88431.3 88388.4 82370 82424.1 82505.3 82564.1
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           997.044 997.046 997.047 997.047 997.047 997.047 997.047 997.047 997.048 997.048 997.048 997.049
           997.051 997.055 997.063 997.078 997.103 997.135 997.171 997.207 997.242 997.273 997.301 997.322
           997.043 997.044 997.044 997.045 997.045 997.045 997.045 997.045 997.045 997.045 997.046 997.047
@@ -173,7 +173,7 @@
           997.039 997.039 997.039 997.039 997.039 997.039 997.039 997.039 997.039 997.039 997.039 997.039
           997.042 997.042 997.042 997.042 997.042 997.042 997.042 997.042 997.04 997.04 997.04 997.04
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.15823 1.19882 1.21883 1.22873 1.23361 1.23607 1.23748 1.23875 1.24075 1.24498 1.25444 1.2756
           1.32204 1.4214 1.62646 2.01368 2.62971 3.43523 4.33712 5.25076 6.12131 6.91488 7.6021 8.13488
           1.13205 1.1531 1.16574 1.17276 1.17649 1.17847 1.17968 1.18084 1.18275 1.18686 1.19618 1.2173
@@ -207,7 +207,7 @@
           1.0327 1.0327 1.03269 1.03269 1.03269 1.03269 1.03269 1.03269 1.03269 1.0327 1.03273 1.0328
           1.11648 1.11702 1.11702 1.11702 1.11702 1.11702 1.11702 1.11654 1.05259 1.0532 1.05411 1.05477
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           446.797 453.875 456.682 458.078 458.773 459.125 459.33 459.515 459.81 460.43 461.823 464.977
           472.176 488.6 520.511 558.1 570.773 547.389 503.086 451.728 397.879 340.341 274.176 187.886
           358.929 361.872 363.362 364.118 364.499 364.694 364.809 364.915 365.086 365.451 366.273 368.111
@@ -241,7 +241,7 @@
           276.872 276.872 276.872 276.872 276.872 276.872 276.872 276.871 276.871 276.872 276.873 276.888
           355.345 355.393 355.393 355.393 355.393 355.393 355.393 355.35 278.104 278.142 278.213 278.265
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           888.639 850.251 835.447 828.169 824.57 822.751 821.694 820.741 819.224 816.041 808.931 793.045
           757.814 682.603 554.977 431.488 395.51 464.054 621.888 861.872 1200.81 1700.34 2535.95 4360.15
           1519.95 1493.2 1479.84 1473.1 1469.72 1468 1466.98 1466.04 1464.52 1461.3 1454.07 1438.02
@@ -275,7 +275,7 @@
           2494.28 2494.28 2494.28 2494.28 2494.28 2494.28 2494.29 2494.29 2494.29 2494.29 2494.27 2494.04
           1553.14 1552.7 1552.7 1552.7 1552.7 1552.7 1552.7 1553.1 2475.65 2475.08 2474 2473.22
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999982 0.999981 0.999981 0.999981 0.999981 0.999981 0.999981 0.999981 0.999981 0.999981 0.99998 0.99998
           0.999979 0.999978 0.999974 0.999968 0.999958 0.999946 0.999931 0.999917 0.999903 0.99989 0.999879 0.999871
           0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999981 0.999981 0.999981
@@ -309,7 +309,7 @@
           0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
           0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999984 0.999984 0.999984 0.999984
         </DataArray>
-        <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2_liq" NumberOfComponents="1" format="ascii">
           1.81011e-05 1.87485e-05 1.90675e-05 1.92253e-05 1.93032e-05 1.93423e-05 1.93649e-05 1.9385e-05 1.9417e-05 1.94844e-05 1.96353e-05 1.99727e-05
           2.07132e-05 2.22975e-05 2.55672e-05 3.17416e-05 4.15643e-05 5.44081e-05 6.87887e-05 8.33563e-05 9.72369e-05 0.00010989 0.000120847 0.000129342
           1.76837e-05 1.80193e-05 1.8221e-05 1.83329e-05 1.83923e-05 1.84239e-05 1.84433e-05 1.84617e-05 1.84921e-05 1.85576e-05 1.87063e-05 1.90431e-05
@@ -343,7 +343,7 @@
           1.60995e-05 1.60995e-05 1.60995e-05 1.60995e-05 1.60994e-05 1.60994e-05 1.60993e-05 1.60993e-05 1.60993e-05 1.60995e-05 1.61e-05 1.61011e-05
           1.74355e-05 1.74441e-05 1.74441e-05 1.74441e-05 1.74441e-05 1.74441e-05 1.74441e-05 1.74364e-05 1.64167e-05 1.64264e-05 1.6441e-05 1.64515e-05
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0198882 0.0192147 0.0188992 0.018747 0.0186728 0.0186357 0.0186144 0.0185954 0.0185653 0.0185024 0.0183628 0.0180581
           0.0174238 0.0162058 0.0141626 0.0114391 0.00875938 0.00670538 0.00531096 0.00438681 0.00376289 0.00333103 0.00302989 0.00283144
           0.0203481 0.0199767 0.0197599 0.0196417 0.0195795 0.0195465 0.0195264 0.0195074 0.0194758 0.0194084 0.0192571 0.018923
@@ -377,7 +377,7 @@
           0.0223058 0.0223058 0.0223058 0.0223058 0.0223058 0.0223059 0.0223059 0.022306 0.0223059 0.0223057 0.022305 0.0223036
           0.0206318 0.0206218 0.0206218 0.0206218 0.0206218 0.0206218 0.0206218 0.0206307 0.0218842 0.0218715 0.0218526 0.0218389
         </DataArray>
-        <DataArray type="Float32" Name="X^N2_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2_gas" NumberOfComponents="1" format="ascii">
           0.980112 0.980785 0.981101 0.981253 0.981327 0.981364 0.981386 0.981405 0.981435 0.981498 0.981637 0.981942
           0.982576 0.983794 0.985837 0.988561 0.991241 0.993295 0.994689 0.995613 0.996237 0.996669 0.99697 0.997169
           0.979652 0.980023 0.98024 0.980358 0.980421 0.980453 0.980474 0.980493 0.980524 0.980592 0.980743 0.981077
@@ -411,7 +411,7 @@
           0.977694 0.977694 0.977694 0.977694 0.977694 0.977694 0.977694 0.977694 0.977694 0.977694 0.977695 0.977696
           0.979368 0.979378 0.979378 0.979378 0.979378 0.979378 0.979378 0.979369 0.978116 0.978128 0.978147 0.978161
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999987 0.999987 0.999987
           0.999987 0.999986 0.999984 0.99998 0.999973 0.999965 0.999956 0.999946 0.999937 0.999929 0.999922 0.999917
           0.999989 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988
@@ -445,7 +445,7 @@
           0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
           0.999989 0.999989 0.999989 0.999989 0.999989 0.999989 0.999989 0.999989 0.999989 0.999989 0.999989 0.999989
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_liq" NumberOfComponents="1" format="ascii">
           1.16407e-05 1.20571e-05 1.22622e-05 1.23637e-05 1.24138e-05 1.2439e-05 1.24535e-05 1.24664e-05 1.2487e-05 1.25303e-05 1.26274e-05 1.28444e-05
           1.33206e-05 1.43395e-05 1.64422e-05 2.0413e-05 2.673e-05 3.49901e-05 4.42385e-05 5.36073e-05 6.25344e-05 7.0672e-05 7.77191e-05 8.31824e-05
           1.13723e-05 1.15881e-05 1.17178e-05 1.17898e-05 1.1828e-05 1.18484e-05 1.18608e-05 1.18726e-05 1.18922e-05 1.19343e-05 1.203e-05 1.22465e-05
@@ -479,7 +479,7 @@
           1.03535e-05 1.03535e-05 1.03535e-05 1.03535e-05 1.03535e-05 1.03534e-05 1.03534e-05 1.03534e-05 1.03534e-05 1.03535e-05 1.03538e-05 1.03545e-05
           1.12127e-05 1.12182e-05 1.12182e-05 1.12182e-05 1.12182e-05 1.12182e-05 1.12182e-05 1.12133e-05 1.05575e-05 1.05637e-05 1.05731e-05 1.05799e-05
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0305883 0.0295633 0.0290831 0.0288512 0.0287382 0.0286817 0.0286492 0.0286203 0.0285745 0.0284785 0.0282658 0.0278016
           0.0268343 0.0249752 0.021851 0.0176755 0.0135548 0.0103881 0.00823421 0.00680487 0.00583906 0.00517015 0.00470353 0.00439594
           0.0312877 0.0307229 0.0303932 0.0302133 0.0301185 0.0300684 0.0300379 0.0300088 0.0299608 0.0298583 0.0296279 0.0291192
@@ -513,7 +513,7 @@
           0.0342611 0.0342611 0.0342611 0.0342611 0.0342612 0.0342612 0.0342613 0.0342614 0.0342613 0.034261 0.0342599 0.0342578
           0.031719 0.0317038 0.0317038 0.0317038 0.0317038 0.0317038 0.0317038 0.0317174 0.0336213 0.0336021 0.0335733 0.0335526
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_gas" NumberOfComponents="1" format="ascii">
           0.969412 0.970437 0.970917 0.971149 0.971262 0.971318 0.971351 0.97138 0.971426 0.971521 0.971734 0.972198
           0.973166 0.975025 0.978149 0.982324 0.986445 0.989612 0.991766 0.993195 0.994161 0.99483 0.995296 0.995604
           0.968712 0.969277 0.969607 0.969787 0.969881 0.969932 0.969962 0.969991 0.970039 0.970142 0.970372 0.970881
diff --git a/test/references/obstaclebox-reference.vtu b/test/references/obstaclebox-reference.vtu
index d348c78d9a02e006b8e444be8c93f63bddcd1bf5..88050f43d7628f26e1d26577fb309f80eac2d947 100644
--- a/test/references/obstaclebox-reference.vtu
+++ b/test/references/obstaclebox-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="384" NumberOfPoints="425">
-      <PointData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_liq">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -41,7 +41,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -79,7 +79,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           100000 100043 100000 100023 100062 100039 100072 100046 100005 100002 100002 100000
           100002 100000 100002 100000 100018 100015 100575 100543 100604 100574 100667 100637
           100767 100736 100908 100875 101097 101063 101344 101306 101659 101618 102057 102010
@@ -117,7 +117,7 @@
           99945.1 99962.7 99980.8 100000 100023 100051 100083 100120 100161 100204 100248 100292
           100331 100365 100392 100408 100414
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100000 100043 100000 100023 100062 100039 100072 100046 100005 100002 100002 100000
           100002 100000 100002 100000 100018 100015 100575 100543 100604 100574 100667 100637
           100767 100736 100908 100875 101097 101063 101344 101306 101659 101618 102057 102010
@@ -155,7 +155,7 @@
           99945.1 99962.7 99980.8 100000 100023 100051 100083 100120 100161 100204 100248 100292
           100331 100365 100392 100408 100414
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048
           997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048
           997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.049 997.049
@@ -193,7 +193,7 @@
           997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048
           997.048 997.048 997.048 997.048 997.048
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.12601 1.12649 1.12601 1.12627 1.12671 1.12645 1.12682 1.12653 1.12607 1.12604 1.12603 1.12601
           1.12603 1.12601 1.12603 1.12602 1.12622 1.12619 1.13249 1.13213 1.13281 1.13248 1.13353 1.13318
           1.13465 1.1343 1.13624 1.13587 1.13837 1.13798 1.14115 1.14072 1.14469 1.14423 1.14917 1.14864
@@ -231,7 +231,7 @@
           1.12539 1.12559 1.1258 1.12602 1.12628 1.12659 1.12695 1.12737 1.12782 1.12831 1.12881 1.1293
           1.12974 1.13013 1.13042 1.13061 1.13067
         </DataArray>
-        <DataArray type="Float32" Name="lambda_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -269,7 +269,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="lambda_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7
           56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7
           56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7
@@ -345,7 +345,7 @@
           0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3
           0.3 0.3 0.3 0.3 0.3
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.315483 0.315617 0.315483 0.315555 0.315678 0.315604 0.31571 0.315627 0.315498 0.31549 0.315488 0.315483
           0.315488 0.315483 0.315488 0.315483 0.31554 0.315531 0.317297 0.317197 0.317388 0.317293 0.317587 0.317492
           0.317902 0.317803 0.318347 0.318244 0.318944 0.318835 0.319722 0.319604 0.320717 0.320586 0.321983 0.321833
@@ -383,7 +383,7 @@
           0.315309 0.315365 0.315422 0.315484 0.315557 0.315643 0.315745 0.315862 0.31599 0.316127 0.316266 0.316402
           0.316528 0.316636 0.316718 0.31677 0.316788
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_liq" NumberOfComponents="1" format="ascii">
           1.14721e-05 1.1477e-05 1.14721e-05 1.14747e-05 1.14792e-05 1.14765e-05 1.14804e-05 1.14774e-05 1.14727e-05 1.14724e-05 1.14723e-05 1.14721e-05
           1.14723e-05 1.14721e-05 1.14723e-05 1.14721e-05 1.14742e-05 1.14739e-05 1.15381e-05 1.15344e-05 1.15414e-05 1.15379e-05 1.15486e-05 1.15452e-05
           1.15601e-05 1.15565e-05 1.15763e-05 1.15725e-05 1.1598e-05 1.1594e-05 1.16263e-05 1.1622e-05 1.16624e-05 1.16577e-05 1.17081e-05 1.17027e-05
@@ -421,7 +421,7 @@
           1.14658e-05 1.14678e-05 1.14699e-05 1.14722e-05 1.14748e-05 1.1478e-05 1.14817e-05 1.14859e-05 1.14906e-05 1.14955e-05 1.15006e-05 1.15056e-05
           1.15101e-05 1.1514e-05 1.1517e-05 1.15189e-05 1.15196e-05
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01
           0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01
           0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.0100004 0.0100003
@@ -459,7 +459,7 @@
           0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01
           0.01 0.01 0.01 0.01 0.01
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_gas" NumberOfComponents="1" format="ascii">
           0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99
           0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99
           0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99
diff --git a/test/references/obstaclecc-reference.vtu b/test/references/obstaclecc-reference.vtu
index 6003008ca475dc408d363df5651509c1a6f3dc2c..7aea2d756312d2ad8dbc6126bc391f37dea1ae96 100644
--- a/test/references/obstaclecc-reference.vtu
+++ b/test/references/obstaclecc-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="384" NumberOfPoints="425">
-      <CellData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_liq">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0.000122183 0.0664269 0.945884
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -37,7 +37,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="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 0.999878 0.933573 0.054116
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -71,7 +71,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           100021 100046 100060 100066 100004 100001 100001 100020 100684 100728 100818 100959
           101160 101431 101787 102247 102831 103565 104480 105609 106984 108634 110626 146728
           100011 100029 100040 100045 100002 100000 100000 100018 100649 100693 100781 100918
@@ -105,7 +105,7 @@
           99872.9 99875.5 99881.1 99890.8 99905.6 99921.9 99939.3 99958.8 99980.6 100001 100024 100049
           100079 100114 100155 100199 100247 100296 100345 100392 100433 100467 100491 100503
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100021 100046 100060 100066 100004 100001 100001 100020 100684 100728 100818 100959
           101160 101431 101787 102247 102831 103565 104480 105609 106984 108634 110626 146728
           100011 100029 100040 100045 100002 100000 100000 100018 100649 100693 100781 100918
@@ -139,7 +139,7 @@
           99872.9 99875.5 99881.1 99890.8 99905.6 99921.9 99939.3 99958.8 99980.6 100001 100024 100049
           100079 100114 100155 100199 100247 100296 100345 100392 100433 100467 100491 100503
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048
           997.048 997.048 997.048 997.049 997.049 997.049 997.05 997.05 997.051 997.052 997.052 997.069
           997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048
@@ -173,7 +173,7 @@
           997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048
           997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.12625 1.12653 1.12669 1.12676 1.12606 1.12602 1.12603 1.12624 1.13371 1.13421 1.13522 1.13681
           1.13907 1.14213 1.14614 1.15131 1.15789 1.16616 1.17642 1.18883 1.20261 1.21483 1.23735 1.64531
           1.12614 1.12634 1.12646 1.12652 1.12604 1.12601 1.12602 1.12621 1.13333 1.13381 1.1348 1.13635
@@ -207,7 +207,7 @@
           1.12458 1.12461 1.12467 1.12478 1.12495 1.12513 1.12533 1.12555 1.12579 1.12603 1.12628 1.12657
           1.12691 1.1273 1.12775 1.12825 1.12879 1.12935 1.1299 1.13042 1.13089 1.13127 1.13154 1.13168
         </DataArray>
-        <DataArray type="Float32" Name="lambda_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0.000149144 47.5714 1090.6
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -241,7 +241,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="lambda_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7
           56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 54344.1 1665.21
           56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7
@@ -309,7 +309,7 @@
           0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3
           0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.315549 0.315627 0.315672 0.315692 0.315496 0.315485 0.315486 0.315546 0.317639 0.317779 0.318063 0.318509
           0.319142 0.319997 0.321121 0.322572 0.324437 0.327043 0.332898 0.359714 0.497574 0.999988 0.999988 0.999983
           0.315518 0.315573 0.315609 0.315626 0.31549 0.315483 0.315483 0.315538 0.317531 0.317668 0.317945 0.31838
@@ -343,7 +343,7 @@
           0.315082 0.31509 0.315107 0.315138 0.315185 0.315236 0.315291 0.315353 0.315421 0.315487 0.315557 0.315638
           0.315733 0.315844 0.31597 0.31611 0.316261 0.316416 0.316571 0.316718 0.316848 0.316955 0.31703 0.317069
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_liq" NumberOfComponents="1" format="ascii">
           1.14745e-05 1.14774e-05 1.1479e-05 1.14797e-05 1.14726e-05 1.14722e-05 1.14722e-05 1.14744e-05 1.15505e-05 1.15556e-05 1.15659e-05 1.15822e-05
           1.16052e-05 1.16363e-05 1.16771e-05 1.17298e-05 1.17969e-05 1.1881e-05 1.19849e-05 1.21058e-05 1.22146e-05 1.22212e-05 1.24521e-05 1.66355e-05
           1.14734e-05 1.14754e-05 1.14767e-05 1.14773e-05 1.14724e-05 1.14721e-05 1.14721e-05 1.14741e-05 1.15466e-05 1.15516e-05 1.15617e-05 1.15775e-05
@@ -377,7 +377,7 @@
           1.14575e-05 1.14578e-05 1.14585e-05 1.14596e-05 1.14613e-05 1.14631e-05 1.14652e-05 1.14674e-05 1.14699e-05 1.14723e-05 1.14748e-05 1.14777e-05
           1.14812e-05 1.14852e-05 1.14898e-05 1.14949e-05 1.15004e-05 1.15061e-05 1.15117e-05 1.1517e-05 1.15218e-05 1.15256e-05 1.15284e-05 1.15298e-05
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01
           0.01 0.01 0.01 0.01 0.0100007 0.0100095 0.0100995 0.0107965 0.0147422 0.0291778 0.0286524 0.0216025
           0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01
@@ -411,7 +411,7 @@
           0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01
           0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_gas" NumberOfComponents="1" format="ascii">
           0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99
           0.99 0.99 0.99 0.99 0.989999 0.98999 0.9899 0.989204 0.985258 0.970822 0.971348 0.978397
           0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99
diff --git a/test/references/outflowbox-reference.vtu b/test/references/outflowbox-reference.vtu
index 0fba0e9e0ab2e437223eda8c5108ec7c6d13539b..4de1c7d23b36a52fcdf55c4babf507843c60cb0d 100644
--- a/test/references/outflowbox-reference.vtu
+++ b/test/references/outflowbox-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="40" NumberOfPoints="63">
-      <PointData Scalars="p" Vectors="velocity_w (m/s)">
+      <PointData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           200000 195000 200000 195000 190000 190000 185000 185000 180001 180001 175001 175001
           170001 170001 165001 165001 160001 160001 155001 155001 150001 150001 145001 145001
@@ -19,7 +19,7 @@
           70000.8 65000.9 60000.9 55001 50001 45001 40000.9 35000.9 30000.8 25000.7 20000.6 15000.5
           10000.3 5000.18 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           0.00997014 1.4509e-18 0 0.00997015 2.11437e-17 0 0.00997014 2.9018e-18 0 0.00997015 -3.62724e-19 0
           0.00997017 2.69473e-17 0 0.00997017 3.26451e-18 0 0.0099702 6.52902e-18 0 0.0099702 7.25446e-19 0
           0.00997022 5.3895e-17 0 0.00997022 3.62722e-19 0 0.00997024 5.67968e-17 0 0.00997024 -3.62722e-19 0
@@ -37,7 +37,7 @@
           0.00997045 -3.26445e-18 0 0.00997047 0 0 0.00997049 -2.2139e-16 0 0.00997052 -2.18125e-16 0
           0.00997054 2.539e-18 0 0.00997056 0 0 0.00997057 0 0
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998
           0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998
           0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.999981 0.999981 0.999981 0.999981
@@ -45,7 +45,7 @@
           0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.999981 0.999981
           0.999981 0.999981 0.999981
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_liq" NumberOfComponents="1" format="ascii">
           2e-05 2e-05 2e-05 2e-05 1.99999e-05 1.99999e-05 1.99995e-05 1.99995e-05 1.99985e-05 1.99985e-05 1.99962e-05 1.99962e-05
           1.99919e-05 1.99919e-05 1.99844e-05 1.99844e-05 1.99724e-05 1.99724e-05 1.99544e-05 1.99544e-05 1.99287e-05 1.99287e-05 1.98936e-05 1.98936e-05
           1.98473e-05 1.98473e-05 1.97882e-05 1.97882e-05 1.97146e-05 1.97146e-05 1.96251e-05 1.96251e-05 1.95186e-05 1.95186e-05 1.9394e-05 1.9394e-05
@@ -53,7 +53,7 @@
           1.99919e-05 1.99844e-05 1.99724e-05 1.99544e-05 1.99287e-05 1.98936e-05 1.98473e-05 1.97882e-05 1.97146e-05 1.96251e-05 1.95186e-05 1.9394e-05
           1.92505e-05 1.90878e-05 1.90016e-05
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969
           0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969
           0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.99997 0.99997 0.99997 0.99997
@@ -61,7 +61,7 @@
           0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.99997 0.99997
           0.99997 0.99997 0.99997
         </DataArray>
-        <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2_liq" NumberOfComponents="1" format="ascii">
           3.10994e-05 3.10994e-05 3.10994e-05 3.10994e-05 3.10992e-05 3.10992e-05 3.10986e-05 3.10986e-05 3.1097e-05 3.1097e-05 3.10935e-05 3.10935e-05
           3.10868e-05 3.10868e-05 3.10752e-05 3.10752e-05 3.10565e-05 3.10565e-05 3.10285e-05 3.10285e-05 3.09886e-05 3.09886e-05 3.0934e-05 3.0934e-05
           3.0862e-05 3.0862e-05 3.077e-05 3.077e-05 3.06556e-05 3.06556e-05 3.05165e-05 3.05165e-05 3.03508e-05 3.03508e-05 3.01571e-05 3.01571e-05
diff --git a/test/references/pipe_laufer_kepsilon.vtu b/test/references/pipe_laufer_kepsilon.vtu
index 7852291bd21cf639e121dc18578caa59b7603875..8f58a5ed395190bcd42943c13f95628fbd0dc313 100644
--- a/test/references/pipe_laufer_kepsilon.vtu
+++ b/test/references/pipe_laufer_kepsilon.vtu
@@ -519,7 +519,7 @@
           1.64559e-05 0.00577919 0 1.22961e-05 0.000548444 0 8.51189e-06 -0.00308419 0 5.21797e-06 -0.00533528 0
           2.56929e-06 -0.00651353 0 4.17783e-07 -0.00685314 0 -4.82556e-06 -0.00653496 0 -9.09409e-06 -0.00314851 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_Air (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_gas (m/s)" NumberOfComponents="3" format="ascii">
           2.00907 0.00281929 0 1.42312 0.000545663 0 1.29252 0.000204377 0 1.23616 0.000119301 0
           1.20244 7.44085e-05 0 1.18193 4.33528e-05 0 1.17049 2.23991e-05 0 1.16506 8.79645e-06 0
           1.1635 1.82088e-07 0 1.16436 -5.11615e-06 0 1.16666 -8.08202e-06 0 1.16971 -9.40221e-06 0
diff --git a/test/references/pipe_laufer_kepsilon_wallfunction.vtu b/test/references/pipe_laufer_kepsilon_wallfunction.vtu
index 3a511558eb1e41669edbf2be7c55a9588d1acd4a..8a873dc6fedb75a05b9de866ec513ed02e5b4f52 100644
--- a/test/references/pipe_laufer_kepsilon_wallfunction.vtu
+++ b/test/references/pipe_laufer_kepsilon_wallfunction.vtu
@@ -961,7 +961,7 @@
           5.19738e-05 0.0193273 0 4.47767e-05 0.0162257 0 3.62129e-05 0.013544 0 2.55574e-05 0.0113506 0
           1.20296e-05 0.00974895 0 -2.04381e-06 0.00886769 0 3.75099e-05 0.00856053 0 8.35677e-05 0.00430302 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_Air (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_gas (m/s)" NumberOfComponents="3" format="ascii">
           2.44567 0.0016769 0 2.34776 0.00134459 0 2.26903 0.00108537 0 2.20551 0.000875067 0
           2.15416 0.000709746 0 2.11214 0.0005872 0 2.0769 0.000500271 0 2.04648 0.000438565 0
           2.01957 0.00039221 0 1.99539 0.000354026 0 1.97356 0.000319774 0 1.95388 0.000287426 0
diff --git a/test/references/pipe_laufer_komega.vtu b/test/references/pipe_laufer_komega.vtu
index ecd36ff58268fb04401c129b3c65d32317fe3283..e0bf6eb41f7451d6e587876c19f96071398994ec 100644
--- a/test/references/pipe_laufer_komega.vtu
+++ b/test/references/pipe_laufer_komega.vtu
@@ -423,7 +423,7 @@
           -3.21172e-06 -0.0038315 0 -2.34481e-06 -0.00246577 0 -1.56467e-06 -0.0015275 0 -9.88663e-07 -0.000923845 0
           -6.03853e-07 -0.000550846 0 -3.59907e-07 -0.00032604 0 -2.43346e-07 -0.000193781 0 -2.20475e-07 -8.26762e-05 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_Air (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_gas (m/s)" NumberOfComponents="3" format="ascii">
           1.5812 0.00527645 0 0.581074 0.000467017 0 0.489436 5.92681e-05 0 0.478351 4.41115e-06 0
           0.479043 -8.36672e-06 0 0.482394 -1.08636e-05 0 0.48595 -9.53736e-06 0 0.488856 -7.1347e-06 0
           0.490948 -4.85974e-06 0 0.49234 -3.12005e-06 0 0.493223 -1.92873e-06 0 0.493764 -1.16422e-06 0
diff --git a/test/references/pipe_laufer_lowrekepsilon.vtu b/test/references/pipe_laufer_lowrekepsilon.vtu
index e41e2f05ef3d3b357e79a57470a2d9f6b98283b8..0986419120c9e4d9cbc57e48428de15513c03982 100644
--- a/test/references/pipe_laufer_lowrekepsilon.vtu
+++ b/test/references/pipe_laufer_lowrekepsilon.vtu
@@ -423,7 +423,7 @@
           7.66006e-06 -0.00083118 0 4.30578e-06 -0.00354387 0 1.77892e-06 -0.00484891 0 1.98383e-08 -0.0051523 0
           -1.06483e-06 -0.00479308 0 -1.46223e-06 -0.00408658 0 -2.63165e-06 -0.00334484 0 -3.78021e-06 -0.00152903 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_Air (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_gas (m/s)" NumberOfComponents="3" format="ascii">
           1.97444 0.00301813 0 1.26691 0.00104503 0 1.02481 0.000345315 0 0.940509 0.000138816 0
           0.905193 6.40093e-05 0 0.888578 3.14145e-05 0 0.880548 1.47155e-05 0 0.877093 5.13765e-06 0
           0.876343 -8.23629e-07 0 0.877262 -4.43648e-06 0 0.879116 -6.2038e-06 0 0.881358 -6.6566e-06 0
diff --git a/test/references/pipe_laufer_oneeq.vtu b/test/references/pipe_laufer_oneeq.vtu
index 8d02abec41cd971e45989365d209dc34bf2deb55..37e560af66f8a1d5725247ed8f7fad0c6db38da3 100644
--- a/test/references/pipe_laufer_oneeq.vtu
+++ b/test/references/pipe_laufer_oneeq.vtu
@@ -399,7 +399,7 @@
           8.21409e-08 -0.000476154 0 -3.98358e-07 -0.0015808 0 -1.04661e-06 -0.00218359 0 -1.59263e-06 -0.00231985 0
           -1.90999e-06 -0.00215744 0 -1.14676e-06 -0.00183825 0 1.92689e-07 -0.00195709 0 6.49985e-07 -0.00117218 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_Air (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_gas (m/s)" NumberOfComponents="3" format="ascii">
           2.02138 0.00274858 0 1.38985 0.00087812 0 1.20724 0.000170601 0 1.1734 2.37209e-05 0
           1.16903 1.42457e-06 0 1.16909 -1.76042e-06 0 1.16992 -3.02086e-06 0 1.17108 -3.6057e-06 0
           1.17236 -3.76944e-06 0 1.17367 -3.70837e-06 0 1.17488 -3.27149e-06 0 1.17587 -2.4001e-06 0
diff --git a/test/references/pipe_laufer_zeroeq.vtu b/test/references/pipe_laufer_zeroeq.vtu
index 013199e7e4217e9bae7890a06f2d0d24e52d3eb4..c8b196e16a63683fe0e9c057ef5f209a383ef56c 100644
--- a/test/references/pipe_laufer_zeroeq.vtu
+++ b/test/references/pipe_laufer_zeroeq.vtu
@@ -375,7 +375,7 @@
           5.05443e-05 -0.00848006 0 3.22016e-06 -0.0235952 0 -2.55711e-05 -0.0071434 0 -1.22662e-05 -0.00063657 0
           -4.8401e-06 0.00194259 0 -1.82477e-06 0.00291257 0 1.44679e-06 0.00323411 0 3.84377e-06 0.0016969 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_Air (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_gas (m/s)" NumberOfComponents="3" format="ascii">
           1.9748 0.0030161 0 1.27101 0.00102558 0 1.10889 -9.4561e-05 0 1.13243 -4.05981e-05 0
           1.13262 3.95373e-05 0 1.12612 -2.24943e-06 0 1.12321 1.89868e-05 0 1.11474 2.9668e-05 0
           1.11105 -8.49306e-06 0 1.11837 -3.35124e-05 0 1.12638 -1.25183e-05 0 1.12884 -1.54853e-06 0
diff --git a/test/references/pipe_zeroeqni.vtu b/test/references/pipe_zeroeqni.vtu
index c402ff7e473c10903707cb3ceb708d1cf74735ff..02e3d4f73e72784ca8be70cce4a615d44a33db90 100644
--- a/test/references/pipe_zeroeqni.vtu
+++ b/test/references/pipe_zeroeqni.vtu
@@ -447,7 +447,7 @@
           0.000159221 0.000830606 0 -2.41471e-05 -0.00241113 0 -8.49134e-05 0.000511097 0 -3.1838e-05 0.00168323 0
           -1.28733e-05 0.00212611 0 -5.49247e-06 0.00229713 0 -1.33082e-06 0.00224491 0 -8.85185e-08 0.00168609 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_Air (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_gas (m/s)" NumberOfComponents="3" format="ascii">
           0.230749 0.000835404 0 0.19468 0.000719595 0 0.164634 0.000559913 0 0.14163 0.00041051 0
           0.124925 0.000289327 0 0.113152 0.000201259 0 0.104885 0.000141831 0 0.0992757 9.05742e-05 0
           0.0986951 -6.14569e-05 0 0.103032 -0.000108451 0 0.106571 -3.1273e-05 0 0.107452 -2.30969e-06 0
diff --git a/test/references/richardsanalyticalcc-reference.vtu b/test/references/richardsanalyticalcc-reference.vtu
index 1f3c3e4a208d75c551a1374c080c4478564c0a7e..ed9cce9d696ea3546686deabc1d91065c24178fc 100644
--- a/test/references/richardsanalyticalcc-reference.vtu
+++ b/test/references/richardsanalyticalcc-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="512" NumberOfPoints="1026">
-      <CellData Scalars="S_n">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_gas">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           4.35874e-07 4.35873e-07 4.35872e-07 4.3587e-07 4.35869e-07 4.35867e-07 4.35865e-07 4.35863e-07 4.35861e-07 4.35859e-07 4.35856e-07 4.35853e-07
           4.3585e-07 4.35847e-07 4.35844e-07 4.3584e-07 4.35836e-07 4.35831e-07 4.35826e-07 4.35821e-07 4.35816e-07 4.3581e-07 4.35803e-07 4.35796e-07
           4.35788e-07 4.3578e-07 4.35771e-07 4.35762e-07 4.35751e-07 4.3574e-07 4.35728e-07 4.35715e-07 4.357e-07 4.35685e-07 4.35668e-07 4.3565e-07
@@ -48,7 +48,7 @@
           1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07
           1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -93,7 +93,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -138,7 +138,7 @@
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           95641.3 95641.3 95641.3 95641.3 95641.3 95641.3 95641.4 95641.4 95641.4 95641.4 95641.4 95641.5
           95641.5 95641.5 95641.6 95641.6 95641.6 95641.7 95641.7 95641.8 95641.8 95641.9 95642 95642
           95642.1 95642.2 95642.3 95642.4 95642.5 95642.6 95642.7 95642.9 95643 95643.1 95643.3 95643.5
@@ -228,7 +228,7 @@
           1057.2 1057.2 1057.2 1057.2 1057.2 1057.2 1057.2 1057.2 1057.2 1057.2 1057.2 1057.2
           1057.2 1057.2 1057.2 1057.2 1057.2 1057.2 1057.2 1057.2
         </DataArray>
-        <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -273,7 +273,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
diff --git a/test/references/richardslensbox-reference-parallel.vtu b/test/references/richardslensbox-reference-parallel.vtu
index 61705ee731e35c4487af11be760ca9144eebe6ab..3c824a4e3a9a2309e8787b7c20c0d1323fdc6a34 100644
--- a/test/references/richardslensbox-reference-parallel.vtu
+++ b/test/references/richardslensbox-reference-parallel.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="192" NumberOfPoints="221">
-      <PointData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_liq">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
           9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
           9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
@@ -24,7 +24,7 @@
           0.615224 0.63579 0.615224 0.228153 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 3.93768e-06 0.0814728
           0.713034 0.932869 0.936509 0.932869 0.713034
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -45,7 +45,7 @@
           0.384776 0.36421 0.384776 0.771847 1 1 1 1 1 1 0.999996 0.918527
           0.286966 0.0671314 0.0634913 0.0671314 0.286966
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
           97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
           97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
@@ -66,7 +66,7 @@
           99733.6 99739 99733.6 99586.5 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.5 99323.1
           99759.4 99835.3 99837.4 99835.3 99759.4
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -108,7 +108,7 @@
           266.37 260.962 266.37 413.55 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.52 676.884
           240.611 164.722 162.618 164.722 240.611
         </DataArray>
-        <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -129,7 +129,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/richardslensbox-reference.vtu b/test/references/richardslensbox-reference.vtu
index c2a5a6d5ce7680da904411b65e7915cef0b8b549..076c15811e15530376dc76496a5cbe583f9c6b14 100644
--- a/test/references/richardslensbox-reference.vtu
+++ b/test/references/richardslensbox-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="384" NumberOfPoints="425">
-      <PointData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_liq">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
           9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
           9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
@@ -41,7 +41,7 @@
           0.713034 0.932869 0.936509 0.932869 0.713034 0.0814728 3.93768e-06 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
           9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -79,7 +79,7 @@
           0.286966 0.0671314 0.0634913 0.0671314 0.286966 0.918527 0.999996 1 1 1 1 1
           1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
           97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
           97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
@@ -117,7 +117,7 @@
           99759.4 99835.3 99837.4 99835.3 99759.4 99323.1 97470.5 97470.4 97470.4 97470.4 97470.4 97470.4
           97470.4 97470.4 97470.4 97470.4 97470.4
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -193,7 +193,7 @@
           240.611 164.722 162.618 164.722 240.611 676.884 2529.52 2529.62 2529.62 2529.62 2529.62 2529.62
           2529.62 2529.62 2529.62 2529.62 2529.62
         </DataArray>
-        <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -231,7 +231,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/richardslenscc-reference-parallel.vtu b/test/references/richardslenscc-reference-parallel.vtu
index 5711d651d5d4a3ff77408112baa32bef81574c8d..64b199f8c9331191c357989572fabbf3e568eb0b 100644
--- a/test/references/richardslenscc-reference-parallel.vtu
+++ b/test/references/richardslenscc-reference-parallel.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="192" NumberOfPoints="221">
-      <CellData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_liq">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17
           9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17
           9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17
@@ -21,7 +21,7 @@
           9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 0.0033326 0.296918 0.339898 0.339898 0.296918
           9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 2.85357e-06 0.0790732 0.814737 0.847266 0.847266 0.814737
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -39,7 +39,7 @@
           1 1 1 1 1 1 1 0.996667 0.703082 0.660102 0.660102 0.703082
           1 1 1 1 1 1 0.999997 0.920927 0.185263 0.152734 0.152734 0.185263
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
           97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
           97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
@@ -57,7 +57,7 @@
           97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97559.5 99627.1 99646.8 99646.8 99627.1
           97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.5 99308.3 99788.3 99798.9 99798.9 99788.3
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -93,7 +93,7 @@
           2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2440.46 372.863 353.176 353.176 372.863
           2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.54 691.737 211.699 201.127 201.127 211.699
         </DataArray>
-        <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -111,7 +111,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/richardslenscc-reference.vtu b/test/references/richardslenscc-reference.vtu
index 4c88cf188052d9e7f431dc89f0978a3d10aaa771..6a548781500b09664cc0bb9d015c85d214796336 100644
--- a/test/references/richardslenscc-reference.vtu
+++ b/test/references/richardslenscc-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="384" NumberOfPoints="425">
-      <CellData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_liq">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
           9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
           9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
@@ -37,7 +37,7 @@
           9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 2.85357e-06 0.0790732 0.814737 0.847266 0.847266 0.814737
           0.0790732 2.85357e-06 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -71,7 +71,7 @@
           1 1 1 1 1 1 0.999997 0.920927 0.185263 0.152734 0.152734 0.185263
           0.920927 0.999997 1 1 1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
           97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
           97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
@@ -105,7 +105,7 @@
           97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.5 99308.3 99788.3 99798.9 99798.9 99788.3
           99308.3 97470.5 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -173,7 +173,7 @@
           2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.54 691.737 211.699 201.127 201.127 211.699
           691.737 2529.54 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62
         </DataArray>
-        <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -207,7 +207,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/richardsniconductionbox-reference.vtu b/test/references/richardsniconductionbox-reference.vtu
index ec965308abdd9a5d6955fac1e7f174aea9225c0a..1986fbf328dba077c6142e1eb4529a3c4c80c603 100644
--- a/test/references/richardsniconductionbox-reference.vtu
+++ b/test/references/richardsniconductionbox-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="200" NumberOfPoints="402">
-      <PointData Scalars="S_n" Vectors="velocity">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_gas" Vectors="velocity">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -39,7 +39,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -75,7 +75,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -111,7 +111,7 @@
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -183,7 +183,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           996.544 996.726 996.544 996.726 996.906 996.906 997.084 997.084 997.239 997.239 997.385 997.385
           997.526 997.526 997.66 997.66 997.787 997.787 997.906 997.906 998.007 998.007 998.094 998.094
           998.175 998.175 998.248 998.248 998.315 998.315 998.376 998.376 998.431 998.431 998.48 998.48
@@ -219,7 +219,7 @@
           998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789
           998.789 998.789 998.789 998.789 998.789 998.789
         </DataArray>
-        <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           1169.89 1152.46 1169.89 1152.46 1135.68 1135.68 1119.64 1119.64 1102.68 1102.68 1086.42 1086.42
           1071.26 1071.26 1057.19 1057.19 1044.22 1044.22 1032.32 1032.32 1020.47 1020.47 1009.2 1009.2
           999.031 999.031 989.899 989.899 981.729 981.729 974.446 974.446 967.977 967.977 962.249 962.249
diff --git a/test/references/richardsniconductioncc-reference.vtu b/test/references/richardsniconductioncc-reference.vtu
index eeaf7ce32e5f6e760f12fb89a9c735bdb7fb080a..36a22a712d441b123f7e502a11164b818e3eec20 100644
--- a/test/references/richardsniconductioncc-reference.vtu
+++ b/test/references/richardsniconductioncc-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="200" NumberOfPoints="402">
-      <CellData Scalars="S_n" Vectors="velocity">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_gas" Vectors="velocity">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -22,7 +22,7 @@
           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="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -41,7 +41,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -60,7 +60,7 @@
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -98,7 +98,7 @@
           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="density" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           996.635 996.816 996.995 997.163 997.312 997.456 997.593 997.724 997.847 997.96 998.051 998.135
           998.212 998.282 998.346 998.404 998.456 998.502 998.544 998.58 998.613 998.641 998.664 998.682
           998.697 998.711 998.722 998.732 998.74 998.748 998.754 998.76 998.764 998.768 998.771 998.774
@@ -117,7 +117,7 @@
           998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789
           998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789
         </DataArray>
-        <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           1161.11 1144 1127.6 1111.26 1094.48 1078.77 1064.16 1050.64 1038.21 1026.63 1014.77 1004.04
           994.394 985.742 978.014 971.136 965.035 959.642 954.889 950.713 947.055 943.859 940.897 938.104
           935.684 933.594 931.791 930.24 928.909 927.768 926.792 925.959 925.25 924.646 924.134 923.699
diff --git a/test/references/richardsniconvectionbox-reference.vtu b/test/references/richardsniconvectionbox-reference.vtu
index 2c7c622d542e032f6fc0869e5fb54ff56fe36b91..72cfb75c55fadbe578e77d718ae97caa04c1e327 100644
--- a/test/references/richardsniconvectionbox-reference.vtu
+++ b/test/references/richardsniconvectionbox-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="80" NumberOfPoints="162">
-      <PointData Scalars="S_n" Vectors="velocity">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_gas" Vectors="velocity">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -19,7 +19,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -35,7 +35,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           121579 121315 121579 121315 121051 121051 120787 120787 120522 120522 120258 120258
           119994 119994 119730 119730 119465 119465 119201 119201 118936 118936 118672 118672
           118407 118407 118141 118141 117876 117876 117610 117610 117343 117343 117075 117075
@@ -51,7 +51,7 @@
           102170 102170 101899 101899 101628 101628 101357 101357 101085 101085 100814 100814
           100543 100543 100271 100271 100000 100000
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           121579 121315 121579 121315 121051 121051 120787 120787 120522 120522 120258 120258
           119994 119994 119730 119730 119465 119465 119201 119201 118936 118936 118672 118672
           118407 118407 118141 118141 117876 117876 117610 117610 117343 117343 117075 117075
@@ -83,7 +83,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           998.631 998.631 998.631 998.631 998.631 998.631 998.631 998.631 998.631 998.631 998.631 998.631
           998.632 998.632 998.633 998.633 998.635 998.635 998.639 998.639 998.645 998.645 998.653 998.653
           998.663 998.663 998.673 998.673 998.684 998.684 998.696 998.696 998.708 998.708 998.721 998.721
@@ -99,7 +99,7 @@
           998.79 998.79 998.79 998.79 998.79 998.79 998.79 998.79 998.79 998.79 998.789 998.789
           998.789 998.789 998.789 998.789 998.789 998.789
         </DataArray>
-        <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           946.105 946.107 946.105 946.107 946.107 946.107 946.104 946.104 946.093 946.093 946.059 946.059
           945.981 945.981 945.825 945.825 945.548 945.548 945.105 945.105 944.453 944.453 943.564 943.564
           942.433 942.433 940.896 940.896 939.114 939.114 937.185 937.185 935.19 935.19 933.206 933.206
diff --git a/test/references/richardsniconvectioncc-reference.vtu b/test/references/richardsniconvectioncc-reference.vtu
index ee07ca796c08b72e943ce93015faac3e4ba3c761..e644b0e21a3495daee0bc521f40c2ae500c048e5 100644
--- a/test/references/richardsniconvectioncc-reference.vtu
+++ b/test/references/richardsniconvectioncc-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="80" NumberOfPoints="162">
-      <CellData Scalars="S_n" Vectors="velocity">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_gas" Vectors="velocity">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -12,7 +12,7 @@
           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="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -21,7 +21,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           121447 121183 120919 120654 120390 120126 119862 119597 119333 119069 118804 118539
           118274 118009 117743 117476 117209 116942 116673 116405 116136 115866 115596 115326
           115055 114784 114514 114243 113972 113700 113429 113158 112887 112615 112344 112073
@@ -30,7 +30,7 @@
           105290 105019 104748 104476 104205 103934 103663 103391 103120 102849 102577 102306
           102035 101763 101492 101221 100950 100678 100407 100136
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           121447 121183 120919 120654 120390 120126 119862 119597 119333 119069 118804 118539
           118274 118009 117743 117476 117209 116942 116673 116405 116136 115866 115596 115326
           115055 114784 114514 114243 113972 113700 113429 113158 112887 112615 112344 112073
@@ -48,7 +48,7 @@
           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="density" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           998.631 998.631 998.631 998.631 998.631 998.631 998.632 998.634 998.637 998.642 998.649 998.658
           998.668 998.678 998.69 998.702 998.715 998.727 998.738 998.749 998.758 998.766 998.773 998.779
           998.783 998.786 998.789 998.791 998.792 998.793 998.794 998.794 998.794 998.794 998.794 998.794
@@ -57,7 +57,7 @@
           998.792 998.791 998.791 998.791 998.791 998.791 998.791 998.791 998.791 998.79 998.79 998.79
           998.79 998.79 998.79 998.79 998.79 998.789 998.789 998.789
         </DataArray>
-        <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           946.105 946.106 946.105 946.098 946.075 946.018 945.9 945.683 945.321 944.771 944 942.989
           941.669 939.994 938.14 936.18 934.194 932.256 930.432 928.771 927.302 926.041 924.985 924.123
           923.435 922.898 922.488 922.18 921.954 921.79 921.674 921.592 921.536 921.498 921.472 921.455
diff --git a/test/references/richardswelltracerbox-reference.vtu b/test/references/richardswelltracerbox-reference.vtu
index 24fd2a4aa6361427534020e12d16ede4af628c54..5a0d6b21619195fab311b366a27a5697b3c0555e 100644
--- a/test/references/richardswelltracerbox-reference.vtu
+++ b/test/references/richardswelltracerbox-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="1000" NumberOfPoints="1071">
-      <PointData Scalars="S_w" Vectors="velocity_SimpleH2O (m/s)">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_liq" Vectors="velocity_liq (m/s)">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -95,7 +95,7 @@
           0.0659598 0.0660826 0.0662806 0.066634 0.0673324 0.0685594 0.0703741 0.0728358 0.076515 0.0844592 0.102671 0.136716
           0.194957 0.285667 0.4
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -187,7 +187,7 @@
           0.93404 0.933917 0.933719 0.933366 0.932668 0.931441 0.929626 0.927164 0.923485 0.915541 0.897329 0.863284
           0.805043 0.714333 0.6
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           109480 109417 108990 108927 109353 108863 109289 108799 109223 108733 109155 108666
           109084 108595 109009 108520 108928 108441 108840 108353 108741 108256 108628 108144
           108496 108013 108342 107859 108168 107683 107980 107492 107784 107294 107586 107095
@@ -279,7 +279,7 @@
           99185.4 99187.1 99189.8 99194.5 99203.5 99218.2 99237.8 99261.1 99290.6 99339.7 99412.6 99489.2
           99559.9 99621.4 99670
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -463,7 +463,7 @@
           814.573 812.878 810.179 805.463 796.505 781.823 762.218 738.891 709.374 660.272 587.385 510.802
           440.121 378.606 329.977
         </DataArray>
-        <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -555,7 +555,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -1107,7 +1107,7 @@
           0.0263839 0.026433 0.0265122 0.0266536 0.026933 0.0274237 0.0281497 0.0291343 0.030606 0.0337837 0.0410686 0.0546863
           0.0779827 0.114267 0.16
         </DataArray>
-        <DataArray type="Float32" Name="x^SimpleH2O_SimpleH2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^SimpleH2O_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -1199,7 +1199,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="x^D2O_SimpleH2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^D2O_liq" NumberOfComponents="1" format="ascii">
           0 4.40022e-34 0 1.16839e-33 3.8932e-32 1.22037e-31 2.63812e-30 1.00452e-29 1.31911e-28 6.24494e-28 4.53834e-27 2.63418e-26
           1.03659e-25 6.23889e-25 1.56903e-24 8.85024e-24 1.69161e-23 8.66094e-23 1.4134e-22 6.57456e-22 1.00924e-21 4.35416e-21 9.59529e-21 3.87121e-20
           4.66686e-19 2.30597e-18 2.46347e-17 1.99321e-16 5.32236e-17 3.79027e-16 7.05029e-17 4.6906e-16 7.61886e-17 4.95173e-16 7.77263e-17 4.97768e-16
@@ -1291,7 +1291,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_SimpleH2O (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           5.25453e-06 -3.74861e-09 0 5.27269e-06 -1.51338e-08 0 5.24211e-06 -7.40309e-09 0 5.25982e-06 -2.98848e-08 0
           5.32853e-06 -3.14007e-08 0 5.31422e-06 -6.19853e-08 0 5.42632e-06 -5.00852e-08 0 5.40939e-06 -9.88104e-08 0
           5.57378e-06 -7.2803e-08 0 5.55271e-06 -1.43511e-07 0 5.78324e-06 -1.01742e-07 0 5.75589e-06 -2.00347e-07 0
diff --git a/test/references/richardswelltracercc-reference.vtu b/test/references/richardswelltracercc-reference.vtu
index 7dc552a768594ef035f7cfd74747f17bb643c631..df51063e775539284ba2e6e183fc2e88af6de54d 100644
--- a/test/references/richardswelltracercc-reference.vtu
+++ b/test/references/richardswelltracercc-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="1000" NumberOfPoints="1071">
-      <CellData Scalars="S_w" Vectors="velocity_H2O (m/s)">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_liq" Vectors="velocity_liq (m/s)">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -89,7 +89,7 @@
           0.0714643 0.0715986 0.0718261 0.0722481 0.073157 0.0747857 0.0775059 0.0837971 0.0995959 0.130492 0.185904 0.282961
           0.44148 0.660322 0.874251 0.982461
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -175,7 +175,7 @@
           0.928536 0.928401 0.928174 0.927752 0.926843 0.925214 0.922494 0.916203 0.900404 0.869508 0.814096 0.717039
           0.55852 0.339678 0.125749 0.0175395
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           109202 109135 109068 109000 108929 108855 108777 108693 108601 108498 108380 108242
           108080 107895 107695 107489 107280 107072 106868 106674 106501 106364 106268 106211
           106190 106201 106243 106309 106396 106500 106616 106741 106872 107007 107145 107284
@@ -261,7 +261,7 @@
           99248.5 99249.8 99251.9 99255.8 99263.9 99277.4 99297.7 99336.2 99402.7 99478.3 99551.4 99620
           99684 99745.5 99808.6 99877.8
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -433,7 +433,7 @@
           751.471 750.195 748.056 744.162 736.082 722.558 702.298 663.794 597.258 521.69 448.615 380.031
           315.962 254.532 191.421 122.176
         </DataArray>
-        <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -519,7 +519,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -1035,7 +1035,7 @@
           0.0285857 0.0286394 0.0287304 0.0288992 0.0292628 0.0299143 0.0310024 0.0335189 0.0398384 0.0521967 0.0743614 0.113184
           0.176592 0.264129 0.3497 0.392984
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -1121,7 +1121,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="x^D2O_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^D2O_liq" NumberOfComponents="1" format="ascii">
           5.38151e-37 1.21053e-34 2.17057e-32 3.00657e-30 2.97518e-28 1.78929e-26 4.365e-25 6.14067e-24 6.20647e-23 5.38605e-22 7.67378e-21 7.44331e-19
           8.06387e-17 1.46951e-16 1.83224e-16 1.98008e-16 2.00569e-16 2.03161e-16 2.05806e-16 2.08545e-16 2.11512e-16 2.15116e-16 2.20095e-16 2.28403e-16
           1.57321e-16 5.49236e-19 1.16639e-21 1.87374e-24 2.52656e-27 3.03946e-30 3.3928e-33 3.60834e-36 3.72377e-39 3.7765e-42 4.2039e-45 0
@@ -1207,7 +1207,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_H2O (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           5.51478e-06 -1.85841e-08 0 5.56022e-06 -5.71563e-08 0 5.65459e-06 -1.00129e-07 0 5.80533e-06 -1.51097e-07 0
           6.02484e-06 -2.14751e-07 0 6.3322e-06 -2.97527e-07 0 6.75576e-06 -4.08403e-07 0 7.33655e-06 -5.59584e-07 0
           8.13186e-06 -7.65934e-07 0 9.21506e-06 -1.03939e-06 0 1.06595e-05 -1.36803e-06 0 1.24761e-05 -1.65969e-06 0
diff --git a/test/references/rosi2c-root-reference.vtp b/test/references/rosi2c-root-reference.vtp
index ce5b740984b462c11452ea1c35ea56a32555366b..c2c9607fa2ac7bf024a8c8a8e2318ab30ff715d0 100644
--- a/test/references/rosi2c-root-reference.vtp
+++ b/test/references/rosi2c-root-reference.vtp
@@ -2,7 +2,7 @@
 <VTKFile type="PolyData" version="0.1" byte_order="LittleEndian">
   <PolyData>
     <Piece NumberOfLines="1738" NumberOfPoints="1739">
-      <CellData Scalars="P" Vectors="velocity_H2O (m/s)">
+      <CellData Scalars="P" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="P" NumberOfComponents="1" format="ascii">
           -93108.9 -92837.6 -92767.2 -92697.4 -92628 -92559 -92490.3 -92419.9 -92347.8 -92276 -92204.6 -92132
           -92058.3 -91985 -91912 -91839.5 -91767.2 -91695.2 -91624.4 -91554.7 -91485.2 -91416.1 -91351.4 -91291.2
@@ -1179,7 +1179,7 @@
           6.65061e-10 3.99093e-10 2.56613e-10 1.78684e-10 1.33107e-10 1.03284e-10 7.98608e-11 6.07547e-11 4.35348e-11 3.07069e-11 2.20248e-11 1.59003e-11
           1.20103e-11 9.64489e-12 8.39821e-12 9.31972e-10 1.02989e-09 9.83012e-10 7.17719e-10 5.32337e-10 4.30111e-10 3.71908e-10
         </DataArray>
-        <DataArray type="Float32" Name="velocity_H2O (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           0 0 1.00873e-06 -1.75905e-07 -3.97482e-07 1.33398e-07 -1.74748e-07 -3.95316e-07 1.32072e-07 -2.21955e-07 -5.02831e-07 1.68754e-07
           -2.94291e-07 -6.64992e-07 2.22421e-07 -4.08292e-07 -9.22594e-07 3.0963e-07 -6.13864e-07 -1.38711e-06 4.63949e-07 -5.83488e-07 -1.13445e-06 1.57969e-06
           -5.77705e-07 -1.12511e-06 1.5695e-06 -5.76684e-07 -1.11921e-06 1.56127e-06 -5.61647e-07 -1.09198e-06 1.52056e-06 6.68707e-08 -1.96679e-08 1.98449e-06
diff --git a/test/references/rosi2c-soil-reference.vtu b/test/references/rosi2c-soil-reference.vtu
index 35ab665ba621846dd582142f8fd05b8548474f4e..99012737accaae4a161fc62a2f6b032bb32fcdb8 100644
--- a/test/references/rosi2c-soil-reference.vtu
+++ b/test/references/rosi2c-soil-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="8000" NumberOfPoints="9261">
-      <CellData Scalars="S_w" Vectors="velocity_H2O (m/s)">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_liq" Vectors="velocity_liq (m/s)">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           0.199094 0.19905 0.198967 0.198854 0.198725 0.198597 0.19849 0.198421 0.198399 0.198426 0.198496 0.198602
           0.198735 0.198882 0.199033 0.199176 0.199301 0.199402 0.199472 0.199508 0.199058 0.19901 0.198919 0.198794
           0.198649 0.198504 0.198384 0.198309 0.198288 0.19832 0.198398 0.198514 0.198658 0.198818 0.19898 0.199133
@@ -672,7 +672,7 @@
           0.198205 0.198143 0.198024 0.197855 0.197648 0.197419 0.197189 0.19698 0.196815 0.196715 0.196694 0.196758
           0.196896 0.19709 0.197316 0.197547 0.19776 0.197936 0.198061 0.198126
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.800906 0.80095 0.801033 0.801146 0.801275 0.801403 0.80151 0.801579 0.801601 0.801574 0.801504 0.801398
           0.801265 0.801118 0.800967 0.800824 0.800699 0.800598 0.800528 0.800492 0.800942 0.80099 0.801081 0.801206
           0.801351 0.801496 0.801616 0.801691 0.801712 0.80168 0.801602 0.801486 0.801342 0.801182 0.80102 0.800867
@@ -1341,7 +1341,7 @@
           0.801795 0.801857 0.801976 0.802145 0.802352 0.802581 0.802811 0.80302 0.803185 0.803285 0.803306 0.803242
           0.803104 0.80291 0.802684 0.802453 0.80224 0.802064 0.801939 0.801874
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           -36994.6 -37075.1 -37228.1 -37437.3 -37677.6 -37915.8 -38115.2 -38243.9 -38284.1 -38234.2 -38102.9 -37905.1
           -37659 -37385.7 -37107 -36843.4 -36612.3 -36427.6 -36299.2 -36233.4 -37060.5 -37148.7 -37317.2 -37549.6
           -37819.1 -38088.3 -38313.1 -38454.3 -38493.6 -38433.4 -38286.6 -38069.6 -37801.5 -37505.2 -37204.4 -36921.2
@@ -2010,7 +2010,7 @@
           -38649.1 -38765 -38989.6 -39308.8 -39700.8 -40135.9 -40576.3 -40978.4 -41296.8 -41490.1 -41529.6 -41407.3
           -41140.3 -40766.1 -40333.5 -39892.6 -39487.8 -39154.5 -38918.6 -38796.5
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -9369,7 +9369,7 @@
           2.76056e-42 1.07538e-40 4.60904e-39 1.86884e-37 6.82757e-36 2.25449e-34 7.01102e-33 2.13571e-31 5.95994e-30 1.22815e-28 1.39407e-27 1.19112e-28
           5.52836e-30 1.8499e-31 4.99623e-33 1.15578e-34 2.37315e-36 4.42619e-38 7.61805e-40 1.24197e-41
         </DataArray>
-        <DataArray type="Float32" Name="velocity_H2O (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           2.72811e-11 2.23197e-11 1.61298e-11 3.95213e-11 2.48828e-11 1.72095e-11 6.11418e-11 3.00273e-11 1.93718e-11 7.55578e-11 3.76457e-11 2.25883e-11
           8.00247e-11 4.71797e-11 2.67039e-11 7.27904e-11 5.7204e-11 3.12877e-11 5.4293e-11 6.53348e-11 3.55361e-11 2.78554e-11 6.92716e-11 3.85181e-11
           -1.59729e-12 6.88724e-11 3.98816e-11 -2.98877e-11 6.55893e-11 3.98557e-11 -5.448e-11 6.06578e-11 3.87318e-11 -7.38664e-11 5.45562e-11 3.66881e-11
diff --git a/test/references/saltflushbox2pncmin-reference.vtu b/test/references/saltflushbox2pncmin-reference.vtu
index c16943559194599467c3e451e7e1b8395bab9106..95981fec4143ac71f9ceb40f8da3831c1dcd18ab 100644
--- a/test/references/saltflushbox2pncmin-reference.vtu
+++ b/test/references/saltflushbox2pncmin-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="200" NumberOfPoints="231">
-      <PointData Scalars="porosity" Vectors="velocity_brine (m/s)">
+      <PointData Scalars="porosity" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="porosity" NumberOfComponents="1" format="ascii">
           0.11 0.11 0.11 0.11 0.11 0.11 0.109738 0.109779 0.0605316 0.0612575 0.057518 0.0575188
           0.057507 0.0575092 0.0574974 0.0575013 0.05749 0.0574925 0.0574819 0.0574865 0.105382 0.1054 0.105367 0.105385
@@ -47,7 +47,7 @@
           499.687 499.687 499.687 499.687 499.687 499.687 499.687 499.687 552.48 638.747 1021.94 1148.58
           1149.63 1156.33 7500
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           0.95 0.968994 0.95 0.954156 0.979941 0.965922 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 0.991108 0.956518 0.94099 0.915977 0.918645 0.880376 0.859222 0.758017
@@ -69,7 +69,7 @@
           1 1 1 1 1 1 1 1 0.854416 0.689587 0.391266 0.351412
           0.351136 0.349391 0.2
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           1.29995e+07 1.29977e+07 1.29995e+07 1.29893e+07 1.29807e+07 1.29718e+07 1.2961e+07 1.2951e+07 1.28853e+07 1.28762e+07 1.2657e+07 1.26498e+07
           1.23857e+07 1.23766e+07 1.21012e+07 1.20913e+07 1.18106e+07 1.18003e+07 1.15172e+07 1.15066e+07 1.14042e+07 1.13935e+07 1.13609e+07 1.13501e+07
           1.13173e+07 1.13065e+07 1.12732e+07 1.12623e+07 1.12267e+07 1.12171e+07 1.11767e+07 1.11653e+07 1.1114e+07 1.11032e+07 1.10524e+07 1.10373e+07
@@ -91,7 +91,7 @@
           1.23315e+07 1.20216e+07 1.17168e+07 1.14141e+07 1.12982e+07 1.12542e+07 1.12104e+07 1.11659e+07 1.11276e+07 1.10652e+07 1.1026e+07 1.1014e+07
           1.10072e+07 1.10019e+07 1.09925e+07
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           929.152 933.512 929.152 930.521 940.555 935.595 1025.86 1017.48 1073.52 1072.01 1075.23 1073.66
           1077.39 1075.84 1080.1 1078.67 1083.42 1082.16 1087.32 1086.28 1095.55 1094.97 1103.34 1103.22
           1109.72 1110.05 1114.37 1115.09 1117.22 1117.22 1117.2 1117.19 1117.17 1117.16 1117.14 1117.13
@@ -113,7 +113,7 @@
           1070.91 1072.88 1075.83 1079.79 1089.41 1099.67 1109.1 1116.71 1117.18 1117.15 1117.13 1117.12
           1117.12 1117.12 1219.48
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           4371.12 4529.91 4371.12 4361.03 4443.21 4350.25 3102.27 3149.7 2952.66 2952.89 2952.4 2952.63
           2952.09 2952.3 2951.73 2951.91 2951.35 2951.48 2950.97 2951.06 2950.42 2950.45 2950.23 2950.23
           2950.33 2950.34 2950.55 2950.6 2835.89 2371.5 2182.71 1902.58 1931.09 1551.47 1367.33 701.998
@@ -135,7 +135,7 @@
           2953.03 2952.71 2952.26 2951.74 2950.79 2950.28 2950.31 2950.72 1327.89 415.973 9.68951 3.80531
           3.77763 3.60616 0
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.05 0.0310062 0.05 0.0458442 0.020059 0.0340778 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0.00889187 0.0434824 0.0590104 0.0840231 0.0813553 0.119624 0.140778 0.241983
@@ -157,7 +157,7 @@
           0 0 0 0 0 0 0 0 0.145584 0.310413 0.608734 0.648588
           0.648864 0.650609 0.8
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           1.3e+07 1.29982e+07 1.3e+07 1.29898e+07 1.29812e+07 1.29723e+07 1.29615e+07 1.29515e+07 1.28858e+07 1.28767e+07 1.26575e+07 1.26503e+07
           1.23862e+07 1.23771e+07 1.21017e+07 1.20918e+07 1.18111e+07 1.18008e+07 1.15177e+07 1.15071e+07 1.14047e+07 1.1394e+07 1.13614e+07 1.13506e+07
           1.13178e+07 1.1307e+07 1.12737e+07 1.12628e+07 1.12272e+07 1.12177e+07 1.11772e+07 1.11659e+07 1.11145e+07 1.11038e+07 1.1053e+07 1.10379e+07
@@ -179,7 +179,7 @@
           1.2332e+07 1.20221e+07 1.17173e+07 1.14146e+07 1.12987e+07 1.12547e+07 1.12109e+07 1.11664e+07 1.11282e+07 1.10658e+07 1.10271e+07 1.10151e+07
           1.10083e+07 1.10031e+07 1.1e+07
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           107.068 107.055 107.068 106.984 106.917 106.84 -4638.64 -4402.16 -7862.51 -8129.96 -7542.83 -7822.19
           -7141.27 -7415.14 -6640.05 -6893.58 -6029.17 -6251.36 -5312.87 -5496.49 -3831.47 -3935.65 -2428.61 -2448.65
           -1274.66 -1214.56 -427.948 -297.108 92.4107 92.3316 91.9949 91.9001 91.4722 91.3831 90.9599 90.8346
@@ -201,7 +201,7 @@
           -8286.12 -7915.24 -7370.76 -6647.06 -4923.89 -3081.52 -1379.02 4.77713 91.586 91.0666 90.744 90.6446
           90.588 90.544 90.6021
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           17.6984 4.11412 17.6984 13.6034 1.06169 5.50114 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0.0765257 11.6778 29.4426 84.9116 77.1404 241.925 390.24 1861.09
@@ -223,7 +223,7 @@
           0 0 0 0 0 0 0 0 430.317 3740.2 21783.9 25297.4
           25323.2 25482.1 39947.1
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_brine" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.998841 0.996971 0.998841 0.998254 0.993918 0.996069 0.989685 0.992332 0.986941 0.98982 0.983499 0.986506
           0.979176 0.982124 0.97378 0.97651 0.967204 0.969596 0.959492 0.961469 0.943544 0.944666 0.928442 0.928658
           0.916019 0.915372 0.906904 0.905495 0.901302 0.901303 0.901307 0.901308 0.901312 0.901313 0.901318 0.901319
@@ -245,7 +245,7 @@
           0.991501 0.987508 0.981647 0.973856 0.955305 0.935471 0.917143 0.902245 0.901311 0.901317 0.90132 0.901321
           0.901322 0.901322 0.828569
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_brine" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_liq" NumberOfComponents="1" format="ascii">
           0.0011285 0.00112841 0.0011285 0.00112761 0.001127 0.00112612 -0.0499597 -0.0474141 -0.0846653 -0.0875444 -0.0812238 -0.0842312
           -0.0769008 -0.0798491 -0.0715049 -0.0742343 -0.0649285 -0.0673205 -0.0572172 -0.0591939 -0.0412692 -0.0423908 -0.0261668 -0.0263826
           -0.013744 -0.013097 -0.00462875 -0.00322019 0.000973163 0.00097231 0.000968686 0.000967665 0.000963059 0.0009621 0.000957543 0.000956194
@@ -267,7 +267,7 @@
           -0.0892256 -0.0852329 -0.0793714 -0.0715804 -0.0530296 -0.0331957 -0.0148675 2.97461e-05 0.000964284 0.000958693 0.00095522 0.00095415
           0.00095354 0.000953066 0.000955504
         </DataArray>
-        <DataArray type="Float32" Name="x^NaCl_brine" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^NaCl_liq" NumberOfComponents="1" format="ascii">
           3.08286e-05 0.00190019 3.08286e-05 0.000618571 0.004955 0.00280456 0.0602749 0.0550818 0.0977245 0.0977244 0.0977248 0.0977248
           0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
           0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
@@ -289,7 +289,7 @@
           0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
           0.0977248 0.0977248 0.170476
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0319348 0.0318795 0.0319348 0.0319412 0.0318235 0.0319142 0.031736 0.0318456 0.0318341 0.0319494 0.0322953 0.0324123
           0.0328576 0.0329808 0.0334447 0.033566 0.0340361 0.0341501 0.0346248 0.034728 0.0343868 0.03446 0.0339652 0.0340054
           0.0336399 0.0336483 0.0334355 0.0334158 0.0333666 0.0333949 0.0335158 0.03355 0.0337053 0.0337378 0.033893 0.0339393
@@ -311,7 +311,7 @@
           0.0334173 0.0341406 0.0348208 0.0354605 0.0351419 0.0345469 0.0340023 0.0335834 0.0336638 0.0338537 0.0339728 0.0340096
           0.0340306 0.034047 0.0313075
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
           0.968065 0.96812 0.968065 0.968059 0.968177 0.968086 -42.9843 -40.8257 -73.2726 -75.8175 -71.562 -74.2536
           -69.2372 -71.9447 -65.8926 -68.4639 -61.3044 -63.6185 -55.3995 -57.3662 -40.3543 -41.49 -25.6841 -25.9205
           -13.5425 -12.9173 -4.57873 -3.18846 0.966633 0.966605 0.966484 0.96645 0.966295 0.966262 0.966107 0.966061
@@ -333,7 +333,7 @@
           -80.6866 -79.0627 -75.5408 -69.9324 -52.3404 -32.8923 -14.7891 0.0297073 0.966336 0.966146 0.966027 0.96599
           0.965969 0.965953 0.968693
         </DataArray>
-        <DataArray type="Float32" Name="x^NaCl_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^NaCl_gas" NumberOfComponents="1" format="ascii">
           -0 -0 -0 -0 -0 -0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 -0 -0 -0 -0 -0 -0
@@ -355,7 +355,7 @@
           0 0 0 0 0 0 0 0 0 -0 -0 -0
           -0 -0 -0
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_brine" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_liq" NumberOfComponents="1" format="ascii">
           51537.1 51562.9 51537.1 51545.2 51599.9 51573.8 51537.6 51588.1 51024.5 51029 51014.6 51019.4
           51002.5 51007.1 50988.1 50992.5 50971.5 50975.4 50952.7 50955.9 50922.1 50923.9 50893.1 50893.3
           50868.2 50866.7 50849.2 50846.1 50836.8 50836.7 50835.9 50835.7 50834.7 50834.5 50833.6 50833.3
@@ -377,7 +377,7 @@
           51021.5 51009.2 50994 50975.3 50941.2 50904.3 50868.4 50837.6 50835 50833.8 50833.1 50832.8
           50832.7 50832.6 48940.7
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_gas" NumberOfComponents="1" format="ascii">
           3744.07 3743.53 3744.07 3741.13 3738.62 3736.08 -160127 -151962 -271449 -280684 -260411 -270057
           -246545 -256001 -229238 -237992 -208144 -215816 -183410 -189751 -132258 -135855 -83817.2 -84509.4
           -43971.7 -41896.4 -14734.8 -10216.8 3233.18 3230.45 3218.82 3215.55 3200.78 3197.7 3183.08 3178.76
@@ -443,7 +443,7 @@
           0.0524756 0.0524839 0.0524925 0.0524999 0.00453936 0.00454294 0.00455807 0.0045719 0.0047005 0.00470484 0.00470582 0.00470719
           0.00470943 0.00471374 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_brine (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           1.90603e-07 -6.84497e-07 0 5.26899e-07 -1.6874e-07 0 4.81727e-07 -7.16056e-07 0 6.71431e-07 -2.64139e-07 0
           9.24199e-07 -3.07078e-08 0 9.35692e-07 -6.8215e-08 0 9.95594e-07 -1.03917e-08 0 1.02038e-06 -2.02481e-08 0
           1.0232e-06 -1.92065e-08 0 1.04303e-06 -3.79628e-08 0 1.09037e-06 -2.49571e-08 0 1.10204e-06 -4.81921e-08 0
@@ -503,7 +503,7 @@
           9.51315e-07 -2.97354e-08 0 4.77317e-07 2.68598e-08 0 8.64097e-08 -1.62526e-09 0 6.8953e-10 -7.67816e-10 0
           2.2033e-10 -7.45348e-10 0 2.76362e-10 -7.36519e-10 0 3.59817e-10 0 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_Air (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_gas (m/s)" NumberOfComponents="3" format="ascii">
           7.7276e-10 4.13748e-10 0 7.78447e-10 5.833e-10 0 1.95084e-09 2.8521e-10 0 2.31878e-09 9.4714e-10 0
           5.09817e-10 3.21633e-10 0 1.98245e-09 8.90533e-10 0 1.1775e-10 0 0 6.39088e-10 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
diff --git a/test/references/saltflushtpfa2pncmin-reference.vtu b/test/references/saltflushtpfa2pncmin-reference.vtu
index 809b0e90f197f8f45712ca166b34990e885fcf3d..6c34e75a46c2796fae0d311a6d17c925a45b79c2 100644
--- a/test/references/saltflushtpfa2pncmin-reference.vtu
+++ b/test/references/saltflushtpfa2pncmin-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="200" NumberOfPoints="231">
-      <CellData Scalars="porosity" Vectors="velocity_brine (m/s)">
+      <CellData Scalars="porosity" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="porosity" NumberOfComponents="1" format="ascii">
           0.11 0.11 0.100091 0.0575376 0.0575154 0.0575048 0.0574949 0.057487 0.0574812 0.0574761 0.105372 0.105365
           0.10535 0.105296 0.105296 0.105295 0.105294 0.105292 0.105289 0.105283 0.11 0.11 0.108447 0.0577398
@@ -41,7 +41,7 @@
           519.576 521.071 499.687 499.687 499.687 499.687 499.687 499.687 499.687 499.687 499.687 499.687
           520.549 579.313 839.476 1116.79 1121.23 1121.58 1122.16 1132.47
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           0.964462 0.971953 1 1 1 1 1 1 1 1 1 1
           0.990954 0.930871 0.904953 0.834134 0.494995 0.379569 0.378722 0.37415 0.952949 0.961997 1 1
           1 1 1 1 1 1 1 1 0.982042 0.915187 0.878217 0.752422
@@ -60,7 +60,7 @@
           0.939925 0.935686 1 1 1 1 1 1 1 1 1 1
           0.937164 0.795196 0.483446 0.360157 0.35889 0.358791 0.358628 0.355752
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           1.30022e+07 1.29924e+07 1.29741e+07 1.28582e+07 1.26424e+07 1.2409e+07 1.21657e+07 1.1917e+07 1.16653e+07 1.14121e+07 1.12666e+07 1.12291e+07
           1.11911e+07 1.11549e+07 1.11051e+07 1.10521e+07 1.10158e+07 1.1011e+07 1.1007e+07 1.10021e+07 1.29969e+07 1.29843e+07 1.29657e+07 1.28521e+07
           1.26362e+07 1.24008e+07 1.21564e+07 1.1907e+07 1.16549e+07 1.14015e+07 1.12558e+07 1.12183e+07 1.11804e+07 1.11445e+07 1.10944e+07 1.10396e+07
@@ -79,7 +79,7 @@
           1.2973e+07 1.29339e+07 1.28997e+07 1.28398e+07 1.26418e+07 1.23648e+07 1.20977e+07 1.18358e+07 1.15766e+07 1.13187e+07 1.11712e+07 1.11341e+07
           1.10985e+07 1.10656e+07 1.10255e+07 1.10146e+07 1.10099e+07 1.10058e+07 1.10023e+07 1.09995e+07
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           937.213 951.562 1075.04 1076.99 1079.39 1082.39 1086.03 1090.25 1094.91 1099.76 1107.7 1113.6
           1117.21 1117.19 1117.17 1117.14 1117.12 1117.12 1117.12 1117.12 930.835 938.252 1063.08 1073.34
           1075.68 1078.78 1082.66 1087.25 1092.37 1097.7 1106.53 1113.23 1117.2 1117.18 1117.16 1117.13
@@ -98,7 +98,7 @@
           929.141 929.377 951.934 1068.57 1069.5 1071.34 1074.4 1078.75 1084.21 1090.41 1101.74 1111.52
           1117.16 1117.15 1117.13 1117.12 1117.12 1117.12 1117.12 1117.12
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           4242.5 3880.42 2952.45 2952.17 2951.85 2951.48 2951.1 2950.75 2950.46 2950.28 2950.27 2950.51
           2833.68 2065.91 1788.08 1170.77 54.8285 7.52794 7.38687 6.65947 4313.3 4142.38 2962.64 2952.69
           2952.34 2951.91 2951.44 2950.99 2950.6 2950.34 2950.25 2950.49 2708.11 1894.19 1531.87 674.265
@@ -117,7 +117,7 @@
           4140.44 4023.63 4249.94 2953.45 2953.28 2952.97 2952.49 2951.89 2951.26 2950.72 2950.24 2950.4
           2137.97 908.629 46.7336 4.76348 4.61456 4.6031 4.58422 4.26065
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.035538 0.0280471 0 0 0 0 0 0 0 0 0 0
           0.00904638 0.0691286 0.095047 0.165866 0.505005 0.620431 0.621278 0.62585 0.0470509 0.0380035 0 0
           0 0 0 0 0 0 0 0 0.0179582 0.0848134 0.121783 0.247578
@@ -136,7 +136,7 @@
           0.0600749 0.0643144 0 0 0 0 0 0 0 0 0 0
           0.0628364 0.204804 0.516554 0.639844 0.64111 0.641209 0.641372 0.644248
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           1.30028e+07 1.29929e+07 1.29746e+07 1.28587e+07 1.26429e+07 1.24095e+07 1.21662e+07 1.19175e+07 1.16658e+07 1.14126e+07 1.12671e+07 1.12296e+07
           1.11916e+07 1.11554e+07 1.11057e+07 1.10526e+07 1.10167e+07 1.1012e+07 1.1008e+07 1.10032e+07 1.29974e+07 1.29848e+07 1.29662e+07 1.28526e+07
           1.26367e+07 1.24013e+07 1.21569e+07 1.19075e+07 1.16554e+07 1.1402e+07 1.12563e+07 1.12188e+07 1.11809e+07 1.1145e+07 1.10949e+07 1.10402e+07
@@ -155,7 +155,7 @@
           1.29735e+07 1.29344e+07 1.29002e+07 1.28403e+07 1.26423e+07 1.23652e+07 1.20982e+07 1.18363e+07 1.15771e+07 1.13192e+07 1.11717e+07 1.11346e+07
           1.1099e+07 1.10662e+07 1.10263e+07 1.10157e+07 1.1011e+07 1.1007e+07 1.10034e+07 1.10006e+07
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           107.095 107.02 -7599.71 -7244.95 -6804.29 -6253.98 -5589.08 -4817.47 -3965.48 -3077.35 -1636.25 -564.645
           92.1142 91.8129 91.3988 90.9569 90.6573 90.6188 90.5855 90.5451 107.047 106.946 -7539.75 -7892.58
           -7462.39 -6896.25 -6188.8 -5352.39 -4420.48 -3445.05 -1844.97 -631.198 92.0258 91.7264 91.3092 90.8533
@@ -174,7 +174,7 @@
           106.847 106.522 -945.745 -8735.74 -8557.4 -8212.88 -7651.51 -6860.71 -5870.42 -4746.53 -2702.64 -934.133
           91.3434 91.0699 90.7379 90.6497 90.6101 90.5765 90.5471 90.5237
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           6.25561 3.0188 0 0 0 0 0 0 0 0 0 0
           0.0811145 47.3836 122.562 629.319 13727.3 22795.2 22869.4 23270.1 14.7194 7.68164 0 0
           0 0 0 0 0 0 0 0 0.755121 87.3223 255.015 1985.5
@@ -193,7 +193,7 @@
           30.8158 37.8401 0 0 0 0 0 0 0 0 0 0
           35.5851 1156.45 14536.9 24509.8 24623.8 24633.1 24648.2 24907.1
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_brine" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.995374 0.98907 0.984112 0.980292 0.975548 0.969624 0.962466 0.954159 0.944987 0.935426 0.919912 0.908376
           0.901305 0.901308 0.901313 0.901318 0.901321 0.901321 0.901322 0.901322 0.998121 0.994921 0.990697 0.987264
           0.982633 0.976538 0.968922 0.959918 0.949885 0.939385 0.922159 0.909092 0.901306 0.901309 0.901314 0.901319
@@ -212,7 +212,7 @@
           0.998841 0.998734 0.997338 0.996342 0.994421 0.990712 0.984669 0.976156 0.965495 0.953395 0.931392 0.912353
           0.901314 0.901316 0.90132 0.901321 0.901321 0.901322 0.901322 0.901322
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_brine" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_liq" NumberOfComponents="1" format="ascii">
           0.00112888 0.00112823 -0.0818361 -0.078017 -0.073273 -0.0673487 -0.0601907 -0.051884 -0.0427119 -0.0331508 -0.0176367 -0.00610034
           0.00096997 0.000966727 0.000962268 0.000957511 0.000954286 0.000953871 0.000953513 0.000953078 0.00112829 0.00112728 -0.0811908 -0.084989
           -0.0803578 -0.074263 -0.066647 -0.0576427 -0.0476103 -0.0371093 -0.0198837 -0.00681682 0.000969019 0.000965795 0.000961304 0.000956396
@@ -231,7 +231,7 @@
           0.00112613 0.00112262 -0.0102052 -0.094066 -0.0921461 -0.0884372 -0.0823938 -0.0738804 -0.0632195 -0.0511203 -0.0291169 -0.0100781
           0.000961672 0.000958728 0.000955154 0.000954204 0.000953778 0.000953416 0.0009531 0.000952848
         </DataArray>
-        <DataArray type="Float32" Name="x^NaCl_brine" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^NaCl_liq" NumberOfComponents="1" format="ascii">
           0.00349724 0.00980135 0.0977245 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
           0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.000751119 0.00395201 0.0904937 0.0977247
           0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
@@ -250,7 +250,7 @@
           3.28386e-05 0.000143149 0.0128672 0.097724 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
           0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0318173 0.0316397 0.0315256 0.0316863 0.0320712 0.0324759 0.0328808 0.0332773 0.0336684 0.0340673 0.0339349 0.0336212
           0.0334729 0.0335816 0.0337321 0.0338941 0.0340049 0.0340192 0.0340316 0.0340466 0.0319182 0.0318467 0.031757 0.0319267
           0.03232 0.0327291 0.0331267 0.0335062 0.0338731 0.0342433 0.0340503 0.03368 0.0335047 0.0336129 0.0337648 0.0339323
@@ -269,7 +269,7 @@
           0.032 0.0320933 0.0321335 0.032251 0.032693 0.033301 0.0338285 0.0342779 0.0346626 0.0350082 0.0346518 0.0340564
           0.0337523 0.0338525 0.033975 0.0340077 0.0340224 0.0340349 0.0340458 0.0340545
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
           0.968183 0.96836 -70.3392 -67.6611 -64.6315 -60.5231 -55.1722 -48.5506 -40.8301 -32.3934 -17.4562 -6.05809
           0.966527 0.966418 0.966268 0.966106 0.965995 0.965981 0.965968 0.965953 0.968082 0.968153 -69.8296 -73.7424
           -70.9156 -66.7807 -61.1371 -53.9846 -45.5531 -36.2952 -19.6991 -6.77611 0.966495 0.966387 0.966235 0.966068
@@ -288,7 +288,7 @@
           0.968 0.967907 -8.82208 -81.6963 -81.2823 -79.7588 -75.9488 -69.608 -60.8971 -50.3644 -29.0651 -10.0936
           0.966248 0.966147 0.966025 0.965992 0.965978 0.965965 0.965954 0.965945
         </DataArray>
-        <DataArray type="Float32" Name="x^NaCl_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^NaCl_gas" NumberOfComponents="1" format="ascii">
           -0 -0 0 0 0 0 0 0 0 0 0 0
           -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 0 0
           0 0 0 0 0 0 0 0 -0 -0 -0 -0
@@ -307,7 +307,7 @@
           -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="rhoMolar_brine" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_liq" NumberOfComponents="1" format="ascii">
           51583.3 51648.6 51021.6 51013.1 51001.2 50986.9 50970.1 50950.9 50929.6 50907.2 50874.9 50851.3
           50836.2 50835.5 50834.6 50833.5 50832.9 50832.8 50832.7 50832.6 51547.2 51588.3 51146.3 51024.4
           51012.8 50998.4 50981 50960.8 50938.3 50914.4 50879 50852.5 50836 50835.3 50834.3 50833.3
@@ -326,7 +326,7 @@
           51536.4 51536.8 51669.1 51038.7 51031.9 51020.8 51006.1 50987.1 50964.2 50938.2 50895.1 50857.5
           50834.4 50833.8 50833 50832.8 50832.7 50832.7 50832.6 50832.6
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_gas" NumberOfComponents="1" format="ascii">
           3744.83 3741.94 -262375 -250125 -234909 -215907 -192948 -166304 -136885 -106218 -56457.2 -19454.8
           3222.94 3212.54 3198.24 3182.98 3172.63 3171.31 3170.16 3168.76 3743.32 3739.66 -260304 -272487
           -257633 -238084 -213656 -184775 -152596 -118915 -63664.4 -21752.9 3219.89 3209.55 3195.15 3179.4
@@ -383,7 +383,7 @@
           1.74796e-11 1.12929e-10 1.39641e-05 0.0293363 0.0524654 0.0524732 0.0524864 0.0524957 0.0525035 0.0525101 0.00456389 0.00456505
           0.00463029 0.00470374 0.00470435 0.0047051 0.0047062 0.00470787 0.00471069 0.00471676
         </DataArray>
-        <DataArray type="Float32" Name="velocity_brine (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           1.0145e-07 -3.64313e-07 0 5.68981e-07 -1.04886e-07 0 7.51759e-07 -1.16476e-07 0 8.68073e-07 -3.78979e-08 0
           9.42445e-07 -3.64281e-08 0 9.99304e-07 -2.03633e-08 0 1.03076e-06 -1.1017e-08 0 1.04775e-06 -5.88958e-09 0
           1.05673e-06 -3.00484e-09 0 1.06104e-06 -1.20861e-09 0 1.06729e-06 -4.98108e-09 0 1.08052e-06 -8.22383e-09 0
@@ -435,7 +435,7 @@
           8.51106e-07 -6.67819e-08 0 5.17007e-07 -3.43181e-09 0 1.78848e-07 -5.61321e-09 0 2.56789e-09 -9.58495e-10 0
           1.99765e-10 -9.12141e-10 0 1.68622e-10 -9.05845e-10 0 1.41045e-10 -9.06454e-10 0 3.50557e-10 -8.59557e-10 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_Air (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_gas (m/s)" NumberOfComponents="3" format="ascii">
           1.50018e-10 6.02772e-10 0 6.04669e-10 4.76707e-10 0 2.6205e-10 0 0 0 0 0
           0 0 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/saltwaterintrusion-reference.vtu b/test/references/saltwaterintrusion-reference.vtu
index 3deaa92ec18afd48a117ccae5b510283831bad07..232523ebf9eead9836fdcac0377674cf53a92635 100644
--- a/test/references/saltwaterintrusion-reference.vtu
+++ b/test/references/saltwaterintrusion-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="100" NumberOfPoints="126">
-      <PointData Scalars="pressure" Vectors="velocity_H2O (m/s)">
-        <DataArray type="Float32" Name="pressure" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="pressure" Vectors="velocity_liq (m/s)">
+        <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           590500 590285 492400 492299 590207 492235 590200 492207 590269 492202 590418 492216
           590651 492253 590968 492318 591361 492418 591823 492559 592340 492748 592899 492988
           593489 493284 594098 493636 594720 494046 595348 494504 595967 494988 596546 495423
@@ -55,7 +55,7 @@
           308.084 294.356 254.183 188.678 96.3219 -25.7275 -181.171 -374.606 -611.69 -899.142 -1244.97 -1660.62
           -2166.87 -2796.87 -3621.87 -4906.8 -5695.4 0
         </DataArray>
-        <DataArray type="Float32" Name="x_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_Brine" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 0.999837 0.999972 0.999289 0.999843 0.99832 0.999564
           0.996948 0.999087 0.995283 0.998368 0.993478 0.997384 0.991682 0.996136 0.990016 0.994668 0.988562 0.993068
           0.987356 0.991458 0.986399 0.989963 0.985661 0.988663 0.985088 0.987558 0.984586 0.986588 0.983922 0.985484
@@ -68,7 +68,7 @@
           1 1 0.999999 0.999999 0.999997 0.999993 0.999987 0.999974 0.999952 0.999914 0.999851 0.999743
           0.999549 0.99917 0.998632 0.99862 0.972024 0.97
         </DataArray>
-        <DataArray type="Float32" Name="x_NaCl" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^NaCl_Brine" NumberOfComponents="1" format="ascii">
           0 1.23038e-16 0 1.25424e-16 1.44703e-10 9.7583e-11 0.000163246 2.78637e-05 0.000711444 0.000156837 0.00167959 0.000436138
           0.0030524 0.000912874 0.00471708 0.00163164 0.00652198 0.00261643 0.0083182 0.00386361 0.00998376 0.00533152 0.0114382 0.00693182
           0.0126439 0.00854176 0.0136008 0.0100366 0.0143387 0.0113371 0.0149121 0.0124424 0.015414 0.0134121 0.0160783 0.0145161
@@ -81,7 +81,7 @@
           6.70071e-08 2.18654e-07 5.41553e-07 1.30858e-06 3.02933e-06 6.57872e-06 1.34302e-05 2.60733e-05 4.84203e-05 8.62638e-05 0.000149084 0.000256678
           0.000450905 0.000830349 0.00136774 0.00138014 0.0279759 0.03
         </DataArray>
-        <DataArray type="Float32" Name="X_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_Brine" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 0.999471 0.99991 0.997696 0.999491 0.994572 0.998587
           0.990165 0.997045 0.984858 0.994726 0.979147 0.991562 0.97351 0.987574 0.968322 0.982909 0.963822 0.977857
           0.960114 0.972811 0.957185 0.968158 0.954934 0.964134 0.95319 0.960732 0.951668 0.957761 0.949657 0.954394
@@ -94,7 +94,7 @@
           1 0.999999 0.999998 0.999996 0.99999 0.999979 0.999956 0.999915 0.999843 0.99972 0.999517 0.999168
           0.998539 0.997311 0.995577 0.995537 0.914605 0.908816
         </DataArray>
-        <DataArray type="Float32" Name="X_NaCl" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^NaCl_Brine" NumberOfComponents="1" format="ascii">
           0 3.99145e-16 0 4.06886e-16 4.69427e-10 3.16568e-10 0.000529391 9.03866e-05 0.00230431 0.000508614 0.00542828 0.00141348
           0.00983488 0.00295539 0.0151423 0.00527386 0.0208527 0.00843838 0.0264905 0.0124262 0.0316784 0.0170914 0.0361777 0.022143
           0.0398863 0.027189 0.0428155 0.0318425 0.0450659 0.035866 0.0468097 0.0392679 0.0483325 0.0422387 0.0503429 0.0456059
@@ -107,7 +107,7 @@
           2.17377e-07 7.09331e-07 1.75684e-06 4.24513e-06 9.82734e-06 2.13416e-05 4.35676e-05 8.4579e-05 0.000157063 0.000279793 0.00048348 0.000832206
           0.0014613 0.00268871 0.00442348 0.00446347 0.0853952 0.0911839
         </DataArray>
-        <DataArray type="Float32" Name="velocity_H2O (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           1.90517e-06 1.31733e-06 0 1.3318e-06 5.73367e-07 0 1.09948e-06 1.40499e-06 0 8.61489e-07 8.11376e-07 0
           4.38221e-07 3.20212e-07 0 4.35845e-07 5.07866e-07 0 -1.93381e-07 3.1139e-07 0 1.14063e-07 4.45532e-07 0
           -8.27179e-07 3.22407e-07 0 -1.42296e-07 4.44639e-07 0 -1.4806e-06 3.31012e-07 0 -3.95628e-07 4.62127e-07 0
diff --git a/test/references/steaminjectionbox-reference.vtu b/test/references/steaminjectionbox-reference.vtu
index 14e80b986649681f079fc1bca41ecdcaf02d61c3..13ee1bd4c0261312ccde6189dbae9224719a8ea5 100644
--- a/test/references/steaminjectionbox-reference.vtu
+++ b/test/references/steaminjectionbox-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="200" NumberOfPoints="231">
-      <PointData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_liq">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -25,7 +25,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -47,7 +47,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           179934 179932 176014 176011 179924 176003 179913 175992 179898 175976 179880 175958
           179861 175939 179841 175919 179821 175898 179800 175877 179780 175856 172098 172096
           172087 172074 172057 172038 172017 171996 171975 171953 171932 168189 168186 168176
@@ -69,7 +69,7 @@
           105229 105227 105226 105224 101300 101300 101300 101300 101300 101300 101300 101300
           101300 101300 101300
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           179934 179932 176014 176011 179924 176003 179913 175992 179898 175976 179880 175958
           179861 175939 179841 175919 179821 175898 179800 175877 179780 175856 172098 172096
           172087 172074 172057 172038 172017 171996 171975 171953 171932 168189 168186 168176
@@ -113,7 +113,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           999.729 999.729 999.727 999.727 999.729 999.727 999.729 999.727 999.729 999.727 999.729 999.727
           999.729 999.727 999.729 999.727 999.729 999.727 999.729 999.727 999.729 999.727 999.725 999.725
           999.725 999.725 999.725 999.725 999.725 999.725 999.725 999.725 999.725 999.722 999.723 999.723
@@ -135,7 +135,7 @@
           999.693 999.693 999.693 999.693 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691
           999.691 999.691 999.691
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.37955 1.37953 1.3495 1.34948 1.37948 1.34942 1.37939 1.34933 1.37928 1.34921 1.37914 1.34907
           1.379 1.34892 1.37884 1.34877 1.37868 1.34861 1.37853 1.34845 1.37837 1.34829 1.31948 1.31946
           1.31939 1.31929 1.31916 1.31901 1.31886 1.31869 1.31853 1.31837 1.3182 1.28945 1.28948 1.2894
@@ -157,7 +157,7 @@
           0.806787 0.806775 0.806762 0.806748 0.776663 0.776663 0.776663 0.776663 0.776663 0.776663 0.776663 0.776663
           0.776663 0.776663 0.776663
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           764.381 764.381 764.378 764.378 764.381 764.378 764.381 764.378 764.381 764.378 764.381 764.378
           764.381 764.378 764.381 764.378 764.381 764.378 764.381 764.378 764.381 764.378 764.378 764.376
           764.376 764.376 764.376 764.376 764.376 764.376 764.376 764.376 764.376 764.642 764.382 764.374
@@ -179,7 +179,7 @@
           764.341 764.341 764.341 764.341 764.339 764.339 764.339 764.339 764.339 764.339 764.339 764.339
           764.339 764.339 764.339
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/steaminjectionbox_gaswet-reference.vtu b/test/references/steaminjectionbox_gaswet-reference.vtu
index b9dc282ea3a826fd0049ccc750660ef2e18333fe..e5ec05634a22e6b414ed552d8e843964a4f139f0 100644
--- a/test/references/steaminjectionbox_gaswet-reference.vtu
+++ b/test/references/steaminjectionbox_gaswet-reference.vtu
@@ -47,7 +47,7 @@
           468274 468274 468274 468274 468274 468274 468274 468274 468274 468274 468274 468274
           468274 468274 468274
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -69,7 +69,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           648121 648120 644198 644198 648118 644195 648113 644190 648107 644184 648100 644176
           648091 644168 648082 644159 648073 644149 648063 644140 648054 644130 640278 640277
           640274 640268 640262 640254 640245 640235 640226 640216 640206 636359 636358 636355
@@ -91,7 +91,7 @@
           573501 573500 573499 573498 569574 569574 569574 569574 569574 569574 569574 569574
           569574 569574 569574
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           999.952 999.952 999.95 999.95 999.952 999.95 999.952 999.95 999.952 999.95 999.952 999.95
           999.952 999.95 999.952 999.95 999.952 999.95 999.952 999.95 999.952 999.95 999.949 999.949
           999.948 999.948 999.948 999.948 999.948 999.948 999.948 999.948 999.948 999.946 999.947 999.947
@@ -113,7 +113,7 @@
           999.917 999.917 999.917 999.917 999.915 999.915 999.915 999.915 999.915 999.915 999.915 999.915
           999.915 999.915 999.915
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           764.63 764.63 764.627 764.627 764.63 764.627 764.63 764.627 764.63 764.627 764.63 764.627
           764.63 764.627 764.63 764.627 764.63 764.627 764.63 764.627 764.63 764.627 764.625 764.625
           764.625 764.625 764.625 764.625 764.625 764.625 764.625 764.625 764.625 764.674 764.626 764.623
@@ -135,7 +135,7 @@
           764.59 764.59 764.59 764.59 764.588 764.588 764.588 764.588 764.588 764.588 764.588 764.588
           764.588 764.588 764.588
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -157,7 +157,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           179848 179847 175925 175924 179844 175921 179839 175916 179833 175910 179826 175902
           179817 175894 179808 175885 179799 175875 179790 175866 179780 175856 172004 172003
           172000 171995 171988 171980 171971 171962 171952 171942 171932 168085 168084 168081
@@ -179,7 +179,7 @@
           105227 105226 105225 105224 101300 101300 101300 101300 101300 101300 101300 101300
           101300 101300 101300
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.37889 1.37888 1.34881 1.34881 1.37886 1.34878 1.37883 1.34875 1.37878 1.3487 1.37872 1.34864
           1.37866 1.34858 1.37859 1.34851 1.37852 1.34844 1.37845 1.34836 1.37837 1.34829 1.31875 1.31874
           1.31872 1.31868 1.31863 1.31857 1.3185 1.31843 1.31835 1.31828 1.3182 1.2887 1.2887 1.28867
@@ -201,7 +201,7 @@
           0.80677 0.806763 0.806755 0.806748 0.776663 0.776663 0.776663 0.776663 0.776663 0.776663 0.776663 0.776663
           0.776663 0.776663 0.776663
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/steaminjectioncc-reference.vtu b/test/references/steaminjectioncc-reference.vtu
index df76678bd218c9eee49f57c5f00048363c796623..031878cbc800110efefa18b071955c24b1d1a3d3 100644
--- a/test/references/steaminjectioncc-reference.vtu
+++ b/test/references/steaminjectioncc-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="800" NumberOfPoints="861">
-      <CellData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_liq">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -72,7 +72,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -141,7 +141,7 @@
           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="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           178915 178914 178912 178909 178906 178902 178897 178891 178885 178879 178872 178865
           178857 178849 178842 178834 178826 178818 178810 178803 176954 176953 176951 176949
           176945 176941 176936 176930 176924 176918 176911 176903 176896 176888 176880 176872
@@ -210,7 +210,7 @@
           102283 102283 102283 102283 102283 102283 102283 102283 102283 102283 102283 102282
           102282 102282 102282 102282 102282 102281 102281 102281
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           178915 178914 178912 178909 178906 178902 178897 178891 178885 178879 178872 178865
           178857 178849 178842 178834 178826 178818 178810 178803 176954 176953 176951 176949
           176945 176941 176936 176930 176924 176918 176911 176903 176896 176888 176880 176872
@@ -348,7 +348,7 @@
           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="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           999.728 999.728 999.728 999.728 999.728 999.728 999.728 999.728 999.728 999.728 999.728 999.728
           999.728 999.728 999.728 999.728 999.728 999.728 999.728 999.728 999.727 999.727 999.727 999.727
           999.727 999.727 999.727 999.727 999.727 999.727 999.727 999.727 999.727 999.727 999.727 999.727
@@ -417,7 +417,7 @@
           999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692
           999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.37174 1.37173 1.37172 1.3717 1.37167 1.37164 1.3716 1.37156 1.37151 1.37146 1.37141 1.37135
           1.3713 1.37124 1.37118 1.37112 1.37106 1.371 1.37094 1.37088 1.35671 1.3567 1.35668 1.35666
           1.35664 1.3566 1.35657 1.35652 1.35648 1.35643 1.35637 1.35632 1.35626 1.3562 1.35614 1.35608
@@ -486,7 +486,7 @@
           0.784203 0.784203 0.784203 0.784202 0.784202 0.784201 0.7842 0.784199 0.784199 0.784198 0.784196 0.784195
           0.784194 0.784193 0.784191 0.78419 0.784189 0.784187 0.784186 0.784185
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           764.38 764.38 764.38 764.38 764.38 764.38 764.38 764.38 764.38 764.38 764.38 764.38
           764.38 764.38 764.38 764.38 764.38 764.38 764.38 764.38 764.379 764.379 764.379 764.379
           764.379 764.379 764.379 764.379 764.379 764.379 764.379 764.379 764.379 764.379 764.379 764.379
@@ -555,7 +555,7 @@
           764.34 764.34 764.34 764.34 764.34 764.34 764.34 764.34 764.339 764.339 764.339 764.339
           764.339 764.339 764.339 764.339 764.339 764.339 764.339 764.339
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/steaminjectioncc_gaswet-reference.vtu b/test/references/steaminjectioncc_gaswet-reference.vtu
index c9fa45db4a0d69e0c2dc336554e7d0c1846c19d5..3096a4eac1496da530e3035ed5afb20901c7c48b 100644
--- a/test/references/steaminjectioncc_gaswet-reference.vtu
+++ b/test/references/steaminjectioncc_gaswet-reference.vtu
@@ -141,7 +141,7 @@
           468274 468274 468274 468274 468274 468274 468274 468274 468274 468274 468274 468274
           468274 468274 468274 468274 468274 468274 468274 468274
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -210,7 +210,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           647127 647127 647127 647126 647124 647123 647121 647119 647116 647113 647110 647107
           647103 647099 647096 647092 647087 647083 647079 647075 645166 645166 645165 645164
           645163 645161 645159 645157 645155 645152 645148 645145 645142 645138 645134 645130
@@ -279,7 +279,7 @@
           570557 570557 570556 570556 570556 570556 570556 570556 570556 570556 570556 570556
           570556 570556 570556 570555 570555 570555 570555 570555
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           999.952 999.952 999.952 999.952 999.952 999.952 999.952 999.952 999.952 999.952 999.952 999.952
           999.952 999.952 999.952 999.952 999.952 999.952 999.952 999.952 999.951 999.951 999.951 999.951
           999.951 999.951 999.951 999.951 999.951 999.951 999.951 999.951 999.951 999.951 999.951 999.951
@@ -348,7 +348,7 @@
           999.915 999.915 999.915 999.915 999.915 999.915 999.915 999.915 999.915 999.915 999.915 999.915
           999.915 999.915 999.915 999.915 999.915 999.915 999.915 999.915
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           764.629 764.629 764.629 764.629 764.629 764.629 764.629 764.629 764.629 764.629 764.629 764.629
           764.629 764.629 764.629 764.629 764.629 764.629 764.629 764.629 764.628 764.628 764.628 764.628
           764.628 764.628 764.628 764.628 764.628 764.628 764.628 764.628 764.628 764.628 764.628 764.628
@@ -417,7 +417,7 @@
           764.589 764.589 764.589 764.589 764.589 764.589 764.589 764.589 764.589 764.589 764.589 764.589
           764.589 764.589 764.589 764.589 764.588 764.588 764.588 764.588
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -486,7 +486,7 @@
           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="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           178854 178853 178853 178852 178851 178849 178847 178845 178842 178840 178836 178833
           178829 178826 178822 178818 178814 178809 178805 178801 176892 176892 176891 176890
           176889 176888 176886 176883 176881 176878 176875 176871 176868 176864 176860 176856
@@ -555,7 +555,7 @@
           102283 102283 102283 102283 102283 102283 102282 102282 102282 102282 102282 102282
           102282 102282 102282 102282 102281 102281 102281 102281
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.37127 1.37127 1.37126 1.37126 1.37125 1.37124 1.37122 1.3712 1.37118 1.37116 1.37114 1.37111
           1.37108 1.37106 1.37103 1.37099 1.37096 1.37093 1.3709 1.37087 1.35623 1.35623 1.35622 1.35622
           1.35621 1.3562 1.35618 1.35616 1.35614 1.35612 1.3561 1.35607 1.35604 1.35601 1.35598 1.35595
@@ -624,7 +624,7 @@
           0.784197 0.784197 0.784197 0.784197 0.784196 0.784196 0.784195 0.784195 0.784194 0.784193 0.784193 0.784192
           0.784191 0.78419 0.784189 0.784188 0.784187 0.784186 0.784185 0.784185
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/stokes-donea-reference.vtu b/test/references/stokes-donea-reference.vtu
index ab8a8474621c57b7b4e2f4fd0119104e2edba62f..994c57cb08f5bd1ca0987d6616a54dafac6b8f27 100644
--- a/test/references/stokes-donea-reference.vtu
+++ b/test/references/stokes-donea-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="1600" NumberOfPoints="1681">
-      <CellData Scalars="p" Vectors="velocity_component (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           0.0123438 0.0360937 0.0585938 0.0798438 0.0998437 0.118594 0.136094 0.152344 0.167344 0.181094 0.193594 0.204844
           0.214844 0.223594 0.231094 0.237344 0.242344 0.246094 0.248594 0.249844 0.249844 0.248594 0.246094 0.242344
@@ -411,7 +411,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="velocity_component (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           7.8435e-06 -7.8435e-06 0 3.67097e-05 -2.10408e-05 0 8.98121e-05 -3.1978e-05 0 0.000163005 -4.08312e-05 0
           0.000252353 -4.77545e-05 0 0.000354146 -5.28872e-05 0 0.000464901 -5.63591e-05 0 0.000581367 -5.82941e-05 0
           0.000700521 -5.88121e-05 0 0.000819571 -5.80303e-05 0 0.000935956 -5.60644e-05 0 0.00104735 -5.30286e-05 0
diff --git a/test/references/stokes2c-advection.vtu b/test/references/stokes2c-advection.vtu
index 6681445ffd6d227a70e69f7571f3dbccfb5418af..8ea462a259de10709546d00d25a9341a414128e4 100644
--- a/test/references/stokes2c-advection.vtu
+++ b/test/references/stokes2c-advection.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="1250" NumberOfPoints="1326">
-      <CellData Scalars="p" Vectors="velocity_liquid (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000
           110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000
@@ -324,7 +324,7 @@
           999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694
           999.694 999.694
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           0.998557 0.99885 0.999166 0.999436 0.999638 0.999777 0.999866 0.999921 0.999954 0.999974 0.999985 0.999992
           0.999995 0.999997 0.999999 0.999999 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -431,7 +431,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999102 0.999284 0.999481 0.999649 0.999775 0.999861 0.999917 0.999951 0.999972 0.999984 0.999991 0.999995
           0.999997 0.999998 0.999999 0.999999 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -538,7 +538,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1
         </DataArray>
-        <DataArray type="Float32" Name="X^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Air_liq" NumberOfComponents="1" format="ascii">
           0.00144265 0.00115046 0.000834238 0.000563684 0.00036167 0.0002234 0.000134168 7.89121e-05 4.5698e-05 2.61622e-05 1.48546e-05 8.38654e-06
           4.71872e-06 2.65153e-06 1.49114e-06 8.41178e-07 4.77249e-07 2.73166e-07 1.58306e-07 9.32643e-08 5.60954e-08 3.45836e-08 2.19241e-08 1.43171e-08
           9.63125e-09 6.6629e-09 4.72577e-09 3.42342e-09 2.52292e-09 1.88452e-09 1.42222e-09 1.08164e-09 8.27492e-10 6.35907e-10 4.90252e-10 3.78825e-10
@@ -645,7 +645,7 @@
           2.93149e-10 2.27175e-10 1.76191e-10 1.36728e-10 1.06147e-10 8.24316e-11 6.40293e-11 4.97437e-11 3.86488e-11 3.00622e-11 2.34455e-11 1.83601e-11
           1.44809e-11 1.15768e-11
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_liq" NumberOfComponents="1" format="ascii">
           0.000897918 0.000715979 0.000519119 0.000350726 0.000225015 0.000138982 8.34661e-05 4.90904e-05 2.84279e-05 1.62749e-05 9.24064e-06 5.21704e-06
           2.93539e-06 1.64944e-06 9.27597e-07 5.23273e-07 2.96883e-07 1.69929e-07 9.84775e-08 5.8017e-08 3.48953e-08 2.15135e-08 1.36383e-08 8.90626e-09
           5.99132e-09 4.1448e-09 2.93977e-09 2.12961e-09 1.56944e-09 1.1723e-09 8.84723e-10 6.72859e-10 5.14759e-10 3.95579e-10 3.04972e-10 2.35656e-10
@@ -752,7 +752,7 @@
           1.82359e-10 1.41319e-10 1.09603e-10 8.50546e-11 6.60312e-11 5.12783e-11 3.98308e-11 3.09441e-11 2.40423e-11 1.87008e-11 1.45848e-11 1.14213e-11
           9.00813e-12 7.20157e-12
         </DataArray>
-        <DataArray type="Float32" Name="D^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="D^Air_liq" NumberOfComponents="1" format="ascii">
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
@@ -859,7 +859,7 @@
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
           1.90888e-09 1.90888e-09
         </DataArray>
-        <DataArray type="Float32" Name="velocity_liquid (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           0.000784757 -3.02909e-07 0 0.000786215 -2.80136e-07 0 0.000787436 -2.08313e-07 0 0.000788311 -1.41532e-07 0
           0.000788893 -9.1236e-08 0 0.000789263 -5.70359e-08 0 0.000789494 -3.52379e-08 0 0.000789637 -2.19292e-08 0
           0.000789727 -1.40032e-08 0 0.000789785 -9.31721e-09 0 0.000789825 -6.52225e-09 0 0.000789853 -4.81563e-09 0
diff --git a/test/references/stokes2c-densitydriven-reference.vtu b/test/references/stokes2c-densitydriven-reference.vtu
index af2f935c08c4a34a8872cdbe064a007b6dcee2ef..09b099bd6e062d6e0fca2094f42239aa4f16f07c 100644
--- a/test/references/stokes2c-densitydriven-reference.vtu
+++ b/test/references/stokes2c-densitydriven-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="1600" NumberOfPoints="1681">
-      <CellData Scalars="p" Vectors="velocity_liquid (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000
           110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000
@@ -411,7 +411,7 @@
           999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689
           999.689 999.689 999.689 999.689
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -547,7 +547,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -683,7 +683,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="X^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Air_liq" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -819,7 +819,7 @@
           6.2997e-09 2.08312e-10 1.79936e-12 1.32069e-14 0 0 0 0 0 0 0 0
           0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_liq" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -955,7 +955,7 @@
           3.91886e-09 1.29585e-10 1.11933e-12 8.21565e-15 0 0 0 0 0 0 0 0
           0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="D^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="D^Air_liq" NumberOfComponents="1" format="ascii">
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
@@ -1091,7 +1091,7 @@
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
         </DataArray>
-        <DataArray type="Float32" Name="velocity_liquid (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           -5.31519e-09 5.31519e-09 0 -1.74717e-08 6.84129e-09 0 -3.1822e-08 7.50901e-09 0 -4.7128e-08 7.79707e-09 0
           -6.23864e-08 7.46131e-09 0 -7.64972e-08 6.64946e-09 0 -8.86959e-08 5.54927e-09 0 -9.85184e-08 4.27317e-09 0
           -1.05674e-07 2.88208e-09 0 -1.09973e-07 1.4173e-09 0 -1.11306e-07 -8.45675e-11 0 -1.09635e-07 -1.58657e-09 0
diff --git a/test/references/stokes2c-purediffusion.vtu b/test/references/stokes2c-purediffusion.vtu
index 8800408cbed46dd431a7bc0b7c21500712d3f44e..b1a901e24cdb9aa2c030a2bd25e05f307b4a41a8 100644
--- a/test/references/stokes2c-purediffusion.vtu
+++ b/test/references/stokes2c-purediffusion.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="500" NumberOfPoints="561">
-      <CellData Scalars="p" Vectors="velocity_liquid (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000
           110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000
@@ -135,7 +135,7 @@
           999.764 999.758 999.753 999.748 999.743 999.739 999.735 999.732 999.729 999.726 999.724 999.722
           999.72 999.718 999.717 999.716 999.715 999.714 999.714 999.714
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           0.998429 0.9985 0.99857 0.99864 0.998709 0.998777 0.998844 0.998909 0.998972 0.999034 0.999093 0.99915
           0.999205 0.999258 0.999309 0.999357 0.999402 0.999445 0.999486 0.999525 0.999561 0.999595 0.999627 0.999657
           0.999684 0.99971 0.999734 0.999756 0.999777 0.999796 0.999813 0.999829 0.999843 0.999857 0.999869 0.99988
@@ -179,7 +179,7 @@
           0.999813 0.999829 0.999843 0.999857 0.999869 0.99988 0.99989 0.999899 0.999907 0.999914 0.999921 0.999927
           0.999931 0.999936 0.999939 0.999942 0.999944 0.999946 0.999947 0.999948
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999022 0.999066 0.99911 0.999154 0.999197 0.999239 0.999281 0.999321 0.99936 0.999399 0.999436 0.999471
           0.999506 0.999538 0.99957 0.9996 0.999628 0.999655 0.99968 0.999704 0.999727 0.999748 0.999768 0.999786
           0.999804 0.99982 0.999835 0.999848 0.999861 0.999873 0.999884 0.999894 0.999903 0.999911 0.999919 0.999925
@@ -223,7 +223,7 @@
           0.999884 0.999894 0.999903 0.999911 0.999919 0.999925 0.999932 0.999937 0.999942 0.999947 0.999951 0.999954
           0.999957 0.99996 0.999962 0.999964 0.999965 0.999967 0.999967 0.999968
         </DataArray>
-        <DataArray type="Float32" Name="X^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Air_liq" NumberOfComponents="1" format="ascii">
           0.00157102 0.00150009 0.00142954 0.00135962 0.0012906 0.00122269 0.00115612 0.00109109 0.00102777 0.000966335 0.000906914 0.000849628
           0.000794569 0.00074181 0.000691403 0.000643379 0.000597751 0.000554515 0.00051365 0.000475124 0.000438889 0.000404891 0.000373063 0.000343333
           0.000315624 0.000289854 0.000265937 0.000243787 0.000223316 0.000204438 0.000187065 0.000171115 0.000156504 0.000143155 0.000130991 0.00011994
@@ -267,7 +267,7 @@
           0.000187065 0.000171115 0.000156504 0.000143155 0.000130991 0.00011994 0.000109935 0.000100913 9.28122e-05 8.55794e-05 7.91638e-05 7.35197e-05
           6.86058e-05 6.43857e-05 6.08275e-05 5.79039e-05 5.55921e-05 5.38741e-05 5.27363e-05 5.21697e-05
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_liq" NumberOfComponents="1" format="ascii">
           0.00097787 0.00093369 0.000889754 0.000846218 0.000803237 0.000760953 0.000719504 0.000679014 0.000639596 0.000601349 0.000564359 0.000528699
           0.000494427 0.000461588 0.000430214 0.000400325 0.000371928 0.00034502 0.000319589 0.000295614 0.000273066 0.000251909 0.000232104 0.000213605
           0.000196364 0.000180329 0.000165448 0.000151667 0.00013893 0.000127185 0.000116376 0.000106452 9.73625e-05 8.90572e-05 8.14896e-05 7.46148e-05
@@ -311,7 +311,7 @@
           0.000116376 0.000106452 9.73625e-05 8.90572e-05 8.14896e-05 7.46148e-05 6.83905e-05 6.27772e-05 5.77378e-05 5.32382e-05 4.9247e-05 4.57358e-05
           4.26788e-05 4.00535e-05 3.78399e-05 3.60211e-05 3.4583e-05 3.35142e-05 3.28064e-05 3.24539e-05
         </DataArray>
-        <DataArray type="Float32" Name="D^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="D^Air_liq" NumberOfComponents="1" format="ascii">
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
@@ -355,7 +355,7 @@
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
         </DataArray>
-        <DataArray type="Float32" Name="velocity_liquid (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/stokes2cni-advection.vtu b/test/references/stokes2cni-advection.vtu
index 188a466cbcaf4e81232c7d535d73c7c44c9ad7b9..0fd36e2b3f4ce36db9dc0796b1436668dbab13ff 100644
--- a/test/references/stokes2cni-advection.vtu
+++ b/test/references/stokes2cni-advection.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="1250" NumberOfPoints="1326">
-      <CellData Scalars="p" Vectors="velocity_liquid (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000
           110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000
@@ -538,7 +538,7 @@
           0.58196 0.58196 0.58196 0.58196 0.58196 0.58196 0.58196 0.581959 0.581959 0.581959 0.581959 0.581959
           0.581959 0.581959
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           0.998539 0.998824 0.999148 0.999434 0.999648 0.999792 0.999882 0.999935 0.999965 0.999981 0.99999 0.999995
           0.999997 0.999999 0.999999 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -645,7 +645,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999091 0.999268 0.99947 0.999648 0.999781 0.999871 0.999927 0.99996 0.999978 0.999988 0.999994 0.999997
           0.999998 0.999999 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -752,7 +752,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1
         </DataArray>
-        <DataArray type="Float32" Name="X^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Air_liq" NumberOfComponents="1" format="ascii">
           0.00146059 0.0011765 0.000851752 0.000566205 0.000352125 0.000207926 0.000117967 6.50346e-05 3.51419e-05 1.87502e-05 9.93324e-06 5.25172e-06
           2.78739e-06 1.4909e-06 8.07757e-07 4.4728e-07 2.52634e-07 1.46087e-07 8.66762e-08 5.26345e-08 3.27393e-08 2.0723e-08 1.33145e-08 8.70322e-09
           5.85069e-09 3.99274e-09 2.74303e-09 1.91299e-09 1.34498e-09 9.45213e-10 6.62752e-10 4.66564e-10 3.28398e-10 2.30969e-10 1.62752e-10 1.15596e-10
@@ -859,7 +859,7 @@
           8.2407e-11 5.87994e-11 4.20569e-11 3.01943e-11 2.17233e-11 1.56081e-11 1.11909e-11 8.01054e-12 5.70075e-12 4.03061e-12 2.83342e-12 1.9839e-12
           1.3928e-12 1.01943e-12
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_liq" NumberOfComponents="1" format="ascii">
           0.000909095 0.00073219 0.000530021 0.000352295 0.000219076 0.000129355 7.33872e-05 4.04572e-05 2.18611e-05 1.1664e-05 6.17921e-06 3.26695e-06
           1.73396e-06 9.27446e-07 5.02482e-07 2.7824e-07 1.57156e-07 9.08764e-08 5.39188e-08 3.27424e-08 2.03662e-08 1.28912e-08 8.28259e-09 5.41402e-09
           3.63955e-09 2.48377e-09 1.70636e-09 1.19002e-09 8.36676e-10 5.87989e-10 4.12279e-10 2.90236e-10 2.04287e-10 1.43679e-10 1.01243e-10 7.19089e-11
@@ -966,7 +966,7 @@
           5.1263e-11 3.65774e-11 2.61624e-11 1.8783e-11 1.35134e-11 9.70934e-12 6.96154e-12 4.98313e-12 3.54627e-12 2.50733e-12 1.76259e-12 1.23412e-12
           8.66418e-13 6.34159e-13
         </DataArray>
-        <DataArray type="Float32" Name="D^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="D^Air_liq" NumberOfComponents="1" format="ascii">
           1.97028e-09 1.95856e-09 1.94517e-09 1.93336e-09 1.92448e-09 1.91843e-09 1.9146e-09 1.91229e-09 1.91094e-09 1.91015e-09 1.90968e-09 1.90941e-09
           1.90924e-09 1.90913e-09 1.90906e-09 1.90901e-09 1.90897e-09 1.90895e-09 1.90893e-09 1.90892e-09 1.90891e-09 1.9089e-09 1.90889e-09 1.90889e-09
           1.90889e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
@@ -1073,7 +1073,7 @@
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
           1.90888e-09 1.90888e-09
         </DataArray>
-        <DataArray type="Float32" Name="velocity_liquid (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           0.00078421 -8.35242e-08 0 0.000784283 4.63231e-08 0 0.000783769 1.49371e-07 0 0.000782883 1.96297e-07 0
           0.000781903 1.8975e-07 0 0.000781121 1.25163e-07 0 0.000780736 2.90532e-08 0 0.000780803 -5.82127e-08 0
           0.000781217 -1.07995e-07 0 0.000781838 -1.39308e-07 0 0.000782553 -1.46118e-07 0 0.000783265 -1.38101e-07 0
diff --git a/test/references/stokes2cni-diffusion.vtu b/test/references/stokes2cni-diffusion.vtu
index 812fed6b83e1cba98c492d5e941eff08a750e004..d67f48792af80781b2be3f127845d227cf95c031 100644
--- a/test/references/stokes2cni-diffusion.vtu
+++ b/test/references/stokes2cni-diffusion.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="500" NumberOfPoints="561">
-      <CellData Scalars="p" Vectors="velocity_liquid (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000
           110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000
@@ -223,7 +223,7 @@
           0.59949 0.599489 0.599489 0.599489 0.599488 0.599488 0.599488 0.599488 0.599487 0.599487 0.599487 0.599487
           0.599487 0.599487 0.599487 0.599487 0.599486 0.599486 0.599486 0.599486
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           0.998428 0.998498 0.998568 0.998636 0.998704 0.998771 0.998837 0.998901 0.998964 0.999024 0.999083 0.99914
           0.999195 0.999247 0.999297 0.999345 0.99939 0.999433 0.999474 0.999513 0.999549 0.999583 0.999615 0.999645
           0.999673 0.999699 0.999724 0.999746 0.999767 0.999786 0.999804 0.99982 0.999835 0.999849 0.999861 0.999873
@@ -267,7 +267,7 @@
           0.999804 0.99982 0.999835 0.999849 0.999861 0.999873 0.999883 0.999892 0.9999 0.999908 0.999915 0.99992
           0.999925 0.99993 0.999934 0.999937 0.999939 0.999941 0.999942 0.999943
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999022 0.999065 0.999108 0.999151 0.999194 0.999235 0.999276 0.999316 0.999355 0.999393 0.999429 0.999465
           0.999499 0.999531 0.999563 0.999592 0.999621 0.999647 0.999673 0.999697 0.99972 0.999741 0.999761 0.999779
           0.999797 0.999813 0.999828 0.999842 0.999855 0.999867 0.999878 0.999888 0.999897 0.999906 0.999914 0.999921
@@ -311,7 +311,7 @@
           0.999878 0.999888 0.999897 0.999906 0.999914 0.999921 0.999927 0.999933 0.999938 0.999943 0.999947 0.99995
           0.999954 0.999956 0.999959 0.999961 0.999962 0.999963 0.999964 0.999964
         </DataArray>
-        <DataArray type="Float32" Name="X^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Air_liq" NumberOfComponents="1" format="ascii">
           0.0015716 0.00150181 0.00143238 0.00136357 0.0012956 0.00122869 0.00116306 0.00109889 0.00103637 0.000975643 0.000916852 0.000860109
           0.000805509 0.000753126 0.000703013 0.000655204 0.000609718 0.000566554 0.000525697 0.00048712 0.000450781 0.000416632 0.000384612 0.000354655
           0.000326688 0.000300636 0.000276417 0.000253951 0.000233154 0.000213942 0.000196235 0.00017995 0.000165009 0.000151336 0.000138858 0.000127505
@@ -355,7 +355,7 @@
           0.000196235 0.00017995 0.000165009 0.000151336 0.000138858 0.000127505 0.000117211 0.000107914 9.95558e-05 9.20833e-05 8.5447e-05 7.96019e-05
           7.45077e-05 7.01286e-05 6.64332e-05 6.33946e-05 6.09905e-05 5.92031e-05 5.80188e-05 5.74289e-05
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_liq" NumberOfComponents="1" format="ascii">
           0.000978228 0.000934762 0.000891528 0.000848674 0.000806348 0.000764687 0.000723822 0.000683872 0.000644947 0.000607143 0.000570545 0.000535223
           0.000501237 0.000468631 0.00043744 0.000407685 0.000379375 0.000352512 0.000327086 0.000303079 0.000280466 0.000259215 0.000239291 0.00022065
           0.000203248 0.000187038 0.000171969 0.000157991 0.000145051 0.000133098 0.000122081 0.000111949 0.000102654 9.41472e-05 8.6384e-05 7.93209e-05
@@ -399,7 +399,7 @@
           0.000122081 0.000111949 0.000102654 9.41472e-05 8.6384e-05 7.93209e-05 7.29166e-05 6.71327e-05 6.19331e-05 5.72844e-05 5.31558e-05 4.95195e-05
           4.63504e-05 4.36262e-05 4.13272e-05 3.94369e-05 3.79413e-05 3.68293e-05 3.60926e-05 3.57257e-05
         </DataArray>
-        <DataArray type="Float32" Name="D^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="D^Air_liq" NumberOfComponents="1" format="ascii">
           1.97629e-09 1.97629e-09 1.97629e-09 1.97628e-09 1.97628e-09 1.97628e-09 1.97628e-09 1.97627e-09 1.97627e-09 1.97627e-09 1.97627e-09 1.97627e-09
           1.97626e-09 1.97626e-09 1.97626e-09 1.97626e-09 1.97626e-09 1.97625e-09 1.97625e-09 1.97625e-09 1.97625e-09 1.97625e-09 1.97624e-09 1.97624e-09
           1.97624e-09 1.97624e-09 1.97624e-09 1.97624e-09 1.97624e-09 1.97623e-09 1.97623e-09 1.97623e-09 1.97623e-09 1.97623e-09 1.97623e-09 1.97623e-09
@@ -443,7 +443,7 @@
           1.97623e-09 1.97623e-09 1.97623e-09 1.97623e-09 1.97623e-09 1.97623e-09 1.97623e-09 1.97622e-09 1.97622e-09 1.97622e-09 1.97622e-09 1.97622e-09
           1.97622e-09 1.97622e-09 1.97622e-09 1.97622e-09 1.97622e-09 1.97622e-09 1.97622e-09 1.97622e-09
         </DataArray>
-        <DataArray type="Float32" Name="velocity_liquid (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           -5.19225e-18 2.89741e-17 0 -2.17229e-18 6.31099e-17 0 3.24046e-17 9.24266e-17 0 1.02795e-16 1.22116e-16 0
           2.07149e-16 1.52997e-16 0 3.43005e-16 1.84773e-16 0 5.08525e-16 2.17016e-16 0 7.02532e-16 2.49404e-16 0
           9.24289e-16 2.81727e-16 0 1.1733e-15 3.13857e-16 0 1.4492e-15 3.45713e-16 0 1.75166e-15 3.77241e-16 0
diff --git a/test/references/stokes_channel_3d-reference.vtu b/test/references/stokes_channel_3d-reference.vtu
index 6fb35f1d50050e938899bf0dbb36b78d1badba5d..7384f38c8fc62a380ea5ec1bdbbe5d1a159c2d44 100644
--- a/test/references/stokes_channel_3d-reference.vtu
+++ b/test/references/stokes_channel_3d-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="600" NumberOfPoints="924">
-      <CellData Scalars="p" Vectors="velocity_component (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           100008 100005 100002 100008 100005 100002 100008 100005 100002 100008 100005 100002
           100008 100005 100002 100008 100005 100002 100008 100005 100002 100008 100005 100002
@@ -159,7 +159,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="velocity_component (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           0.00187614 7.12886e-14 -1.76194e-14 0.00187614 2.46472e-14 -6.49934e-15 0.00187614 -1.70929e-14 3.30583e-15 0.00275429 3.74927e-14 2.60983e-14
           0.00275429 -3.08739e-14 1.84864e-14 0.00275429 -6.96312e-14 7.04705e-15 0.00301195 -1.33332e-13 1.68702e-14 0.00301195 -4.75997e-14 -1.59778e-14
           0.00301195 -5.02019e-14 -1.46059e-14 0.00309036 -2.9833e-15 -4.96805e-14 0.00309036 1.09858e-14 1.30187e-15 0.00309036 5.94208e-14 -1.34826e-14
diff --git a/test/references/stokes_channel_pseudo3d-reference.vtu b/test/references/stokes_channel_pseudo3d-reference.vtu
index e46406a57191353ed1dbeaf7f1949b562e1e15c2..7b2847f55637195f6692c1894f078eb476d28b68 100644
--- a/test/references/stokes_channel_pseudo3d-reference.vtu
+++ b/test/references/stokes_channel_pseudo3d-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="60" NumberOfPoints="84">
-      <CellData Scalars="p" Vectors="velocity_component (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           100008 100005 100002 100008 100005 100002 100008 100005 100002 100008 100005 100002
           100008 100005 100002 100008 100005 100002 100008 100005 100002 100008 100005 100002
@@ -24,7 +24,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="velocity_component (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           0.00769322 -4.68964e-15 0 0.00769322 -2.4791e-15 0 0.00769322 2.90074e-15 0 0.012927 -5.09704e-15 0
           0.012927 5.86407e-15 0 0.012927 9.61387e-15 0 0.0147073 -4.75273e-15 0 0.0147073 1.87467e-14 0
           0.0147073 1.81825e-14 0 0.0153128 -1.67094e-14 0 0.0153128 2.37587e-14 0 0.0153128 2.78985e-14 0
diff --git a/test/references/stokeshydrostaticpressure-reference.vtu b/test/references/stokeshydrostaticpressure-reference.vtu
index 319d9a6d92c7b4351be37997c5c8544d867b0581..4feb4424a7024edb77f957e0ddc6db1824a65f46 100644
--- a/test/references/stokeshydrostaticpressure-reference.vtu
+++ b/test/references/stokeshydrostaticpressure-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="4096" NumberOfPoints="4225">
-      <CellData Scalars="p" Vectors="velocity_component (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000
           110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000
@@ -1035,7 +1035,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="velocity_Constant (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           2.00148e-22 -2.00148e-22 0 1.196e-21 -7.95701e-22 0 3.12499e-21 -1.1333e-21 0 5.45686e-21 -1.19857e-21 0
           7.69965e-21 -1.04421e-21 0 9.46236e-21 -7.18497e-22 0 1.04511e-20 -2.70216e-22 0 1.04845e-20 2.36775e-22 0
           9.52401e-21 7.23728e-22 0 7.67715e-21 1.12313e-21 0 5.14511e-21 1.4089e-21 0 2.15304e-21 1.58317e-21 0
diff --git a/test/references/stokesni-conduction-reference.vtu b/test/references/stokesni-conduction-reference.vtu
index 45ed0b1216384d712fb4a7d1faeeb2df61178941..24f857f540bfab477d73cde827147c5f3d27cc08 100644
--- a/test/references/stokesni-conduction-reference.vtu
+++ b/test/references/stokesni-conduction-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="5000" NumberOfPoints="5151">
-      <CellData Scalars="p" Vectors="velocity_SimpleH2O (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000
           110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000
@@ -2098,7 +2098,7 @@
           0.679 0.679 0.679 0.679 0.679 0.679 0.679 0.679 0.679 0.679 0.679 0.679
           0.679 0.679 0.679 0.679 0.679 0.679 0.679 0.679
         </DataArray>
-        <DataArray type="Float32" Name="velocity_H2O (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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/stokesni-convection-reference.vtu b/test/references/stokesni-convection-reference.vtu
index aca4a48b6c8e6b7042ae99407c241edaa0ca1cf8..71b7cb7e213e48922705bf4fc5bf71d727fd9800 100644
--- a/test/references/stokesni-convection-reference.vtu
+++ b/test/references/stokesni-convection-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="5000" NumberOfPoints="5151">
-      <CellData Scalars="p" Vectors="velocity_SimpleH2O (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000
           110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000
@@ -2098,7 +2098,7 @@
           0.679 0.679 0.679 0.679 0.679 0.679 0.679 0.679 0.679 0.679 0.679 0.679
           0.679 0.679 0.679 0.679 0.679 0.679 0.679 0.679
         </DataArray>
-        <DataArray type="Float32" Name="velocity_SimpleH2O (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           0.00555762 0.000444238 0 0.000893036 2.22197e-05 0 0.000640556 3.02833e-06 0 0.000605365 4.90769e-07 0
           0.000599895 5.62163e-08 0 0.000599364 -3.0933e-09 0 0.000599441 -4.60585e-09 0 0.000599505 -1.83763e-09 0
           0.000599529 -5.35314e-10 0 0.000599535 -1.26658e-10 0 0.000599537 -2.4026e-11 0 0.000599537 -3.0738e-12 0
diff --git a/test/references/test_1pncmin-00064_batch.vtu b/test/references/test_1pncmin-00064_batch.vtu
index caf238731230bc12aa39ad537e106997acfaeca0..7bf9c3c55ea18d13ee22478ba040345f23091467 100644
--- a/test/references/test_1pncmin-00064_batch.vtu
+++ b/test/references/test_1pncmin-00064_batch.vtu
@@ -15,16 +15,16 @@
         <DataArray type="Float32" Name="delp" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_gas" NumberOfComponents="1" format="ascii">
           0.536 0.536 0.536 0.536 0.536 0.536
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.464 0.464 0.464 0.464 0.464 0.464
         </DataArray>
-        <DataArray type="Float32" Name="X^N2_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2_gas" NumberOfComponents="1" format="ascii">
           0.642382 0.642382 0.642382 0.642382 0.642382 0.642382
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_gas" NumberOfComponents="1" format="ascii">
           0.357618 0.357618 0.357618 0.357618 0.357618 0.357618
         </DataArray>
         <DataArray type="Float32" Name="precipVolFrac_CaO" NumberOfComponents="1" format="ascii">
diff --git a/test/references/test_angeli-reference.vtu b/test/references/test_angeli-reference.vtu
index 62a9a1fdfd8fc9534b8333657a3d68eb3cae1d15..47d463e8b7f38870856b72a3b6b046de58323752 100644
--- a/test/references/test_angeli-reference.vtu
+++ b/test/references/test_angeli-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="2500" NumberOfPoints="2601">
-      <CellData Scalars="p" Vectors="velocity_component (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           -11.1423 -11.0015 -10.7223 -10.3089 -9.7679 -9.10784 -8.33913 -7.47388 -6.52574 -5.50967 -4.44168 -3.33862
           -2.21788 -1.09715 0.00591258 1.0739 2.08998 3.03812 3.90337 4.67208 5.33213 5.87312 6.2865 6.56577
@@ -636,7 +636,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="velocity_component (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           -0.377844 0.0942446 0 -0.381716 0.281191 0 -0.383958 0.466528 0 -0.384405 0.649772 0
           -0.382983 0.830342 0 -0.379661 1.0076 0 -0.374427 1.18088 0 -0.367281 1.34953 0
           -0.358238 1.5129 0 -0.347321 1.67035 0 -0.334569 1.82128 0 -0.320034 1.96509 0
diff --git a/test/references/test_boxrichardsevaporation-reference.vtu b/test/references/test_boxrichardsevaporation-reference.vtu
index f5611168cf5ea995526062cccd39c865ddbdc71a..45135a776820db34e89f4b49aaefd264b5ae7121 100644
--- a/test/references/test_boxrichardsevaporation-reference.vtu
+++ b/test/references/test_boxrichardsevaporation-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="100" NumberOfPoints="126">
-      <PointData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_liq">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721
           0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721
           0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721
@@ -16,7 +16,7 @@
           0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571695 0.0571695 0.0571695 0.0571695 0.0571695 0.0571695
           0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828
           0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828
           0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828
@@ -29,7 +29,7 @@
           0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.94283 0.94283 0.94283 0.94283 0.94283 0.94283
           1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000
           99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000
           99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000
@@ -42,7 +42,7 @@
           99000 99000 99000 99000 99000 99000 98999.9 98999.9 98999.9 98999.9 98999.9 98999.9
           97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -68,7 +68,7 @@
           1000 1000 1000 1000 1000 1000 1000.07 1000.07 1000.07 1000.07 1000.07 1000.07
           2529.62 2529.62 2529.62 2529.62 2529.62 2529.62
         </DataArray>
-        <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621
           998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621
           998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621
@@ -81,7 +81,7 @@
           998.621 998.621 998.621 998.621 998.621 998.621 998.632 998.632 998.632 998.632 998.632 998.632
           999.788 999.788 999.788 999.788 999.788 999.788
         </DataArray>
-        <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047
           0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047
           0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047
diff --git a/test/references/test_ccrichardsevaporation-reference.vtu b/test/references/test_ccrichardsevaporation-reference.vtu
index fb9935370366c76464c1f230ace02211559caf43..14e279ed93ec2aee760d67e673dca46cbbc1eb0c 100644
--- a/test/references/test_ccrichardsevaporation-reference.vtu
+++ b/test/references/test_ccrichardsevaporation-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="100" NumberOfPoints="126">
-      <CellData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_liq">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721
           0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721
           0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721
@@ -14,7 +14,7 @@
           0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571703 0.0571703 0.0571703 0.0571703 0.0571703 0
           0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828
           0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828
           0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828
@@ -25,7 +25,7 @@
           0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.94283 0.94283 0.94283 0.94283 0.94283 1
           1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000
           99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000
           99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000
@@ -36,7 +36,7 @@
           99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 97470.4
           97470.4 97470.4 97470.4 97470.4
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -58,7 +58,7 @@
           1000 1000 1000 1000 1000 1000 1000.05 1000.05 1000.05 1000.05 1000.05 2529.62
           2529.62 2529.62 2529.62 2529.62
         </DataArray>
-        <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621
           998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621
           998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621
@@ -69,7 +69,7 @@
           998.621 998.621 998.621 998.621 998.621 998.621 998.627 998.627 998.627 998.627 998.627 999.369
           999.369 999.369 999.369 999.369
         </DataArray>
-        <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047
           0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047
           0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047
@@ -102,7 +102,7 @@
           0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
           0.4 0.4 0.4 0.4
         </DataArray>
-        <DataArray type="Float32" Name="x^air_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^air_liq" NumberOfComponents="1" format="ascii">
           0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743
           0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743
           0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743
diff --git a/test/references/test_embedded_1d3d_1p2c_richards2c_1d-reference.vtp b/test/references/test_embedded_1d3d_1p2c_richards2c_1d-reference.vtp
index 168a2a1993a54d98987645d4956122be42e2c582..79bd0c262c5d51979a23882f2db03160cdc05ceb 100644
--- a/test/references/test_embedded_1d3d_1p2c_richards2c_1d-reference.vtp
+++ b/test/references/test_embedded_1d3d_1p2c_richards2c_1d-reference.vtp
@@ -591,7 +591,7 @@
           -78531.8 -78526.1 -78520.7 -78515.5 -78509.5 -78502.6 -78495.9 -78490.1 -78485.1 -78480.3 -78477.2 -78475.7
           -78474.3 -78473.2 -78472.1 -78530.6 -78522.6 -78517.1 -78514 -78511.1 -78506 -78498.7
         </DataArray>
-        <DataArray type="Float32" Name="x_SimpleH2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^SimpleH2O_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -738,7 +738,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="x_D2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^D2O_liq" NumberOfComponents="1" format="ascii">
           3.54951e-09 2.8308e-09 2.10858e-09 1.64163e-09 1.32283e-09 1.12258e-09 1.01757e-09 9.85875e-10 9.85443e-10 9.94688e-10 1.00679e-09 1.02017e-09
           1.03431e-09 1.04892e-09 1.06399e-09 1.07952e-09 1.09555e-09 1.11358e-09 1.13226e-09 1.15149e-09 1.17144e-09 1.19269e-09 1.21098e-09 1.22829e-09
           1.24652e-09 1.26547e-09 1.28524e-09 1.44113e-09 1.61447e-09 1.7046e-09 1.75896e-09 1.8077e-09 1.85483e-09 1.89905e-09 1.94379e-09 1.99185e-09
@@ -885,7 +885,7 @@
           1.09343e-09 8.79871e-10 7.42312e-10 6.48619e-10 5.7981e-10 5.23205e-10 4.68201e-10 4.16537e-10 3.67197e-10 3.25345e-10 2.91172e-10 2.62269e-10
           2.40728e-10 2.25972e-10 2.18041e-10 1.23597e-09 1.25082e-09 1.20838e-09 1.07959e-09 9.87752e-10 9.3311e-10 8.98533e-10
         </DataArray>
-        <DataArray type="Float32" Name="X_SimpleH2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^SimpleH2O_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -1032,7 +1032,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="X_D2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^D2O_liq" NumberOfComponents="1" format="ascii">
           3.9439e-09 3.14533e-09 2.34287e-09 1.82404e-09 1.46981e-09 1.24731e-09 1.13064e-09 1.09542e-09 1.09494e-09 1.10521e-09 1.11865e-09 1.13352e-09
           1.14923e-09 1.16546e-09 1.18221e-09 1.19946e-09 1.21728e-09 1.23731e-09 1.25807e-09 1.27944e-09 1.3016e-09 1.32521e-09 1.34553e-09 1.36476e-09
           1.38503e-09 1.40607e-09 1.42805e-09 1.60125e-09 1.79385e-09 1.894e-09 1.9544e-09 2.00855e-09 2.06092e-09 2.11006e-09 2.15977e-09 2.21317e-09
diff --git a/test/references/test_embedded_1d3d_1p2c_richards2c_3d-reference.vtu b/test/references/test_embedded_1d3d_1p2c_richards2c_3d-reference.vtu
index f0e435b95716b0c2d2420719decafe148b5d6406..606678d167cfcb93761a053917008eac95a16814 100644
--- a/test/references/test_embedded_1d3d_1p2c_richards2c_3d-reference.vtu
+++ b/test/references/test_embedded_1d3d_1p2c_richards2c_3d-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="3198" NumberOfPoints="4179">
-      <CellData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_liq">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           0.289507 0.289475 0.289424 0.289381 0.289366 0.289392 0.289451 0.289523 0.289587 0.289623 0.289493 0.289453
           0.289389 0.289336 0.289316 0.289348 0.289417 0.289502 0.289575 0.289616 0.289475 0.289424 0.289338 0.289238
           0.289279 0.289364 0.289472 0.289561 0.289609 0.289473 0.289415 0.289319 0.289181 0.289331 0.289458 0.28956
@@ -272,7 +272,7 @@
           0.284962 0.284625 0.283504 0.283748 0.284354 0.284214 0.283449 0.283694 0.284284 0.284142 0.28417 0.284584
           0.284911 0.284635 0.284092 0.284498 0.28482 0.284555
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.710493 0.710525 0.710576 0.710619 0.710634 0.710608 0.710549 0.710477 0.710413 0.710377 0.710507 0.710547
           0.710611 0.710664 0.710684 0.710652 0.710583 0.710498 0.710425 0.710384 0.710525 0.710576 0.710662 0.710762
           0.710721 0.710636 0.710528 0.710439 0.710391 0.710527 0.710585 0.710681 0.710819 0.710669 0.710543 0.71044
@@ -541,7 +541,7 @@
           0.715038 0.715375 0.716496 0.716252 0.715646 0.715786 0.716551 0.716306 0.715716 0.715858 0.71583 0.715416
           0.715089 0.715365 0.715908 0.715502 0.71518 0.715445
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           47346.4 47332 47309.2 47289.7 47283.3 47294.9 47321.1 47353.5 47381.8 47398.1 47339.8 47322.1
           47293.4 47269.7 47260.8 47275 47306 47344.1 47376.6 47394.9 47331.8 47309.1 47270.6 47225.8
           47244.4 47282.5 47330.7 47370.2 47391.9 47330.9 47305.3 47262.1 47200.4 47267.5 47324.1 47369.9
@@ -810,7 +810,7 @@
           45256.2 45096.7 44559.9 44677.6 44967.7 44900.8 44533.7 44651.4 44934.4 44866.5 44879.7 45076.9
           45232.3 45101.5 44842.3 45036.3 45189.3 45063.1
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -1348,7 +1348,7 @@
           54743.8 54903.3 55440.1 55322.4 55032.3 55099.2 55466.3 55348.6 55065.6 55133.5 55120.3 54923.1
           54767.7 54898.5 55157.7 54963.7 54810.7 54936.9
         </DataArray>
-        <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_SimpleH2o" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -1617,7 +1617,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           0.0144809 0.0144682 0.0144481 0.0144309 0.0144253 0.0144355 0.0144585 0.0144872 0.0145122 0.0145267 0.0144751 0.0144594
           0.0144341 0.0144133 0.0144055 0.0144179 0.0144452 0.0144789 0.0145076 0.0145239 0.014468 0.0144479 0.0144141 0.0143748
           0.0143911 0.0144245 0.014467 0.014502 0.0145212 0.0144672 0.0144446 0.0144066 0.0143525 0.0144114 0.0144612 0.0145016
@@ -3231,7 +3231,7 @@
           0.113985 0.11385 0.113401 0.113499 0.113742 0.113686 0.11338 0.113478 0.113714 0.113657 0.113668 0.113833
           0.113964 0.113854 0.113637 0.113799 0.113928 0.113822
         </DataArray>
-        <DataArray type="Float32" Name="x^SimpleH2O_SimpleH2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^SimpleH2O_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -3500,7 +3500,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="x^SimpleH2O_D2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^D2O_liq" NumberOfComponents="1" format="ascii">
           5.3563e-12 1.41013e-11 1.43641e-11 7.59047e-12 3.47449e-12 7.26293e-13 1.01331e-13 1.12044e-14 1.06469e-15 9.78533e-17 5.10502e-11 1.47954e-10
           1.67193e-10 8.97752e-11 4.11811e-11 7.58771e-12 9.21807e-13 9.0669e-14 7.79524e-15 6.5272e-16 4.33714e-10 1.38076e-09 1.81502e-09 4.56414e-10
           7.13372e-11 7.23477e-12 6.32343e-13 4.96344e-14 3.83526e-15 2.7399e-09 9.43164e-09 1.26826e-08 3.05935e-09 3.58963e-11 3.00622e-12 2.23908e-13
diff --git a/test/references/test_embedded_1p_richards_box_3d.vtu b/test/references/test_embedded_1p_richards_box_3d.vtu
index f2cdbfa9e6378f4262a24bec075bad5f2a941b51..335590ba65e26809d475d6df6bb713d8a6f39a22 100644
--- a/test/references/test_embedded_1p_richards_box_3d.vtu
+++ b/test/references/test_embedded_1p_richards_box_3d.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="1728" NumberOfPoints="2197">
-      <PointData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_liq">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           0.209039 0.209003 0.209033 0.208994 0.208832 0.208778 0.208817 0.208753 0.208919 0.208905 0.208648 0.20859
           0.208849 0.208835 0.208533 0.208424 0.208855 0.208832 0.208527 0.208421 0.208957 0.208925 0.208653 0.208579
           0.209137 0.209102 0.208867 0.208807 0.209367 0.209331 0.209123 0.209069 0.209617 0.209586 0.209396 0.209351
@@ -189,7 +189,7 @@
           0.205115 0.205023 0.204765 0.204395 0.203991 0.203652 0.203467 0.203492 0.203718 0.20407 0.204434 0.204701
           0.204799
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.790961 0.790997 0.790967 0.791006 0.791168 0.791222 0.791183 0.791247 0.791081 0.791095 0.791352 0.79141
           0.791151 0.791165 0.791467 0.791576 0.791145 0.791167 0.791473 0.791579 0.791043 0.791075 0.791346 0.791421
           0.790863 0.790898 0.791133 0.791193 0.790633 0.790669 0.790877 0.790931 0.790383 0.790414 0.790604 0.790649
@@ -375,7 +375,7 @@
           0.794885 0.794977 0.795235 0.795605 0.796009 0.796348 0.796533 0.796508 0.796282 0.79593 0.795566 0.795299
           0.795201
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           -20329.6 -20384.7 -20338.6 -20398.2 -20646 -20728.2 -20667.9 -20766.2 -20512 -20534.5 -20927.3 -21015.2
           -20619.3 -20641.3 -21103.5 -21270.2 -20610.8 -20644.6 -21112 -21275.5 -20455 -20503.7 -20918.2 -21032.4
           -20180.6 -20234.5 -20591.7 -20683.5 -19833.1 -19886.8 -20202.1 -20284.5 -19455.7 -19502.1 -19788.7 -19857.4
@@ -561,7 +561,7 @@
           -26523.9 -26674.9 -27098.7 -27712.3 -28384.9 -28955.2 -29267.5 -29225.2 -28843.2 -28253.3 -27647.4 -27205
           -27043.8
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -933,7 +933,7 @@
           126524 126675 127099 127712 128385 128955 129268 129225 128843 128253 127647 127205
           127044
         </DataArray>
-        <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -1119,7 +1119,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000
         </DataArray>
-        <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           0.00100391 0.00100242 0.00100366 0.00100206 0.000995402 0.000993208 0.000994817 0.000992198 0.000998992 0.000998387 0.00098792 0.000985599
           0.000996116 0.000995527 0.000983273 0.000978899 0.000996344 0.00099544 0.000983048 0.000978762 0.00100053 0.000999215 0.000988161 0.000985146
           0.00100794 0.00100648 0.000996855 0.0009944 0.00101744 0.00101597 0.00100736 0.00100513 0.00102789 0.0010266 0.00101866 0.00101678
diff --git a/test/references/test_embedded_1p_richards_tpfa_3d.vtu b/test/references/test_embedded_1p_richards_tpfa_3d.vtu
index d4c5918f367b063422b0551b8b4d054ba80dfaf5..35ff8633f6ea9eb2545b505e1aa0527291b0e9a4 100644
--- a/test/references/test_embedded_1p_richards_tpfa_3d.vtu
+++ b/test/references/test_embedded_1p_richards_tpfa_3d.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="1728" NumberOfPoints="2197">
-      <CellData Scalars="S_w">
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_liq">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           0.208985 0.208914 0.20882 0.208792 0.208883 0.209067 0.209309 0.209583 0.20986 0.210105 0.210288 0.210385
           0.208948 0.208853 0.208715 0.208664 0.208771 0.208967 0.209215 0.209503 0.209798 0.210061 0.210257 0.210361
           0.208917 0.20879 0.20858 0.208491 0.208622 0.208816 0.209052 0.20936 0.20969 0.209987 0.210207 0.210323
@@ -149,7 +149,7 @@
           0.204892 0.204672 0.204266 0.203742 0.203199 0.202766 0.202589 0.202789 0.203276 0.203821 0.204265 0.20451
           0.205137 0.204946 0.204597 0.204154 0.203708 0.203369 0.203248 0.203403 0.203775 0.204212 0.204579 0.204785
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.791015 0.791086 0.79118 0.791208 0.791117 0.790933 0.790691 0.790417 0.79014 0.789895 0.789712 0.789615
           0.791052 0.791147 0.791285 0.791336 0.791229 0.791033 0.790785 0.790497 0.790202 0.789939 0.789743 0.789639
           0.791083 0.79121 0.79142 0.791509 0.791378 0.791184 0.790948 0.79064 0.79031 0.790013 0.789793 0.789677
@@ -295,7 +295,7 @@
           0.795108 0.795328 0.795734 0.796258 0.796801 0.797234 0.797411 0.797211 0.796724 0.796179 0.795735 0.79549
           0.794863 0.795054 0.795403 0.795846 0.796292 0.796631 0.796752 0.796597 0.796225 0.795789 0.795421 0.795215
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           -20412.6 -20520.9 -20663.6 -20706.3 -20566.9 -20287.2 -19920.8 -19506.5 -19090.9 -18724.7 -18453.3 -18309.2
           -20469.2 -20614 -20823.6 -20901.6 -20738.2 -20439.1 -20062.6 -19627.5 -19183.6 -18790.5 -18499.4 -18345.1
           -20515.9 -20708.9 -21031.3 -21167.8 -20966.4 -20669.2 -20309.8 -19843.2 -19345.6 -18901.5 -18573.9 -18401.1
@@ -441,7 +441,7 @@
           -26890.3 -27253.1 -27925.9 -28803.5 -29722.7 -30462.4 -30765.8 -30422.5 -29591.8 -28670.4 -27928.1 -27520.4
           -26487.9 -26801.3 -27376.7 -28113.4 -28861.5 -29432.8 -29639.2 -29375.6 -28748.5 -28017.2 -27407.2 -27066
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -733,7 +733,7 @@
           126890 127253 127926 128803 129723 130462 130766 130422 129592 128670 127928 127520
           126488 126801 127377 128113 128862 129433 129639 129376 128749 128017 127407 127066
         </DataArray>
-        <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -879,7 +879,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           0.00100167 0.000998753 0.000994934 0.000993791 0.000997519 0.00100505 0.00101504 0.00102648 0.00103813 0.00104854 0.00105634 0.00106051
           0.00100014 0.00099626 0.00099067 0.000988601 0.000992941 0.00100095 0.00101116 0.00102312 0.00103551 0.00104666 0.00105501 0.00105947
           0.000998887 0.000993723 0.000985174 0.000981583 0.000986886 0.000994784 0.00100444 0.00101717 0.00103097 0.00104349 0.00105286 0.00105785
diff --git a/test/references/test_kovasznay-reference.vtu b/test/references/test_kovasznay-reference.vtu
index c2ce8574a95e830b40178f2cc4fbdb0b71398ed6..c0d7c1b2c398650d834c6515c949b44475b9ce58 100644
--- a/test/references/test_kovasznay-reference.vtu
+++ b/test/references/test_kovasznay-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="2500" NumberOfPoints="2601">
-      <CellData Scalars="p" Vectors="velocity_component (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           -0.749079 -0.615405 -0.507054 -0.411442 -0.325135 -0.246597 -0.174991 -0.10974 -0.0503596 0.00359659 0.0525568 0.0969336
           0.137121 0.173494 0.206401 0.236168 0.263096 0.287458 0.309503 0.329458 0.347525 0.363889 0.378715 0.392151
@@ -636,7 +636,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="velocity_component (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           2.56902 0.029554 0 2.49712 0.0276693 0 2.42921 0.0266607 0 2.36367 0.0257708 0
           2.30042 0.0248317 0 2.23959 0.0238343 0 2.18129 0.0228058 0 2.12556 0.0217742 0
           2.07239 0.0207602 0 2.02172 0.019777 0 1.97346 0.0188318 0 1.92751 0.0179282 0
diff --git a/test/references/test_navierstokes_1d.vtp b/test/references/test_navierstokes_1d.vtp
index 55ed9f74ae3516156328c29cd479a76e795d127c..3b45d5759acd832b2940b127f6e2dcf5d71b1c38 100644
--- a/test/references/test_navierstokes_1d.vtp
+++ b/test/references/test_navierstokes_1d.vtp
@@ -18,7 +18,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="velocity_component (m/s)" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="1" format="ascii">
           0.000771803 0.0017496 0.0025278 0.00422152 0.00719699 0.0118204 0.018458 0.0274759 0.0392404 0.0541178 0.0724741 0.0946756
           0.121089 0.152079 0.188014 0.229258 0.276179 0.329142 0.388514 0.454661 0.527949 0.608744 0.697413 0.794322
           0.899836 1.01432 1.13815 1.27168 1.41528 1.56932 1.73416 1.90966
diff --git a/test/references/test_stokes1p2cdarcy1p2chorizontal_darcy-reference.vtu b/test/references/test_stokes1p2cdarcy1p2chorizontal_darcy-reference.vtu
index 71c71562e6ab8f4b3b255c5961828a1a03b23b15..769ce1d91306803ac1356a7091d0996dca12e432 100644
--- a/test/references/test_stokes1p2cdarcy1p2chorizontal_darcy-reference.vtu
+++ b/test/references/test_stokes1p2cdarcy1p2chorizontal_darcy-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="400" NumberOfPoints="441">
-      <CellData Scalars="p" Vectors="velocity_liquid (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -147,7 +147,7 @@
           7.90169e-09 7.42148e-09 6.94126e-09 6.4465e-09 5.95173e-09 5.45697e-09 4.9622e-09 4.46744e-09 3.97267e-09 3.49246e-09 2.99769e-09 2.51748e-09
           2.03727e-09 1.57161e-09 1.1496e-09 8.14907e-10
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -183,7 +183,7 @@
           0.999415 0.999474 0.999528 0.999575 0.999617 0.999654 0.999687 0.999717 0.999743 0.999767 0.999788 0.999807
           0.999824 0.999839 0.999853 0.999862
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_liq" NumberOfComponents="1" format="ascii">
           2.83567e-15 2.68895e-15 2.4287e-15 2.10637e-15 1.77236e-15 1.46294e-15 1.19686e-15 9.78736e-16 8.04748e-16 6.67553e-16 5.59378e-16 4.73481e-16
           4.04581e-16 3.48787e-16 3.03377e-16 2.66571e-16 2.37347e-16 2.15284e-16 2.00381e-16 1.9284e-16 1.05016e-14 9.93342e-15 8.93281e-15 7.70651e-15
           6.45129e-15 5.30294e-15 4.32662e-15 3.53367e-15 2.90532e-15 2.41174e-15 2.02312e-15 1.71443e-15 1.46645e-15 1.2652e-15 1.10097e-15 9.67417e-16
@@ -219,7 +219,7 @@
           0.00058483 0.000525527 0.000472369 0.000425066 0.000383073 0.000345786 0.000312627 0.000283079 0.000256696 0.000233091 0.000211933 0.000192939
           0.000175877 0.00016062 0.000147405 0.000137901
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -255,7 +255,7 @@
           0.99906 0.999155 0.999241 0.999317 0.999384 0.999444 0.999498 0.999545 0.999587 0.999625 0.999659 0.99969
           0.999717 0.999742 0.999763 0.999778
         </DataArray>
-        <DataArray type="Float32" Name="X^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Air_liq" NumberOfComponents="1" format="ascii">
           4.55844e-15 4.32258e-15 3.90422e-15 3.38606e-15 2.84913e-15 2.35173e-15 1.92399e-15 1.57335e-15 1.29366e-15 1.07311e-15 8.99219e-16 7.61137e-16
           6.50377e-16 5.60686e-16 4.87689e-16 4.28522e-16 3.81544e-16 3.46076e-16 3.22119e-16 3.09997e-16 1.68817e-14 1.59683e-14 1.43598e-14 1.23885e-14
           1.03707e-14 8.52465e-15 6.95519e-15 5.68049e-15 4.6704e-15 3.87695e-15 3.25224e-15 2.75601e-15 2.35737e-15 2.03386e-15 1.76984e-15 1.55516e-15
@@ -291,7 +291,7 @@
           0.0009398 0.000844532 0.000759132 0.000683131 0.00061566 0.000555745 0.000502462 0.000454981 0.000412584 0.000374649 0.000340646 0.000310119
           0.000282697 0.000258176 0.000236937 0.000221662
         </DataArray>
-        <DataArray type="Float32" Name="velocity_liquid (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           2.22587e-17 0 0 2.22587e-17 -2.22587e-17 0 3.3388e-17 -2.22587e-17 0 4.45174e-17 -2.22587e-17 0
           5.56467e-17 0 0 6.67761e-17 0 0 7.79054e-17 0 0 7.79054e-17 -2.22587e-17 0
           7.79054e-17 0 0 8.90348e-17 0 0 8.90348e-17 0 0 8.90348e-17 0 0
diff --git a/test/references/test_stokes1p2cdarcy1p2chorizontal_stokes-reference.vtu b/test/references/test_stokes1p2cdarcy1p2chorizontal_stokes-reference.vtu
index e862b097071f6dc22329d05fe4f83a56cf465888..d51598cc3ab4360376c32a090ae38b2ca1cd2622 100644
--- a/test/references/test_stokes1p2cdarcy1p2chorizontal_stokes-reference.vtu
+++ b/test/references/test_stokes1p2cdarcy1p2chorizontal_stokes-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="400" NumberOfPoints="441">
-      <CellData Scalars="p" Vectors="velocity_liquid (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -111,7 +111,7 @@
           1000.2 1000.16 1000.13 1000.09 1000.06 1000.03 1000 999.974 999.95 999.928 999.908 999.889
           999.872 999.857 999.844 999.833
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           0.998453 0.998541 0.99864 0.998744 0.998848 0.998948 0.999041 0.999126 0.999204 0.999275 0.999339 0.999396
           0.999449 0.999496 0.999539 0.999578 0.999613 0.999645 0.999674 0.999695 0.998401 0.998421 0.998452 0.998494
           0.998546 0.998605 0.998669 0.998737 0.998806 0.998876 0.998944 0.99901 0.999074 0.999134 0.999192 0.999247
@@ -147,7 +147,7 @@
           0.998661 0.998752 0.998844 0.998934 0.999019 0.9991 0.999176 0.999245 0.999309 0.999368 0.999421 0.99947
           0.999515 0.999555 0.999591 0.999618
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999037 0.999092 0.999153 0.999218 0.999283 0.999345 0.999403 0.999456 0.999505 0.999549 0.999588 0.999624
           0.999657 0.999686 0.999713 0.999738 0.99976 0.999779 0.999797 0.99981 0.999005 0.999017 0.999037 0.999063
           0.999095 0.999132 0.999172 0.999214 0.999257 0.9993 0.999343 0.999384 0.999424 0.999461 0.999497 0.999531
@@ -183,7 +183,7 @@
           0.999166 0.999223 0.99928 0.999336 0.99939 0.99944 0.999487 0.99953 0.99957 0.999607 0.99964 0.99967
           0.999698 0.999723 0.999745 0.999762
         </DataArray>
-        <DataArray type="Float32" Name="X^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Air_liq" NumberOfComponents="1" format="ascii">
           0.00154671 0.00145918 0.0013603 0.00125587 0.00115177 0.00105211 0.000959155 0.000873764 0.000795981 0.000725419 0.000661517 0.000603673
           0.000551302 0.000503864 0.000460868 0.000421876 0.000386512 0.000354546 0.000326311 0.000304792 0.00159855 0.00157886 0.00154777 0.00150572
           0.00145413 0.00139501 0.00133056 0.00126284 0.00119364 0.00112442 0.0010563 0.000990104 0.000926406 0.000865579 0.000807842 0.000753298
@@ -219,7 +219,7 @@
           0.00133943 0.00124845 0.00115643 0.00106648 0.00098053 0.000899678 0.000824417 0.000754866 0.000690913 0.000632312 0.000578744 0.000529861
           0.000485326 0.000444932 0.000409141 0.00038176
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_liq" NumberOfComponents="1" format="ascii">
           0.000962728 0.000908212 0.000846639 0.000781612 0.000716795 0.00065475 0.000596879 0.000543723 0.000495306 0.000451386 0.000411614 0.000375613
           0.000343021 0.000313499 0.000286743 0.000262478 0.000240473 0.000220583 0.000203014 0.000189624 0.000995013 0.000982749 0.000963389 0.000937198
           0.000905068 0.000868253 0.000828118 0.000785949 0.000742864 0.000699767 0.000657357 0.000616146 0.000576492 0.000538628 0.000502689 0.000468738
@@ -255,7 +255,7 @@
           0.000833643 0.000776994 0.000719698 0.000663691 0.000610185 0.000559854 0.000513006 0.000469714 0.000429909 0.000393437 0.000360099 0.000329677
           0.000301963 0.000276826 0.000254554 0.000237516
         </DataArray>
-        <DataArray type="Float32" Name="D^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="D^Air_liq" NumberOfComponents="1" format="ascii">
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
@@ -291,7 +291,7 @@
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
         </DataArray>
-        <DataArray type="Float32" Name="velocity_liquid (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           9.78509e-08 -3.50913e-10 0 9.84899e-08 -2.8809e-10 0 9.89535e-08 -1.75455e-10 0 9.92314e-08 -1.02466e-10 0
           9.93949e-08 -6.10353e-11 0 9.94935e-08 -3.75578e-11 0 9.95548e-08 -2.37564e-11 0 9.95938e-08 -1.52927e-11 0
           9.9619e-08 -9.92126e-12 0 9.96354e-08 -6.43427e-12 0 9.9646e-08 -4.14368e-12 0 9.96528e-08 -2.63431e-12 0
diff --git a/test/references/test_stokes1p2cdarcy1p2cvertical_advection_darcy-reference.vtu b/test/references/test_stokes1p2cdarcy1p2cvertical_advection_darcy-reference.vtu
index 05c6fcf6014a39ef8fb7f256fc5cd75859450129..e1dd159b69f59a0444df182824d3e790078d49c4 100644
--- a/test/references/test_stokes1p2cdarcy1p2cvertical_advection_darcy-reference.vtu
+++ b/test/references/test_stokes1p2cdarcy1p2cvertical_advection_darcy-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="400" NumberOfPoints="441">
-      <CellData Scalars="p" Vectors="velocity_liquid (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           99995.6 99995.6 99995.6 99995.6 99995.6 99995.6 99995.6 99995.6 99995.6 99995.6 99995.6 99995.6
           99995.6 99995.6 99995.6 99995.6 99995.6 99995.6 99995.6 99995.6 99986.9 99986.9 99986.9 99986.9
@@ -147,7 +147,7 @@
           -170.191 -170.191 -170.191 -170.191 -170.191 -170.191 -170.191 -170.191 -170.191 -170.191 -170.191 -170.191
           -170.191 -170.191 -170.191 -170.191
         </DataArray>
-        <DataArray type="Float32" Name="x_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -183,7 +183,7 @@
           0.999968 0.999962 0.999957 0.999954 0.999952 0.999951 0.999951 0.999952 0.999954 0.999957 0.999962 0.999968
           0.999975 0.999984 0.999991 0.999996
         </DataArray>
-        <DataArray type="Float32" Name="x_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_liq" NumberOfComponents="1" format="ascii">
           4.70986e-12 1.16577e-11 2.30053e-11 3.67667e-11 5.02784e-11 6.20178e-11 7.14832e-11 7.86306e-11 8.35496e-11 8.63058e-11 8.63058e-11 8.35496e-11
           7.86307e-11 7.14832e-11 6.20178e-11 5.02784e-11 3.67667e-11 2.30053e-11 1.16577e-11 4.70986e-12 4.61857e-11 1.14133e-10 2.24984e-10 3.59219e-10
           4.90847e-10 6.05091e-10 6.97133e-10 7.66596e-10 8.14382e-10 8.4115e-10 8.4115e-10 8.14382e-10 7.66596e-10 6.97133e-10 6.05091e-10 4.90847e-10
@@ -219,7 +219,7 @@
           3.20791e-05 3.80471e-05 4.26105e-05 4.593e-05 4.81596e-05 4.93945e-05 4.93945e-05 4.81596e-05 4.593e-05 4.26105e-05 3.80471e-05 3.20791e-05
           2.46949e-05 1.6441e-05 8.89947e-06 3.86735e-06
         </DataArray>
-        <DataArray type="Float32" Name="X_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -255,7 +255,7 @@
           0.999948 0.999939 0.999932 0.999926 0.999923 0.999921 0.999921 0.999923 0.999926 0.999932 0.999939 0.999948
           0.99996 0.999974 0.999986 0.999994
         </DataArray>
-        <DataArray type="Float32" Name="X_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Air_liq" NumberOfComponents="1" format="ascii">
           7.57125e-12 1.87401e-11 3.69818e-11 5.91037e-11 8.08242e-11 9.96957e-11 1.14912e-10 1.26401e-10 1.34309e-10 1.38739e-10 1.38739e-10 1.34309e-10
           1.26401e-10 1.14912e-10 9.96957e-11 8.08242e-11 5.91037e-11 3.69818e-11 1.87401e-11 7.57125e-12 7.42451e-11 1.83472e-10 3.61669e-10 5.77456e-10
           7.89053e-10 9.72705e-10 1.12067e-09 1.23233e-09 1.30915e-09 1.35218e-09 1.35218e-09 1.30915e-09 1.23233e-09 1.12067e-09 9.72705e-10 7.89053e-10
@@ -291,7 +291,7 @@
           5.15672e-05 6.11605e-05 6.84961e-05 7.38319e-05 7.74159e-05 7.9401e-05 7.9401e-05 7.74159e-05 7.38319e-05 6.84961e-05 6.11605e-05 5.15672e-05
           3.96973e-05 2.64292e-05 1.43061e-05 6.21687e-06
         </DataArray>
-        <DataArray type="Float32" Name="velocity_liquid (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           1.11293e-17 6.675e-06 0 5.56467e-18 6.675e-06 0 5.56467e-18 6.675e-06 0 1.6694e-17 6.675e-06 0
           1.6694e-17 6.675e-06 0 1.11293e-17 6.675e-06 0 1.11293e-17 6.675e-06 0 1.11293e-17 6.675e-06 0
           5.56467e-18 6.675e-06 0 0 6.675e-06 0 0 6.675e-06 0 -5.56467e-18 6.675e-06 0
diff --git a/test/references/test_stokes1p2cdarcy1p2cvertical_advection_stokes-reference.vtu b/test/references/test_stokes1p2cdarcy1p2cvertical_advection_stokes-reference.vtu
index ba21a825c88273e238c2caf0b30f13d4445b6310..6c5702808fc446e7a496871c9ddcdb1ab85a6a18 100644
--- a/test/references/test_stokes1p2cdarcy1p2cvertical_advection_stokes-reference.vtu
+++ b/test/references/test_stokes1p2cdarcy1p2cvertical_advection_stokes-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="400" NumberOfPoints="441">
-      <CellData Scalars="p" Vectors="velocity_liquid (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           99825.4 99825.4 99825.4 99825.4 99825.4 99825.4 99825.4 99825.4 99825.4 99825.4 99825.4 99825.4
           99825.4 99825.4 99825.4 99825.4 99825.4 99825.4 99825.4 99825.4 99825.4 99825.4 99825.4 99825.4
@@ -111,7 +111,7 @@
           999.974 999.972 999.976 999.982 999.988 999.992 999.992 999.988 999.982 999.976 999.972 999.974
           999.98 999.977 999.934 999.941
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999992 0.999984 0.999971 0.999954 0.999938 0.999925 0.999915 0.999908 0.999904 0.999901 0.999901 0.999904
           0.999908 0.999915 0.999925 0.999938 0.999954 0.999971 0.999984 0.999992 0.999988 0.999982 0.999968 0.99995
           0.99993 0.999912 0.999899 0.999889 0.999882 0.999879 0.999879 0.999882 0.999889 0.999899 0.999912 0.99993
@@ -147,7 +147,7 @@
           0.999247 0.999251 0.99924 0.999224 0.999208 0.999197 0.999197 0.999208 0.999224 0.99924 0.999251 0.999247
           0.999229 0.999239 0.999352 0.999333
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999995 0.99999 0.999982 0.999971 0.999961 0.999953 0.999947 0.999943 0.99994 0.999938 0.999938 0.99994
           0.999943 0.999947 0.999953 0.999961 0.999971 0.999982 0.99999 0.999995 0.999993 0.999989 0.99998 0.999969
           0.999956 0.999946 0.999937 0.999931 0.999927 0.999924 0.999924 0.999927 0.999931 0.999937 0.999946 0.999956
@@ -183,7 +183,7 @@
           0.999531 0.999534 0.999527 0.999517 0.999507 0.999501 0.999501 0.999507 0.999517 0.999527 0.999534 0.999531
           0.99952 0.999526 0.999597 0.999585
         </DataArray>
-        <DataArray type="Float32" Name="X^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Air_liq" NumberOfComponents="1" format="ascii">
           8.0994e-06 1.57695e-05 2.93636e-05 4.61401e-05 6.20538e-05 7.503e-05 8.48215e-05 9.18305e-05 9.6486e-05 9.90583e-05 9.90584e-05 9.64861e-05
           9.18305e-05 8.48215e-05 7.503e-05 6.20538e-05 4.61401e-05 2.93636e-05 1.57695e-05 8.0994e-06 1.1653e-05 1.82552e-05 3.16308e-05 5.01911e-05
           7.00129e-05 8.75973e-05 0.00010138 0.00011129 0.000117817 0.000121418 0.000121418 0.000117817 0.00011129 0.00010138 8.75973e-05 7.00129e-05
@@ -219,7 +219,7 @@
           0.000753315 0.000749354 0.000760049 0.000776456 0.000791675 0.000802715 0.000802715 0.000791674 0.000776456 0.000760049 0.000749354 0.000753314
           0.00077142 0.000761164 0.000647635 0.000666819
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_liq" NumberOfComponents="1" format="ascii">
           5.03842e-06 9.80983e-06 1.82665e-05 2.8703e-05 3.86028e-05 4.66753e-05 5.27667e-05 5.71271e-05 6.00234e-05 6.16236e-05 6.16237e-05 6.00234e-05
           5.71271e-05 5.27667e-05 4.66753e-05 3.86028e-05 2.8703e-05 1.82665e-05 9.80983e-06 5.03842e-06 7.24905e-06 1.13561e-05 1.96768e-05 3.1223e-05
           4.35542e-05 5.44935e-05 6.30681e-05 6.92333e-05 7.3294e-05 7.5534e-05 7.5534e-05 7.3294e-05 6.92333e-05 6.30681e-05 5.44935e-05 4.35542e-05
@@ -255,7 +255,7 @@
           0.000468749 0.000466283 0.00047294 0.000483153 0.000492625 0.000499498 0.000499498 0.000492625 0.000483153 0.00047294 0.000466283 0.000468749
           0.000480018 0.000473635 0.000402974 0.000414913
         </DataArray>
-        <DataArray type="Float32" Name="D^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="D^Air_liq" NumberOfComponents="1" format="ascii">
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
@@ -291,7 +291,7 @@
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
         </DataArray>
-        <DataArray type="Float32" Name="velocity_liquid (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           9.25111e-07 5.74989e-06 0 1.80044e-06 6.72478e-06 0 1.56741e-06 6.85824e-06 0 1.22301e-06 6.83616e-06 0
           9.35539e-07 6.80131e-06 0 7.07868e-07 6.77636e-06 0 5.20678e-07 6.76083e-06 0 3.58205e-07 6.75164e-06 0
           2.10033e-07 6.74653e-06 0 6.92502e-08 6.74425e-06 0 -6.925e-08 6.74425e-06 0 -2.10033e-07 6.74653e-06 0
diff --git a/test/references/test_stokes1p2cdarcy1p2cvertical_diffusion_darcy-reference.vtu b/test/references/test_stokes1p2cdarcy1p2cvertical_diffusion_darcy-reference.vtu
index 271a5d196e36ad76a8d22f7c69bf12b18f27e771..dd8a5a4064b4906a82992589277e3066628bcf06 100644
--- a/test/references/test_stokes1p2cdarcy1p2cvertical_diffusion_darcy-reference.vtu
+++ b/test/references/test_stokes1p2cdarcy1p2cvertical_diffusion_darcy-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="400" NumberOfPoints="441">
-      <CellData Scalars="p" Vectors="velocity_liquid (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -147,7 +147,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="x_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999015 0.999015 0.999015 0.999015 0.999015 0.999015 0.999015 0.999015 0.999015 0.999015 0.999015 0.999015
           0.999015 0.999015 0.999015 0.999015 0.999015 0.999015 0.999015 0.999015 0.999045 0.999045 0.999045 0.999045
           0.999045 0.999045 0.999045 0.999045 0.999045 0.999045 0.999045 0.999045 0.999045 0.999045 0.999045 0.999045
@@ -183,7 +183,7 @@
           0.99949 0.99949 0.99949 0.99949 0.99949 0.99949 0.99949 0.99949 0.99949 0.99949 0.99949 0.99949
           0.99949 0.99949 0.99949 0.99949
         </DataArray>
-        <DataArray type="Float32" Name="x_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_liq" NumberOfComponents="1" format="ascii">
           0.000984899 0.000984899 0.000984899 0.000984899 0.000984899 0.000984899 0.000984899 0.000984899 0.000984899 0.000984899 0.000984899 0.000984899
           0.000984899 0.000984899 0.000984899 0.000984899 0.000984899 0.000984899 0.000984899 0.000984899 0.00095546 0.00095546 0.00095546 0.00095546
           0.00095546 0.00095546 0.00095546 0.00095546 0.00095546 0.00095546 0.00095546 0.00095546 0.00095546 0.00095546 0.00095546 0.00095546
@@ -219,7 +219,7 @@
           0.00051027 0.00051027 0.00051027 0.00051027 0.00051027 0.00051027 0.00051027 0.00051027 0.00051027 0.00051027 0.00051027 0.00051027
           0.00051027 0.00051027 0.00051027 0.00051027
         </DataArray>
-        <DataArray type="Float32" Name="X_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           0.998418 0.998418 0.998418 0.998418 0.998418 0.998418 0.998418 0.998418 0.998418 0.998418 0.998418 0.998418
           0.998418 0.998418 0.998418 0.998418 0.998418 0.998418 0.998418 0.998418 0.998465 0.998465 0.998465 0.998465
           0.998465 0.998465 0.998465 0.998465 0.998465 0.998465 0.998465 0.998465 0.998465 0.998465 0.998465 0.998465
@@ -255,7 +255,7 @@
           0.99918 0.99918 0.99918 0.99918 0.99918 0.99918 0.99918 0.99918 0.99918 0.99918 0.99918 0.99918
           0.99918 0.99918 0.99918 0.99918
         </DataArray>
-        <DataArray type="Float32" Name="X_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Air_liq" NumberOfComponents="1" format="ascii">
           0.00158231 0.00158231 0.00158231 0.00158231 0.00158231 0.00158231 0.00158231 0.00158231 0.00158231 0.00158231 0.00158231 0.00158231
           0.00158231 0.00158231 0.00158231 0.00158231 0.00158231 0.00158231 0.00158231 0.00158231 0.00153504 0.00153504 0.00153504 0.00153504
           0.00153504 0.00153504 0.00153504 0.00153504 0.00153504 0.00153504 0.00153504 0.00153504 0.00153504 0.00153504 0.00153504 0.00153504
@@ -291,7 +291,7 @@
           0.000820022 0.000820022 0.000820022 0.000820022 0.000820022 0.000820022 0.000820022 0.000820022 0.000820022 0.000820022 0.000820022 0.000820022
           0.000820022 0.000820022 0.000820022 0.000820022
         </DataArray>
-        <DataArray type="Float32" Name="velocity_liquid (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 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_stokes1p2cdarcy1p2cvertical_diffusion_stokes-reference.vtu b/test/references/test_stokes1p2cdarcy1p2cvertical_diffusion_stokes-reference.vtu
index 2f874159838b2499839c521791991f2f9d5ce92c..43aca471ef8f1b6e2fb31a6bb904d0519ce085a0 100644
--- a/test/references/test_stokes1p2cdarcy1p2cvertical_diffusion_stokes-reference.vtu
+++ b/test/references/test_stokes1p2cdarcy1p2cvertical_diffusion_stokes-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="400" NumberOfPoints="441">
-      <CellData Scalars="p" Vectors="velocity_liquid (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -111,7 +111,7 @@
           999.698 999.698 999.698 999.698 999.698 999.698 999.698 999.698 999.698 999.698 999.698 999.698
           999.698 999.698 999.698 999.698
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999216 0.999216 0.999216 0.999216 0.999216 0.999216 0.999216 0.999216 0.999216 0.999216 0.999216 0.999216
           0.999216 0.999216 0.999216 0.999216 0.999216 0.999216 0.999216 0.999216 0.999252 0.999252 0.999252 0.999252
           0.999252 0.999252 0.999252 0.999252 0.999252 0.999252 0.999252 0.999252 0.999252 0.999252 0.999252 0.999252
@@ -147,7 +147,7 @@
           0.999976 0.999976 0.999976 0.999976 0.999976 0.999976 0.999976 0.999976 0.999976 0.999976 0.999976 0.999976
           0.999976 0.999976 0.999976 0.999976
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999512 0.999512 0.999512 0.999512 0.999512 0.999512 0.999512 0.999512 0.999512 0.999512 0.999512 0.999512
           0.999512 0.999512 0.999512 0.999512 0.999512 0.999512 0.999512 0.999512 0.999535 0.999535 0.999535 0.999535
           0.999535 0.999535 0.999535 0.999535 0.999535 0.999535 0.999535 0.999535 0.999535 0.999535 0.999535 0.999535
@@ -183,7 +183,7 @@
           0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985
           0.999985 0.999985 0.999985 0.999985
         </DataArray>
-        <DataArray type="Float32" Name="X^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Air_liq" NumberOfComponents="1" format="ascii">
           0.000783919 0.000783919 0.000783919 0.000783919 0.000783919 0.000783919 0.000783919 0.000783919 0.000783919 0.000783919 0.000783919 0.000783919
           0.000783919 0.000783919 0.000783919 0.000783919 0.000783919 0.000783919 0.000783919 0.000783919 0.000747794 0.000747794 0.000747794 0.000747794
           0.000747794 0.000747794 0.000747794 0.000747794 0.000747794 0.000747794 0.000747794 0.000747794 0.000747794 0.000747794 0.000747794 0.000747794
@@ -219,7 +219,7 @@
           2.41533e-05 2.41533e-05 2.41533e-05 2.41533e-05 2.41533e-05 2.41533e-05 2.41533e-05 2.41533e-05 2.41533e-05 2.41533e-05 2.41533e-05 2.41533e-05
           2.41533e-05 2.41533e-05 2.41533e-05 2.41533e-05
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_liq" NumberOfComponents="1" format="ascii">
           0.000487798 0.000487798 0.000487798 0.000487798 0.000487798 0.000487798 0.000487798 0.000487798 0.000487798 0.000487798 0.000487798 0.000487798
           0.000487798 0.000487798 0.000487798 0.000487798 0.000487798 0.000487798 0.000487798 0.000487798 0.000465313 0.000465313 0.000465313 0.000465313
           0.000465313 0.000465313 0.000465313 0.000465313 0.000465313 0.000465313 0.000465313 0.000465313 0.000465313 0.000465313 0.000465313 0.000465313
@@ -255,7 +255,7 @@
           1.50252e-05 1.50252e-05 1.50252e-05 1.50252e-05 1.50252e-05 1.50252e-05 1.50252e-05 1.50252e-05 1.50252e-05 1.50252e-05 1.50252e-05 1.50252e-05
           1.50252e-05 1.50252e-05 1.50252e-05 1.50252e-05
         </DataArray>
-        <DataArray type="Float32" Name="D^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="D^Air_liq" NumberOfComponents="1" format="ascii">
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
@@ -291,7 +291,7 @@
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
           1.90888e-09 1.90888e-09 1.90888e-09 1.90888e-09
         </DataArray>
-        <DataArray type="Float32" Name="velocity_liquid (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           7.41034e-28 7.06686e-28 0 2.3648e-27 2.13809e-27 0 2.88341e-27 1.15224e-27 0 2.74971e-27 1.00046e-27 0
           2.79402e-27 -1.24971e-29 0 1.28729e-27 -3.3594e-28 0 1.15428e-28 -1.18692e-27 0 -3.89466e-28 -1.75215e-27 0
           3.78017e-28 -1.01579e-27 0 9.43101e-28 -2.6749e-27 0 -3.59216e-28 -1.59885e-27 0 4.93605e-28 -1.00072e-28 0
diff --git a/test/references/test_stokes1p2cdarcy2p2chorizontal_darcy-reference.vtu b/test/references/test_stokes1p2cdarcy2p2chorizontal_darcy-reference.vtu
index 936aefac199e3268194285cdbba2aa809e9b97f8..2d5dcccb3d5b91d291311129192ae61a64b0a34a 100644
--- a/test/references/test_stokes1p2cdarcy2p2chorizontal_darcy-reference.vtu
+++ b/test/references/test_stokes1p2cdarcy2p2chorizontal_darcy-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="64" NumberOfPoints="81">
-      <CellData Scalars="S_n" Vectors="velocity_liquid (m/s)">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_gas" Vectors="velocity_liq (m/s)">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.385652 0.385652 0.385652 0.385652 0.385652 0.385651 0.385651 0.385651 0.874634 0.874634 0.874634 0.874634
           0.874634 0.874633 0.874633 0.874633 0.954314 0.954314 0.954313 0.954312 0.954312 0.954312 0.954311 0.954311
           0.974244 0.974239 0.974234 0.974231 0.974228 0.974225 0.974223 0.974221 0.982745 0.982728 0.982714 0.982703
@@ -11,7 +11,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           0.614348 0.614348 0.614348 0.614348 0.614348 0.614349 0.614349 0.614349 0.125366 0.125366 0.125366 0.125366
           0.125366 0.125367 0.125367 0.125367 0.0456858 0.0456864 0.0456871 0.0456876 0.0456881 0.0456884 0.0456888 0.045689
           0.0257562 0.0257612 0.0257657 0.0257693 0.0257723 0.0257749 0.0257771 0.0257788 0.0172552 0.017272 0.0172858 0.0172967
@@ -19,7 +19,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100002 100002 100002 100002 100002 100002 100002 100002 100002 100002 100002 100002
           100002 100002 100002 100002 100001 100001 100001 100001 100001 100001 100001 100001
           100001 100001 100001 100001 100001 100001 100001 100001 100000 100000 100000 100000
@@ -27,7 +27,7 @@
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           98495.8 98495.8 98495.8 98495.8 98495.8 98495.8 98495.8 98495.8 97788.9 97788.9 97788.9 97788.9
           97788.9 97788.9 97788.9 97788.9 97316.6 97316.6 97316.7 97316.7 97316.7 97316.7 97316.7 97316.7
           96986.1 96986.2 96986.3 96986.4 96986.5 96986.6 96986.6 96986.7 96701.8 96702.6 96703.2 96703.7
@@ -43,7 +43,7 @@
           4302.49 4302.49 4302.49 4302.49 4302.49 4302.49 4302.49 4302.49 4302.49 4302.49 4302.49 4302.49
           4302.49 4302.49 4302.49 4302.49
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           997.051 997.051 997.051 997.051 997.051 997.051 997.051 997.051 997.051 997.051 997.051 997.051
           997.051 997.051 997.051 997.051 997.051 997.051 997.051 997.051 997.051 997.051 997.051 997.051
           997.051 997.051 997.051 997.051 997.051 997.051 997.051 997.051 997.05 997.05 997.05 997.05
@@ -51,7 +51,7 @@
           608.964 627.112 640.493 650.992 659.759 667.36 674.128 680.1 136.063 159.96 176.394 189.277
           200.046 209.383 217.705 225.36
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.15428 1.15428 1.15428 1.15428 1.15428 1.15428 1.15428 1.15428 1.15427 1.15427 1.15427 1.15427
           1.15427 1.15427 1.15427 1.15427 1.15427 1.15427 1.15427 1.15427 1.15427 1.15427 1.15427 1.15427
           1.15426 1.15426 1.15426 1.15426 1.15426 1.15426 1.15426 1.15426 1.15426 1.15426 1.15426 1.15426
@@ -59,7 +59,7 @@
           1.15969 1.15943 1.15925 1.1591 1.15898 1.15887 1.15878 1.15869 1.16632 1.16598 1.16575 1.16557
           1.16542 1.16529 1.16517 1.16507
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           233.68 233.68 233.68 233.68 233.68 233.681 233.681 233.681 2.12919 2.1292 2.1292 2.12921
           2.12921 2.12922 2.12922 2.12922 0.0970185 0.0970229 0.0970272 0.0970308 0.0970339 0.0970365 0.0970387 0.0970403
           0.0143285 0.0143382 0.0143471 0.0143542 0.0143601 0.0143651 0.0143695 0.0143728 0.00320809 0.00322057 0.00323088 0.00323901
@@ -67,7 +67,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           9439.73 9439.73 9439.72 9439.71 9439.7 9439.69 9439.69 9439.68 45340.3 45340.3 45340.3 45340.3
           45340.3 45340.2 45340.2 45340.2 53130.2 53130.1 53130.1 53130 53130 53130 53129.9 53129.9
           54584.8 54584.5 54584.3 54584.1 54583.9 54583.8 54583.6 54583.6 54964.1 54963.5 54963 54962.6
@@ -75,7 +75,7 @@
           54832.9 54849.1 54861 54870.4 54878.3 54885.1 54891.1 54896.5 54413.2 54434.3 54448.8 54460.2
           54469.7 54477.9 54485.3 54492.1
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_liq" NumberOfComponents="1" format="ascii">
           55344.6 55344.6 55344.6 55344.6 55344.6 55344.6 55344.6 55344.6 55344.6 55344.6 55344.6 55344.6
           55344.6 55344.6 55344.6 55344.6 55344.6 55344.6 55344.6 55344.6 55344.6 55344.6 55344.6 55344.6
           55344.6 55344.6 55344.6 55344.6 55344.6 55344.6 55344.6 55344.6 55344.6 55344.6 55344.6 55344.6
@@ -91,7 +91,7 @@
           40.3403 40.3403 40.3404 40.3404 40.3404 40.3405 40.3405 40.3405 40.3395 40.3396 40.3396 40.3396
           40.3396 40.3396 40.3396 40.3396
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978
           0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978
           0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978
@@ -99,7 +99,7 @@
           0.610741 0.628942 0.642363 0.652893 0.661687 0.66931 0.676098 0.682088 0.136436 0.160404 0.176887 0.189808
           0.200609 0.209974 0.21832 0.225998
         </DataArray>
-        <DataArray type="Float32" Name="X^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Air_liq" NumberOfComponents="1" format="ascii">
           2.15464e-05 2.15464e-05 2.15464e-05 2.15464e-05 2.15464e-05 2.15464e-05 2.15464e-05 2.15464e-05 2.15462e-05 2.15462e-05 2.15462e-05 2.15462e-05
           2.15462e-05 2.15462e-05 2.15462e-05 2.15462e-05 2.15461e-05 2.15461e-05 2.15461e-05 2.15461e-05 2.15461e-05 2.15461e-05 2.15461e-05 2.15461e-05
           2.1546e-05 2.1546e-05 2.1546e-05 2.1546e-05 2.1546e-05 2.1546e-05 2.1546e-05 2.1546e-05 2.1546e-05 2.1546e-05 2.1546e-05 2.1546e-05
@@ -123,7 +123,7 @@
           0.987852 0.987487 0.987218 0.987007 0.986831 0.986678 0.986541 0.986421 0.997302 0.996827 0.9965 0.996244
           0.996029 0.995844 0.995678 0.995525
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987
           0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987
           0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987
@@ -131,7 +131,7 @@
           0.610749 0.628951 0.642371 0.652902 0.661695 0.669319 0.676106 0.682096 0.136444 0.160413 0.176895 0.189816
           0.200618 0.209982 0.218329 0.226006
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_liq" NumberOfComponents="1" format="ascii">
           1.34035e-05 1.34035e-05 1.34035e-05 1.34035e-05 1.34035e-05 1.34035e-05 1.34035e-05 1.34035e-05 1.34034e-05 1.34034e-05 1.34034e-05 1.34034e-05
           1.34034e-05 1.34034e-05 1.34034e-05 1.34034e-05 1.34033e-05 1.34033e-05 1.34033e-05 1.34033e-05 1.34033e-05 1.34033e-05 1.34033e-05 1.34033e-05
           1.34033e-05 1.34033e-05 1.34033e-05 1.34033e-05 1.34033e-05 1.34033e-05 1.34033e-05 1.34033e-05 1.34032e-05 1.34032e-05 1.34032e-05 1.34032e-05
@@ -171,7 +171,7 @@
           2 2 2 2 2 2 2 2 2 2 2 2
           2 2 2 2
         </DataArray>
-        <DataArray type="Float32" Name="velocity_liquid (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           -8.35586e-11 1.06974e-08 0 -1.10781e-10 1.06166e-08 0 -1.50637e-10 1.05356e-08 0 -1.63906e-10 1.0469e-08 0
           -1.55244e-10 1.04139e-08 0 -1.28175e-10 1.03668e-08 0 -8.54043e-11 1.03267e-08 0 -6.04044e-11 1.02978e-08 0
           -2.46383e-12 1.17099e-08 0 -2.71375e-12 1.16273e-08 0 -2.9274e-12 1.15458e-08 0 -2.77613e-12 1.1479e-08 0
diff --git a/test/references/test_stokes1p2cdarcy2p2cvertical_darcy-reference.vtu b/test/references/test_stokes1p2cdarcy2p2cvertical_darcy-reference.vtu
index d4bfc3c3c71b7d9db750802f987203a043d20a5d..644ad051d8014124bbf3e0c167753c493021806a 100644
--- a/test/references/test_stokes1p2cdarcy2p2cvertical_darcy-reference.vtu
+++ b/test/references/test_stokes1p2cdarcy2p2cvertical_darcy-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="400" NumberOfPoints="441">
-      <CellData Scalars="S_n" Vectors="velocity_liquid (m/s)">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_gas" Vectors="velocity_liq (m/s)">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -39,7 +39,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -75,7 +75,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100001 100001 100001 100001 100001 100001 100001 100001 100001 100001 100001 100001
           100001 100001 100001 100001 100001 100001 100001 100001 100003 100003 100003 100003
           100003 100003 100003 100003 100003 100003 100003 100003 100003 100003 100003 100003
@@ -111,7 +111,7 @@
           100043 100043 100043 100043 100043 100043 100043 100043 100043 100043 100043 100043
           100043 100043 100043 100043
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           96317 96317 96317 96317 96317 96317 96317 96317 96317 96317 96317 96317
           96317 96317 96317 96317 96317 96317 96317 96317 96319.2 96319.2 96319.2 96319.2
           96319.2 96319.2 96319.2 96319.2 96319.2 96319.2 96319.2 96319.2 96319.2 96319.2 96319.2 96319.2
@@ -255,7 +255,7 @@
           1.18151 1.18151 1.18151 1.18151 1.18151 1.18151 1.18151 1.18151 1.18151 1.18151 1.18151 1.18151
           1.18151 1.18151 1.18151 1.18151
         </DataArray>
-        <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -291,7 +291,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           55315.2 55315.3 55315.4 55315.5 55315.6 55315.8 55315.9 55315.9 55316 55316 55316 55316
           55315.9 55315.9 55315.8 55315.6 55315.5 55315.4 55315.3 55315.2 55425.1 55425.2 55425.4 55425.6
           55425.8 55425.9 55426.1 55426.2 55426.2 55426.2 55426.2 55426.2 55426.2 55426.1 55425.9 55425.8
@@ -327,7 +327,7 @@
           55474.4 55474.4 55474.4 55474.4 55474.4 55474.4 55474.4 55474.4 55474.4 55474.4 55474.4 55474.4
           55474.3 55474.3 55474.2 55474.1
         </DataArray>
-        <DataArray type="Float32" Name="X_liquid^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           0.44094 0.441039 0.441212 0.441422 0.441632 0.441817 0.441964 0.44207 0.442138 0.44217 0.44217 0.442138
           0.44207 0.441964 0.441817 0.441632 0.441422 0.441212 0.441039 0.44094 0.605655 0.605788 0.606023 0.606306
           0.606588 0.606836 0.607031 0.607172 0.60726 0.607303 0.607303 0.60726 0.607172 0.607031 0.606836 0.606588
@@ -363,7 +363,7 @@
           0.679482 0.679508 0.679514 0.67951 0.679503 0.679498 0.679498 0.679503 0.67951 0.679514 0.679508 0.679482
           0.679426 0.679335 0.679218 0.679116
         </DataArray>
-        <DataArray type="Float32" Name="X_liquid^Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Air_liq" NumberOfComponents="1" format="ascii">
           2.39371e-05 2.3937e-05 2.39369e-05 2.39368e-05 2.39367e-05 2.39366e-05 2.39365e-05 2.39364e-05 2.39364e-05 2.39364e-05 2.39364e-05 2.39364e-05
           2.39364e-05 2.39365e-05 2.39366e-05 2.39367e-05 2.39368e-05 2.39369e-05 2.3937e-05 2.39371e-05 2.38441e-05 2.3844e-05 2.38439e-05 2.38438e-05
           2.38436e-05 2.38435e-05 2.38433e-05 2.38433e-05 2.38432e-05 2.38432e-05 2.38432e-05 2.38432e-05 2.38433e-05 2.38433e-05 2.38435e-05 2.38436e-05
@@ -399,7 +399,7 @@
           2.38118e-05 2.38118e-05 2.38118e-05 2.38118e-05 2.38118e-05 2.38118e-05 2.38118e-05 2.38118e-05 2.38118e-05 2.38118e-05 2.38118e-05 2.38118e-05
           2.38119e-05 2.38119e-05 2.3812e-05 2.3812e-05
         </DataArray>
-        <DataArray type="Float32" Name="X_gas^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_gas" NumberOfComponents="1" format="ascii">
           0.00647163 0.00647308 0.00647562 0.00647872 0.00648182 0.00648455 0.00648671 0.00648827 0.00648927 0.00648974 0.00648974 0.00648927
           0.00648827 0.00648671 0.00648455 0.00648182 0.00647872 0.00647562 0.00647308 0.00647163 0.00890194 0.00890392 0.00890738 0.00891156
           0.00891574 0.0089194 0.00892229 0.00892436 0.00892567 0.0089263 0.0089263 0.00892567 0.00892436 0.00892229 0.0089194 0.00891574
@@ -435,7 +435,7 @@
           0.00998963 0.00999001 0.0099901 0.00999004 0.00998993 0.00998986 0.00998986 0.00998993 0.00999004 0.0099901 0.00999001 0.00998963
           0.0099888 0.00998746 0.00998573 0.00998421
         </DataArray>
-        <DataArray type="Float32" Name="X_gas^Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Air_gas" NumberOfComponents="1" format="ascii">
           0.993528 0.993527 0.993524 0.993521 0.993518 0.993515 0.993513 0.993512 0.993511 0.99351 0.99351 0.993511
           0.993512 0.993513 0.993515 0.993518 0.993521 0.993524 0.993527 0.993528 0.991098 0.991096 0.991093 0.991088
           0.991084 0.991081 0.991078 0.991076 0.991074 0.991074 0.991074 0.991074 0.991076 0.991078 0.991081 0.991084
@@ -471,7 +471,7 @@
           0.99001 0.99001 0.99001 0.99001 0.99001 0.99001 0.99001 0.99001 0.99001 0.99001 0.99001 0.99001
           0.990011 0.990013 0.990014 0.990016
         </DataArray>
-        <DataArray type="Float32" Name="x_liquid^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.44095 0.441048 0.441221 0.441431 0.441641 0.441826 0.441973 0.442079 0.442147 0.442179 0.442179 0.442147
           0.442079 0.441973 0.441826 0.441641 0.441431 0.441221 0.441048 0.44095 0.605664 0.605797 0.606032 0.606315
           0.606597 0.606845 0.60704 0.607181 0.607269 0.607312 0.607312 0.607269 0.607181 0.60704 0.606845 0.606597
@@ -507,7 +507,7 @@
           0.679491 0.679517 0.679523 0.679519 0.679512 0.679507 0.679507 0.679512 0.679519 0.679523 0.679517 0.679491
           0.679435 0.679344 0.679227 0.679125
         </DataArray>
-        <DataArray type="Float32" Name="x_liquid^Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_liq" NumberOfComponents="1" format="ascii">
           1.48909e-05 1.48908e-05 1.48908e-05 1.48907e-05 1.48906e-05 1.48906e-05 1.48905e-05 1.48905e-05 1.48904e-05 1.48904e-05 1.48904e-05 1.48904e-05
           1.48905e-05 1.48905e-05 1.48906e-05 1.48906e-05 1.48907e-05 1.48908e-05 1.48908e-05 1.48909e-05 1.4833e-05 1.48329e-05 1.48328e-05 1.48327e-05
           1.48326e-05 1.48325e-05 1.48325e-05 1.48324e-05 1.48324e-05 1.48324e-05 1.48324e-05 1.48324e-05 1.48324e-05 1.48325e-05 1.48325e-05 1.48326e-05
@@ -543,7 +543,7 @@
           1.48128e-05 1.48128e-05 1.48128e-05 1.48128e-05 1.48128e-05 1.48128e-05 1.48128e-05 1.48128e-05 1.48128e-05 1.48128e-05 1.48128e-05 1.48128e-05
           1.48129e-05 1.48129e-05 1.48129e-05 1.4813e-05
         </DataArray>
-        <DataArray type="Float32" Name="x_gas^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0103626 0.0103649 0.010369 0.0103739 0.0103789 0.0103832 0.0103867 0.0103892 0.0103907 0.0103915 0.0103915 0.0103907
           0.0103892 0.0103867 0.0103832 0.0103789 0.0103739 0.010369 0.0103649 0.0103626 0.0142332 0.0142363 0.0142418 0.0142485
           0.0142551 0.0142609 0.0142655 0.0142688 0.0142709 0.0142719 0.0142719 0.0142709 0.0142688 0.0142655 0.0142609 0.0142551
@@ -579,7 +579,7 @@
           0.0159618 0.0159624 0.0159625 0.0159624 0.0159623 0.0159622 0.0159622 0.0159623 0.0159624 0.0159625 0.0159624 0.0159618
           0.0159605 0.0159583 0.0159556 0.0159532
         </DataArray>
-        <DataArray type="Float32" Name="x_gas^Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
           0.989637 0.989635 0.989631 0.989626 0.989621 0.989617 0.989613 0.989611 0.989609 0.989608 0.989608 0.989609
           0.989611 0.989613 0.989617 0.989621 0.989626 0.989631 0.989635 0.989637 0.985767 0.985764 0.985758 0.985752
           0.985745 0.985739 0.985734 0.985731 0.985729 0.985728 0.985728 0.985729 0.985731 0.985734 0.985739 0.985745
@@ -687,7 +687,7 @@
           2 2 2 2 2 2 2 2 2 2 2 2
           2 2 2 2
         </DataArray>
-        <DataArray type="Float32" Name="velocity_liquid (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           -0 -0 0 -0 -0 0 -0 -0 0 -0 -0 0
           -0 -0 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_stokes1p2cdarcy2p2cvertical_stokes-reference.vtu b/test/references/test_stokes1p2cdarcy2p2cvertical_stokes-reference.vtu
index 9a6cae9ee1050714c387975f71efd43b9dc13e5e..37be87627bd9ab9e513b07b3d4d4098c52d98eaa 100644
--- a/test/references/test_stokes1p2cdarcy2p2cvertical_stokes-reference.vtu
+++ b/test/references/test_stokes1p2cdarcy2p2cvertical_stokes-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="400" NumberOfPoints="441">
-      <CellData Scalars="p" Vectors="velocity_liquid (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           100043 100043 100043 100043 100043 100043 100043 100043 100043 100043 100043 100043
           100043 100043 100043 100043 100043 100043 100043 100043 100043 100043 100043 100043
@@ -255,7 +255,7 @@
           0.984077 0.984085 0.984092 0.984098 0.984102 0.984104 0.984104 0.984102 0.984098 0.984092 0.984085 0.984077
           0.984069 0.98406 0.984053 0.984049
         </DataArray>
-        <DataArray type="Float32" Name="velocity_liquid (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           -0.00092535 -0.00574946 0 -0.00180336 -0.00672229 0 -0.00157664 -0.00685434 0 -0.00124015 -0.00683208 0
           -0.000959815 -0.0067982 0 -0.000736495 -0.00677507 0 -0.000549584 -0.0067618 0 -0.000382941 -0.00675481 0
           -0.000226667 -0.00675143 0 -7.51102e-05 -0.00675009 0 7.51102e-05 -0.00675009 0 0.000226667 -0.00675143 0
diff --git a/test/references/test_stokes1p2cnidarcy2p2cni_vertical_darcy-reference.vtu b/test/references/test_stokes1p2cnidarcy2p2cni_vertical_darcy-reference.vtu
index 03cf738c18cf30afeea5af39bf8649efc7d0c55f..e9062df9554f8c585545fe92ee2d8ca2c1513b2c 100644
--- a/test/references/test_stokes1p2cnidarcy2p2cni_vertical_darcy-reference.vtu
+++ b/test/references/test_stokes1p2cnidarcy2p2cni_vertical_darcy-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="400" NumberOfPoints="441">
-      <CellData Scalars="S_n" Vectors="velocity_liquid (m/s)">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_gas" Vectors="velocity_liq (m/s)">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -39,7 +39,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -75,7 +75,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100001 100001 100001 100001 100001 100001 100001 100001 100001 100001 100001 100001
           100001 100001 100001 100001 100001 100001 100001 100001 100003 100003 100003 100003
           100003 100003 100003 100003 100003 100003 100003 100003 100003 100003 100003 100003
@@ -111,7 +111,7 @@
           100044 100044 100044 100044 100044 100044 100044 100044 100044 100044 100044 100044
           100044 100044 100044 100044
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           96317 96317 96317 96317 96317 96317 96317 96317 96317 96317 96317 96317
           96317 96317 96317 96317 96317 96317 96317 96317 96319.2 96319.2 96319.2 96319.2
           96319.2 96319.2 96319.2 96319.2 96319.2 96319.2 96319.2 96319.2 96319.2 96319.2 96319.2 96319.2
@@ -255,7 +255,7 @@
           1.18867 1.18867 1.18867 1.18867 1.18867 1.18867 1.18867 1.18867 1.18867 1.18867 1.18867 1.18867
           1.18867 1.18867 1.18867 1.18867
         </DataArray>
-        <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -291,7 +291,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           55022.6 55022.6 55022.6 55022.6 55022.6 55022.6 55022.6 55022.6 55022.6 55022.6 55022.6 55022.6
           55022.6 55022.6 55022.6 55022.6 55022.6 55022.6 55022.6 55022.6 55022.6 55022.6 55022.6 55022.6
           55022.6 55022.6 55022.6 55022.6 55022.6 55022.6 55022.6 55022.6 55022.6 55022.6 55022.6 55022.6
@@ -327,7 +327,7 @@
           55022.5 55022.5 55022.5 55022.5 55022.5 55022.6 55022.6 55022.5 55022.5 55022.5 55022.5 55022.5
           55022.5 55022.5 55022.5 55022.5
         </DataArray>
-        <DataArray type="Float32" Name="X_liquid^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           -1.68053e-15 -1.7702e-15 -1.91706e-15 -2.07822e-15 -2.22191e-15 -2.33429e-15 -2.41475e-15 -2.46839e-15 -2.50086e-15 -2.51612e-15 -2.51609e-15 -2.50078e-15
           -2.46827e-15 -2.41462e-15 -2.33417e-15 -2.22181e-15 -2.07813e-15 -1.91699e-15 -1.77016e-15 -1.6805e-15 -2.317e-15 -2.44948e-15 -2.66466e-15 -2.89815e-15
           -3.10382e-15 -3.26287e-15 -3.37574e-15 -3.45058e-15 -3.49576e-15 -3.51698e-15 -3.51694e-15 -3.49564e-15 -3.45041e-15 -3.37556e-15 -3.2627e-15 -3.10367e-15
@@ -363,7 +363,7 @@
           -4.0517e-15 -4.36073e-15 -4.5633e-15 -4.70411e-15 -4.79686e-15 -4.84339e-15 -4.84319e-15 -4.79623e-15 -4.70265e-15 -4.56262e-15 -4.36047e-15 -4.05151e-15
           -3.48232e-15 -2.26867e-15 -5.23427e-17 -5.9388e-17
         </DataArray>
-        <DataArray type="Float32" Name="X_liquid^Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Air_liq" NumberOfComponents="1" format="ascii">
           1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05
           1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05
           1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05
@@ -399,7 +399,7 @@
           1.50531e-05 1.50531e-05 1.50531e-05 1.50531e-05 1.50531e-05 1.50531e-05 1.50531e-05 1.50531e-05 1.50531e-05 1.50531e-05 1.50531e-05 1.50531e-05
           1.50531e-05 1.50531e-05 1.50531e-05 1.50531e-05
         </DataArray>
-        <DataArray type="Float32" Name="X_gas^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_gas" NumberOfComponents="1" format="ascii">
           -3.94935e-17 -4.16009e-17 -4.50521e-17 -4.88395e-17 -5.22164e-17 -5.48574e-17 -5.67482e-17 -5.80088e-17 -5.87719e-17 -5.91305e-17 -5.91297e-17 -5.87699e-17
           -5.80061e-17 -5.67452e-17 -5.48546e-17 -5.2214e-17 -4.88375e-17 -4.50506e-17 -4.15999e-17 -3.94928e-17 -5.44498e-17 -5.75632e-17 -6.26199e-17 -6.8107e-17
           -7.29402e-17 -7.66779e-17 -7.93304e-17 -8.10892e-17 -8.21509e-17 -8.26495e-17 -8.26485e-17 -8.21481e-17 -8.10852e-17 -7.93261e-17 -7.66739e-17 -7.29367e-17
@@ -435,7 +435,7 @@
           -9.51795e-17 -1.02439e-16 -1.07198e-16 -1.10505e-16 -1.12684e-16 -1.13777e-16 -1.13773e-16 -1.12669e-16 -1.10471e-16 -1.07182e-16 -1.02433e-16 -9.51751e-17
           -8.18042e-17 -5.32939e-17 -1.2296e-18 -1.3951e-18
         </DataArray>
-        <DataArray type="Float32" Name="X_gas^Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Air_gas" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -471,7 +471,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="x_liquid^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           -2.70151e-15 -2.84566e-15 -3.08173e-15 -3.3408e-15 -3.5718e-15 -3.75245e-15 -3.88179e-15 -3.96802e-15 -4.02021e-15 -4.04474e-15 -4.04469e-15 -4.02008e-15
           -3.96783e-15 -3.88158e-15 -3.75226e-15 -3.57163e-15 -3.34067e-15 -3.08163e-15 -2.84559e-15 -2.70146e-15 -3.72465e-15 -3.93763e-15 -4.28353e-15 -4.65887e-15
           -4.98949e-15 -5.24517e-15 -5.42661e-15 -5.54692e-15 -5.61955e-15 -5.65366e-15 -5.65359e-15 -5.61936e-15 -5.54666e-15 -5.42632e-15 -5.2449e-15 -4.98926e-15
@@ -507,7 +507,7 @@
           -6.51324e-15 -7.01002e-15 -7.33565e-15 -7.56201e-15 -7.71111e-15 -7.78591e-15 -7.78559e-15 -7.7101e-15 -7.55967e-15 -7.33456e-15 -7.00961e-15 -6.51294e-15
           -5.59795e-15 -3.64696e-15 -8.41426e-17 -9.54682e-17
         </DataArray>
-        <DataArray type="Float32" Name="x_liquid^Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_liq" NumberOfComponents="1" format="ascii">
           1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05
           1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05
           1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05
@@ -543,7 +543,7 @@
           1.50531e-05 1.50531e-05 1.50531e-05 1.50531e-05 1.50531e-05 1.50531e-05 1.50531e-05 1.50531e-05 1.50531e-05 1.50531e-05 1.50531e-05 1.50531e-05
           1.50531e-05 1.50531e-05 1.50531e-05 1.50531e-05
         </DataArray>
-        <DataArray type="Float32" Name="x_gas^H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           -6.34872e-17 -6.68749e-17 -7.24227e-17 -7.85111e-17 -8.39396e-17 -8.81852e-17 -9.12246e-17 -9.32512e-17 -9.44777e-17 -9.50542e-17 -9.5053e-17 -9.44746e-17
           -9.32468e-17 -9.12198e-17 -8.81806e-17 -8.39357e-17 -7.85079e-17 -7.24204e-17 -6.68733e-17 -6.3486e-17 -8.75299e-17 -9.25348e-17 -1.00664e-16 -1.09484e-16
           -1.17254e-16 -1.23262e-16 -1.27526e-16 -1.30354e-16 -1.3206e-16 -1.32862e-16 -1.3286e-16 -1.32056e-16 -1.30347e-16 -1.27519e-16 -1.23256e-16 -1.17248e-16
@@ -579,7 +579,7 @@
           -1.53004e-16 -1.64674e-16 -1.72324e-16 -1.77641e-16 -1.81144e-16 -1.82901e-16 -1.82893e-16 -1.8112e-16 -1.77586e-16 -1.72298e-16 -1.64664e-16 -1.52997e-16
           -1.31503e-16 -8.56717e-17 -1.97662e-18 -2.24267e-18
         </DataArray>
-        <DataArray type="Float32" Name="x_gas^Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -723,7 +723,7 @@
           293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
           293.15 293.15 293.15 293.15
         </DataArray>
-        <DataArray type="Float32" Name="velocity_liquid (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           -0 -0 0 -0 -0 0 -0 -0 0 -0 -0 0
           -0 -0 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_stokes1p2cnidarcy2p2cni_vertical_stokes-reference.vtu b/test/references/test_stokes1p2cnidarcy2p2cni_vertical_stokes-reference.vtu
index 4d988186d8bdfad50024853bd6797b83b7249a76..b1964deb5972e4c45bf818bd5bd94cd6de844175 100644
--- a/test/references/test_stokes1p2cnidarcy2p2cni_vertical_stokes-reference.vtu
+++ b/test/references/test_stokes1p2cnidarcy2p2cni_vertical_stokes-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="400" NumberOfPoints="441">
-      <CellData Scalars="p" Vectors="velocity_liquid (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           100044 100044 100044 100044 100044 100044 100044 100044 100044 100044 100044 100044
           100044 100044 100044 100044 100044 100044 100044 100044 100044 100044 100044 100044
@@ -291,7 +291,7 @@
           293.146 293.146 293.146 293.145 293.145 293.145 293.145 293.145 293.145 293.146 293.146 293.146
           293.147 293.148 293.149 293.15
         </DataArray>
-        <DataArray type="Float32" Name="velocity_liquid (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           -0.000925729 -0.00574904 0 -0.00180581 -0.00672058 0 -0.00158322 -0.00685186 0 -0.00125148 -0.0068297 0
           -0.000974899 -0.00679665 0 -0.000753262 -0.00677471 0 -0.000565602 -0.00676262 0 -0.000396017 -0.0067566 0
           -0.000235167 -0.00675386 0 -7.80518e-05 -0.00675284 0 7.80504e-05 -0.00675285 0 0.000235166 -0.00675386 0
diff --git a/test/references/test_stokes1p2cnidarcy2p2cnihorizontal_darcy-reference.vtu b/test/references/test_stokes1p2cnidarcy2p2cnihorizontal_darcy-reference.vtu
index a21bc97f3c11c5e26a4ca9150ddfcb8d5378ad8d..97961a0fcb3d5388fa573b9f977da242e9324188 100644
--- a/test/references/test_stokes1p2cnidarcy2p2cnihorizontal_darcy-reference.vtu
+++ b/test/references/test_stokes1p2cnidarcy2p2cnihorizontal_darcy-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="64" NumberOfPoints="81">
-      <CellData Scalars="porosity" Vectors="velocity_liquid (m/s)">
+      <CellData Scalars="porosity" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="porosity" NumberOfComponents="1" format="ascii">
           0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41
           0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41
@@ -19,7 +19,7 @@
           3727.79 3711.57 3700.4 3692.79 3687 3682.3 3678.75 3677.96 4302.49 4302.49 4302.49 4302.49
           4302.49 4302.49 4302.49 4302.49
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           0.766373 0.766373 0.766373 0.766373 0.766373 0.766373 0.766373 0.766373 0.181876 0.181876 0.181875 0.181873
           0.181872 0.181871 0.18187 0.181869 0.0622745 0.0622754 0.0622759 0.0622761 0.062276 0.0622759 0.0622757 0.0622756
           0.0336659 0.0336764 0.0336858 0.0336929 0.0336983 0.0337025 0.0337054 0.0337064 0.0225137 0.0225507 0.0225809 0.0226025
@@ -27,7 +27,7 @@
           0.00971054 0.00998464 0.0101734 0.010302 0.0103998 0.0104792 0.0105392 0.0105526 0 0 0 0
           0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           98653.5 98653.5 98653.5 98653.5 98653.5 98653.5 98653.5 98653.5 97945.1 97945.1 97945.1 97945.1
           97945.1 97945.1 97945.1 97945.1 97472.3 97472.3 97472.3 97472.3 97472.3 97472.3 97472.3 97472.3
           97148.8 97148.9 97149.1 97149.2 97149.3 97149.4 97149.4 97149.4 96896.9 96898 96898.9 96899.6
@@ -35,7 +35,7 @@
           96272.3 96288.5 96299.7 96307.3 96313.1 96317.8 96321.3 96322.1 95697.5 95697.5 95697.5 95697.5
           95697.5 95697.5 95697.5 95697.5
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           999.353 999.354 999.356 999.359 999.362 999.364 999.366 999.367 999.32 999.323 999.329 999.335
           999.341 999.346 999.35 999.352 999.277 999.284 999.296 999.308 999.32 999.33 999.337 999.341
           999.232 999.247 999.267 999.287 999.306 999.321 999.331 999.336 999.176 999.209 999.245 999.273
@@ -43,7 +43,7 @@
           999.088 999.154 999.216 999.258 999.289 999.314 999.331 999.337 267.146 322.082 362.104 393.653
           419.704 442.232 460.557 464.397
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           343.429 343.332 343.157 342.935 342.703 342.494 342.337 342.253 4.7945 4.79109 4.78519 4.77808
           4.77096 4.76481 4.76034 4.758 0.194259 0.193934 0.193411 0.192825 0.192272 0.191815 0.191493 0.19133
           0.0274416 0.0273767 0.0272683 0.0271516 0.0270459 0.0269612 0.0269032 0.026874 0.00682694 0.00683274 0.00682083 0.00679826
@@ -51,7 +51,7 @@
           0.000166205 0.000193139 0.000212592 0.000225956 0.000236209 0.000244749 0.000251418 0.0002528 0 0 0 0
           0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.233627 0.233627 0.233627 0.233627 0.233627 0.233627 0.233627 0.233627 0.818124 0.818124 0.818125 0.818127
           0.818128 0.818129 0.81813 0.818131 0.937725 0.937725 0.937724 0.937724 0.937724 0.937724 0.937724 0.937724
           0.966334 0.966324 0.966314 0.966307 0.966302 0.966298 0.966295 0.966294 0.977486 0.977449 0.977419 0.977398
@@ -59,7 +59,7 @@
           0.990289 0.990015 0.989827 0.989698 0.9896 0.989521 0.989461 0.989447 1 1 1 1
           1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100002 100002 100002 100002 100002 100002 100002 100002 100002 100002 100002 100002
           100002 100002 100002 100002 100001 100001 100001 100001 100001 100001 100001 100001
           100001 100001 100001 100001 100001 100001 100001 100001 100000 100000 100000 100000
@@ -67,7 +67,7 @@
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.20963 1.20968 1.20976 1.20987 1.20998 1.21008 1.21016 1.2102 1.20837 1.20848 1.20868 1.20892
           1.20916 1.20937 1.20952 1.2096 1.20668 1.20696 1.2074 1.20789 1.20836 1.20875 1.20902 1.20916
           1.20493 1.20549 1.20627 1.20708 1.2078 1.20838 1.20878 1.20897 1.20329 1.20426 1.20544 1.20653
@@ -75,7 +75,7 @@
           1.20074 1.20267 1.20447 1.20595 1.20716 1.20813 1.20879 1.20902 1.20558 1.20737 1.20894 1.21022
           1.21126 1.21209 1.21265 1.21282
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           3444.23 3444.31 3444.45 3444.63 3444.82 3445 3445.13 3445.2 41315.8 41318.2 41322.4 41327.4
           41332.4 41336.8 41340 41341.6 52673.4 52680.5 52691.9 52704.7 52716.9 52727 52734.2 52737.8
           55260.5 55274.8 55295.6 55317 55336.3 55351.8 55362.5 55367.7 55891.1 55914.2 55943.8 55972.9
@@ -83,7 +83,7 @@
           56232.1 56278 56321.7 56359.9 56392.1 56417.5 56435 56441.1 55871.9 55973.1 56053.4 56117.7
           56170.1 56212.4 56243.1 56251.2
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983
           0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983
           0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999984 0.999983 0.999983 0.999983
@@ -91,7 +91,7 @@
           0.999984 0.999984 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.267375 0.322337 0.362368 0.393923
           0.419981 0.442513 0.460842 0.464682
         </DataArray>
-        <DataArray type="Float32" Name="x^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_liq" NumberOfComponents="1" format="ascii">
           1.69292e-05 1.69329e-05 1.69396e-05 1.69482e-05 1.69572e-05 1.69653e-05 1.69714e-05 1.69746e-05 1.6829e-05 1.68381e-05 1.68539e-05 1.6873e-05
           1.68923e-05 1.6909e-05 1.69212e-05 1.69276e-05 1.66966e-05 1.67183e-05 1.6753e-05 1.6792e-05 1.6829e-05 1.68599e-05 1.68818e-05 1.68929e-05
           1.6561e-05 1.6604e-05 1.66651e-05 1.67281e-05 1.67848e-05 1.68307e-05 1.68625e-05 1.68779e-05 1.6437e-05 1.65101e-05 1.66001e-05 1.6685e-05
@@ -115,7 +115,7 @@
           0.982815 0.98329 0.983731 0.984057 0.984304 0.9845 0.984635 0.984681 0.99534 0.994574 0.994079 0.993707
           0.993402 0.993141 0.992925 0.992886
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_liq" NumberOfComponents="1" format="ascii">
           55472.3 55472.3 55472.4 55472.6 55472.7 55472.9 55473 55473.1 55470.5 55470.6 55470.9 55471.2
           55471.6 55471.9 55472.1 55472.2 55468.1 55468.5 55469.1 55469.8 55470.4 55471 55471.4 55471.6
           55465.5 55466.4 55467.5 55468.6 55469.6 55470.5 55471 55471.3 55462.4 55464.3 55466.3 55467.8
@@ -131,7 +131,7 @@
           41.7335 41.7929 41.8483 41.8947 41.9328 41.9631 41.984 41.9912 41.7025 41.7768 41.8389 41.8891
           41.93 41.9626 41.9855 41.9921
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973
           0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973
           0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999974 0.999973 0.999973 0.999973
@@ -139,7 +139,7 @@
           0.999974 0.999974 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.267365 0.322327 0.362358 0.393913
           0.41997 0.442502 0.460832 0.464672
         </DataArray>
-        <DataArray type="Float32" Name="X^Air_liquid" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^Air_liq" NumberOfComponents="1" format="ascii">
           2.72139e-05 2.72199e-05 2.72307e-05 2.72445e-05 2.7259e-05 2.7272e-05 2.72818e-05 2.7287e-05 2.70529e-05 2.70675e-05 2.70929e-05 2.71237e-05
           2.71546e-05 2.71815e-05 2.72011e-05 2.72114e-05 2.684e-05 2.68749e-05 2.69307e-05 2.69934e-05 2.7053e-05 2.71026e-05 2.71377e-05 2.71556e-05
           2.6622e-05 2.66912e-05 2.67895e-05 2.68907e-05 2.69818e-05 2.70556e-05 2.71067e-05 2.71315e-05 2.64227e-05 2.65403e-05 2.6685e-05 2.68214e-05
@@ -179,7 +179,7 @@
           288.197 287.787 287.406 287.087 286.826 286.619 286.476 286.428 288.406 287.893 287.466 287.121
           286.841 286.618 286.462 286.417
         </DataArray>
-        <DataArray type="Float32" Name="velocity_liquid (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           -3.17449e-10 1.02579e-08 0 -4.23469e-10 9.96599e-09 0 -5.77539e-10 9.64492e-09 0 -6.24307e-10 9.3715e-09 0
           -5.816e-10 9.14864e-09 0 -4.67422e-10 8.97467e-09 0 -3.00504e-10 8.85593e-09 0 -2.06339e-10 8.80608e-09 0
           4.56367e-11 1.18029e-08 0 6.60727e-11 1.15148e-08 0 9.83534e-11 1.12086e-08 0 1.12101e-10 1.09525e-08 0
diff --git a/test/references/test_stokes1pdarcy1phorizontal_darcy-reference.vtu b/test/references/test_stokes1pdarcy1phorizontal_darcy-reference.vtu
index 67408ce78a2d93079ad35e1e205788977538d453..e72163d381839c6a28ca3c0d5aed00f8ae291c57 100644
--- a/test/references/test_stokes1pdarcy1phorizontal_darcy-reference.vtu
+++ b/test/references/test_stokes1pdarcy1phorizontal_darcy-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="400" NumberOfPoints="441">
-      <CellData Scalars="p" Vectors="velocity_SimpleH2O (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           5.3505e-10 5.34186e-10 5.32478e-10 5.2997e-10 5.26724e-10 5.22821e-10 5.18358e-10 5.13444e-10 5.082e-10 5.02756e-10 4.97244e-10 4.918e-10
           4.86556e-10 4.81642e-10 4.77179e-10 4.73276e-10 4.7003e-10 4.67522e-10 4.65814e-10 4.6495e-10 5.35915e-10 5.35029e-10 5.33278e-10 5.30708e-10
@@ -39,7 +39,7 @@
           7.59057e-10 7.12655e-10 6.65773e-10 6.1859e-10 5.71222e-10 5.23751e-10 4.76249e-10 4.28778e-10 3.8141e-10 3.34227e-10 2.87345e-10 2.40943e-10
           1.95339e-10 1.51216e-10 1.10363e-10 7.86106e-11
         </DataArray>
-        <DataArray type="Float32" Name="velocity_SimpleH2O (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           1.72934e-14 -1.72934e-14 0 2.57236e-14 -1.68605e-14 0 4.21573e-14 -1.6007e-14 0 5.75391e-14 -1.47566e-14 0
           7.14891e-14 -1.31434e-14 0 8.3666e-14 -1.12105e-14 0 9.37751e-14 -9.00766e-15 0 1.01574e-13 -6.59017e-15 0
           1.06878e-13 -4.017e-15 0 1.09561e-13 -1.34953e-15 0 1.09561e-13 1.34953e-15 0 1.06878e-13 4.017e-15 0
diff --git a/test/references/test_stokes1pdarcy1phorizontal_stokes-reference.vtu b/test/references/test_stokes1pdarcy1phorizontal_stokes-reference.vtu
index c9de1ed63f0c837a6d7ea68b3d26b19794ac775f..19ac93082277978b5a5740ce4adf4b88dbc7d4b8 100644
--- a/test/references/test_stokes1pdarcy1phorizontal_stokes-reference.vtu
+++ b/test/references/test_stokes1pdarcy1phorizontal_stokes-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="400" NumberOfPoints="441">
-      <CellData Scalars="p" Vectors="velocity_SimpleH2O (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           9.74982e-10 9.24992e-10 8.74996e-10 8.24998e-10 7.74998e-10 7.24999e-10 6.74999e-10 6.24999e-10 5.75e-10 5.25e-10 4.75e-10 4.25e-10
           3.75001e-10 3.25001e-10 2.75001e-10 2.25002e-10 1.75002e-10 1.25004e-10 7.50078e-11 2.50184e-11 9.74989e-10 9.24992e-10 8.74995e-10 8.24997e-10
@@ -111,7 +111,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="velocity_SimpleH2O (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           1.29871e-08 -1.97439e-12 0 1.29869e-08 -1.40652e-12 0 1.29869e-08 -1.05853e-12 0 1.29869e-08 -8.2115e-13 0
           1.29869e-08 -6.422e-13 0 1.29869e-08 -4.96396e-13 0 1.29869e-08 -3.70596e-13 0 1.29869e-08 -2.57269e-13 0
           1.29869e-08 -1.51593e-13 0 1.29869e-08 -5.00881e-14 0 1.29869e-08 5.00881e-14 0 1.29869e-08 1.51593e-13 0
diff --git a/test/references/test_stokes1pdarcy1pvertical_darcy-reference.vtu b/test/references/test_stokes1pdarcy1pvertical_darcy-reference.vtu
index d4abc24a0047568c4cd33e9ea60ffd1cc9b9bb6f..66dd605c35624e922d060c8eb76d1103526b5627 100644
--- a/test/references/test_stokes1pdarcy1pvertical_darcy-reference.vtu
+++ b/test/references/test_stokes1pdarcy1pvertical_darcy-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="400" NumberOfPoints="441">
-      <CellData Scalars="p" Vectors="velocity_SimpleH2O (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           0.33375 0.33375 0.33375 0.33375 0.33375 0.33375 0.33375 0.33375 0.33375 0.33375 0.33375 0.33375
           0.33375 0.33375 0.33375 0.33375 0.33375 0.33375 0.33375 0.33375 1.00125 1.00125 1.00125 1.00125
@@ -39,7 +39,7 @@
           13.0162 13.0162 13.0162 13.0162 13.0162 13.0162 13.0162 13.0162 13.0162 13.0162 13.0162 13.0162
           13.0162 13.0162 13.0162 13.0162
         </DataArray>
-        <DataArray type="Float32" Name="velocity_SimpleH2O (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           -4.18887e-19 -6.675e-07 0 -6.07042e-19 -6.675e-07 0 -9.43134e-19 -6.675e-07 0 -1.18444e-18 -6.675e-07 0
           -1.30781e-18 -6.675e-07 0 -1.3024e-18 -6.675e-07 0 -1.17034e-18 -6.675e-07 0 -9.25787e-19 -6.675e-07 0
           -5.9297e-19 -6.675e-07 0 -2.04031e-19 -6.675e-07 0 2.04059e-19 -6.675e-07 0 5.92915e-19 -6.675e-07 0
diff --git a/test/references/test_stokes1pdarcy1pvertical_stokes-reference.vtu b/test/references/test_stokes1pdarcy1pvertical_stokes-reference.vtu
index 254088c0c2ab45b0a6d2107008102b6e84cdc48b..16dc9c8d7afc00932da435ad48217d9f7e5fcb46 100644
--- a/test/references/test_stokes1pdarcy1pvertical_stokes-reference.vtu
+++ b/test/references/test_stokes1pdarcy1pvertical_stokes-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="400" NumberOfPoints="441">
-      <CellData Scalars="p" Vectors="velocity_SimpleH2O (m/s)">
+      <CellData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           13.35 13.35 13.35 13.35 13.35 13.35 13.35 13.35 13.35 13.35 13.35 13.35
           13.35 13.35 13.35 13.35 13.35 13.35 13.35 13.35 13.35 13.35 13.35 13.35
@@ -111,7 +111,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="velocity_SimpleH2O (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           -9.25107e-08 -5.74989e-07 0 -1.80047e-07 -6.72475e-07 0 -1.56756e-07 -6.85816e-07 0 -1.22332e-07 -6.83608e-07 0
           -9.36e-08 -6.80124e-07 0 -7.08437e-08 -6.77632e-07 0 -5.21269e-08 -6.76085e-07 0 -3.58721e-08 -6.7517e-07 0
           -2.10384e-08 -6.74663e-07 0 -6.93745e-09 -6.74438e-07 0 6.93748e-09 -6.74437e-07 0 2.10384e-08 -6.74663e-07 0
diff --git a/test/references/test_stokes1pdarcy2pvertical_darcy-reference.vtu b/test/references/test_stokes1pdarcy2pvertical_darcy-reference.vtu
index be7cc1399c94a489366b0bc16a51e5ceed568aed..cf5c05da79310328147889106295c0e4cf7cf8f1 100644
--- a/test/references/test_stokes1pdarcy2pvertical_darcy-reference.vtu
+++ b/test/references/test_stokes1pdarcy2pvertical_darcy-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="400" NumberOfPoints="441">
-      <CellData Scalars="porosity" Vectors="velocity_SimpleH2O (m/s)">
+      <CellData Scalars="porosity" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="porosity" NumberOfComponents="1" format="ascii">
           0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41
           0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41
@@ -75,7 +75,7 @@
           1618.74 1618.74 1618.74 1618.74 1618.74 1618.74 1618.74 1618.74 1618.74 1618.74 1618.74 1618.74
           1618.74 1618.74 1618.74 1618.74
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           0.499567 0.499567 0.499567 0.499567 0.499567 0.499567 0.499567 0.499567 0.499567 0.499567 0.499567 0.499567
           0.499567 0.499567 0.499567 0.499567 0.499567 0.499567 0.499567 0.499567 0.498705 0.498705 0.498705 0.498705
           0.498705 0.498705 0.498705 0.498705 0.498705 0.498705 0.498705 0.498705 0.498705 0.498705 0.498705 0.498705
@@ -111,7 +111,7 @@
           0.483966 0.483966 0.483966 0.483966 0.483966 0.483966 0.483966 0.483966 0.483966 0.483966 0.483966 0.483966
           0.483966 0.483966 0.483966 0.483966
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           98395 98395 98395 98395 98395 98395 98395 98395 98395 98395 98395 98395
           98395 98395 98395 98395 98395 98395 98395 98395 98395.2 98395.2 98395.2 98395.2
           98395.2 98395.2 98395.2 98395.2 98395.2 98395.2 98395.2 98395.2 98395.2 98395.2 98395.2 98395.2
@@ -183,7 +183,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           120.322 120.322 120.322 120.322 120.322 120.322 120.322 120.322 120.322 120.322 120.322 120.322
           120.322 120.322 120.322 120.322 120.322 120.322 120.322 120.322 119.719 119.719 119.719 119.719
           119.719 119.719 119.719 119.719 119.719 119.719 119.719 119.719 119.719 119.719 119.719 119.719
@@ -219,7 +219,7 @@
           109.712 109.712 109.712 109.712 109.712 109.712 109.712 109.712 109.712 109.712 109.712 109.712
           109.712 109.712 109.712 109.712
         </DataArray>
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0.500433 0.500433 0.500433 0.500433 0.500433 0.500433 0.500433 0.500433 0.500433 0.500433 0.500433 0.500433
           0.500433 0.500433 0.500433 0.500433 0.500433 0.500433 0.500433 0.500433 0.501295 0.501295 0.501295 0.501295
           0.501295 0.501295 0.501295 0.501295 0.501295 0.501295 0.501295 0.501295 0.501295 0.501295 0.501295 0.501295
@@ -255,7 +255,7 @@
           0.516034 0.516034 0.516034 0.516034 0.516034 0.516034 0.516034 0.516034 0.516034 0.516034 0.516034 0.516034
           0.516034 0.516034 0.516034 0.516033
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
           100000 100000 100000 100000 100000 100000 100000 100000 100001 100001 100001 100001
           100001 100001 100001 100001 100001 100001 100001 100001 100001 100001 100001 100001
@@ -327,7 +327,7 @@
           1.16842 1.16842 1.16842 1.16842 1.16842 1.16842 1.16842 1.16842 1.16842 1.16842 1.16842 1.16842
           1.16842 1.16842 1.16842 1.16842
         </DataArray>
-        <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           14874.5 14874.5 14874.5 14874.5 14874.5 14874.5 14874.5 14874.5 14874.5 14874.5 14874.5 14874.5
           14874.5 14874.5 14874.5 14874.5 14874.5 14874.5 14874.5 14874.5 14926.5 14926.5 14926.5 14926.5
           14926.5 14926.5 14926.5 14926.5 14926.5 14926.5 14926.5 14926.5 14926.5 14926.5 14926.5 14926.5
@@ -363,7 +363,7 @@
           15829.4 15829.4 15829.4 15829.4 15829.4 15829.4 15829.4 15829.4 15829.4 15829.4 15829.4 15829.4
           15829.4 15829.4 15829.4 15829.4
         </DataArray>
-        <DataArray type="Float32" Name="velocity_SimpleH2O (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
           -9.27984e-17 -7.93252e-07 0 -2.78395e-16 -7.93252e-07 0 -4.17593e-16 -7.93252e-07 0 -4.63992e-16 -7.93252e-07 0
           -5.10391e-16 -7.93252e-07 0 -5.5679e-16 -7.93252e-07 0 -5.10391e-16 -7.93252e-07 0 -3.71194e-16 -7.93252e-07 0
           -2.31996e-16 -7.93252e-07 0 -9.27984e-17 -7.93252e-07 0 4.63992e-17 -7.93252e-07 0 2.78395e-16 -7.93252e-07 0
@@ -465,7 +465,7 @@
           7.50119e-14 -7.93227e-07 0 1.16516e-13 -7.93227e-07 0 1.76509e-13 -7.93227e-07 0 2.78682e-13 -7.93227e-07 0
           4.88402e-13 -7.93227e-07 0 1.00253e-12 -7.93227e-07 0 3.63937e-12 -7.93227e-07 0 5.90593e-12 -7.93223e-07 0
         </DataArray>
-        <DataArray type="Float32" Name="velocity_Air (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_gas (m/s)" NumberOfComponents="3" format="ascii">
           -1.49136e-13 -0.00067899 0 -2.23703e-13 -0.00067899 0 -3.44159e-13 -0.00067899 0 -4.30199e-13 -0.00067899 0
           -4.76087e-13 -0.00067899 0 -4.76087e-13 -0.00067899 0 -4.30199e-13 -0.00067899 0 -3.32687e-13 -0.00067899 0
           -2.12231e-13 -0.00067899 0 -7.45678e-14 -0.00067899 0 7.45678e-14 -0.00067899 0 2.12231e-13 -0.00067899 0
diff --git a/test/references/test_stokes1pdarcy2pvertical_stokes-reference.vtu b/test/references/test_stokes1pdarcy2pvertical_stokes-reference.vtu
index e9e90f9a9393a889a72b6e1e5c27891ffd697e3d..bf264f68b6443031f749b560fd8faa2c0a0671bc 100644
--- a/test/references/test_stokes1pdarcy2pvertical_stokes-reference.vtu
+++ b/test/references/test_stokes1pdarcy2pvertical_stokes-reference.vtu
@@ -2,7 +2,7 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="400" NumberOfPoints="441">
-      <CellData Scalars="p" Vectors="velocity_Air (m/s)">
+      <CellData Scalars="p" Vectors="velocity_gas (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
           100016 100016 100016 100016 100016 100016 100016 100016 100016 100016 100016 100016
           100016 100016 100016 100016 100016 100016 100016 100016 100016 100016 100016 100016
@@ -111,7 +111,7 @@
           1.18835 1.18835 1.18835 1.18835 1.18835 1.18835 1.18835 1.18835 1.18835 1.18835 1.18835 1.18835
           1.18835 1.18835 1.18835 1.18835
         </DataArray>
-        <DataArray type="Float32" Name="velocity_Air (m/s)" NumberOfComponents="3" format="ascii">
+        <DataArray type="Float32" Name="velocity_gas (m/s)" NumberOfComponents="3" format="ascii">
           -9.26552e-05 -0.000574837 0 -0.00018043 -0.000672385 0 -0.00015725 -0.0006858 0 -0.00012282 -0.000683631 0
           -9.40281e-05 -0.000680162 0 -7.11934e-05 -0.000677673 0 -5.23954e-05 -0.000676125 0 -3.60613e-05 -0.00067521 0
           -2.11507e-05 -0.000674702 0 -6.97471e-06 -0.000674475 0 6.97471e-06 -0.000674475 0 2.11507e-05 -0.000674702 0
diff --git a/test/references/waterairbox-reference.vtu b/test/references/waterairbox-reference.vtu
index a85d1a377ea2fef6bb4aa3d9c43c22e9afa192b3..06c61d248301014937fc3cedcac541bbce8d4349 100644
--- a/test/references/waterairbox-reference.vtu
+++ b/test/references/waterairbox-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="4096" NumberOfPoints="4225">
-      <PointData Scalars="S_n">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="S_gas">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -358,7 +358,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -713,7 +713,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           9.92e+06 9.9209e+06 9.91387e+06 9.91478e+06 9.92181e+06 9.9157e+06 9.92274e+06 9.91662e+06 9.92367e+06 9.91756e+06 9.92462e+06 9.9185e+06
           9.92558e+06 9.91946e+06 9.92655e+06 9.92043e+06 9.92754e+06 9.92142e+06 9.92854e+06 9.92242e+06 9.92957e+06 9.92345e+06 9.93062e+06 9.9245e+06
           9.9317e+06 9.92558e+06 9.93282e+06 9.92668e+06 9.93397e+06 9.92783e+06 9.93516e+06 9.92902e+06 9.93641e+06 9.93027e+06 9.93772e+06 9.93158e+06
@@ -1068,7 +1068,7 @@
           9.53433e+06 9.53385e+06 9.53335e+06 9.53283e+06 9.53229e+06 9.53175e+06 9.53118e+06 9.53061e+06 9.53003e+06 9.52944e+06 9.52884e+06 9.52823e+06
           9.5276e+06
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           9.91e+06 9.9109e+06 9.90387e+06 9.90478e+06 9.91181e+06 9.9057e+06 9.91274e+06 9.90662e+06 9.91367e+06 9.90756e+06 9.91462e+06 9.9085e+06
           9.91558e+06 9.90946e+06 9.91655e+06 9.91043e+06 9.91754e+06 9.91142e+06 9.91854e+06 9.91242e+06 9.91957e+06 9.91345e+06 9.92062e+06 9.9145e+06
           9.9217e+06 9.91558e+06 9.92282e+06 9.91668e+06 9.92397e+06 9.91783e+06 9.92516e+06 9.91902e+06 9.92641e+06 9.92027e+06 9.92772e+06 9.92158e+06
@@ -1778,7 +1778,7 @@
           10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
           10000
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           996.524 996.524 996.529 996.529 996.525 996.529 996.525 996.53 996.526 996.53 996.526 996.531
           996.526 996.531 996.527 996.531 996.527 996.532 996.528 996.532 996.528 996.533 996.529 996.533
           996.529 996.534 996.529 996.534 996.53 996.534 996.531 996.535 996.531 996.535 996.532 996.536
@@ -2133,7 +2133,7 @@
           996.821 996.821 996.821 996.82 996.82 996.82 996.82 996.82 996.819 996.819 996.819 996.819
           996.818
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           0.0510122 0.0510106 0.0509622 0.0509623 0.0510106 0.0509623 0.0510106 0.0509624 0.0510107 0.0509624 0.0510107 0.0509624
           0.0510107 0.0509625 0.0510108 0.0509625 0.0510108 0.0509626 0.0510109 0.0509626 0.0510109 0.0509626 0.0510109 0.0509627
           0.051011 0.0509627 0.051011 0.0509628 0.0510111 0.0509628 0.0510112 0.0509629 0.0510134 0.0509633 0.0510796 0.0509748
@@ -2488,7 +2488,7 @@
           0.0479096 0.0479096 0.0479096 0.0479096 0.0479096 0.0479096 0.0479095 0.0479095 0.0479095 0.0479095 0.0479095 0.0479094
           0.047908
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           1523.7 1523.68 1523.18 1523.18 1523.68 1523.18 1523.68 1523.18 1523.68 1523.18 1523.68 1523.18
           1523.68 1523.18 1523.68 1523.18 1523.68 1523.18 1523.68 1523.18 1523.68 1523.18 1523.68 1523.18
           1523.68 1523.18 1523.68 1523.18 1523.68 1523.18 1523.68 1523.18 1523.68 1523.18 1523.68 1523.18
@@ -2843,7 +2843,7 @@
           1490.54 1490.54 1490.54 1490.54 1490.54 1490.54 1490.54 1490.54 1490.54 1490.54 1490.54 1490.54
           1490.52
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -3198,7 +3198,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_liq" NumberOfComponents="1" format="ascii">
           55315.8 55315.8 55316 55316.1 55315.8 55316.1 55315.9 55316.1 55315.9 55316.1 55315.9 55316.2
           55315.9 55316.2 55316 55316.2 55316 55316.2 55316 55316.2 55316 55316.3 55316 55316.3
           55316.1 55316.3 55316.1 55316.3 55316.1 55316.4 55316.2 55316.4 55316.2 55316.4 55316.2 55316.5
@@ -3553,7 +3553,7 @@
           55332.3 55332.3 55332.3 55332.2 55332.2 55332.2 55332.2 55332.2 55332.2 55332.2 55332.2 55332.1
           55332.1
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_gas" NumberOfComponents="1" format="ascii">
           2.83162 2.83153 2.82885 2.82885 2.83153 2.82886 2.83154 2.82886 2.83154 2.82886 2.83154 2.82886
           2.83154 2.82886 2.83154 2.82887 2.83155 2.82887 2.83155 2.82887 2.83155 2.82887 2.83155 2.82887
           2.83155 2.82888 2.83156 2.82888 2.83156 2.82888 2.83156 2.82889 2.83164 2.8289 2.83401 2.82931
@@ -3908,7 +3908,7 @@
           2.6594 2.6594 2.6594 2.6594 2.6594 2.6594 2.6594 2.6594 2.6594 2.6594 2.65939 2.65939
           2.65931
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -4263,7 +4263,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1
         </DataArray>
-        <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2_liq" NumberOfComponents="1" format="ascii">
           0 7.27664e-37 0 7.63352e-38 4.74341e-35 5.03745e-36 3.02359e-33 3.26013e-34 1.88403e-31 2.06599e-32 1.14555e-29 1.27945e-30
           6.77988e-28 7.72405e-29 3.89406e-26 4.53235e-27 2.16293e-24 2.57635e-25 1.15719e-22 1.41331e-23 5.93623e-21 7.4499e-22 2.90468e-19 3.75507e-20
           1.34758e-17 1.7998e-18 5.88629e-16 8.15111e-17 2.4009e-14 3.46307e-15 9.05433e-13 1.36899e-13 3.11899e-11 4.98957e-12 9.66424e-10 1.66011e-10
@@ -4618,7 +4618,7 @@
           -0 -0 0 0 -0 0 -0 -0 0 0 -0 -0
           0
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_gas" NumberOfComponents="1" format="ascii">
           0.00074076 0.000740669 0.00074045 0.000740383 0.000740601 0.000740315 0.000740532 0.000740246 0.000740463 0.000740177 0.000740393 0.000740107
           0.000740322 0.000740036 0.00074025 0.000739964 0.000740177 0.000739891 0.000740102 0.000739817 0.000740026 0.000739741 0.000739949 0.000739664
           0.000739869 0.000739584 0.000739786 0.000739502 0.000739701 0.000739418 0.000739613 0.00073933 0.000739509 0.000739236 0.00073907 0.000739081
@@ -4973,7 +4973,7 @@
           0.000721176 0.000721212 0.00072125 0.000721289 0.000721329 0.00072137 0.000721412 0.000721455 0.000721499 0.000721544 0.000721589 0.000721635
           0.00072166
         </DataArray>
-        <DataArray type="Float32" Name="X^N2_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2_gas" NumberOfComponents="1" format="ascii">
           0 7.49803e-34 0 7.86936e-35 4.88727e-32 5.1926e-33 3.11501e-30 3.36023e-31 1.94081e-28 2.12922e-29 1.17996e-26 1.31849e-27
           6.98286e-25 7.95894e-26 4.01026e-23 4.66972e-24 2.22724e-21 2.65417e-22 1.19148e-19 1.45586e-20 6.1115e-18 7.67337e-19 2.99012e-16 3.86729e-17
           1.38707e-14 1.85339e-15 6.05811e-13 8.39287e-14 2.4707e-11 3.56537e-12 9.31642e-10 1.40927e-10 3.20882e-08 5.1357e-09 9.93666e-07 1.70837e-07
@@ -5328,7 +5328,7 @@
           -0 -0 0 0 -0 0 -0 -0 0 0 -0 -0
           0
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
@@ -5683,7 +5683,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_liq" NumberOfComponents="1" format="ascii">
           0 4.67954e-37 0 4.90905e-38 3.05044e-35 3.23954e-36 1.94445e-33 2.09656e-34 1.2116e-31 1.32862e-32 7.36694e-30 8.22804e-31
           4.36008e-28 4.96727e-29 2.50424e-26 2.91472e-27 1.39096e-24 1.65683e-25 7.44177e-23 9.08889e-24 3.81754e-21 4.79097e-22 1.86797e-19 2.41485e-20
           8.66618e-18 1.15744e-18 3.78542e-16 5.24191e-17 1.544e-14 2.22707e-15 5.82276e-13 8.80389e-14 2.00579e-11 3.20875e-12 6.21499e-10 1.0676e-10
@@ -6038,7 +6038,7 @@
           -0 -0 0 0 -0 0 -0 -0 0 0 -0 -0
           0
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.00074076 0.000740669 0.00074045 0.000740383 0.000740601 0.000740315 0.000740532 0.000740246 0.000740463 0.000740177 0.000740393 0.000740107
           0.000740322 0.000740036 0.00074025 0.000739964 0.000740177 0.000739891 0.000740102 0.000739817 0.000740026 0.000739741 0.000739949 0.000739664
           0.000739869 0.000739584 0.000739786 0.000739502 0.000739701 0.000739418 0.000739613 0.00073933 0.000739521 0.000739238 0.000739424 0.000739142
@@ -6393,7 +6393,7 @@
           0.000721176 0.000721212 0.00072125 0.000721289 0.000721329 0.00072137 0.000721412 0.000721455 0.000721499 0.000721544 0.000721589 0.000721635
           0.00072166
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_gas" NumberOfComponents="1" format="ascii">
           0 4.82192e-34 0 5.06072e-35 3.14296e-32 3.33932e-33 2.00323e-30 2.16093e-31 1.24812e-28 1.36928e-29 7.58823e-27 8.47907e-28
           4.49062e-25 5.11832e-26 2.57896e-23 3.00306e-24 1.43232e-21 1.70688e-22 7.66228e-20 9.36249e-21 3.93025e-18 4.93468e-19 1.92292e-16 2.48702e-17
           8.92014e-15 1.1919e-15 3.89592e-13 5.39739e-14 1.58889e-11 2.29286e-12 5.99132e-10 9.06288e-11 2.0636e-08 3.30273e-09 6.39325e-07 1.09873e-07
diff --git a/test/references/wateraircc-reference.vtu b/test/references/wateraircc-reference.vtu
index 5c36a9d74e995213e9ba24b4ecc03f167ccbc8cc..0cdc48780440b4b3ce74e8538a3dcad31137f357 100644
--- a/test/references/wateraircc-reference.vtu
+++ b/test/references/wateraircc-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="4096" NumberOfPoints="4225">
-      <CellData Scalars="S_n">
-        <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="S_gas">
+        <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0.00453813 0.0995865
           0.163644 0.166523 0.166678 0.166698 0.166703 0.166699 0.16677 0.168653 0.195872 0.195061 0.194464 0.194306
@@ -347,7 +347,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 0.995462 0.900414
           0.836356 0.833477 0.833322 0.833302 0.833297 0.833301 0.83323 0.831347 0.804128 0.804939 0.805536 0.805694
@@ -691,7 +691,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           9.91737e+06 9.91825e+06 9.91914e+06 9.92004e+06 9.92095e+06 9.92187e+06 9.9228e+06 9.92375e+06 9.92471e+06 9.92569e+06 9.92669e+06 9.92772e+06
           9.92877e+06 9.92986e+06 9.93098e+06 9.93215e+06 9.93338e+06 9.93466e+06 9.93602e+06 9.93747e+06 9.93903e+06 9.94072e+06 9.94263e+06 9.946e+06
           9.9492e+06 9.95144e+06 9.95313e+06 9.95429e+06 9.95495e+06 9.95511e+06 9.95477e+06 9.95389e+06 9.95263e+06 9.95175e+06 9.95086e+06 9.94988e+06
@@ -1035,7 +1035,7 @@
           9.53857e+06 9.53818e+06 9.53777e+06 9.53733e+06 9.53688e+06 9.53641e+06 9.53592e+06 9.53541e+06 9.5349e+06 9.53436e+06 9.53382e+06 9.53327e+06
           9.5327e+06 9.53213e+06 9.53156e+06 9.53097e+06
         </DataArray>
-        <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
           9.90737e+06 9.90825e+06 9.90914e+06 9.91004e+06 9.91095e+06 9.91187e+06 9.9128e+06 9.91375e+06 9.91471e+06 9.91569e+06 9.91669e+06 9.91772e+06
           9.91877e+06 9.91986e+06 9.92098e+06 9.92215e+06 9.92338e+06 9.92466e+06 9.92602e+06 9.92747e+06 9.92903e+06 9.93072e+06 9.9326e+06 9.93531e+06
           9.93799e+06 9.94021e+06 9.94189e+06 9.94305e+06 9.94371e+06 9.94387e+06 9.94353e+06 9.94264e+06 9.94112e+06 9.94025e+06 9.93936e+06 9.93839e+06
@@ -1723,7 +1723,7 @@
           10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
           10000 10000 10000 10000
         </DataArray>
-        <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           996.526 996.527 996.527 996.528 996.528 996.528 996.529 996.529 996.53 996.53 996.53 996.531
           996.531 996.532 996.532 996.533 996.533 996.534 996.534 996.535 996.538 996.575 997.065 997.066
           997.066 997.067 997.068 997.068 997.068 997.068 997.064 996.655 962.513 958.944 958.788 958.782
@@ -2067,7 +2067,7 @@
           996.82 996.819 996.819 996.819 996.819 996.819 996.818 996.818 996.818 996.818 996.818 996.817
           996.817 996.817 996.817 996.816
         </DataArray>
-        <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           0.0509864 0.0509864 0.0509865 0.0509865 0.0509865 0.0509866 0.0509866 0.0509866 0.0509867 0.0509867 0.0509868 0.0509868
           0.0509868 0.0509869 0.0509869 0.050987 0.0509878 0.0510121 0.0517184 0.0697898 0.469495 7.84273 106.993 107.028
           107.061 107.086 107.104 107.116 107.123 107.125 107.118 106.754 89.2475 88.0152 87.9554 87.9452
@@ -2411,7 +2411,7 @@
           0.0479301 0.0479301 0.0479301 0.04793 0.04793 0.04793 0.04793 0.04793 0.04793 0.04793 0.0479299 0.0479299
           0.0479299 0.0479299 0.0479299 0.0479298
         </DataArray>
-        <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
           1523.43 1523.43 1523.43 1523.43 1523.43 1523.43 1523.43 1523.43 1523.43 1523.43 1523.43 1523.43
           1523.43 1523.43 1523.43 1523.43 1523.43 1523.43 1523.43 1523.43 1523.43 1523.46 1489.81 895.529
           610.237 599.268 598.68 598.604 598.588 598.604 598.438 602.692 1158.04 1224.25 1231.58 1232.95
@@ -2755,7 +2755,7 @@
           1490.81 1490.81 1490.8 1490.8 1490.8 1490.8 1490.8 1490.8 1490.8 1490.8 1490.8 1490.8
           1490.8 1490.8 1490.8 1490.8
         </DataArray>
-        <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0.0199118 197.881
           840.515 883.891 886.271 886.582 886.646 886.584 887.662 914.587 1238.13 1212.77 1201.75 1198.93
@@ -3099,7 +3099,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_liq" NumberOfComponents="1" format="ascii">
           55315.9 55316 55316 55316 55316 55316 55316.1 55316.1 55316.1 55316.1 55316.2 55316.2
           55316.2 55316.2 55316.3 55316.3 55316.3 55316.3 55316.4 55316.4 55316.4 55316.5 55316 55316
           55316 55316.1 55316.1 55316.1 55316.1 55316.1 55315.9 55293.5 53402.3 53203.9 53195.2 53194.9
@@ -3443,7 +3443,7 @@
           55332.2 55332.2 55332.2 55332.2 55332.2 55332.2 55332.1 55332.1 55332.1 55332.1 55332.1 55332.1
           55332.1 55332.1 55332 55332
         </DataArray>
-        <DataArray type="Float32" Name="rhoMolar_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="rhoMolar_gas" NumberOfComponents="1" format="ascii">
           2.83019 2.83019 2.8302 2.8302 2.8302 2.8302 2.8302 2.8302 2.83021 2.83021 2.83021 2.83021
           2.83021 2.83022 2.83022 2.83022 2.83025 2.83112 2.85634 3.50144 17.7698 280.973 3820.35 3821.63
           3822.8 3823.66 3824.31 3824.76 3825.01 3825.07 3824.82 3811.9 3198.22 3156.38 3154.35 3153.98
@@ -3787,7 +3787,7 @@
           2.66054 2.66054 2.66054 2.66054 2.66054 2.66053 2.66053 2.66053 2.66053 2.66053 2.66053 2.66053
           2.66053 2.66053 2.66053 2.66053
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 0.999994 0.99989 0.99849 0.998489
           0.998489 0.998488 0.998488 0.998488 0.998488 0.998488 0.998488 0.998502 0.998658 0.998636 0.998635 0.998635
@@ -4131,7 +4131,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2_liq" NumberOfComponents="1" format="ascii">
           1.71024e-39 1.20489e-37 8.30067e-36 5.59404e-34 3.68339e-32 2.36468e-30 1.4762e-28 8.93313e-27 5.22138e-25 2.9357e-23 1.58038e-21 8.10306e-20
           3.93337e-18 1.79532e-16 7.6453e-15 3.01071e-13 1.08543e-11 3.54231e-10 1.03341e-08 2.65713e-07 5.9142e-06 0.000110106 0.00151025 0.00151074
           0.00151117 0.00151151 0.00151176 0.00151194 0.00151204 0.00151206 0.00151188 0.00149823 0.00134222 0.00136396 0.00136484 0.00136474
@@ -4475,7 +4475,7 @@
           0 0 0 -0 -0 0 0 0 0 0 0 -0
           -0 -0 0 -0
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^H2O_gas" NumberOfComponents="1" format="ascii">
           0.000740561 0.000740495 0.000740429 0.000740362 0.000740295 0.000740227 0.000740158 0.000740088 0.000740016 0.000739944 0.00073987 0.000739794
           0.000739716 0.000739636 0.000739553 0.000739466 0.000739372 0.000739151 0.00073544 0.00066786 0.000503788 0.000476837 0.00047534 0.000475211
           0.000475174 0.00047507 0.00047499 0.000474935 0.000474904 0.000474898 0.000475165 0.000502319 0.00686749 0.00815793 0.00822106 0.00822377
@@ -4819,7 +4819,7 @@
           0.000721184 0.000721213 0.000721244 0.000721277 0.000721311 0.000721346 0.000721383 0.000721421 0.00072146 0.0007215 0.000721541 0.000721582
           0.000721624 0.000721667 0.000721711 0.000721755
         </DataArray>
-        <DataArray type="Float32" Name="X^N2_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="X^N2_gas" NumberOfComponents="1" format="ascii">
           1.76276e-36 1.24178e-34 8.55404e-33 5.76427e-31 3.79513e-29 2.43619e-27 1.5207e-25 9.20153e-24 5.37774e-22 3.02331e-20 1.62739e-18 8.34319e-17
           4.04951e-15 1.84813e-13 7.86928e-12 3.09856e-10 1.11695e-08 3.6441e-07 1.05776e-05 0.000246984 0.00414682 0.0730765 0.999525 0.999525
           0.999525 0.999525 0.999525 0.999525 0.999525 0.999525 0.999525 0.999498 0.993133 0.991842 0.991779 0.991776
@@ -5163,7 +5163,7 @@
           0 0 0 -0 -0 0 0 0 0 0 0 -0
           -0 -0 0 -0
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 0.999996 0.999929 0.999028 0.999028
           0.999028 0.999027 0.999027 0.999027 0.999027 0.999027 0.999027 0.999036 0.999136 0.999122 0.999122 0.999122
@@ -5507,7 +5507,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_liq" NumberOfComponents="1" format="ascii">
           1.09984e-39 7.74856e-38 5.33809e-36 3.59748e-34 2.36875e-32 1.5207e-30 9.4933e-29 5.74482e-27 3.35783e-25 1.88792e-23 1.01633e-21 5.21101e-20
           2.52952e-18 1.15455e-16 4.91662e-15 1.93617e-13 6.9803e-12 2.27803e-10 6.64575e-09 1.70878e-07 3.80338e-06 7.08107e-05 0.00097175 0.000972069
           0.000972344 0.000972563 0.000972727 0.000972841 0.000972905 0.00097292 0.000972804 0.000964013 0.000863587 0.000877576 0.000878148 0.00087808
@@ -5851,7 +5851,7 @@
           0 0 0 -0 -0 0 0 0 0 0 0 -0
           -0 -0 0 -0
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.000740561 0.000740495 0.000740429 0.000740362 0.000740295 0.000740227 0.000740158 0.000740088 0.000740016 0.000739944 0.00073987 0.000739794
           0.000739716 0.000739636 0.000739553 0.000739466 0.000739376 0.000739281 0.000739181 0.000739074 0.000738958 0.000738819 0.000738953 0.000738753
           0.000738696 0.000738534 0.00073841 0.000738324 0.000738276 0.000738267 0.000738682 0.000780883 0.0106383 0.0126283 0.0127256 0.0127298
@@ -6195,7 +6195,7 @@
           0.000721184 0.000721213 0.000721244 0.000721277 0.000721311 0.000721346 0.000721383 0.000721421 0.00072146 0.0007215 0.000721541 0.000721582
           0.000721624 0.000721667 0.000721711 0.000721755
         </DataArray>
-        <DataArray type="Float32" Name="x^N2_n" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^N2_gas" NumberOfComponents="1" format="ascii">
           1.13362e-36 7.9858e-35 5.50103e-33 3.70695e-31 2.44061e-29 1.56669e-27 9.77947e-26 5.91743e-24 3.45838e-22 1.94427e-20 1.04656e-18 5.36544e-17
           2.6042e-15 1.18851e-13 5.06067e-12 1.99265e-10 7.18308e-09 2.3439e-07 6.83699e-06 0.000175769 0.00391165 0.0728145 0.999261 0.999261
           0.999261 0.999261 0.999262 0.999262 0.999262 0.999262 0.999261 0.999219 0.989362 0.987372 0.987274 0.98727