diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d.prj b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d.prj
index 3284154bcc34fa82c19ad371e54a293c017dc7a5..97759243a949b3c6733a11a0f773968fb921bdcf 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d.prj
@@ -18,7 +18,7 @@
             <specific_body_force>0</specific_body_force>
             <secondary_variables>
                 <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
-                <secondary_variable internal_name="molar_flux" output_name="molar_flux"/>
+                <secondary_variable internal_name="CsFlux" output_name="CsFlux"/>
             </secondary_variables>
         </process>
     </processes>
@@ -165,7 +165,7 @@
             <variables>
                 <variable>Cs</variable>
                 <variable>pressure</variable>
-                <variable>molar_flux</variable>
+                <variable>CsFlux</variable>
                 <variable>CsFlowRate</variable>
                 <variable>darcy_velocity</variable>
             </variables>
@@ -308,7 +308,7 @@
         </vtkdiff>
         <vtkdiff>
             <regex>ConTracer_1d_ts_[0-9]*_t_[0-9]*.000000.vtu</regex>
-            <field>molar_flux</field>
+            <field>CsFlux</field>
             <absolute_tolerance>1e-10</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
         </vtkdiff>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_132_t_475200.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_132_t_475200.000000.vtu
index 5f3aeb7aac8f119ded683f92ef76e97f2585cc1a..61dfc80423efc2ee690af81b14bf2dde0a72f654 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_132_t_475200.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_132_t_475200.000000.vtu
@@ -9,7 +9,7 @@
         <DataArray type="Float64" Name="Cs" format="appended" RangeMin="0"                    RangeMax="0.0016952074579"      offset="84"                  />
         <DataArray type="Float64" Name="CsFlowRate" format="appended" RangeMin="-7.5395603657e-07"    RangeMax="7.4327141122e-20"     offset="1156"                />
         <DataArray type="Float64" Name="darcy_velocity" format="appended" RangeMin="6.5509299998e-06"     RangeMax="6.5509300003e-06"     offset="1512"                />
-        <DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="-2.9378619751e-10"    RangeMax="1.1053831544e-08"     offset="2064"                />
+        <DataArray type="Float64" Name="CsFlux" format="appended" RangeMin="-2.9378619751e-10"    RangeMax="1.1053831544e-08"     offset="2064"                />
         <DataArray type="Float64" Name="pressure" format="appended" RangeMin="9810"                 RangeMax="9813.0789371"         offset="3136"                />
       </PointData>
       <CellData>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_165_t_594000.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_165_t_594000.000000.vtu
index f642644e5a68e2e231b4097bbfbabacfb45cfef6..6f24353ec449593b243588392de6dc9c75610946 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_165_t_594000.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_165_t_594000.000000.vtu
@@ -9,7 +9,7 @@
         <DataArray type="Float64" Name="Cs" format="appended" RangeMin="0"                    RangeMax="0.0006181961386"      offset="84"                  />
         <DataArray type="Float64" Name="CsFlowRate" format="appended" RangeMin="-2.7362690253e-07"    RangeMax="2.9857911391e-20"     offset="1156"                />
         <DataArray type="Float64" Name="darcy_velocity" format="appended" RangeMin="6.5509299998e-06"     RangeMax="6.5509300003e-06"     offset="1536"                />
-        <DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="-1.0662147579e-10"    RangeMax="4.0309688576e-09"     offset="2092"                />
+        <DataArray type="Float64" Name="CsFlux" format="appended" RangeMin="-1.0662147579e-10"    RangeMax="4.0309688576e-09"     offset="2092"                />
         <DataArray type="Float64" Name="pressure" format="appended" RangeMin="9810"                 RangeMax="9813.0789371"         offset="3164"                />
       </PointData>
       <CellData>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_198_t_712800.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_198_t_712800.000000.vtu
index f3c02c9ff49c3c9a45284cfb3793732991df8a3a..2ed54d87e3b7f5d3a96640813559580a26b49c51 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_198_t_712800.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_198_t_712800.000000.vtu
@@ -9,7 +9,7 @@
         <DataArray type="Float64" Name="Cs" format="appended" RangeMin="0"                    RangeMax="0.00022510165765"     offset="84"                  />
         <DataArray type="Float64" Name="CsFlowRate" format="appended" RangeMin="-9.9557591071e-08"    RangeMax="6.5909751208e-21"     offset="1156"                />
         <DataArray type="Float64" Name="darcy_velocity" format="appended" RangeMin="6.5509299998e-06"     RangeMax="6.5509300003e-06"     offset="1532"                />
-        <DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="-3.879362475e-11"     RangeMax="1.467779272e-09"      offset="2084"                />
+        <DataArray type="Float64" Name="CsFlux" format="appended" RangeMin="-3.879362475e-11"     RangeMax="1.467779272e-09"      offset="2084"                />
         <DataArray type="Float64" Name="pressure" format="appended" RangeMin="9810"                 RangeMax="9813.0789371"         offset="3156"                />
       </PointData>
       <CellData>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_231_t_831600.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_231_t_831600.000000.vtu
index 6f84e64fd556d94f59d8176283bc3ae5f669573b..cd78271004fc1d86744df47b0212c88713f04c45 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_231_t_831600.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_231_t_831600.000000.vtu
@@ -9,7 +9,7 @@
         <DataArray type="Float64" Name="Cs" format="appended" RangeMin="0"                    RangeMax="8.1945746162e-05"     offset="84"                  />
         <DataArray type="Float64" Name="CsFlowRate" format="appended" RangeMin="-3.623830446e-08"     RangeMax="2.5146290622e-21"     offset="1156"                />
         <DataArray type="Float64" Name="darcy_velocity" format="appended" RangeMin="6.5509299998e-06"     RangeMax="6.5509300003e-06"     offset="1528"                />
-        <DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="-1.4120623192e-11"    RangeMax="5.3432844507e-10"     offset="2084"                />
+        <DataArray type="Float64" Name="CsFlux" format="appended" RangeMin="-1.4120623192e-11"    RangeMax="5.3432844507e-10"     offset="2084"                />
         <DataArray type="Float64" Name="pressure" format="appended" RangeMin="9810"                 RangeMax="9813.0789371"         offset="3156"                />
       </PointData>
       <CellData>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_264_t_950400.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_264_t_950400.000000.vtu
index 4278274efeef1d1f41dbdda5a2e6cf7b16033e7d..319983247768c8151b8467d84c90af5adb8cd7cf 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_264_t_950400.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_264_t_950400.000000.vtu
@@ -9,7 +9,7 @@
         <DataArray type="Float64" Name="Cs" format="appended" RangeMin="0"                    RangeMax="2.9830276923e-05"     offset="84"                  />
         <DataArray type="Float64" Name="CsFlowRate" format="appended" RangeMin="-1.319137327e-08"     RangeMax="1.2291903903e-21"     offset="1156"                />
         <DataArray type="Float64" Name="darcy_velocity" format="appended" RangeMin="6.5509299998e-06"     RangeMax="6.5509300003e-06"     offset="1544"                />
-        <DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="-5.1401525281e-12"    RangeMax="1.945087474e-10"      offset="2096"                />
+        <DataArray type="Float64" Name="CsFlux" format="appended" RangeMin="-5.1401525281e-12"    RangeMax="1.945087474e-10"      offset="2096"                />
         <DataArray type="Float64" Name="pressure" format="appended" RangeMin="9810"                 RangeMax="9813.0789371"         offset="3168"                />
       </PointData>
       <CellData>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_297_t_1069200.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_297_t_1069200.000000.vtu
index 247cb9025f590c8bb2e8f35f075cb79ab12c9c8a..6e1cb87f695ca1a041aec2bb7f35effd48436388 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_297_t_1069200.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_297_t_1069200.000000.vtu
@@ -9,7 +9,7 @@
         <DataArray type="Float64" Name="Cs" format="appended" RangeMin="0"                    RangeMax="1.0858890242e-05"     offset="84"                  />
         <DataArray type="Float64" Name="CsFlowRate" format="appended" RangeMin="-4.8019403654e-09"    RangeMax="4.5164061445e-22"     offset="1156"                />
         <DataArray type="Float64" Name="darcy_velocity" format="appended" RangeMin="6.5509299998e-06"     RangeMax="6.5509300003e-06"     offset="1548"                />
-        <DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="-1.8711248195e-12"    RangeMax="7.0805548412e-11"     offset="2104"                />
+        <DataArray type="Float64" Name="CsFlux" format="appended" RangeMin="-1.8711248195e-12"    RangeMax="7.0805548412e-11"     offset="2104"                />
         <DataArray type="Float64" Name="pressure" format="appended" RangeMin="9810"                 RangeMax="9813.0789371"         offset="3176"                />
       </PointData>
       <CellData>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_329_t_1184400.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_329_t_1184400.000000.vtu
index a77b70fd4be2733536a622a96352d21861c7b6af..948e3e4bea1a234ed982793e87614f667d640ee3 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_329_t_1184400.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_329_t_1184400.000000.vtu
@@ -9,7 +9,7 @@
         <DataArray type="Float64" Name="Cs" format="appended" RangeMin="0"                    RangeMax="4.0757949483e-06"     offset="84"                  />
         <DataArray type="Float64" Name="CsFlowRate" format="appended" RangeMin="-1.8023678075e-09"    RangeMax="1.2407709188e-22"     offset="1156"                />
         <DataArray type="Float64" Name="darcy_velocity" format="appended" RangeMin="6.5509299998e-06"     RangeMax="6.5509300003e-06"     offset="1544"                />
-        <DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="-7.0231091649e-13"    RangeMax="2.657627894e-11"      offset="2100"                />
+        <DataArray type="Float64" Name="CsFlux" format="appended" RangeMin="-7.0231091649e-13"    RangeMax="2.657627894e-11"      offset="2100"                />
         <DataArray type="Float64" Name="pressure" format="appended" RangeMin="9810"                 RangeMax="9813.0789371"         offset="3172"                />
       </PointData>
       <CellData>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_33_t_118800.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_33_t_118800.000000.vtu
index 990309fc12be6779a2f50bd72e4e748d6e68ddeb..3999d5f92cd9d7084a15cf652589abf2942af939 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_33_t_118800.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_33_t_118800.000000.vtu
@@ -9,7 +9,7 @@
         <DataArray type="Float64" Name="Cs" format="appended" RangeMin="0"                    RangeMax="0.019872219069"       offset="84"                  />
         <DataArray type="Float64" Name="CsFlowRate" format="appended" RangeMin="-3.0510869208e-05"    RangeMax="8.1315162936e-19"     offset="1148"                />
         <DataArray type="Float64" Name="darcy_velocity" format="appended" RangeMin="6.5509299998e-06"     RangeMax="6.5509300003e-06"     offset="1576"                />
-        <DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="-1.1886071819e-08"    RangeMax="1.3169399861e-07"     offset="2132"                />
+        <DataArray type="Float64" Name="CsFlux" format="appended" RangeMin="-1.1886071819e-08"    RangeMax="1.3169399861e-07"     offset="2132"                />
         <DataArray type="Float64" Name="pressure" format="appended" RangeMin="9810"                 RangeMax="9813.0789371"         offset="3204"                />
       </PointData>
       <CellData>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_66_t_237600.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_66_t_237600.000000.vtu
index fa7f469b8f6af5a0b1e09dacf6270f1908fb3de2..d098e6806a3ac5e91195d1c417f165865207fc02 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_66_t_237600.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_66_t_237600.000000.vtu
@@ -9,7 +9,7 @@
         <DataArray type="Float64" Name="Cs" format="appended" RangeMin="0"                    RangeMax="0.011771181282"       offset="84"                  />
         <DataArray type="Float64" Name="CsFlowRate" format="appended" RangeMin="-6.4634665781e-06"    RangeMax="4.3368086899e-19"     offset="1152"                />
         <DataArray type="Float64" Name="darcy_velocity" format="appended" RangeMin="6.5509299998e-06"     RangeMax="6.5509300003e-06"     offset="1552"                />
-        <DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="-2.5184294297e-09"    RangeMax="7.6814002898e-08"     offset="2104"                />
+        <DataArray type="Float64" Name="CsFlux" format="appended" RangeMin="-2.5184294297e-09"    RangeMax="7.6814002898e-08"     offset="2104"                />
         <DataArray type="Float64" Name="pressure" format="appended" RangeMin="9810"                 RangeMax="9813.0789371"         offset="3176"                />
       </PointData>
       <CellData>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_99_t_356400.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_99_t_356400.000000.vtu
index 88d979eb8ac236670d4f993be681b64d5558e345..e3ffd49b6d87bbc5eb74b744d72424fb2c709562 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_99_t_356400.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_99_t_356400.000000.vtu
@@ -9,7 +9,7 @@
         <DataArray type="Float64" Name="Cs" format="appended" RangeMin="0"                    RangeMax="0.0046051699035"      offset="84"                  />
         <DataArray type="Float64" Name="CsFlowRate" format="appended" RangeMin="-2.1100816265e-06"    RangeMax="1.5839516114e-19"     offset="1156"                />
         <DataArray type="Float64" Name="darcy_velocity" format="appended" RangeMin="6.5509299998e-06"     RangeMax="6.5509300003e-06"     offset="1548"                />
-        <DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="-8.2220743365e-10"    RangeMax="3.0031610414e-08"     offset="2104"                />
+        <DataArray type="Float64" Name="CsFlux" format="appended" RangeMin="-8.2220743365e-10"    RangeMax="3.0031610414e-08"     offset="2104"                />
         <DataArray type="Float64" Name="pressure" format="appended" RangeMin="9810"                 RangeMax="9813.0789371"         offset="3176"                />
       </PointData>
       <CellData>
diff --git a/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/1D_MultiLayerDiffusion.prj b/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/1D_MultiLayerDiffusion.prj
index 633752332524aebb3347b7a71f6f9ebd00c09fea..91831d730f805f959e8f8b9720040aafa25401ac 100644
--- a/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/1D_MultiLayerDiffusion.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/1D_MultiLayerDiffusion.prj
@@ -17,7 +17,7 @@
             </process_variables>
             <specific_body_force>0</specific_body_force>
             <secondary_variables>
-                <secondary_variable internal_name="molar_flux" output_name="molar_flux"/>
+                <secondary_variable internal_name="HTOFlux" output_name="HTOFlux"/>
             </secondary_variables>
         </process>
     </processes>
@@ -240,7 +240,7 @@
                 <variable>HTO</variable>
                 <variable>HTOFlowRate</variable>
                 <variable>pressure</variable>
-                <variable>molar_flux</variable>
+                <variable>HTOFlux</variable>
             </variables>
         </output>
     </time_loop>
diff --git a/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/1D_MultiLayerDiffusion_ts_0_t_0.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/1D_MultiLayerDiffusion_ts_0_t_0.000000.vtu
index eb949e187f269f485dda6fd9d3dc78285ecdb261..0906458be0ca4bdd1b6cd0fadbd0537f8f36b092 100644
--- a/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/1D_MultiLayerDiffusion_ts_0_t_0.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/1D_MultiLayerDiffusion_ts_0_t_0.000000.vtu
@@ -8,7 +8,7 @@
       <PointData>
         <DataArray type="Float64" Name="HTO" format="appended" RangeMin="0"                    RangeMax="0"                    offset="84"                  />
         <DataArray type="Float64" Name="HTOFlowRate" format="appended" RangeMin="0"                    RangeMax="0"                    offset="200"                 />
-        <DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="0"                    RangeMax="0"                    offset="316"                 />
+        <DataArray type="Float64" Name="HTOFlux" format="appended" RangeMin="0"                    RangeMax="0"                    offset="316"                 />
         <DataArray type="Float64" Name="pressure" format="appended" RangeMin="100000"               RangeMax="100000"               offset="432"                 />
       </PointData>
       <CellData>
diff --git a/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/1D_MultiLayerDiffusion_ts_1000_t_31536000000000.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/1D_MultiLayerDiffusion_ts_1000_t_31536000000000.000000.vtu
index ee0fa306a7ddda82b0ebf0e29ba8d5807a2f98b5..4f384090a517e2db9d583d2e3368282c29afd5b2 100644
--- a/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/1D_MultiLayerDiffusion_ts_1000_t_31536000000000.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/1D_MultiLayerDiffusion_ts_1000_t_31536000000000.000000.vtu
@@ -8,7 +8,7 @@
       <PointData>
         <DataArray type="Float64" Name="HTO" format="appended" RangeMin="0.99999995091"        RangeMax="1"                    offset="84"                  />
         <DataArray type="Float64" Name="HTOFlowRate" format="appended" RangeMin="-1.44489737e-20"      RangeMax="3.9741543552e-17"     offset="19540"               />
-        <DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="1.7507797138e-24"     RangeMax="1.4309788558e-20"     offset="52316"               />
+        <DataArray type="Float64" Name="HTOFlux" format="appended" RangeMin="1.7507797138e-24"     RangeMax="1.4309788558e-20"     offset="52316"               />
         <DataArray type="Float64" Name="pressure" format="appended" RangeMin="100000"               RangeMax="100000"               offset="90604"               />
       </PointData>
       <CellData>
diff --git a/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/1D_MultiLayerDiffusion_ts_100_t_3153600000000.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/1D_MultiLayerDiffusion_ts_100_t_3153600000000.000000.vtu
index 7eafdefefbd879d9993d66dfe5b4a71c7bf4bcab..cc2c1d20dee909eaaabd20bfd58e494043f74013 100644
--- a/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/1D_MultiLayerDiffusion_ts_100_t_3153600000000.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/1D_MultiLayerDiffusion_ts_100_t_3153600000000.000000.vtu
@@ -8,7 +8,7 @@
       <PointData>
         <DataArray type="Float64" Name="HTO" format="appended" RangeMin="0.76901194403"        RangeMax="1"                    offset="84"                  />
         <DataArray type="Float64" Name="HTOFlowRate" format="appended" RangeMin="-1.5432837935e-20"    RangeMax="1.8700423403e-10"     offset="35200"               />
-        <DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="4.5400813177e-18"     RangeMax="6.7321523976e-14"     offset="52264"               />
+        <DataArray type="Float64" Name="HTOFlux" format="appended" RangeMin="4.5400813177e-18"     RangeMax="6.7321523976e-14"     offset="52264"               />
         <DataArray type="Float64" Name="pressure" format="appended" RangeMin="100000"               RangeMax="100000"               offset="91072"               />
       </PointData>
       <CellData>
diff --git a/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/1D_MultiLayerDiffusion_ts_10_t_315360000000.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/1D_MultiLayerDiffusion_ts_10_t_315360000000.000000.vtu
index 07d4200d7662ff01692401fd33ae6cf6b11d8469..22a435c0bb56b27e11808fc9ea1ff698f6a45169 100644
--- a/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/1D_MultiLayerDiffusion_ts_10_t_315360000000.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/1D_MultiLayerDiffusion_ts_10_t_315360000000.000000.vtu
@@ -8,7 +8,7 @@
       <PointData>
         <DataArray type="Float64" Name="HTO" format="appended" RangeMin="0.020285735525"       RangeMax="1"                    offset="84"                  />
         <DataArray type="Float64" Name="HTOFlowRate" format="appended" RangeMin="-1.5212265055e-20"    RangeMax="1.1455334874e-09"     offset="40028"               />
-        <DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="6.4450973387e-18"     RangeMax="4.1239204967e-13"     offset="54128"               />
+        <DataArray type="Float64" Name="HTOFlux" format="appended" RangeMin="6.4450973387e-18"     RangeMax="4.1239204967e-13"     offset="54128"               />
         <DataArray type="Float64" Name="pressure" format="appended" RangeMin="100000"               RangeMax="100000"               offset="93808"               />
       </PointData>
       <CellData>
diff --git a/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/1D_MultiLayerDiffusion_ts_1_t_31536000000.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/1D_MultiLayerDiffusion_ts_1_t_31536000000.000000.vtu
index 1d39eca7d067e72a8b377dd2c6b548109c790672..fcabeffa5f8631cf19872ac6f46496e773443dda 100644
--- a/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/1D_MultiLayerDiffusion_ts_1_t_31536000000.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/1D_MultiLayerDiffusion_ts_1_t_31536000000.000000.vtu
@@ -8,7 +8,7 @@
       <PointData>
         <DataArray type="Float64" Name="HTO" format="appended" RangeMin="1.251477596e-05"      RangeMax="1"                    offset="84"                  />
         <DataArray type="Float64" Name="HTOFlowRate" format="appended" RangeMin="-1.4694036401e-20"    RangeMax="1.3001968678e-08"     offset="40612"               />
-        <DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="1.4286296581e-20"     RangeMax="4.6704358623e-12"     offset="53656"               />
+        <DataArray type="Float64" Name="HTOFlux" format="appended" RangeMin="1.4286296581e-20"     RangeMax="4.6704358623e-12"     offset="53656"               />
         <DataArray type="Float64" Name="pressure" format="appended" RangeMin="100000"               RangeMax="100000"               offset="94184"               />
       </PointData>
       <CellData>
diff --git a/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/MultiLayerDiffusion.ipynb b/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/MultiLayerDiffusion.ipynb
index d1cfcbec8cbb7517cf4ee763cebdc0f9f5a061df..f638a39afe17761120ba1338fba06a989b1448e0 100644
--- a/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/MultiLayerDiffusion.ipynb
+++ b/Tests/Data/Parabolic/ComponentTransport/MultiLayerDiffusion/MultiLayerDiffusion.ipynb
@@ -406,7 +406,7 @@
     "    for t, color in zip(time, color_map):\n",
     "        c_t = pvdfile.read_set_data(\n",
     "            t * 3.1536e7,\n",
-    "            \"molar_flux\",\n",
+    "            \"HTOFlux\",\n",
     "            data_type=\"point\",\n",
     "            pointsetarray=[(i, 0, 0) for i in x],\n",
     "        )\n",