diff --git a/dumux/freeflow/nonisothermal/vtkoutputfields.hh b/dumux/freeflow/nonisothermal/vtkoutputfields.hh
index 02773d6713ff43e6e7f86a789ab1a4ea0b732f3c..8e6bb42dac94af1d9a302a3904e1a2eb4f7d4d23 100644
--- a/dumux/freeflow/nonisothermal/vtkoutputfields.hh
+++ b/dumux/freeflow/nonisothermal/vtkoutputfields.hh
@@ -48,7 +48,7 @@ public:
     template <class VtkOutputModule>
     static void add(VtkOutputModule& vtk)
     {
-        vtk.addVolumeVariable([](const auto& v){ return v.temperature(); }, "temperature");
+        vtk.addVolumeVariable([](const auto& v){ return v.temperature(); }, "T");
         vtk.addVolumeVariable([](const auto& v){ return v.thermalConductivity(); }, "lambda");
         if (ModelTraits::usesTurbulenceModel())
             vtk.addVolumeVariable([](const auto& v){ return v.effectiveThermalConductivity() - v.thermalConductivity(); }, "lambda_t");
diff --git a/dumux/porousmediumflow/nonisothermal/vtkoutputfields.hh b/dumux/porousmediumflow/nonisothermal/vtkoutputfields.hh
index 3c94a1a7cb6c5521adf89f618c25db4fd3de8d26..d5c0e6c0b490cb27bd4ae887e28dd8598cf9e397 100644
--- a/dumux/porousmediumflow/nonisothermal/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/nonisothermal/vtkoutputfields.hh
@@ -39,7 +39,7 @@ public:
     static void init(VtkOutputModule& vtk)
     {
         IsothermalVtkOutputFields::init(vtk);
-        vtk.addVolumeVariable( [](const auto& v){ return v.temperature(); }, "temperature");
+        vtk.addVolumeVariable( [](const auto& v){ return v.temperature(); }, "T");
     }
 };
 
diff --git a/dumux/porousmediumflow/richardsnc/vtkoutputfields.hh b/dumux/porousmediumflow/richardsnc/vtkoutputfields.hh
index d9f16161a37ed8f6863edc89a9d5251f2c0c5241..360a9a0865bb39836de69eb7ffda4f0e32047f07 100644
--- a/dumux/porousmediumflow/richardsnc/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/richardsnc/vtkoutputfields.hh
@@ -50,7 +50,7 @@ public:
         vtk.addVolumeVariable([](const auto& v){ return v.mobility(VolumeVariables::liquidPhaseIdx); }, "mobility");
         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(); }, "temperature");
+        vtk.addVolumeVariable([](const auto& v){ return v.temperature(); }, "T");
 
         static const bool gravity = getParamFromGroup<bool>(vtk.paramGroup(), "Problem.EnableGravity");
         if(gravity)
diff --git a/test/freeflow/rans/pdelab-kepsilon_twolayers.csv b/test/freeflow/rans/pdelab-kepsilon_twolayers.csv
index d3d1cdbcbb38bf0b8b236f1cbc2869a39954de44..49c8f45e114f2f9f0b6d602ba7a3a682b328b4bb 100644
--- a/test/freeflow/rans/pdelab-kepsilon_twolayers.csv
+++ b/test/freeflow/rans/pdelab-kepsilon_twolayers.csv
@@ -1,4 +1,4 @@
-"wallNormalAxis","velocityAtElementCenters:0","velocityAtElementCenters:1","velocityAtElementCenters:2","relVelocity:0","relVelocity:1","relVelocity:2","storedNeighborID00","storedNeighborID01","storedNeighborID10","storedNeighborID11","velocityGradients0:0","velocityGradients0:1","velocityGradients0:2","velocityGradients1:0","velocityGradients1:1","velocityGradients1:2","hasWall","isMatchingPoint","inWallFunctionRegion","useWallFunctionK","useWallFunctionE","pressure","pn_rel","massMoleFrac","temperature","k","epsilon","density","viscosity","eddyViscosity","distanceToWall","u^+","y^+","u^+_nominal","y^+_nominal","vtkValidPointMask","arc_length","Points:0","Points:1","Points:2"
+"wallNormalAxis","velocityAtElementCenters:0","velocityAtElementCenters:1","velocityAtElementCenters:2","relVelocity:0","relVelocity:1","relVelocity:2","storedNeighborID00","storedNeighborID01","storedNeighborID10","storedNeighborID11","velocityGradients0:0","velocityGradients0:1","velocityGradients0:2","velocityGradients1:0","velocityGradients1:1","velocityGradients1:2","hasWall","isMatchingPoint","inWallFunctionRegion","useWallFunctionK","useWallFunctionE","pressure","pn_rel","massMoleFrac","T","k","epsilon","density","viscosity","eddyViscosity","distanceToWall","u^+","y^+","u^+_nominal","y^+_nominal","vtkValidPointMask","arc_length","Points:0","Points:1","Points:2"
 1,0.1371,-1.0428e-07,0,0.048606,-1042.8,0,18,20,19,44,0.00079757,1030,0,-1.482e-08,-0.00079736,0,1,0,1,1,1,1e+05,0.34067,1,298,0.017058,22.31,1.1688,1.5752e-05,1.9569e-08,0.00013078,1.0764,1.0575,1.2916,0.88129,1,0,8,0,0
 1,0.1371,-1.0428e-07,0,0.048606,-1042.8,0,18,20,19,44,0.00079757,1030,0,-1.482e-08,-0.00079736,0,1,0,1,1,1,1e+05,0.34067,1,298,0.017058,22.31,1.1688,1.5752e-05,1.9569e-08,0.00013078,1.0764,1.0575,1.2916,0.88129,1,0.0002469,8,0.0002469,0
 1,0.43103,-5.9329e-07,0,0.15281,-5932.9,0,43,45,19,69,0.0024523,952.89,0,-8.3059e-08,-0.0024516,0,0,0,1,1,1,1e+05,0.34067,1,298,0.017058,6.972,1.1688,1.5752e-05,7.1404e-07,0.00041849,3.384,3.384,4.0607,2.8201,1,0.0004938,8,0.0004938,0
diff --git a/test/freeflow/rans/pdelab-kepsilon_wallfunction.csv b/test/freeflow/rans/pdelab-kepsilon_wallfunction.csv
index f394f889501709603c93f56cb62efd531ae2d458..e2caa546540c0e011547ce5ebf1858ccdffd86de 100644
--- a/test/freeflow/rans/pdelab-kepsilon_wallfunction.csv
+++ b/test/freeflow/rans/pdelab-kepsilon_wallfunction.csv
@@ -1,4 +1,4 @@
-"wallNormalAxis","velocityAtElementCenters:0","velocityAtElementCenters:1","velocityAtElementCenters:2","relVelocity:0","relVelocity:1","relVelocity:2","storedNeighborID00","storedNeighborID01","storedNeighborID10","storedNeighborID11","velocityGradients0:0","velocityGradients0:1","velocityGradients0:2","velocityGradients1:0","velocityGradients1:1","velocityGradients1:2","hasWall","isMatchingPoint","inWallFunctionRegion","useWallFunctionK","useWallFunctionE","pressure","pn_rel","massMoleFrac","temperature","k","epsilon","density","viscosity","eddyViscosity","distanceToWall","u^+","y^+","u^+_nominal","y^+_nominal","vtkValidPointMask","arc_length","Points:0","Points:1","Points:2"
+"wallNormalAxis","velocityAtElementCenters:0","velocityAtElementCenters:1","velocityAtElementCenters:2","relVelocity:0","relVelocity:1","relVelocity:2","storedNeighborID00","storedNeighborID01","storedNeighborID10","storedNeighborID11","velocityGradients0:0","velocityGradients0:1","velocityGradients0:2","velocityGradients1:0","velocityGradients1:1","velocityGradients1:2","hasWall","isMatchingPoint","inWallFunctionRegion","useWallFunctionK","useWallFunctionE","pressure","pn_rel","massMoleFrac","T","k","epsilon","density","viscosity","eddyViscosity","distanceToWall","u^+","y^+","u^+_nominal","y^+_nominal","vtkValidPointMask","arc_length","Points:0","Points:1","Points:2"
 1,1.8548,8.128e-05,0,0.66988,0.13229,0,18,20,19,44,-0.013166,117.36,0,-4.3828e-05,0.013168,0,1,1,1,0,1,1e+05,0.30242,1,298,0.037041,0.46288,1.1688,1.5752e-05,0.00026677,0.0061725,43.138,16.849,17.595,41.308,1,0,8,0,0
 1,1.8548,8.128e-05,0,0.66988,0.13229,0,18,20,19,44,-0.013166,117.36,0,-4.3828e-05,0.013168,0,1,1,1,0,1,1e+05,0.30242,1,298,0.037041,0.46288,1.1688,1.5752e-05,0.00026677,0.0061725,43.138,16.849,17.595,41.308,1,0.0002469,8,0.0002469,0
 1,1.8548,8.128e-05,0,0.66988,0.13229,0,18,20,19,44,-0.013166,117.36,0,-4.3828e-05,0.013168,0,1,1,1,0,1,1e+05,0.30242,1,298,0.037041,0.46288,1.1688,1.5752e-05,0.00026677,0.0061725,43.138,16.849,17.595,41.308,1,0.0004938,8,0.0004938,0
diff --git a/test/freeflow/rans/pdelab-komega.csv b/test/freeflow/rans/pdelab-komega.csv
index f9e9df04908e0748df12b3f6c07fc8c693b01583..1584dd28ae5063fbe038932cabc69aa0df7ac790 100644
--- a/test/freeflow/rans/pdelab-komega.csv
+++ b/test/freeflow/rans/pdelab-komega.csv
@@ -1,4 +1,4 @@
-"pressure","velocityAtElementCenters:0","velocityAtElementCenters:1","velocityAtElementCenters:2","relVelocity:0","relVelocity:1","relVelocity:2","velocityGradients0:0","velocityGradients0:1","velocityGradients0:2","velocityGradients1:0","velocityGradients1:1","velocityGradients1:2","pn_rel","massMoleFrac","temperature","turbulentKineticEnergy","dissipation","density","viscosity","eddyViscosity","distanceToWall","u^+","y^+","MaximumVelocity_X","vtkValidPointMask","arc_length","Points:0","Points:1","Points:2"
+"pressure","velocityAtElementCenters:0","velocityAtElementCenters:1","velocityAtElementCenters:2","relVelocity:0","relVelocity:1","relVelocity:2","velocityGradients0:0","velocityGradients0:1","velocityGradients0:2","velocityGradients1:0","velocityGradients1:1","velocityGradients1:2","pn_rel","massMoleFrac","T","turbulentKineticEnergy","dissipation","density","viscosity","eddyViscosity","distanceToWall","u^+","y^+","MaximumVelocity_X","vtkValidPointMask","arc_length","Points:0","Points:1","Points:2"
 1e+05,0.12082,-4.6671e-08,0,0.043473,-466.71,0,0.00035704,921.55,0,-1.1449e-08,-0.00035687,0,0.30136,1,298,1.4258e-05,73680,1.1688,1.5752e-05,1.9351e-10,0.00013078,1.0028,1.0003,2.7791,1,0,8,0,0
 1e+05,0.12082,-4.6671e-08,0,0.043473,-466.71,0,0.00035704,921.55,0,-1.1449e-08,-0.00035687,0,0.30136,1,298,1.4258e-05,73680,1.1688,1.5752e-05,1.9351e-10,0.00013078,1.0028,1.0003,2.7791,1,0.0002469,8,0.0002469,0
 1e+05,0.38566,-2.722e-07,0,0.13877,-2722.1,0,0.0011403,900.44,0,-6.6164e-08,-0.0011397,0,0.30136,1,298,0.00049618,11619,1.1688,1.5752e-05,4.2703e-08,0.00041849,3.201,3.201,2.7791,1,0.0004938,8,0.0004938,0
diff --git a/test/freeflow/rans/pdelab-lowrekepsilon.csv b/test/freeflow/rans/pdelab-lowrekepsilon.csv
index daa79ad6eb4f0407f933c503fddf797db4f87dd0..f28d81115970d927b1453c86e11c2b3d50f32c29 100644
--- a/test/freeflow/rans/pdelab-lowrekepsilon.csv
+++ b/test/freeflow/rans/pdelab-lowrekepsilon.csv
@@ -1,4 +1,4 @@
-"pressure","velocityAtElementCenters:0","velocityAtElementCenters:1","velocityAtElementCenters:2","relVelocity:0","relVelocity:1","relVelocity:2","velocityGradients0:0","velocityGradients0:1","velocityGradients0:2","velocityGradients1:0","velocityGradients1:1","velocityGradients1:2","pn_rel","massMoleFrac","temperature","turbulentKineticEnergy","dissipation","viscosity","eddyViscosity","distanceToWall","u^+","y^+","vtkValidPointMask","arc_length","Points:0","Points:1","Points:2"
+"pressure","velocityAtElementCenters:0","velocityAtElementCenters:1","velocityAtElementCenters:2","relVelocity:0","relVelocity:1","relVelocity:2","velocityGradients0:0","velocityGradients0:1","velocityGradients0:2","velocityGradients1:0","velocityGradients1:1","velocityGradients1:2","pn_rel","massMoleFrac","T","turbulentKineticEnergy","dissipation","viscosity","eddyViscosity","distanceToWall","u^+","y^+","vtkValidPointMask","arc_length","Points:0","Points:1","Points:2"
 1e+05,0.1263,-1.1541e-07,0,0.044747,-0.0025772,0,0.00088262,953.6,0,-5.8516e-09,-0.00088244,0,0.31418,1,298,0.00068913,0.053599,1.5752e-05,9.2769e-09,0.00013078,1.0306,1.0175,1,0,8,0,0
 1e+05,0.1263,-1.1541e-07,0,0.044747,-0.0025772,0,0.00088262,953.6,0,-5.8516e-09,-0.00088244,0,0.31418,1,298,0.00068913,0.053599,1.5752e-05,9.2769e-09,0.00013078,1.0306,1.0175,1,0.0002469,8,0.0002469,0
 1e+05,0.39907,-6.5885e-07,0,0.14139,-0.014713,0,0.0027281,892.4,0,-3.3792e-08,-0.0027275,0,0.31418,1,298,0.0083547,0.47342,1.5752e-05,4.8771e-07,0.00041849,3.2562,3.2562,1,0.0004938,8,0.0004938,0
diff --git a/test/freeflow/rans/pdelab-oneeq.csv b/test/freeflow/rans/pdelab-oneeq.csv
index a51d71946415a63166bf938ded84ee16ca92903e..f1d24655dc42ed9c5ec24f95b2045eba589e179c 100644
--- a/test/freeflow/rans/pdelab-oneeq.csv
+++ b/test/freeflow/rans/pdelab-oneeq.csv
@@ -1,4 +1,4 @@
-"pressure","velocityAtElementCenters:0","velocityAtElementCenters:1","velocityAtElementCenters:2","relVelocity:0","relVelocity:1","relVelocity:2","velocityGradients0:0","velocityGradients0:1","velocityGradients0:2","velocityGradients1:0","velocityGradients1:1","velocityGradients1:2","pn_rel","massMoleFrac","temperature","viscosity","density","eddyViscosity","distanceToWall","u^+","y^+","vtkValidPointMask","arc_length","Points:0","Points:1","Points:2"
+"pressure","velocityAtElementCenters:0","velocityAtElementCenters:1","velocityAtElementCenters:2","relVelocity:0","relVelocity:1","relVelocity:2","velocityGradients0:0","velocityGradients0:1","velocityGradients0:2","velocityGradients1:0","velocityGradients1:1","velocityGradients1:2","pn_rel","massMoleFrac","T","viscosity","density","eddyViscosity","distanceToWall","u^+","y^+","vtkValidPointMask","arc_length","Points:0","Points:1","Points:2"
 1e+05,0.17658,-1.6647e-07,0,0.063284,-1664.7,0,0.0012733,1333.6,0,4.0203e-08,-0.0012729,0,0.44091,1,298,1.5752e-05,1.1688,4.2277e-09,0.00013078,1.2183,1.2033,1,0,8,0,0
 1e+05,0.17658,-1.6647e-07,0,0.063284,-1664.7,0,0.0012733,1333.6,0,4.0203e-08,-0.0012729,0,0.44091,1,298,1.5752e-05,1.1688,4.2277e-09,0.00013078,1.2183,1.2033,1,0.0002469,8,0.0002469,0
 1e+05,0.5581,-9.5165e-07,0,0.20002,-9516.5,0,0.0039436,1231.1,0,2.306e-07,-0.0039425,0,0.44091,1,298,1.5752e-05,1.1688,4.6919e-07,0.00041849,3.8506,3.8506,1,0.0004938,8,0.0004938,0
diff --git a/test/freeflow/rans/pdelab-zeroeq.csv b/test/freeflow/rans/pdelab-zeroeq.csv
index f4d619cfbae582c9eef8d2d9fa187e228e6c60ff..d2e9b1a0c410144e7fd1e073b5a9d1a9845321f9 100644
--- a/test/freeflow/rans/pdelab-zeroeq.csv
+++ b/test/freeflow/rans/pdelab-zeroeq.csv
@@ -1,4 +1,4 @@
-"pressure","velocityAtElementCenters:0","velocityAtElementCenters:1","velocityAtElementCenters:2","relVelocity:0","relVelocity:1","relVelocity:2","velocityGradients0:0","velocityGradients0:1","velocityGradients0:2","velocityGradients1:0","velocityGradients1:1","velocityGradients1:2","pn_rel","massMoleFrac","temperature","viscosity","density","eddyViscosity","distanceToWall","u^+","y^+","vtkValidPointMask","arc_length","Points:0","Points:1","Points:2"
+"pressure","velocityAtElementCenters:0","velocityAtElementCenters:1","velocityAtElementCenters:2","relVelocity:0","relVelocity:1","relVelocity:2","velocityGradients0:0","velocityGradients0:1","velocityGradients0:2","velocityGradients1:0","velocityGradients1:1","velocityGradients1:2","pn_rel","massMoleFrac","T","viscosity","density","eddyViscosity","distanceToWall","u^+","y^+","vtkValidPointMask","arc_length","Points:0","Points:1","Points:2"
 1e+05,0.12476,-2.125e-07,0,0.043244,-0.00083283,0,0.0016251,944.64,0,1.5163e-07,-0.0016249,0,0.31581,1,298,1.5752e-05,1.1688,3.9638e-09,0.00013078,1.0228,1.0128,1,0,8,0,0
 1e+05,0.12476,-2.125e-07,0,0.043244,-0.00083283,0,0.0016251,944.64,0,1.5163e-07,-0.0016249,0,0.31581,1,298,1.5752e-05,1.1688,3.9638e-09,0.00013078,1.0228,1.0128,1,0.0002469,8,0.0002469,0
 1e+05,0.39532,-1.2181e-06,0,0.13703,-0.0047738,0,0.005054,892.34,0,8.8337e-07,-0.0050535,0,0.31581,1,298,1.5752e-05,1.1688,3.608e-07,0.00041849,3.2408,3.2408,1,0.0004938,8,0.0004938,0
diff --git a/test/porousmediumflow/co2/implicit/boxt1e9.vtu b/test/porousmediumflow/co2/implicit/boxt1e9.vtu
index 79f339c8f01826e8c0826a96e548fb5c1373c432..634913834af659bf9fb8f3e3110989b2da92c0fc 100644
--- a/test/porousmediumflow/co2/implicit/boxt1e9.vtu
+++ b/test/porousmediumflow/co2/implicit/boxt1e9.vtu
@@ -4469,7 +4469,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
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           317.07 317.066 317.071 317.063 317.074 317.07 317.076 317.079 317.079 317.078 317.078 317.079
           317.079 316.159 316.172 316.101 316.081 316.202 316.263 316.121 316.278 316.321 316.268 316.327
           316.241 316.283 316.212 317.056 317.054 317.063 317.061 317.052 317.045 317.06 317.019 317.008
diff --git a/test/porousmediumflow/co2/implicit/cct1e9.vtu b/test/porousmediumflow/co2/implicit/cct1e9.vtu
index e14e47a8d783256c7e7314a8abcab17a7f6e0ed0..1c29fb4cb4ba638bc4285ef9fa25afbd3ce2b00f 100644
--- a/test/porousmediumflow/co2/implicit/cct1e9.vtu
+++ b/test/porousmediumflow/co2/implicit/cct1e9.vtu
@@ -4315,7 +4315,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
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           317.071 317.073 317.076 317.082 317.083 317.082 316.165 316.222 316.172 316.299 316.281 316.252
           317.051 317.041 317.049 316.999 316.993 317.007 316.901 316.883 316.882 316.924 316.914 316.897
           315.255 315.188 315.228 315.379 315.422 315.405 315.667 315.662 315.718 315.766 315.731 315.787
diff --git a/test/porousmediumflow/co2/implicit/heterogeneousproblem.hh b/test/porousmediumflow/co2/implicit/heterogeneousproblem.hh
index 9447df13b1f2519808f8d2cf79c35c3ef3caf5fd..f1d36d4c344e0c170e2c498cc039cccadad4207c 100644
--- a/test/porousmediumflow/co2/implicit/heterogeneousproblem.hh
+++ b/test/porousmediumflow/co2/implicit/heterogeneousproblem.hh
@@ -257,7 +257,7 @@ public:
         vtk.addVolumeVariable([](const VolumeVariables& v){ return v.enthalpy(CO2Idx); }, "enthalpyN");
 #else
         vtkTemperature_.resize(numDofs, 0.0);
-        vtk.addField(vtkTemperature_, "temperature");
+        vtk.addField(vtkTemperature_, "T");
 #endif
 
         const auto& gridView = this->fvGridGeometry().gridView();
diff --git a/test/references/1p2cniboxconduction-reference.vtu b/test/references/1p2cniboxconduction-reference.vtu
index 7e9c6ab835c1fe348f71cb190753bf5d45e24a70..066df3c1bbb49f036156a67e8d27369dd9a6d510 100644
--- a/test/references/1p2cniboxconduction-reference.vtu
+++ b/test/references/1p2cniboxconduction-reference.vtu
@@ -394,7 +394,7 @@
           0.00108531 0.00108531 0.00108531 0.00108531 0.00108531 0.00108531 0.00108531 0.00108531 0.00108531 0.00108531 0.00108531 0.00108531
           0.00108531 0.00108531 0.00108531 0.00108531 0.00108531 0.00108531
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           300 299.407 300 299.407 298.817 298.817 298.235 298.235 297.665 297.665 297.108 297.108
           296.569 296.569 296.049 296.049 295.552 295.552 295.078 295.078 294.63 294.63 294.208 294.208
           293.812 293.812 293.443 293.443 293.101 293.101 292.784 292.784 292.493 292.493 292.227 292.227
diff --git a/test/references/1p2cniboxconvection-reference.vtu b/test/references/1p2cniboxconvection-reference.vtu
index 348c88967ccd011f226f11911aade69c75ea26d6..ef7fb528653fdff73f916b4824bdc4bd9089e6d0 100644
--- a/test/references/1p2cniboxconvection-reference.vtu
+++ b/test/references/1p2cniboxconvection-reference.vtu
@@ -174,7 +174,7 @@
           0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528
           0.00108528 0.00108528 0.00108528 0.00108528 0.00108531 0.00108531
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           291 291 291 291 291 291 291 291 290.999 290.999 290.998 290.998
           290.994 290.994 290.987 290.987 290.975 290.975 290.955 290.955 290.926 290.926 290.886 290.886
           290.835 290.835 290.774 290.774 290.705 290.705 290.63 290.63 290.551 290.551 290.473 290.473
diff --git a/test/references/1p2cniccconduction-reference.vtu b/test/references/1p2cniccconduction-reference.vtu
index 19a46e53e37e0d1f72e776ba9fa51849d666235c..39c440c662a6fb5a891fbcf17b02cea93c8b8589 100644
--- a/test/references/1p2cniccconduction-reference.vtu
+++ b/test/references/1p2cniccconduction-reference.vtu
@@ -226,7 +226,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="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           299.703 299.111 298.524 297.947 297.382 296.834 296.304 295.795 295.309 294.848 294.412 294.003
           293.621 293.265 292.936 292.633 292.354 292.1 291.868 291.658 291.468 291.297 291.143 291.006
           290.883 290.774 290.677 290.591 290.515 290.449 290.39 290.338 290.293 290.254 290.219 290.189
diff --git a/test/references/1p2cniccconvection-reference.vtu b/test/references/1p2cniccconvection-reference.vtu
index 0236ae9d902077b1b90332dc21fbcd9dbf812dc1..835d4c0ff8956d4a1f3db66197a9c9d7810edb32 100644
--- a/test/references/1p2cniccconvection-reference.vtu
+++ b/test/references/1p2cniccconvection-reference.vtu
@@ -106,7 +106,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="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           291 291 291 291 290.999 290.996 290.991 290.981 290.965 290.94 290.906 290.86
           290.805 290.74 290.667 290.59 290.512 290.436 290.363 290.297 290.239 290.188 290.145 290.111
           290.083 290.061 290.044 290.032 290.023 290.016 290.011 290.008 290.006 290.004 290.003 290.002
diff --git a/test/references/1p2cniccmpfaconduction-reference.vtu b/test/references/1p2cniccmpfaconduction-reference.vtu
index 2a49571b586baea8d9eee52a80952f72830dc624..2ccf1fe1ed16b350efd31250d6965b25b574d8e1 100644
--- a/test/references/1p2cniccmpfaconduction-reference.vtu
+++ b/test/references/1p2cniccmpfaconduction-reference.vtu
@@ -174,7 +174,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="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           299.703 299.111 298.524 297.947 297.382 296.834 296.304 295.795 295.309 294.848 294.412 294.003
           293.621 293.265 292.936 292.633 292.354 292.1 291.868 291.658 291.468 291.297 291.143 291.006
           290.883 290.774 290.677 290.591 290.515 290.449 290.39 290.338 290.293 290.254 290.219 290.189
diff --git a/test/references/1p2cniccmpfaconvection-reference.vtu b/test/references/1p2cniccmpfaconvection-reference.vtu
index d0560b9b93c23f4599e613399c37938575fc166b..06b047a28d999d5df73f41ffa0d80d67fd968035 100644
--- a/test/references/1p2cniccmpfaconvection-reference.vtu
+++ b/test/references/1p2cniccmpfaconvection-reference.vtu
@@ -84,7 +84,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="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           291 291 291 291 290.999 290.996 290.991 290.981 290.965 290.94 290.906 290.86
           290.805 290.74 290.667 290.59 290.512 290.436 290.363 290.297 290.239 290.188 290.145 290.111
           290.083 290.061 290.044 290.032 290.023 290.016 290.011 290.008 290.006 290.004 290.003 290.002
diff --git a/test/references/1pniboxconduction-reference.vtu b/test/references/1pniboxconduction-reference.vtu
index 677c50d9ba122d78140cafdf2f54caa91ba31333..e30851e869e692f5c306eb6d818f94b8f2c811b2 100644
--- a/test/references/1pniboxconduction-reference.vtu
+++ b/test/references/1pniboxconduction-reference.vtu
@@ -142,7 +142,7 @@
           8.96175e-11 0 0 8.96175e-11 0 0 8.96175e-11 2.01369e-18 0 8.96175e-11 2.01369e-18 0
           8.96175e-11 0 0 8.96175e-11 0 0
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           300 299.409 300 299.409 298.822 298.822 298.242 298.242 297.673 297.673 297.118 297.118
           296.58 296.58 296.061 296.061 295.565 295.565 295.092 295.092 294.644 294.644 294.221 294.221
           293.826 293.826 293.456 293.456 293.114 293.114 292.797 292.797 292.506 292.506 292.239 292.239
diff --git a/test/references/1pniboxconvection-reference.vtu b/test/references/1pniboxconvection-reference.vtu
index 618a08c0d05b8ed4aef9f6b889085f79b3df289f..5c0e668a8178b235721846ba2f466c9d369f2b34 100644
--- a/test/references/1pniboxconvection-reference.vtu
+++ b/test/references/1pniboxconvection-reference.vtu
@@ -62,7 +62,7 @@
           9.99933e-05 -1.67809e-18 0 9.99933e-05 -1.67809e-18 0 9.99933e-05 -1.34253e-18 0 9.99933e-05 -1.34253e-18 0
           9.99933e-05 0 0 9.99933e-05 0 0
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           291 291 291 291 290.999 290.999 291 291 291.002 291.002 291.001 291.001
           290.998 290.998 290.996 290.996 291 291 291.01 291.01 291.018 291.018 291.011 291.011
           290.977 290.977 290.91 290.91 290.813 290.813 290.695 290.695 290.569 290.569 290.446 290.446
diff --git a/test/references/1pniccconduction-reference.vtu b/test/references/1pniccconduction-reference.vtu
index a2a8f1e82cb1494809d7c0babcdb074a1214c2e2..2a0059529b12b9f7d6410339bf4a0d84a8686f63 100644
--- a/test/references/1pniccconduction-reference.vtu
+++ b/test/references/1pniccconduction-reference.vtu
@@ -93,7 +93,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="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           299.704 299.114 298.529 297.954 297.391 296.844 296.315 295.807 295.322 294.861 294.426 294.017
           293.634 293.279 292.949 292.645 292.366 292.111 291.879 291.668 291.477 291.306 291.151 291.013
           290.89 290.78 290.683 290.596 290.52 290.453 290.394 290.342 290.296 290.257 290.222 290.192
diff --git a/test/references/1pniccconvection-reference.vtu b/test/references/1pniccconvection-reference.vtu
index f72253b56a9c463a173d860c72d5ad02d1406461..42bfb2b30f678ce56f882cca98ceec9aa6fb519d 100644
--- a/test/references/1pniccconvection-reference.vtu
+++ b/test/references/1pniccconvection-reference.vtu
@@ -43,7 +43,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="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           291 291 291 291.001 291.002 291 290.997 290.998 291.005 291.014 291.015 290.994
           290.943 290.861 290.754 290.632 290.508 290.391 290.29 290.208 290.144 290.096 290.063 290.04
           290.025 290.015 290.009 290.006 290.004 290.003 290.002 290.002 290.001 290.001 290.001 290.001
diff --git a/test/references/2cnistokes2p2cni-ff-reference.vtu b/test/references/2cnistokes2p2cni-ff-reference.vtu
index e952eb5824e02fadc219d594924ba620391cfbbe..f354ba75249714113ba5ffd2b4f35933c7ec217c 100644
--- a/test/references/2cnistokes2p2cni-ff-reference.vtu
+++ b/test/references/2cnistokes2p2cni-ff-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="48" NumberOfPoints="63">
-      <PointData Scalars="temperature" Vectors="v">
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="T" Vectors="v">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           296.984 296.98 298.15 298.145 296.98 298.141 296.983 298.136 296.987 298.132 296.992 298.127
           297.002 298.124 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15
           298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15
diff --git a/test/references/2cnistokes2p2cni-pm-reference.vtu b/test/references/2cnistokes2p2cni-pm-reference.vtu
index 7d2e9f2ca13b4bef50b9def934d21bdb39180109..edf24fe616122c9b593bdaee7a716432acd19f82 100644
--- a/test/references/2cnistokes2p2cni-pm-reference.vtu
+++ b/test/references/2cnistokes2p2cni-pm-reference.vtu
@@ -93,7 +93,7 @@
           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
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           298.15 298.15 298.125 298.125 298.15 298.125 298.15 298.125 298.15 298.125 298.15 298.125
           298.15 298.125 297.966 297.966 297.966 297.967 297.967 297.968 297.968 297.544 297.544 297.544
           297.546 297.548 297.55 297.552 296.984 296.98 296.98 296.983 296.987 296.992 297.002
diff --git a/test/references/2cnistokes2p2cniboundarylayer-ff-reference.vtu b/test/references/2cnistokes2p2cniboundarylayer-ff-reference.vtu
index 68ad9a759f60da907a987c24f99c29d5e54d5a13..3b87304b7f7224eab470a89c56b9c0db453a439e 100644
--- a/test/references/2cnistokes2p2cniboundarylayer-ff-reference.vtu
+++ b/test/references/2cnistokes2p2cniboundarylayer-ff-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="48" NumberOfPoints="63">
-      <PointData Scalars="temperature" Vectors="v">
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="T" Vectors="v">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           295.785 295.777 298.15 298.141 295.769 298.133 295.763 298.124 295.757 298.115 295.751 298.106
           295.748 298.101 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15
           298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15
diff --git a/test/references/2cnizeroeq2p2cni-ff-reference.vtu b/test/references/2cnizeroeq2p2cni-ff-reference.vtu
index af15c0b34605f3124173b475c3ead050f2798457..70690970936ceff6d03d29ce28c079f7e51f2af8 100644
--- a/test/references/2cnizeroeq2p2cni-ff-reference.vtu
+++ b/test/references/2cnizeroeq2p2cni-ff-reference.vtu
@@ -83,7 +83,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="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           298.15 298.15 298.15 298.149 291.519 298.14 288.232 298.057 288.412 298.042 288.643 298.021
           298.15 298.021 290.888 295.948 298.15 298.15 298.15 298.148 298.148 298.147 298.147 296.755
           298.15 298.15 298.15 298.15 298.15 298.15 298.149 296.814 298.15 298.15 298.15 298.15
diff --git a/test/references/2cstokes2p2c-ff-reference.vtu b/test/references/2cstokes2p2c-ff-reference.vtu
index eb48a406d99f2758b271381e07e6c8ec77afa62e..717d6ab692491b128b315233bdf6e739361c239e 100644
--- a/test/references/2cstokes2p2c-ff-reference.vtu
+++ b/test/references/2cstokes2p2c-ff-reference.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="120" NumberOfPoints="143">
-      <PointData Scalars="temperature" Vectors="v">
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="T" Vectors="v">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15
           298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15
           298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15
diff --git a/test/references/2pdfm-reference.vtu b/test/references/2pdfm-reference.vtu
index 6f2557566dc08bc24ef0e71e98abfaa4b0c01378..49abdc751fccd8b03b5c64afcff91187bbb7a9a4 100644
--- a/test/references/2pdfm-reference.vtu
+++ b/test/references/2pdfm-reference.vtu
@@ -843,7 +843,7 @@
           0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25
           0.25 0.25 0.25 0.25 0.25 0.25 0.25 0.25
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           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 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 293.15 293.15 293.15 293.15
diff --git a/test/references/3pniconductionbox-reference.vtu b/test/references/3pniconductionbox-reference.vtu
index f9835c8136c7a7f9021c71e4d2c58d7c4fd4f5e6..3490330550e0cb63e8725cae747be06dc7417a47 100644
--- a/test/references/3pniconductionbox-reference.vtu
+++ b/test/references/3pniconductionbox-reference.vtu
@@ -399,7 +399,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="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           300 299.335 300 299.335 298.676 298.676 298.026 298.026 297.392 297.392 296.777 296.777
           296.186 296.186 295.622 295.622 295.088 295.088 294.585 294.585 294.115 294.115 293.678 293.678
           293.276 293.276 292.907 292.907 292.57 292.57 292.265 292.265 291.989 291.989 291.742 291.742
diff --git a/test/references/3pniconductioncc-reference.vtu b/test/references/3pniconductioncc-reference.vtu
index 65d4779a05107678472cfdf8b42a49b748113341..624cee4f9a737a3a90c328563d151145e63e0546 100644
--- a/test/references/3pniconductioncc-reference.vtu
+++ b/test/references/3pniconductioncc-reference.vtu
@@ -212,7 +212,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="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           299.667 299.004 298.348 297.705 297.079 296.475 295.897 295.347 294.828 294.341 293.888 293.469
           293.083 292.73 292.41 292.12 291.859 291.625 291.417 291.231 291.068 290.923 290.797 290.686
           290.589 290.505 290.432 290.369 290.315 290.268 290.228 290.193 290.164 290.139 290.117 290.099
diff --git a/test/references/3pniconvectionbox-reference.vtu b/test/references/3pniconvectionbox-reference.vtu
index f765bcaed56a8561f1b5c877532b607296ac748e..c3778bb138880ab4709c190b11fcb8660cb451ac 100644
--- a/test/references/3pniconvectionbox-reference.vtu
+++ b/test/references/3pniconvectionbox-reference.vtu
@@ -179,7 +179,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="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           291 291 291 291 291 291 291 291 291 291 290.998 290.998
           290.995 290.995 290.988 290.988 290.975 290.975 290.955 290.955 290.926 290.926 290.887 290.887
           290.836 290.836 290.775 290.775 290.705 290.705 290.63 290.63 290.552 290.552 290.473 290.473
diff --git a/test/references/3pniconvectioncc-reference.vtu b/test/references/3pniconvectioncc-reference.vtu
index 0bc92e7712a878dc93fe1776c0a891e2d227cb77..1bfbaf9acaa20433e2b422f929344002041f8ebb 100644
--- a/test/references/3pniconvectioncc-reference.vtu
+++ b/test/references/3pniconvectioncc-reference.vtu
@@ -102,7 +102,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="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           291 291 291 291 290.999 290.996 290.991 290.981 290.965 290.941 290.906 290.861
           290.805 290.74 290.668 290.591 290.512 290.436 290.363 290.297 290.238 290.187 290.145 290.11
           290.082 290.061 290.044 290.032 290.022 290.016 290.011 290.008 290.006 290.004 290.003 290.002
diff --git a/test/references/3pwateroilbox-reference.vtu b/test/references/3pwateroilbox-reference.vtu
index a3a207bc5c7c1d2b08179f3fddd8aaf5a2a8b01d..ce4334e5a09a0fce51b228ca2c4e8e1755825831 100644
--- a/test/references/3pwateroilbox-reference.vtu
+++ b/test/references/3pwateroilbox-reference.vtu
@@ -4856,7 +4856,7 @@
           1e-16 1e-16 1e-16 1e-16 1e-16 1e-16 1e-16 1e-16 1e-16 1e-16 1e-16 1e-16
           1e-16 1e-16 1e-16 1e-16 1e-16
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           295.132 295.133 295.132 295.132 295.133 295.133 295.133 295.133 295.133 295.133 295.133 295.133
           295.134 295.134 295.134 295.134 295.134 295.134 295.134 295.134 295.134 295.134 295.134 295.134
           295.134 295.134 295.133 295.133 295.133 295.133 295.133 295.133 295.133 295.133 295.133 295.133
diff --git a/test/references/box1pncmin-00042.vtu b/test/references/box1pncmin-00042.vtu
index ad939c3e19f5bf5827430435382bd63347e8568d..813502156ac1c2fdd8f4fee0469e3ec7d244381e 100644
--- a/test/references/box1pncmin-00042.vtu
+++ b/test/references/box1pncmin-00042.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="80" NumberOfPoints="123">
-      <PointData Scalars="temperature">
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+      <PointData Scalars="T">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           773.15 748.138 773.15 748.138 732.976 732.976 731.372 731.372 731.432 731.432 731.682 731.682
           731.957 731.957 732.236 732.236 732.518 732.518 732.8 732.8 733.082 733.082 733.363 733.363
           733.639 733.639 733.908 733.908 734.167 734.167 734.411 734.411 734.632 734.632 734.823 734.823
diff --git a/test/references/box2pmincdist-reference.vtu b/test/references/box2pmincdist-reference.vtu
index 53a8ba5b538986970b6781d020bbb6c254f902f3..466b4d43f45cf7597d278a80e686edb2bc60b272 100644
--- a/test/references/box2pmincdist-reference.vtu
+++ b/test/references/box2pmincdist-reference.vtu
@@ -1675,7 +1675,7 @@
           1e-12 1e-12 1e-12 1e-12 1e-12 1e-12 1e-12 1e-12 1e-12 1e-12 1e-12 1e-12
           1e-12 1e-12 1e-12 1e-12 1e-12
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           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 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 293.15 293.15 293.15 293.15
diff --git a/test/references/box2pmincvol-reference.vtu b/test/references/box2pmincvol-reference.vtu
index 10300b0a7fbe7222966fdf66d0a3385a9edef9e1..e18e467c6349bad890dcdfbe3998190e995b6b73 100644
--- a/test/references/box2pmincvol-reference.vtu
+++ b/test/references/box2pmincvol-reference.vtu
@@ -1675,7 +1675,7 @@
           1e-12 1e-12 1e-12 1e-12 1e-12 1e-12 1e-12 1e-12 1e-12 1e-12 1e-12 1e-12
           1e-12 1e-12 1e-12 1e-12 1e-12
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           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 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 293.15 293.15 293.15 293.15
diff --git a/test/references/cc1pncmin-00042.vtu b/test/references/cc1pncmin-00042.vtu
index 2b2b015185f44a34149a5fad254f029eb2c61840..6dcf4cc4decbf87ec947037285181153e809db03 100644
--- a/test/references/cc1pncmin-00042.vtu
+++ b/test/references/cc1pncmin-00042.vtu
@@ -2,8 +2,8 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="80" NumberOfPoints="123">
-      <CellData Scalars="temperature">
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+      <CellData Scalars="T">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           773.15 732.152 695.627 685.878 685.266 686.19 687.337 688.478 689.571 690.602 691.565 692.456
           693.268 693.998 694.642 695.195 695.653 696.01 696.262 696.403 696.425 696.321 696.082 695.697
           695.156 694.443 693.541 692.433 691.094 689.498 687.613 685.401 682.817 679.802 676.263 672.217
diff --git a/test/references/ccmpfa1pniconduction-reference.vtu b/test/references/ccmpfa1pniconduction-reference.vtu
index cb2cfeb34c6c57d2784d8305be1615b1696bc5a9..b366335e3f33d5c772ba319e8aa25ed2634b93b3 100644
--- a/test/references/ccmpfa1pniconduction-reference.vtu
+++ b/test/references/ccmpfa1pniconduction-reference.vtu
@@ -60,7 +60,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="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           299.704 299.114 298.529 297.954 297.391 296.844 296.315 295.807 295.322 294.861 294.426 294.017
           293.634 293.279 292.949 292.645 292.366 292.111 291.879 291.668 291.477 291.306 291.151 291.013
           290.89 290.78 290.683 290.596 290.52 290.453 290.394 290.342 290.296 290.257 290.222 290.192
diff --git a/test/references/ccmpfa1pniconvection-reference.vtu b/test/references/ccmpfa1pniconvection-reference.vtu
index 6f0c43cb57ac7fadfbb16ebb57d4232d19f732d9..eb1b48e23eb3bc4bdd8a18f4640dd935fe4c91c0 100644
--- a/test/references/ccmpfa1pniconvection-reference.vtu
+++ b/test/references/ccmpfa1pniconvection-reference.vtu
@@ -21,7 +21,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="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           291 291 291 291.001 291.002 291 290.997 290.998 291.005 291.014 291.014 290.994
           290.943 290.861 290.754 290.632 290.508 290.392 290.291 290.208 290.144 290.096 290.063 290.04
           290.025 290.015 290.009 290.006 290.004 290.003 290.002 290.002 290.001 290.001 290.001 290.001
diff --git a/test/references/co2box-reference.vtu b/test/references/co2box-reference.vtu
index c3a38fd81e8ff84f419c83a1226847c7c3639c4f..77125cb46b870d05e9bbb44acca3718a58768112 100644
--- a/test/references/co2box-reference.vtu
+++ b/test/references/co2box-reference.vtu
@@ -5745,7 +5745,7 @@
           0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001
           0.001 0.001
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           319 318.946 319 318.926 318.966 319 318.925 318.885 318.894 318.951 318.872 319
           319 318.939 319 318.931 318.875 318.855 318.863 318.835 318.811 318.801 318.78 318.81
           318.813 318.861 318.8 318.784 319 318.923 319 318.919 319 318.93 319 318.937
diff --git a/test/references/co2cc-reference.vtu b/test/references/co2cc-reference.vtu
index 8faecf1e4fef6f1d9ba470735f7b63eb572e2848..8a3b8acf588a0a7cbe09266d041aebb1dec00cbd 100644
--- a/test/references/co2cc-reference.vtu
+++ b/test/references/co2cc-reference.vtu
@@ -7087,7 +7087,7 @@
           4.57671 4.81994 6.1998 6.18493 5.89826 5.55699 5.45407 4.92771 5.59241 5.76663 5.73772 4.22208
           5.97341 4.75575 6.0961 7.50343 4.60144 5.14531 8.28131
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           318.968 318.978 318.934 318.939 318.909 318.979 318.972 318.968 318.915 318.884 318.877 318.847
           318.82 318.837 318.847 318.902 318.846 318.83 318.964 318.961 318.962 318.967 318.967 318.963
           318.89 318.885 318.878 318.813 318.905 318.905 318.887 318.859 318.82 318.82 318.792 318.766
diff --git a/test/references/co2nibox-reference.vtu b/test/references/co2nibox-reference.vtu
index 30e87a5c45d566f1a2ad17c60995253931f44ecc..0569687a30bc3beb47ee82d37db5ba31dee84f2d 100644
--- a/test/references/co2nibox-reference.vtu
+++ b/test/references/co2nibox-reference.vtu
@@ -5745,7 +5745,7 @@
           0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001 0.001
           0.001 0.001
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           319.095 318.977 319.767 319.042 318.978 318.993 319.134 319.634 318.912 318.963 318.931 318.993
           318.996 318.953 318.998 318.946 318.891 319.077 318.32 319.414 319.377 318.097 319.298 318.879
           318.833 318.877 318.816 318.8 318.999 318.938 318.999 318.934 318.997 318.943 318.996 318.949
diff --git a/test/references/co2nicc-reference.vtu b/test/references/co2nicc-reference.vtu
index 97c30b9aa4719eab9e17a63df526b748bdc52f8d..4bd1f39085884f67e41f86fe8eb1f29da667c010 100644
--- a/test/references/co2nicc-reference.vtu
+++ b/test/references/co2nicc-reference.vtu
@@ -5855,7 +5855,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="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           319.081 318.997 319.772 318.956 318.944 318.986 318.977 318.973 318.93 319.08 318.978 319.512
           318.784 319.002 318.874 318.916 318.862 318.847 318.97 318.968 318.97 318.972 318.972 318.969
           318.905 318.902 318.894 318.83 318.92 318.919 318.902 318.873 318.835 318.834 319.515 318.441
diff --git a/test/references/column3p3cnibox-reference.vtu b/test/references/column3p3cnibox-reference.vtu
index 59554e185a6a93de6bc373977da539cdb0cc5a66..295b8855d051e493d824b9ee4eee53f4c26a5885 100644
--- a/test/references/column3p3cnibox-reference.vtu
+++ b/test/references/column3p3cnibox-reference.vtu
@@ -486,7 +486,7 @@
           1.4e-11 1.4e-11 1.4e-11 1.4e-11 1.4e-11 1.4e-11 1.4e-11 1.4e-11 1.4e-11 1.4e-11 1.4e-11 1.4e-11
           1.4e-11 1.4e-11
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15
           296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15
           296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15
diff --git a/test/references/column3p3cnicc-reference.vtu b/test/references/column3p3cnicc-reference.vtu
index c4e9fee7db369da170b97d35afe792a76a32da40..185f78c2e7a789e54f079595a421a57f4c8a31ac 100644
--- a/test/references/column3p3cnicc-reference.vtu
+++ b/test/references/column3p3cnicc-reference.vtu
@@ -231,7 +231,7 @@
           0.46 0.46 0.46 0.46 0.46 0.46 0.46 0.46 0.46 0.46 0.46 0.46
           0.46 0.46 0.46 0.46 0.46 0.46 0.46 0.46 0.46 0.46 0.46 0.46
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15
           296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15
           296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15
diff --git a/test/references/generalizeddirichlet-reference.vtp b/test/references/generalizeddirichlet-reference.vtp
index ede61fa12e55be55e9fb1bc9248bfc76b85e8a92..1144931578b01c983a676f67208f26eec725f4dd 100644
--- a/test/references/generalizeddirichlet-reference.vtp
+++ b/test/references/generalizeddirichlet-reference.vtp
@@ -113,7 +113,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
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
           283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
           283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
diff --git a/test/references/generallens_box-reference.vtu b/test/references/generallens_box-reference.vtu
index 41d5a3beba67bd8272f701ea4f5bb7087ee168eb..997850e8de2d7af1bd4f7efad21e70f52ec7e897 100644
--- a/test/references/generallens_box-reference.vtu
+++ b/test/references/generallens_box-reference.vtu
@@ -1373,7 +1373,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 0.4 0.4 0.4 0.4 0.4
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           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 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 293.15 293.15 293.15 293.15
diff --git a/test/references/generallens_cc-reference.vtu b/test/references/generallens_cc-reference.vtu
index 7bb283d1ed84837668638ea54e9bfd99e4dbe321..b373ae66f7e09dcb876a1787534b7945f345c235 100644
--- a/test/references/generallens_cc-reference.vtu
+++ b/test/references/generallens_cc-reference.vtu
@@ -1303,7 +1303,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 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           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 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 293.15 293.15 293.15 293.15
diff --git a/test/references/injection2pnibox-cube-reference.vtu b/test/references/injection2pnibox-cube-reference.vtu
index 40c961b0692e94f2ef83a67e1caf0efbf824a206..0a52c815382885c8489191aaae80daaa45cbc295 100644
--- a/test/references/injection2pnibox-cube-reference.vtu
+++ b/test/references/injection2pnibox-cube-reference.vtu
@@ -383,7 +383,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="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           364 364 363.925 363.925 364 363.925 364 363.925 364 363.925 364 363.925
           364 363.925 364 363.925 364 363.925 364 363.925 364 363.925 364 363.925
           364 363.925 364 363.925 364 363.925 364 363.925 364 363.925 364 363.925
diff --git a/test/references/injection2pnibox-simplex-reference.vtu b/test/references/injection2pnibox-simplex-reference.vtu
index 446e4f216003e68c3d42fec07c2dd881a6e1ee82..9431df94843a43444304722014aa7c3844e13ae9 100644
--- a/test/references/injection2pnibox-simplex-reference.vtu
+++ b/test/references/injection2pnibox-simplex-reference.vtu
@@ -383,7 +383,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="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           364 364 363.925 363.925 364 363.925 364 363.925 364 363.925 364 363.925
           364 363.925 364 363.925 364 363.925 364 363.925 364 363.925 364 363.925
           364 363.925 364 363.925 364 363.925 364 363.925 364 363.925 364 363.925
diff --git a/test/references/injection2pnicc-cube-reference.vtu b/test/references/injection2pnicc-cube-reference.vtu
index 1b610b3bb472b225efb15ac7cc9e18646181360b..8c1e918945d9d5f74c8ab4851f884a17f4c868f8 100644
--- a/test/references/injection2pnicc-cube-reference.vtu
+++ b/test/references/injection2pnicc-cube-reference.vtu
@@ -343,7 +343,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="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           363.962 363.962 363.962 363.962 363.962 363.962 363.963 363.963 363.963 363.963 363.963 363.963
           363.963 363.963 363.963 363.963 363.963 363.963 363.963 363.963 363.963 363.963 363.963 363.963
           363.888 363.888 363.888 363.888 363.888 363.888 363.888 363.888 363.905 363.905 363.905 363.905
diff --git a/test/references/injection2pnicc-simplex-reference.vtu b/test/references/injection2pnicc-simplex-reference.vtu
index 8c734a0c03e0dd46009b098cf0cf2bcf05783e26..adc0c23c57f8c520b9a3eb9ba6de2dca6123898d 100644
--- a/test/references/injection2pnicc-simplex-reference.vtu
+++ b/test/references/injection2pnicc-simplex-reference.vtu
@@ -663,7 +663,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="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           363.974 363.95 363.974 363.951 363.975 363.951 363.975 363.952 363.976 363.952 363.976 363.952
           363.976 363.952 363.977 363.953 363.977 363.953 363.977 363.953 363.977 363.953 363.978 363.954
           363.978 363.954 363.978 363.954 363.978 363.954 363.979 363.955 363.979 363.955 363.979 363.955
diff --git a/test/references/kuevette3p3cnibox-reference.vtu b/test/references/kuevette3p3cnibox-reference.vtu
index 8f6b6d9cd833389f5d926e6c18f131a214ca296e..402ad0171c87e812cd94378eb38cfc2b96ca9dbd 100644
--- a/test/references/kuevette3p3cnibox-reference.vtu
+++ b/test/references/kuevette3p3cnibox-reference.vtu
@@ -297,7 +297,7 @@
           9.14e-10 9.14e-10 9.14e-10 9.14e-10 9.14e-10 9.14e-10 9.14e-10 9.14e-10 9.14e-10 9.14e-10 9.14e-10 9.14e-10
           9.14e-10 9.14e-10 9.14e-10 9.14e-10 9.14e-10 9.14e-10 9.14e-10 9.14e-10 9.14e-10 9.14e-10 9.14e-10 9.14e-10
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           349.086 343.487 349.123 345.138 320.74 323.405 299.575 299.442 293.717 293.706 293.061 293.063
           293.005 293.005 293 293 293 293 293 293 293 293 293 293
           293 293 293 293 293 293 293 293 349.111 344.713 325.575 300.661
diff --git a/test/references/kuevette3p3cnicc-reference.vtu b/test/references/kuevette3p3cnicc-reference.vtu
index 4df4bb9509852e13fb3e22dbb4ae3856aa6c2257..e0d3f2b8799d13a2617fd339b89632077bcee2a8 100644
--- a/test/references/kuevette3p3cnicc-reference.vtu
+++ b/test/references/kuevette3p3cnicc-reference.vtu
@@ -231,7 +231,7 @@
           0.42 0.42 0.42 0.42 0.42 0.42 0.42 0.42 0.42 0.42 0.42 0.42
           0.42 0.42 0.42 0.42 0.42 0.42 0.42 0.42 0.42 0.42 0.42 0.42
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           347.642 336.669 310.281 295.649 293.26 293.023 293.002 293 293 293 293 293
           293 293 293 347.804 340 313.347 296.169 293.315 293.027 293.002 293 293
           293 293 293 293 293 293 347.58 342.061 317.178 297.034 293.396 293.033
diff --git a/test/references/pipe_zeroeqni.vtu b/test/references/pipe_zeroeqni.vtu
index 563d86a6064aba9e6e08c036794220a6d24f8358..f59a68e3e632b3a5039fcc84b538edbbfaaaa6aa 100644
--- a/test/references/pipe_zeroeqni.vtu
+++ b/test/references/pipe_zeroeqni.vtu
@@ -243,7 +243,7 @@
           25.3015 21.3902 18.2778 15.9643 14.3279 13.2118 12.4607 11.9799 12.078 12.7653 13.3186 13.525
           13.6028 13.6274 13.6253 13.5979
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           286.725 289.784 292.217 294.055 295.379 296.303 296.941 297.387 297.561 297.377 297.447 297.558
           297.646 297.719 297.785 297.849 283.701 284.536 285.48 286.395 287.218 287.934 288.555 289.081
           289.457 289.482 289.55 289.655 289.792 289.945 290.103 290.261 283.212 283.355 283.582 283.869
diff --git a/test/references/richardsniconductionbox-reference.vtu b/test/references/richardsniconductionbox-reference.vtu
index 49b8b1c5d0b92936d5fcad5963e1dcde6a040d9d..2af9e3266c22df16912f99f5426e21c0293a3390 100644
--- a/test/references/richardsniconductionbox-reference.vtu
+++ b/test/references/richardsniconductionbox-reference.vtu
@@ -363,7 +363,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           300 299.327 300 299.327 298.659 298.659 298.003 298.003 297.362 297.362 296.742 296.742
           296.147 296.147 295.58 295.58 295.043 295.043 294.539 294.539 294.068 294.068 293.632 293.632
           293.23 293.23 292.863 292.863 292.528 292.528 292.225 292.225 291.952 291.952 291.707 291.707
diff --git a/test/references/richardsniconductioncc-reference.vtu b/test/references/richardsniconductioncc-reference.vtu
index fd5e45f7ae861445add988291b9a75ca0ce5715a..5e6d2c747a4e07dbbe48d1276611cb92e7ae4d22 100644
--- a/test/references/richardsniconductioncc-reference.vtu
+++ b/test/references/richardsniconductioncc-reference.vtu
@@ -174,7 +174,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 0.4 0.4 0.4 0.4
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           299.663 298.993 298.331 297.682 297.052 296.444 295.863 295.31 294.79 294.302 293.849 293.43
           293.045 292.693 292.374 292.085 291.826 291.594 291.388 291.204 291.043 290.9 290.775 290.666
           290.571 290.489 290.417 290.356 290.303 290.257 290.218 290.185 290.156 290.132 290.111 290.093
diff --git a/test/references/richardsniconvectionbox-reference.vtu b/test/references/richardsniconvectionbox-reference.vtu
index ce88f5894c3559c79578afc782317092265995c0..428925cd496f029fedadfc526e3761a92fe1d8bc 100644
--- a/test/references/richardsniconvectionbox-reference.vtu
+++ b/test/references/richardsniconvectionbox-reference.vtu
@@ -147,7 +147,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 0.4 0.4
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           291 291 291 291 291 291 291 291 291 291 290.998 290.998
           290.995 290.995 290.988 290.988 290.975 290.975 290.956 290.956 290.926 290.926 290.887 290.887
           290.836 290.836 290.775 290.775 290.706 290.706 290.63 290.63 290.552 290.552 290.473 290.473
diff --git a/test/references/richardsniconvectioncc-reference.vtu b/test/references/richardsniconvectioncc-reference.vtu
index f37040fdc62ac0154924d815607a402ebd59e9ac..911019e5367d0629b45ad773d2a444616ce0a944 100644
--- a/test/references/richardsniconvectioncc-reference.vtu
+++ b/test/references/richardsniconvectioncc-reference.vtu
@@ -84,7 +84,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 0.4 0.4 0.4 0.4
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           291 291 291 291 290.999 290.996 290.991 290.981 290.965 290.941 290.906 290.861
           290.805 290.74 290.667 290.591 290.512 290.436 290.363 290.297 290.238 290.188 290.145 290.11
           290.083 290.061 290.044 290.032 290.023 290.016 290.011 290.008 290.006 290.004 290.003 290.002
diff --git a/test/references/richardswelltracerbox-reference.vtu b/test/references/richardswelltracerbox-reference.vtu
index 1e23f144bbb024d2ea57c20c1863a9be9fb4da07..24fd2a4aa6361427534020e12d16ede4af628c54 100644
--- a/test/references/richardswelltracerbox-reference.vtu
+++ b/test/references/richardswelltracerbox-reference.vtu
@@ -831,7 +831,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
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
           283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
           283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
diff --git a/test/references/richardswelltracercc-reference.vtu b/test/references/richardswelltracercc-reference.vtu
index 8168013b101ffa0057453c0534397cd49fcec157..7dc552a768594ef035f7cfd74747f17bb643c631 100644
--- a/test/references/richardswelltracercc-reference.vtu
+++ b/test/references/richardswelltracercc-reference.vtu
@@ -691,7 +691,7 @@
           6.14061e-06 6.2582e-06 6.46096e-06 6.84863e-06 7.73605e-06 9.51366e-06 1.30612e-05 2.44501e-05 7.86285e-05 0.000344282 0.00170825 0.00896678
           0.0452552 0.188888 0.535009 0.890348
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
           283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
           283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
diff --git a/test/references/rosi2c-soil-reference.vtu b/test/references/rosi2c-soil-reference.vtu
index ba44d9c362c81fe171dcf76e9f0dd8242b2217e6..35ab665ba621846dd582142f8fd05b8548474f4e 100644
--- a/test/references/rosi2c-soil-reference.vtu
+++ b/test/references/rosi2c-soil-reference.vtu
@@ -5355,7 +5355,7 @@
           6.34247e-07 6.32533e-07 6.29226e-07 6.24564e-07 6.189e-07 6.12694e-07 6.06494e-07 6.00903e-07 5.96525e-07 5.93887e-07 5.9335e-07 5.95015e-07
           5.98672e-07 6.03847e-07 6.09902e-07 6.16155e-07 6.2197e-07 6.26811e-07 6.30269e-07 6.32067e-07
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
           283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
           283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
diff --git a/test/references/steaminjectionbox-reference.vtu b/test/references/steaminjectionbox-reference.vtu
index 620badca7a349545ebe8cc4a27961cde19ea3774..bfd6ee45a7da620be33ff270606962bec1f8668a 100644
--- a/test/references/steaminjectionbox-reference.vtu
+++ b/test/references/steaminjectionbox-reference.vtu
@@ -245,7 +245,7 @@
           2 2 2 2 2 2 2 2 2 2 2 2
           2 2 2
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13
           283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13
           283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.142 283.13 283.13
diff --git a/test/references/steaminjectioncc-reference.vtu b/test/references/steaminjectioncc-reference.vtu
index 42ddf315ace161c643092bd039c93af4bbe58b37..df76678bd218c9eee49f57c5f00048363c796623 100644
--- a/test/references/steaminjectioncc-reference.vtu
+++ b/test/references/steaminjectioncc-reference.vtu
@@ -831,7 +831,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="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13
           283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13
           283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13 283.13
diff --git a/test/references/stokes2cni-advection.vtu b/test/references/stokes2cni-advection.vtu
index 4e7cb6d0d0267132e40b19df70220cc911cc4b74..21bc90f429d780d66ae86e05b48f87a5bebefcc1 100644
--- a/test/references/stokes2cni-advection.vtu
+++ b/test/references/stokes2cni-advection.vtu
@@ -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="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           292.245 290.499 288.516 286.776 285.467 284.576 284.01 283.666 283.463 283.344 283.274 283.232
           283.206 283.189 283.178 283.17 283.165 283.161 283.158 283.156 283.155 283.154 283.153 283.152
           283.152 283.151 283.151 283.151 283.151 283.15 283.15 283.15 283.15 283.15 283.15 283.15
diff --git a/test/references/stokes2cni-diffusion.vtu b/test/references/stokes2cni-diffusion.vtu
index 6c9369d74d1f7df4fd7f31c48be7e868335e52ba..812fed6b83e1cba98c492d5e941eff08a750e004 100644
--- a/test/references/stokes2cni-diffusion.vtu
+++ b/test/references/stokes2cni-diffusion.vtu
@@ -47,7 +47,7 @@
           110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000
           110000 110000 110000 110000 110000 110000 110000 110000
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           293.15 293.149 293.149 293.149 293.148 293.148 293.148 293.147 293.147 293.147 293.146 293.146
           293.146 293.146 293.145 293.145 293.145 293.144 293.144 293.144 293.143 293.143 293.143 293.143
           293.142 293.142 293.142 293.142 293.142 293.141 293.141 293.141 293.141 293.141 293.14 293.14
diff --git a/test/references/stokesni-conduction-reference.vtu b/test/references/stokesni-conduction-reference.vtu
index 688665bd7263a11c015062bc0cc1202f92c83918..45ed0b1216384d712fb4a7d1faeeb2df61178941 100644
--- a/test/references/stokesni-conduction-reference.vtu
+++ b/test/references/stokesni-conduction-reference.vtu
@@ -1260,7 +1260,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="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           293.072 292.915 292.759 292.603 292.447 292.291 292.136 291.982 291.828 291.675 291.522 291.371
           291.221 291.071 290.923 290.776 290.63 290.485 290.342 290.2 290.059 289.92 289.783 289.647
           289.513 289.381 289.25 289.121 288.994 288.869 288.745 288.624 288.504 288.387 288.271 288.157
diff --git a/test/references/stokesni-convection-reference.vtu b/test/references/stokesni-convection-reference.vtu
index 1f1b0c107d59e72b1ce7c1d40c649d90cdae0a3b..aca4a48b6c8e6b7042ae99407c241edaa0ca1cf8 100644
--- a/test/references/stokesni-convection-reference.vtu
+++ b/test/references/stokesni-convection-reference.vtu
@@ -1260,7 +1260,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="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           293.15 293.12 293.033 292.908 292.76 292.595 292.42 292.237 292.05 291.859 291.668 291.477
           291.287 291.098 290.912 290.729 290.549 290.372 290.199 290.029 289.863 289.701 289.543 289.389
           289.238 289.091 288.948 288.809 288.673 288.541 288.412 288.287 288.165 288.046 287.931 287.818
diff --git a/test/references/test_1pncmin-00064_batch.vtu b/test/references/test_1pncmin-00064_batch.vtu
index 7b94de43b8b0340a9d615ffb34f406b756afdabf..caf238731230bc12aa39ad537e106997acfaeca0 100644
--- a/test/references/test_1pncmin-00064_batch.vtu
+++ b/test/references/test_1pncmin-00064_batch.vtu
@@ -33,7 +33,7 @@
         <DataArray type="Float32" Name="precipVolFrac_CaOH2" NumberOfComponents="1" format="ascii">
           0.0943089 0.0943089 0.0943089 0.0943089 0.0943089 0.0943089
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           573.15 573.15 573.15 573.15 573.15 573.15
         </DataArray>
         <DataArray type="Float32" Name="permeability" NumberOfComponents="1" format="ascii">
diff --git a/test/references/test_boxrichardsevaporation-reference.vtu b/test/references/test_boxrichardsevaporation-reference.vtu
index 067cc9d766268599d5b6bcae44b22a443085d22a..cc64082d7cfe96248d6ff7c0ba89550c7ceffcd8 100644
--- a/test/references/test_boxrichardsevaporation-reference.vtu
+++ b/test/references/test_boxrichardsevaporation-reference.vtu
@@ -159,7 +159,7 @@
           3 3 3 3 3 3 3 3 3 3 3 3
           2 2 2 2 2 2
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           291 291 291 291 291 291 291 291 291 291 291 291
           291 291 291 291 291 291 291 291 291 291 291 291
           291 291 291 291 291 291 291 291 291 291 291 291
diff --git a/test/references/test_ccrichardsevaporation-reference.vtu b/test/references/test_ccrichardsevaporation-reference.vtu
index be01c2a2c05a7882a37a0f3db8383486ac8da9fb..2dfa91b996be3e3b865f19f8684bf168c9c5c40a 100644
--- a/test/references/test_ccrichardsevaporation-reference.vtu
+++ b/test/references/test_ccrichardsevaporation-reference.vtu
@@ -135,7 +135,7 @@
           3 3 3 3 3 3 3 3 3 3 3 2
           2 2 2 2
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           291 291 291 291 291 291 291 291 291 291 291 291
           291 291 291 291 291 291 291 291 291 291 291 291
           291 291 291 291 291 291 291 291 291 291 291 291
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 d40d07c1d68067572307dc5c59fbbf6174d798c4..f0e435b95716b0c2d2420719decafe148b5d6406 100644
--- a/test/references/test_embedded_1d3d_1p2c_richards2c_3d-reference.vtu
+++ b/test/references/test_embedded_1d3d_1p2c_richards2c_3d-reference.vtu
@@ -2424,7 +2424,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 0.4 0.4
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
           283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
           283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
diff --git a/test/references/test_flatplate_kepsilon2cni.vtu b/test/references/test_flatplate_kepsilon2cni.vtu
index c7de836616f979435aadd7a21d649fba6141337b..6d21181ed92ba78f6982d8dbd1bd4254c7c4f4b3 100644
--- a/test/references/test_flatplate_kepsilon2cni.vtu
+++ b/test/references/test_flatplate_kepsilon2cni.vtu
@@ -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="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           312.829 313.001 313.032 313.045 313.055 313.061 313.065 313.068 313.07 313.071 312.076 312.643
           312.748 312.793 312.827 312.848 312.861 312.871 312.877 312.881 311.052 312.142 312.352 312.44
           312.508 312.549 312.576 312.595 312.607 312.615 309.677 311.441 311.796 311.947 312.062 312.131
diff --git a/test/references/test_flatplate_kepsilon2cni_wallfunction.vtu b/test/references/test_flatplate_kepsilon2cni_wallfunction.vtu
index a919fe60132cb099505a74610a488b0c77d2bdc1..138d7eccbc947727c40ac090d61ed786b1c4a005 100644
--- a/test/references/test_flatplate_kepsilon2cni_wallfunction.vtu
+++ b/test/references/test_flatplate_kepsilon2cni_wallfunction.vtu
@@ -115,7 +115,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           283.869 284.533 285.147 285.718 286.248 286.744 287.207 287.641 288.047 288.426 283.209 283.31
           283.441 283.592 283.758 283.935 284.118 284.305 284.494 284.675 283.156 283.17 283.192 283.224
           283.264 283.311 283.365 283.425 283.491 283.557 283.151 283.152 283.156 283.161 283.17 283.18
diff --git a/test/references/test_flatplate_komega2cni.vtu b/test/references/test_flatplate_komega2cni.vtu
index 17c93bf34e37516de97b5829103a73187d4ae5fe..ea8e908988347cbf58bb7b5e1773f6d151edf3e3 100644
--- a/test/references/test_flatplate_komega2cni.vtu
+++ b/test/references/test_flatplate_komega2cni.vtu
@@ -231,7 +231,7 @@
           0.324596 0.290217 0.262571 0.239849 0.22087 0.204822 0.191128 0.179369 0.169221 0.16034 0.324462 0.289864
           0.262008 0.239058 0.219817 0.203459 0.189388 0.177164 0.166452 0.156993
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           312.87 313.034 313.061 313.071 313.076 313.078 313.08 313.081 313.083 313.083 312.213 312.757
           312.848 312.882 312.898 312.906 312.912 312.917 312.921 312.923 311.326 312.369 312.549 312.617
           312.648 312.666 312.677 312.686 312.694 312.7 310.141 311.826 312.131 312.245 312.299 312.329
diff --git a/test/references/test_flatplate_lowrekepsilon2cni.vtu b/test/references/test_flatplate_lowrekepsilon2cni.vtu
index 27504a73616cad2a27539f3d90e54b0ea8b252fb..f368f17b19bf7aa5759ad96216e5dfc8f1da2b5a 100644
--- a/test/references/test_flatplate_lowrekepsilon2cni.vtu
+++ b/test/references/test_flatplate_lowrekepsilon2cni.vtu
@@ -231,7 +231,7 @@
           1.25962e-06 9.83796e-07 7.8565e-07 6.39041e-07 5.2798e-07 4.42185e-07 3.74806e-07 3.21144e-07 2.77888e-07 2.42598e-07 1.25974e-06 9.83939e-07
           7.86075e-07 6.39765e-07 5.28934e-07 4.4326e-07 3.7587e-07 3.22048e-07 2.78482e-07 2.42814e-07
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           312.852 313.029 313.062 313.076 313.083 313.089 313.092 313.094 313.096 313.097 312.154 312.739
           312.849 312.897 312.924 312.941 312.953 312.961 312.967 312.971 311.208 312.333 312.553 312.647
           312.7 312.734 312.758 312.774 312.786 312.794 309.941 311.765 312.137 312.297 312.388 312.445
diff --git a/test/references/test_flatplate_oneeq2cni.vtu b/test/references/test_flatplate_oneeq2cni.vtu
index eb3b35f87b0198cfacc82089ee33b07cf7b79baf..cbe32c9b4d02a84ea76f92011bd45093119fdfb4 100644
--- a/test/references/test_flatplate_oneeq2cni.vtu
+++ b/test/references/test_flatplate_oneeq2cni.vtu
@@ -212,7 +212,7 @@
           2.47846e-07 2.48342e-07 2.49338e-07 2.51562e-07 2.56448e-07 2.6658e-07 2.86298e-07 3.22492e-07 3.84544e-07 4.70014e-07 2.47699e-07 2.47965e-07
           2.48223e-07 2.485e-07 2.48834e-07 2.49287e-07 2.49963e-07 2.51038e-07 2.52754e-07 2.55035e-07
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           312.873 313.041 313.07 313.083 313.089 313.094 313.096 313.098 313.099 313.1 312.225 312.78
           312.879 312.921 312.944 312.958 312.967 312.973 312.977 312.979 311.348 312.414 312.611 312.695
           312.741 312.769 312.786 312.798 312.805 312.81 310.179 311.902 312.236 312.379 312.456 312.503
diff --git a/test/references/test_flatplate_zeroeq2cni.vtu b/test/references/test_flatplate_zeroeq2cni.vtu
index fe2b9c1a752d6a6f0a346a695b41cd48367609e8..17e254b067872f4a6f5739e8f16c18f14adbab98 100644
--- a/test/references/test_flatplate_zeroeq2cni.vtu
+++ b/test/references/test_flatplate_zeroeq2cni.vtu
@@ -193,7 +193,7 @@
           2.16617 7.9427 8.93461 9.48493 9.82985 10.0611 10.2212 10.3358 10.4189 10.4617 2.16397 7.9281
           8.92433 9.49394 9.88015 10.1691 10.3902 10.5589 10.6844 10.753
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           312.795 312.891 312.929 312.949 312.961 312.969 312.976 312.981 312.985 312.988 311.955 312.275
           312.403 312.467 312.508 312.537 312.559 312.576 312.59 312.601 310.818 311.434 311.681 311.807
           311.887 311.943 311.986 312.019 312.046 312.068 309.332 310.323 310.72 310.924 311.055 311.147
diff --git a/test/references/test_stokes1p2cnidarcy2p2cni_horizontal_darcy-reference.vtu b/test/references/test_stokes1p2cnidarcy2p2cni_horizontal_darcy-reference.vtu
index cd2f8fc51aead65bfa3ad21ec4c820eeb335c8e5..f395e07cb2f5f654eb568178d2b75c00f0916b67 100644
--- a/test/references/test_stokes1p2cnidarcy2p2cni_horizontal_darcy-reference.vtu
+++ b/test/references/test_stokes1p2cnidarcy2p2cni_horizontal_darcy-reference.vtu
@@ -687,7 +687,7 @@
           3 3 3 3 3 3 3 3 3 3 3 3
           3 3 3 3
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           298.147 298.147 298.147 298.147 298.147 298.147 298.146 298.146 298.146 298.146 298.146 298.146
           298.146 298.146 298.146 298.146 298.146 298.146 298.146 298.146 298.146 298.146 298.146 298.146
           298.146 298.146 298.146 298.146 298.146 298.146 298.146 298.146 298.146 298.146 298.146 298.146
diff --git a/test/references/test_stokes1p2cnidarcy2p2cni_horizontal_stokes-reference.vtu b/test/references/test_stokes1p2cnidarcy2p2cni_horizontal_stokes-reference.vtu
index 3a59d9985d0b9c6c256a363415fb0266fae36de7..a7befdae00983826901bd904b9f02d7a32ea208a 100644
--- a/test/references/test_stokes1p2cnidarcy2p2cni_horizontal_stokes-reference.vtu
+++ b/test/references/test_stokes1p2cnidarcy2p2cni_horizontal_stokes-reference.vtu
@@ -255,7 +255,7 @@
           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 0.987202
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           296.755 295.568 294.692 294.054 293.599 293.284 293.078 292.954 292.894 292.882 292.905 292.953
           293.017 293.093 293.175 293.26 293.347 293.443 293.666 294.953 298.075 297.937 297.757 297.549
           297.323 297.086 296.845 296.604 296.366 296.133 295.908 295.692 295.486 295.29 295.105 294.931
diff --git a/test/references/test_stokes1p2cnidarcy2p2cni_vertical_darcy-reference.vtu b/test/references/test_stokes1p2cnidarcy2p2cni_vertical_darcy-reference.vtu
index 52c295133bfbc8244e537b8cc52d8a8767308834..03cf738c18cf30afeea5af39bf8649efc7d0c55f 100644
--- a/test/references/test_stokes1p2cnidarcy2p2cni_vertical_darcy-reference.vtu
+++ b/test/references/test_stokes1p2cnidarcy2p2cni_vertical_darcy-reference.vtu
@@ -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="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           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 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 293.15 293.15 293.15 293.15
diff --git a/test/references/test_stokes1p2cnidarcy2p2cni_vertical_stokes-reference.vtu b/test/references/test_stokes1p2cnidarcy2p2cni_vertical_stokes-reference.vtu
index 0015f6b05d56c3d9a0056f9f93fbcbdaf210eb0c..4d988186d8bdfad50024853bd6797b83b7249a76 100644
--- a/test/references/test_stokes1p2cnidarcy2p2cni_vertical_stokes-reference.vtu
+++ b/test/references/test_stokes1p2cnidarcy2p2cni_vertical_stokes-reference.vtu
@@ -255,7 +255,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           293.167 293.167 293.167 293.166 293.165 293.164 293.164 293.163 293.163 293.163 293.163 293.163
           293.163 293.164 293.164 293.165 293.166 293.167 293.167 293.167 293.173 293.173 293.173 293.172
           293.17 293.169 293.168 293.167 293.167 293.166 293.166 293.167 293.167 293.168 293.169 293.17
diff --git a/test/references/test_stokes1p2cnidarcy2p2cnihorizontal_darcy-reference.vtu b/test/references/test_stokes1p2cnidarcy2p2cnihorizontal_darcy-reference.vtu
index 69b3f139cda29d9ff1dadfc8f941333770873b34..f1686add16d806b0613771df799ebcda19ba2126 100644
--- a/test/references/test_stokes1p2cnidarcy2p2cnihorizontal_darcy-reference.vtu
+++ b/test/references/test_stokes1p2cnidarcy2p2cnihorizontal_darcy-reference.vtu
@@ -155,7 +155,7 @@
           3 3 3 3 3 3 3 3 2 2 2 2
           2 2 2 2
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           286.028 286.018 285.999 285.976 285.951 285.929 285.912 285.903 286.304 286.279 286.235 286.181
           286.128 286.081 286.048 286.03 286.676 286.614 286.516 286.406 286.302 286.216 286.155 286.124
           287.063 286.939 286.763 286.584 286.424 286.295 286.207 286.165 287.42 287.208 286.948 286.705
diff --git a/test/references/test_stokes1p2cnidarcy2p2cnihorizontal_stokes-reference.vtu b/test/references/test_stokes1p2cnidarcy2p2cnihorizontal_stokes-reference.vtu
index c2618fc98e902f0a20ea7a811f487d4ff66affe6..38b598835a1c34822429402b91d69d097e8ef95f 100644
--- a/test/references/test_stokes1p2cnidarcy2p2cnihorizontal_stokes-reference.vtu
+++ b/test/references/test_stokes1p2cnidarcy2p2cnihorizontal_stokes-reference.vtu
@@ -42,7 +42,7 @@
           1.16822 1.16822 1.16822 1.16822 1.16821 1.16821 1.16821 1.16821 1.16821 1.16821 1.16821 1.16821
           1.1682 1.1682 1.1682 1.1682 1.1682 1.1682 1.1682 1.1682
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           292.716 291.572 290.867 290.343 289.927 289.592 289.345 289.323 293.133 291.935 291.206 290.667
           290.24 289.895 289.64 289.621 293.744 292.476 291.712 291.151 290.707 290.348 290.081 290.066
           294.602 293.269 292.461 291.87 291.402 291.023 290.74 290.73 295.703 294.386 293.541 292.916
diff --git a/test/references/waterairbox-reference.vtu b/test/references/waterairbox-reference.vtu
index 05b93afc87c4f40a8d7c54a599e4489e50933d90..a5e0753e3ad4cac8534f272df63822ddff9bd9e3 100644
--- a/test/references/waterairbox-reference.vtu
+++ b/test/references/waterairbox-reference.vtu
@@ -6748,7 +6748,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           313 312.999 312.981 312.981 312.999 312.981 312.999 312.981 312.999 312.981 312.999 312.981
           312.999 312.981 312.999 312.981 312.999 312.981 313 312.981 313 312.981 313 312.981
           313 312.981 313 312.981 313 312.981 313 312.982 313 312.982 313 312.982
diff --git a/test/references/wateraircc-reference.vtu b/test/references/wateraircc-reference.vtu
index f0fabf8cc0f4ba080f715a80188a5eba899faef2..1eb283a23199fd2258cb2192fa792d44517a2599 100644
--- a/test/references/wateraircc-reference.vtu
+++ b/test/references/wateraircc-reference.vtu
@@ -6539,7 +6539,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
           312.99 312.99 312.99 312.99 312.99 312.99 312.99 312.99 312.99 312.99 312.99 312.99
           312.99 312.991 312.991 312.991 312.991 312.991 312.991 312.991 312.991 312.992 313.015 313.016
           313.02 313.02 313.02 313.02 313.02 313.021 313.03 314.064 374.342 379.293 379.505 379.511