From 22157ee9bb8ae9b9d27c24127e509ab037cf6be3 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Sun, 3 Nov 2019 16:30:40 +0100
Subject: [PATCH] [T] Remove type="static" from project files.

---
 .../circle_radius_1/circle_1e1_axi.prj        |  2 +-
 .../circle_radius_1/circle_1e2_axi.prj        |  2 +-
 .../circle_radius_1/circle_1e3_axi.prj        |  2 +-
 .../circle_radius_1/circle_1e4_axi.prj        |  2 +-
 .../circle_radius_1/circle_1e5_axi.prj        |  2 +-
 .../circle_radius_1/circle_1e6_axi.prj        |  2 +-
 .../cube_1x1x1_GroundWaterFlow/cube_1e0.prj   |  2 +-
 .../cube_1e0_neumann.prj                      |  2 +-
 .../cube_1e0_newton.prj                       |  2 +-
 .../cube_1e0_quadratic_hex.prj                |  2 +-
 .../cube_1x1x1_GroundWaterFlow/cube_1e1.prj   |  2 +-
 .../cube_1e1_neumann.prj                      |  2 +-
 .../cube_1e1_newton.prj                       |  2 +-
 .../cube_1x1x1_GroundWaterFlow/cube_1e2.prj   |  2 +-
 .../cube_1e2_neumann.prj                      |  2 +-
 .../cube_1e2_newton.prj                       |  2 +-
 .../cube_1x1x1_GroundWaterFlow/cube_1e3.prj   |  2 +-
 .../cube_1e3_bottom_neumann.prj               |  2 +-
 .../cube_1e3_bottom_neumann_newton.prj        |  2 +-
 .../cube_1e3_calculatesurfaceflux.prj         |  2 +-
 .../cube_1e3_neumann.prj                      |  2 +-
 .../cube_1e3_neumann_calculatesurfaceflux.prj |  2 +-
 .../cube_1e3_newton.prj                       |  2 +-
 .../cube_1e3_top_neumann.prj                  |  2 +-
 .../cube_1e3_top_neumann_newton.prj           |  2 +-
 .../cube_1x1x1_GroundWaterFlow/cube_1e4.prj   |  2 +-
 .../cube_1e4_anisotropic.prj                  |  2 +-
 .../cube_1e4_neumann.prj                      |  2 +-
 .../cube_1x1x1_GroundWaterFlow/cube_1e5.prj   |  2 +-
 .../cube_1e5_neumann.prj                      |  2 +-
 .../cube_1x1x1_GroundWaterFlow/cube_1e6.prj   |  2 +-
 .../cube_1e6_neumann.prj                      |  2 +-
 .../cube_2e3_prism_surfaceflux_front_back.prj |  2 +-
 .../cube_2e3_prism_surfaceflux_left_right.prj |  2 +-
 .../cube_2e3_prism_surfaceflux_top_bottom.prj |  2 +-
 .../cube_1x1x1_GroundWaterFlow/cube_2e4.prj   |  2 +-
 .../cube_2e4_neumann.prj                      |  2 +-
 .../cube_1x1x1_GroundWaterFlow/cube_3e4.prj   |  2 +-
 .../cube_3e4_neumann.prj                      |  2 +-
 .../cube_1x1x1_GroundWaterFlow/cube_4e4.prj   |  2 +-
 .../cube_4e4_neumann.prj                      |  2 +-
 .../cube_1x1x1_GroundWaterFlow/cube_5e4.prj   |  2 +-
 .../cube_5e4_neumann.prj                      |  2 +-
 .../line_1_GroundWaterFlow/line_1e1.prj       |  2 +-
 .../line_1e1_neumann.prj                      |  2 +-
 .../line_1e1_robin_left_picard.prj            |  2 +-
 .../line_1e1_robin_right_picard.prj           |  2 +-
 .../line_1e1_time_dep_dirichlet.prj           |  2 +-
 .../line_1e1_time_dep_neumann.prj             |  2 +-
 .../inhomogeneous_permeability.prj            |  2 +-
 .../neumann_nonuniform.prj                    |  2 +-
 .../square_1e4_heterogeneity.prj              |  2 +-
 .../square_1x1_GroundWaterFlow/square_1e0.prj |  2 +-
 .../square_1e0_neumann.prj                    |  2 +-
 .../square_1x1_GroundWaterFlow/square_1e1.prj |  2 +-
 .../square_1e1_neumann.prj                    |  2 +-
 .../square_1x1_GroundWaterFlow/square_1e2.prj |  2 +-
 .../square_1e2_axi.prj                        |  2 +-
 .../square_1e2_neumann.prj                    |  2 +-
 .../square_1e2_volumetricsourceterm.prj       |  2 +-
 .../square_1x1_GroundWaterFlow/square_1e3.prj |  2 +-
 .../square_1e3_neumann.prj                    |  2 +-
 .../square_1e3_volumetricsourceterm.prj       |  2 +-
 ...uare_1e3_volumetricsourcetermdataarray.prj |  2 +-
 .../square_1x1_GroundWaterFlow/square_1e4.prj |  2 +-
 .../square_1e4_axi.prj                        |  2 +-
 .../square_1e4_neumann.prj                    |  2 +-
 .../square_1x1_GroundWaterFlow/square_1e5.prj |  2 +-
 .../square_1e5_neumann.prj                    |  2 +-
 .../square_1x1_GroundWaterFlow/square_1e6.prj |  2 +-
 .../square_1e6_neumann.prj                    |  2 +-
 .../square_1e6_with_nodal_sources.prj         |  2 +-
 .../wedge_1e2_axi_ang_0.02.prj                |  2 +-
 .../wedge_1e2_axi_ang_0.2.prj                 |  2 +-
 .../wedge_1e4_axi_ang_0.02.prj                |  2 +-
 .../square_1e3_laplace_eq.prj                 |  2 +-
 .../square_1e3_poisson_sin_x_sin_y.prj        |  2 +-
 .../square_1e5_poisson_sin_x_sin_y.prj        |  2 +-
 .../wedge_1e3_prism_surfaceflux_diagonal.prj  |  2 +-
 Tests/Data/EllipticPETSc/cube_1e3.prj         |  2 +-
 Tests/Data/EllipticPETSc/cube_1e3_neumann.prj |  2 +-
 .../quad_20x10_GroundWaterFlow.prj            |  2 +-
 .../Data/EllipticPETSc/square_1e1_neumann.prj |  2 +-
 .../flow_free_expansion.prj                   | 18 ++++++-------
 .../flow_no_strain/flow_no_strain.prj         | 18 ++++++-------
 .../flow_pressure_boundary.prj                | 18 ++++++-------
 .../Confined_Compression/square_1e2.prj       | 18 ++++++-------
 .../Linear/Gravity/flow_gravity.prj           | 18 ++++++-------
 .../Principal_Stress/Hollow_Sphere/sphere.prj | 18 ++++++-------
 .../Principal_Stress/Tube/tube.prj            | 18 ++++++-------
 .../InjectionProduction1D.prj                 | 18 ++++++-------
 .../InjectionProduction1DMono.prj             | 18 ++++++-------
 .../Verification/hm1_1Dbeam.prj               | 26 +++++++++----------
 .../Verification/hm1_2Dsquare.prj             | 26 +++++++++----------
 .../Verification/hm1_3Dcube.prj               | 26 +++++++++----------
 .../Verification/hm1_3Dgravity.prj            | 26 +++++++++----------
 .../HydroMechanics/Verification/hm2_1D1bt.prj | 26 +++++++++----------
 .../HydroMechanics/Verification/hm2_1D2bt.prj | 26 +++++++++----------
 .../Verification/hm2_1Dbiot.prj               | 26 +++++++++----------
 .../Verification/hm2_1Dcolumn1.prj            | 26 +++++++++----------
 .../Verification/hm2_1Dcolumn2.prj            | 26 +++++++++----------
 .../Verification/hm2_2Dmandel.prj             | 26 +++++++++----------
 .../LIE/Mechanics/cohesive_zone_load_path.prj |  8 +++---
 .../LIE/Mechanics/mohr_coulomb_load_path.prj  |  6 ++---
 Tests/Data/LIE/Mechanics/sfrac.q.prj          |  6 ++---
 Tests/Data/LIE/Mechanics/single_joint.prj     |  6 ++---
 Tests/Data/LIE/Mechanics/single_joint_3D.prj  | 24 ++++++++---------
 .../single_joint_displacement_controlled.prj  |  6 ++---
 .../LIE/Mechanics/single_joint_inside.prj     |  6 ++---
 .../single_joint_negative_aperture.prj        |  6 ++---
 .../LIE/Mechanics/two_cracks_branch_pull.prj  |  6 ++---
 .../Mechanics/two_cracks_junction_pull.prj    |  6 ++---
 Tests/Data/LIE/Mechanics/two_joints.prj       |  6 ++---
 Tests/Data/Mechanics/Burgers/cube_1e0.prj     |  2 +-
 Tests/Data/Mechanics/Burgers/cube_1e3.prj     |  2 +-
 .../Mechanics/Ehlers/MFront/cube_1e0_dp.prj   |  4 +--
 .../Ehlers/axisymmetric_sphere_pl.prj         |  2 +-
 Tests/Data/Mechanics/Ehlers/cube_1e0.prj      |  4 +--
 Tests/Data/Mechanics/Ehlers/cube_1e0_dp.prj   |  4 +--
 Tests/Data/Mechanics/Ehlers/cube_1e1.prj      |  4 +--
 Tests/Data/Mechanics/Ehlers/cube_1e3.prj      |  4 +--
 .../CrackedSolid/griffith.prj                 |  6 ++---
 .../EhlersDamageNonLocal/bar/coarse/bar.prj   |  6 ++---
 .../bar/coarse_elastic_tangent/bar.prj        |  6 ++---
 .../EhlersDamageNonLocal/bar/fine/bar.prj     |  6 ++---
 .../EhlersDamageNonLocal/bar/medium/bar.prj   |  6 ++---
 .../EhlersDamageNonLocal/bar/p1/bar.prj       |  6 ++---
 .../EhlersDamageNonLocal/bar/p2/bar.prj       |  6 ++---
 .../EhlersDamageNonLocal/bar/p3/bar.prj       |  6 ++---
 .../EhlersDamageNonLocal/bar/t1/bar.prj       |  6 ++---
 .../EhlersDamageNonLocal/bar/t2/bar.prj       |  6 ++---
 .../EhlersDamageNonLocal/bar/veryfine/bar.prj |  6 ++---
 .../beam/3D_hexa/beam.prj                     |  6 ++---
 .../beam/3D_tetr/beam.prj                     |  6 ++---
 .../EhlersDamageNonLocal/beam/coarse/beam.prj |  6 ++---
 .../beam/coarse_quad/beam.prj                 |  6 ++---
 .../beam/coarse_tria/beam.prj                 |  6 ++---
 .../EhlersDamageNonLocal/beam/fine/beam.prj   |  6 ++---
 .../EhlersDamageNonLocal/beam/medium/beam.prj |  6 ++---
 .../holed_beam/holed_beam.prj                 |  6 ++---
 .../notched_beam/smallbeam_3D.prj             |  6 ++---
 .../InitialStates/equilibrium_restart.prj     |  4 +--
 .../InitialStates/into_initial_state.prj      |  4 +--
 .../non_equilibrium_initial_state.prj         |  4 +--
 .../MFront/axisymm_ring/ring_plane_strain.prj |  2 +-
 .../MFront/cube_standard_elasticity_brick.prj |  2 +-
 .../MFront/disc_with_hole/disc_with_hole.prj  |  2 +-
 .../Mechanics/Linear/MaterialForces/bar.prj   |  6 ++---
 .../Linear/MaterialForces/bar_3D.prj          |  6 ++---
 .../Orthotropy/cube_1e0_orthotropic_xyz.prj   |  4 +--
 .../Orthotropy/cube_1e0_orthotropic_yzx.prj   |  4 +--
 .../Orthotropy/cube_1e0_orthotropic_zxy.prj   |  4 +--
 .../Linear/Orthotropy/m3_3Dshearz.prj         |  4 +--
 .../Linear/Orthotropy/m3_3Dshearz_rot.prj     |  4 +--
 .../Linear/Orthotropy/m3_3Dtopload.prj        |  4 +--
 .../Linear/Orthotropy/m3_3Dtoploadlc.prj      |  4 +--
 .../Orthotropy/square_1e0_orthotropic_xyz.prj |  4 +--
 .../Orthotropy/square_1e0_orthotropic_yzx.prj |  4 +--
 .../Orthotropy/square_1e0_orthotropic_zxy.prj |  4 +--
 .../Linear/PressureBC/axisymmetric_pipe.prj   |  2 +-
 .../Linear/PressureBC/axisymmetric_sphere.prj |  2 +-
 .../Linear/PressureBC/hollow_sphere.prj       |  2 +-
 .../PythonHertzContact/hertz_contact.prj      |  4 +--
 .../Mechanics/Linear/PythonPiston/piston.prj  |  4 +--
 Tests/Data/Mechanics/Linear/cube_1e0.prj      |  4 +--
 .../Linear/cube_1e0_simple_shear.prj          |  4 +--
 .../Data/Mechanics/Linear/disc_with_hole.prj  |  2 +-
 .../Mechanics/Linear/plain_strain_pipe.prj    |  2 +-
 .../Mechanics/Linear/ring_plane_strain.prj    |  2 +-
 Tests/Data/Mechanics/Linear/square_1e0.prj    |  2 +-
 Tests/Data/Mechanics/Linear/square_1e2.prj    |  2 +-
 .../Linear/square_1e2_quad8_traction_top.prj  |  2 +-
 Tests/Data/Mechanics/Linear/square_1e5.prj    |  2 +-
 .../Linear/square_with_deactivated_hole.prj   |  2 +-
 .../Mechanics/Linear/two_material_gravity.prj |  4 +--
 .../Linear/two_material_gravity_Emodulus.prj  |  4 +--
 .../displacement_load.prj                     |  8 +++---
 .../load_test_elastic.prj                     |  4 +--
 .../MohrCoulombAbboSloan/load_test_mc.prj     |  8 +++---
 .../load_test_mc_nonassociated.prj            |  8 +++---
 Tests/Data/Mechanics/m1_1Dload/m1_1Dload.prj  |  4 +--
 .../Mechanics/m1_1Dlozenge/m1_1Dlozenge.prj   |  4 +--
 Tests/Data/Mechanics/m1_2Dload/m1_2Dload.prj  |  4 +--
 .../Mechanics/m1_3Dbottom/m1_3Dbottom.prj     |  4 +--
 .../Mechanics/m1_3Dgravity/m1_3Dgravity.prj   |  4 +--
 Tests/Data/Mechanics/m1_3Dload/m1_3Dload.prj  |  4 +--
 .../Mechanics/m1_3Dsquare/m1_3Dsquare.prj     |  4 +--
 .../Mechanics/m1_3Dtopload/m1_3Dtopload.prj   |  4 +--
 .../Mechanics/m3_3Dshearz/m3_3Dshearz.prj     |  4 +--
 .../m3_3Dshearz_rot/m3_3Dshearz_rot.prj       |  4 +--
 .../Mechanics/m3_3Dtopload/m3_3Dtopload.prj   |  4 +--
 .../m3_3Dtoploadlc/m3_3Dtoploadlc.prj         |  4 +--
 .../ConTracer/ConTracer_1d.prj                |  2 +-
 .../ConTracer/ConTracer_2d.prj                |  2 +-
 .../MassConservation/mass_conservation.prj    |  2 +-
 .../OpenBoundaryWithTets/box_flow.prj         |  2 +-
 .../EquilibriumPhase/calcite.prj              |  2 +-
 .../KineticReactant/1d_isofrac.prj            |  2 +-
 .../1d_isofrac_flag_formula.prj               |  2 +-
 .../1d_isofrac_phreeqckernel.prj              |  2 +-
 .../KineticReactant2.prj                      |  2 +-
 .../KineticReactant2_2d.prj                   |  2 +-
 .../ReactiveTransport/Wetland/Wetland_1d.prj  |  2 +-
 .../ConcentrationDiffusionAndStorage.prj      |  2 +-
 .../ConcentrationDiffusionOnly.prj            |  2 +-
 ...ConcentrationDiffusionOnly_3Components.prj |  2 +-
 .../DiffusionAndStorageAndAdvection.prj       |  2 +-
 ...iffusionAndStorageAndAdvectionAndDecay.prj |  2 +-
 ...ionAndStorageAndAdvectionAndDispersion.prj |  2 +-
 ...ndStorageAndAdvectionAndDispersionHalf.prj |  2 +-
 ...nAndStorageAndGravityAndDispersionHalf.prj |  2 +-
 ..._boundary_component-transport_cube_1e3.prj |  2 +-
 ...nent-transport_cube_1e3_advective_form.prj |  2 +-
 ...rfaceflux_component-transport_cube_1e3.prj |  2 +-
 .../ConcentrationDiffusionAndStorage.prj      |  2 +-
 .../ConcentrationDiffusionOnly.prj            |  2 +-
 .../DiffusionAndStorageAndAdvection.prj       |  2 +-
 ...iffusionAndStorageAndAdvectionAndDecay.prj |  2 +-
 ...ionAndStorageAndAdvectionAndDispersion.prj |  2 +-
 ...ndStorageAndAdvectionAndDispersionHalf.prj |  2 +-
 ...eAndAdvectionAndDispersion_3Components.prj |  2 +-
 ...nAndStorageAndGravityAndDispersionHalf.prj |  2 +-
 ...rfaceflux_component-transport_cube_1e3.prj |  2 +-
 .../ComponentTransport/Theis/theis.prj        |  2 +-
 .../TracerSimulation/TracerSimulation.prj     |  2 +-
 .../VariableNeumannBoundary/vdbc_input.prj    |  2 +-
 .../ComponentTransport/elder/elder-python.prj |  2 +-
 .../ComponentTransport/elder/elder.prj        |  2 +-
 .../goswami/goswami_input.prj                 |  2 +-
 .../heterogeneous/ogs5_H_2D/ogs5_H_2d.prj     |  2 +-
 .../heterogeneous/ogs5_H_3D/ogs5_H_3d.prj     |  2 +-
 .../HT/ConstViscosity/square_5500x5500.prj    |  2 +-
 .../FaultedCube/Ra_795_fault_bcgs_jacobi.prj  |  2 +-
 ...dPressureParabolicTemperatureParabolic.prj |  2 +-
 ...ParabolicTemperatureParabolicStaggered.prj |  2 +-
 .../SimpleSynthetics/IsothermalFluidFlow.prj  |  2 +-
 .../IsothermalFluidFlowStaggered.prj          |  2 +-
 .../IsothermalFluidFlowWithGravity.prj        |  2 +-
 ...sothermalFluidFlowWithGravityStaggered.prj |  2 +-
 .../PressureDiffusionTemperatureDiffusion.prj |  2 +-
 ...DiffusionTemperatureDiffusionStaggered.prj |  2 +-
 .../PressureParabolicTemperatureParabolic.prj |  2 +-
 ...ParabolicTemperatureParabolicStaggered.prj |  2 +-
 .../calculatesurfaceflux_ht_cube_1e3.prj      |  2 +-
 .../calculatesurfaceflux_ht_cube_1e4.prj      |  2 +-
 .../HT/SimpleSynthetics/constraint_bc_1e3.prj |  2 +-
 .../th_decovalex.prj                          |  2 +-
 .../square_5500x5500_staggered_scheme.prj     |  2 +-
 ...5500x5500_staggered_scheme_adaptive_dt.prj |  2 +-
 .../LiquidFlow/AxiSymTheis/axisym_theis.prj   |  2 +-
 .../LiquidFlow/BuildupTest/buildup_test.prj   |  2 +-
 .../LiquidFlow/Dupuit/BC_BC/TestSet_01.prj    |  2 +-
 .../Dupuit/BC_BC_RECHARGE/TestSet_01.prj      |  2 +-
 .../Dupuit/BC_BC_RECHARGE2/TestSet_01.prj     |  2 +-
 .../Dupuit/BC_BC_STORAGE/TestSet_01.prj       |  2 +-
 .../GravityDriven/gravity_driven.prj          |  2 +-
 .../anisotropic_gravity_driven3D.prj          |  2 +-
 .../isotropic_gravity_driven3D.prj            |  2 +-
 .../line_dirichlet_neumannBC.prj              |  2 +-
 ...sureBC_at_corner_of_anisotropic_square.prj |  2 +-
 ...pendentHeterogeneousBoundaryConditions.prj |  2 +-
 .../TimeDependentHeterogeneousSourceTerm.prj  |  2 +-
 .../TimeIntervalDirichletBC.prj               |  2 +-
 .../Verification/h1_1Dsource/h1_1Dsource.prj  |  2 +-
 .../Verification/h1_1Dsteady/h1_1Dsteady.prj  |  2 +-
 .../h1_3Dhydstat/h1_3Dhydstat.prj             |  2 +-
 .../Verification/h2_1D1bt/h2_1D1bt.prj        |  2 +-
 .../Verification/h2_1D2bt/h2_1D2bt.prj        |  2 +-
 .../Richards/RichardsFlow_2d_compare_ogs5.prj |  2 +-
 .../Richards/RichardsFlow_2d_large.prj        |  2 +-
 .../Richards/RichardsFlow_2d_small.prj        |  2 +-
 .../RichardsFlow_2d_small_PID_adaptive_dt.prj |  2 +-
 ...rdsFlow_2d_small_iteration_adaptive_dt.prj |  2 +-
 .../Padilla/Padilla_NaCl1/Padilla_NaCl1.prj   |  4 +--
 .../Padilla_NaCl1/Padilla_NaCl1_quadratic.prj |  4 +--
 .../Padilla/Padilla_NaCl6/Padilla_NaCl6.prj   |  4 +--
 .../Parabolic/T/1D_dirichlet/line_60_heat.prj |  2 +-
 .../line_1_line_1e2_source_term.prj           |  2 +-
 .../line_source_term.prj                      |  2 +-
 .../Parabolic/T/1D_neumann/line_60_heat.prj   |  2 +-
 Tests/Data/Parabolic/T/2D_BHE_array/bhe2d.prj |  2 +-
 .../T/2D_axially_symmetric/square_1e2_axi.prj |  2 +-
 .../wedge_1e2_axi_ang_0.02.prj                |  2 +-
 .../source_term_left.prj                      |  2 +-
 .../line_source_term_x_0.5.prj                |  2 +-
 .../line_source_term_x_0.5.prj                |  2 +-
 .../line_source_term_x=5.prj                  |  2 +-
 .../line_source_term_in_cylinder.prj          |  2 +-
 .../line_source_term_in_cylinder.prj          |  2 +-
 .../line_source_term_in_cylinder.prj          |  2 +-
 .../line_source_term_x_0.5_y_0.5.prj          |  2 +-
 ...ine_source_term_x_0.5_y_0.5_restricted.prj |  2 +-
 .../TES/1D/tes-1D-zeolite-discharge-large.prj | 16 ++++++------
 .../tes-1D-zeolite-discharge-small-newton.prj | 16 ++++++------
 .../TES/1D/tes-1D-zeolite-discharge-small.prj | 16 ++++++------
 .../Twophase_HeatPipe_quad_curve_large.prj    |  4 +--
 .../Twophase_HeatPipe_quad_curve_small.prj    |  4 +--
 .../Liakopoulos/TwoPhase_Lia_quad_large.prj   |  2 +-
 .../Liakopoulos/TwoPhase_Lia_quad_short.prj   |  2 +-
 .../McWhorter/TwoPhase_mcwt_line.prj          |  2 +-
 .../MoMaS/Twophase_MoMaS_quad.prj             |  4 +--
 .../MoMaS/Twophase_MoMaS_quad_adaptive_dt.prj |  4 +--
 .../MoMaS/Twophase_MoMaS_small.prj            |  4 +--
 Tests/Data/PhaseField/beam3d.prj              |  4 +--
 .../RichardsFlow_2d_quasinewton.prj           |  8 +++---
 .../RichardsFlow_2d_richardsflow.prj          |  2 +-
 .../RichardsFlow_2d_small.prj                 |  8 +++---
 .../RichardsFlow_2d_small_masslumping.prj     |  8 +++---
 .../confined_compression_fully_saturated.prj  |  8 +++---
 .../flow_fully_saturated.prj                  |  8 +++---
 .../flow_fully_saturated_anisotropic.prj      |  8 +++---
 ...flow_fully_saturated_coordinate_system.prj |  8 +++---
 Tests/Data/RichardsMechanics/gravity.prj      |  8 +++---
 .../RichardsMechanics/mechanics_linear.prj    |  8 +++---
 .../Beam_sealed_bimaterial/square_1e2.prj     |  4 +--
 .../Beam_unsealed_bimaterial/square_1e2.prj   |  4 +--
 .../Linear/Point_injection/square_1e2.prj     |  4 +--
 .../Square_sealed_homogeneous/square_1e0.prj  |  4 +--
 .../ThermoMechanicalPhaseField/beam3d.prj     |  6 ++---
 .../ThermoMechanicalPhaseField/slab_5.prj     |  6 ++---
 .../tes_hx3_iglu.prj                          |  6 ++---
 .../Data/ThermoMechanics/BDT/cube_1e0_bdt.prj |  4 +--
 .../CreepAfterExcavation.prj                  |  4 +--
 .../SimpleAxisymmetricCreep.prj               |  4 +--
 ...eAxisymmetricCreepWithAnalyticSolution.prj |  4 +--
 .../Verification/m2_1D1bt/m2_1D1bt.prj        |  4 +--
 .../Verification/m2_1D2bt/m2_1D2bt.prj        |  4 +--
 .../Verification/m2_1Dcreep/m2_1Dcreep.prj    |  4 +--
 .../m2_1Dlozenge/m2_1Dlozenge.prj             |  4 +--
 .../m2_1Dlozengebt/m2_1Dlozengebt.prj         |  4 +--
 .../Verification/m2_1Drelax/m2_1Drelax.prj    |  4 +--
 .../Verification/m2_2Dload/m2_2Dload.prj      |  4 +--
 .../Verification/m2_2Dload/m2_2Dload_ym45.prj |  4 +--
 .../Verification/m2_2Dloadbt/m2_2Dloadbt.prj  |  4 +--
 .../Verification/m2_3Dload/m2_3Dload.prj      |  4 +--
 .../Verification/m2_3Dloadbt/m2_3Dloadbt.prj  |  4 +--
 .../InitialStates/equilibrium_restart.prj     |  4 +--
 .../InitialStates/into_initial_state.prj      |  4 +--
 .../non_equilibrium_initial_state.prj         |  4 +--
 .../LinearMFront/cube_1e0_lin.prj             |  4 +--
 .../CreepAfterExcavation.prj                  |  4 +--
 .../iglu_quarter_plane_strain_quad.prj        |  4 +--
 Tests/Data/ThermoMechanics/cube_1e3.prj       |  4 +--
 .../iglu_axisymmetric_plane_strain.prj        |  4 +--
 .../iglu_axisymmetric_plane_strain_quad.prj   |  4 +--
 .../iglu_quarter_plane_strain.prj             |  4 +--
 .../iglu_quarter_plane_strain_quad.prj        |  4 +--
 .../ThermoMechanics/tm1_1Dbeam/tm1_1Dbeam.prj |  4 +--
 .../ThermoMechanics/tm1_1Dfixa/tm1_1Dfixa.prj |  4 +--
 .../ThermoMechanics/tm1_1Dfixb/tm1_1Dfixb.prj |  4 +--
 .../ThermoMechanics/tm1_2Dbeam/tm1_2Dbeam.prj |  4 +--
 .../tm1_2Dsquare/tm1_2Dsquare.prj             |  4 +--
 .../ThermoMechanics/tm1_3Dcube/tm1_3Dcube.prj |  4 +--
 .../tm1_3Dgravity/tm1_3Dgravity.prj           |  4 +--
 .../tm1_3Dorigin/tm1_3Dorigin.prj             |  4 +--
 .../tm1_3Dsquare/tm1_3Dsquare.prj             |  4 +--
 .../ThermoMechanics/tm2_1D1bt/tm2_1D1bt.prj   |  4 +--
 .../ThermoMechanics/tm2_1Dfixc/tm2_1Dfixc.prj |  4 +--
 358 files changed, 776 insertions(+), 776 deletions(-)

diff --git a/Tests/Data/Elliptic/circle_radius_1/circle_1e1_axi.prj b/Tests/Data/Elliptic/circle_radius_1/circle_1e1_axi.prj
index cdef2d04c0c..f6a2578f46a 100644
--- a/Tests/Data/Elliptic/circle_radius_1/circle_1e1_axi.prj
+++ b/Tests/Data/Elliptic/circle_radius_1/circle_1e1_axi.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/circle_radius_1/circle_1e2_axi.prj b/Tests/Data/Elliptic/circle_radius_1/circle_1e2_axi.prj
index 3a17d49ec62..184c22e47c7 100644
--- a/Tests/Data/Elliptic/circle_radius_1/circle_1e2_axi.prj
+++ b/Tests/Data/Elliptic/circle_radius_1/circle_1e2_axi.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/circle_radius_1/circle_1e3_axi.prj b/Tests/Data/Elliptic/circle_radius_1/circle_1e3_axi.prj
index 4cfaa620d89..e871bafa809 100644
--- a/Tests/Data/Elliptic/circle_radius_1/circle_1e3_axi.prj
+++ b/Tests/Data/Elliptic/circle_radius_1/circle_1e3_axi.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/circle_radius_1/circle_1e4_axi.prj b/Tests/Data/Elliptic/circle_radius_1/circle_1e4_axi.prj
index 6f169223f56..434e0fc9823 100644
--- a/Tests/Data/Elliptic/circle_radius_1/circle_1e4_axi.prj
+++ b/Tests/Data/Elliptic/circle_radius_1/circle_1e4_axi.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/circle_radius_1/circle_1e5_axi.prj b/Tests/Data/Elliptic/circle_radius_1/circle_1e5_axi.prj
index 918bc944df4..c62df8ea448 100644
--- a/Tests/Data/Elliptic/circle_radius_1/circle_1e5_axi.prj
+++ b/Tests/Data/Elliptic/circle_radius_1/circle_1e5_axi.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/circle_radius_1/circle_1e6_axi.prj b/Tests/Data/Elliptic/circle_radius_1/circle_1e6_axi.prj
index 3e4774b854d..164171bbd16 100644
--- a/Tests/Data/Elliptic/circle_radius_1/circle_1e6_axi.prj
+++ b/Tests/Data/Elliptic/circle_radius_1/circle_1e6_axi.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0.prj
index 41ac66e6b8f..c309829114c 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0_neumann.prj
index 17ec3ba671c..9fd4b526b60 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0_neumann.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0_newton.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0_newton.prj
index 745f0fac1b3..aa6e07e5bb4 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0_newton.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0_newton.prj
@@ -15,7 +15,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0_quadratic_hex.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0_quadratic_hex.prj
index feda9c61be9..4edd8550694 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0_quadratic_hex.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0_quadratic_hex.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1.prj
index ff5c1107d6a..2e8b45969e1 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1_neumann.prj
index f1091841847..de178a40b08 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1_neumann.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1_newton.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1_newton.prj
index b14d0397168..60d99876454 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1_newton.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1_newton.prj
@@ -15,7 +15,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2.prj
index 8703856cdbc..afd6f7a3fb6 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2_neumann.prj
index 5ee5743765c..cffead85708 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2_neumann.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2_newton.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2_newton.prj
index 963310604ea..2af8e9def81 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2_newton.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2_newton.prj
@@ -15,7 +15,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3.prj
index 63ccfab4038..c0ee1e5e7dc 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_bottom_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_bottom_neumann.prj
index 5ff6df7cf75..59912720416 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_bottom_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_bottom_neumann.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_bottom_neumann_newton.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_bottom_neumann_newton.prj
index 63c20e8e97a..f7ea01441e7 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_bottom_neumann_newton.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_bottom_neumann_newton.prj
@@ -15,7 +15,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_calculatesurfaceflux.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_calculatesurfaceflux.prj
index a8e9d85105e..ec9a1b6ea1a 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_calculatesurfaceflux.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_calculatesurfaceflux.prj
@@ -16,7 +16,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <calculatesurfaceflux>
                 <mesh>cube_1x1x1_hex_1e3_complete_surface</mesh>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_neumann.prj
index 9079b6909b0..4da682e0255 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_neumann.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_neumann_calculatesurfaceflux.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_neumann_calculatesurfaceflux.prj
index d8b3187e18f..69a8794d7fc 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_neumann_calculatesurfaceflux.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_neumann_calculatesurfaceflux.prj
@@ -17,7 +17,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <calculatesurfaceflux>
                 <mesh>cube_1x1x1_hex_1e3_complete_surface</mesh>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_newton.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_newton.prj
index c486020d8f6..ddef55c40e6 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_newton.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_newton.prj
@@ -15,7 +15,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_top_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_top_neumann.prj
index 97d08d948ce..d74457c5f9d 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_top_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_top_neumann.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_top_neumann_newton.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_top_neumann_newton.prj
index 86ad144b29f..1846d5608d9 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_top_neumann_newton.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_top_neumann_newton.prj
@@ -15,7 +15,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e4.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e4.prj
index 4c03401539d..1bde58382a0 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e4.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e4.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e4_anisotropic.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e4_anisotropic.prj
index 873cfeda241..aa861751cde 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e4_anisotropic.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e4_anisotropic.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e4_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e4_neumann.prj
index db7ca3a0e94..a7c4ce970b8 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e4_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e4_neumann.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e5.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e5.prj
index 54a482326bd..37372ec3b5b 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e5.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e5.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e5_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e5_neumann.prj
index c6413bb7f80..931bd42dfef 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e5_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e5_neumann.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e6.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e6.prj
index 07061163998..4ee3ca94344 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e6.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e6.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e6_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e6_neumann.prj
index aa7095782af..bba20ef0c66 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e6_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e6_neumann.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_front_back.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_front_back.prj
index d7287b9e12a..bfbf38cf368 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_front_back.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_front_back.prj
@@ -16,7 +16,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <calculatesurfaceflux>
                 <mesh>cube_1x1x1_prism_2e3_complete_surface</mesh>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_left_right.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_left_right.prj
index a039b967555..51f9eda2d21 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_left_right.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_left_right.prj
@@ -16,7 +16,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <calculatesurfaceflux>
                 <mesh>cube_1x1x1_prism_2e3_complete_surface</mesh>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_top_bottom.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_top_bottom.prj
index e8cf58a967a..4354d87bc67 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_top_bottom.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_top_bottom.prj
@@ -16,7 +16,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <calculatesurfaceflux>
                 <mesh>cube_1x1x1_prism_2e3_complete_surface</mesh>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e4.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e4.prj
index 2c3d3161d3a..dac304cddba 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e4.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e4.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e4_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e4_neumann.prj
index 588ef689eb0..4db9b7517b6 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e4_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e4_neumann.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_3e4.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_3e4.prj
index 51cfaec4bb1..bd79b4cb102 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_3e4.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_3e4.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_3e4_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_3e4_neumann.prj
index b501d5b8f98..c185a39eba5 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_3e4_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_3e4_neumann.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_4e4.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_4e4.prj
index a3e760415fd..68dcb4e968c 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_4e4.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_4e4.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_4e4_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_4e4_neumann.prj
index 2af1f7d45b2..860aa309739 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_4e4_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_4e4_neumann.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_5e4.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_5e4.prj
index 1d11866ca77..b81c0d15f94 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_5e4.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_5e4.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_5e4_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_5e4_neumann.prj
index 4b3f2a18d21..6fde1a8c3f2 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_5e4_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_5e4_neumann.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1.prj b/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1.prj
index eaa775043a9..e8c97392e40 100644
--- a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1.prj
+++ b/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_neumann.prj b/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_neumann.prj
index 43cfb54641f..1d7e812c934 100644
--- a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_neumann.prj
+++ b/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_neumann.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_robin_left_picard.prj b/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_robin_left_picard.prj
index 1b3033633a2..ff24721ab0f 100644
--- a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_robin_left_picard.prj
+++ b/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_robin_left_picard.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_robin_right_picard.prj b/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_robin_right_picard.prj
index 20ac25b54fa..98695821e58 100644
--- a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_robin_right_picard.prj
+++ b/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_robin_right_picard.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_time_dep_dirichlet.prj b/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_time_dep_dirichlet.prj
index 5192a04c90d..ce774933a8b 100644
--- a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_time_dep_dirichlet.prj
+++ b/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_time_dep_dirichlet.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_time_dep_neumann.prj b/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_time_dep_neumann.prj
index c4813074e60..3509ce978f8 100644
--- a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_time_dep_neumann.prj
+++ b/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_time_dep_neumann.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_permeability.prj b/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_permeability.prj
index c30ee66bbe1..612a2cc0036 100644
--- a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_permeability.prj
+++ b/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_permeability.prj
@@ -15,7 +15,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="mass_flux"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="mass_flux"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/neumann_nonuniform.prj b/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/neumann_nonuniform.prj
index b2e30d62990..b0f4fdccd21 100644
--- a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/neumann_nonuniform.prj
+++ b/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/neumann_nonuniform.prj
@@ -15,7 +15,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_100x100_ComponentTransport/square_1e4_heterogeneity.prj b/Tests/Data/Elliptic/square_100x100_ComponentTransport/square_1e4_heterogeneity.prj
index 135620b68cc..a43a10d4b8c 100644
--- a/Tests/Data/Elliptic/square_100x100_ComponentTransport/square_1e4_heterogeneity.prj
+++ b/Tests/Data/Elliptic/square_100x100_ComponentTransport/square_1e4_heterogeneity.prj
@@ -13,7 +13,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e0.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e0.prj
index f122b6f5cc4..53626ae68ef 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e0.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e0.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e0_neumann.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e0_neumann.prj
index c3d75444315..35fe277fd30 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e0_neumann.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e0_neumann.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e1.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e1.prj
index 6f4fdfc8484..cb2c9f282fd 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e1.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e1.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e1_neumann.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e1_neumann.prj
index 5e7f8039aa1..3c18b6e6a80 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e1_neumann.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e1_neumann.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2.prj
index b3b5f8f60ac..87166a70ba2 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2_axi.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2_axi.prj
index ae0074bd877..f35ae347aa1 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2_axi.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2_axi.prj
@@ -12,7 +12,7 @@
                 <process_variable>temperature</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2_neumann.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2_neumann.prj
index efaeb5fadda..a4cbfb8ee3a 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2_neumann.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2_neumann.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2_volumetricsourceterm.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2_volumetricsourceterm.prj
index def3f26fb26..d8021955422 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2_volumetricsourceterm.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2_volumetricsourceterm.prj
@@ -16,7 +16,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3.prj
index 2c6140be2fc..3fd2835e416 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3.prj
@@ -17,7 +17,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3_neumann.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3_neumann.prj
index c49926b2cbe..2e24501732d 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3_neumann.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3_neumann.prj
@@ -16,7 +16,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3_volumetricsourceterm.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3_volumetricsourceterm.prj
index c14933d3578..1cbaaf46fa6 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3_volumetricsourceterm.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3_volumetricsourceterm.prj
@@ -16,7 +16,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3_volumetricsourcetermdataarray.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3_volumetricsourcetermdataarray.prj
index 9e403edb0cd..c00549d22e0 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3_volumetricsourcetermdataarray.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3_volumetricsourcetermdataarray.prj
@@ -18,7 +18,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e4.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e4.prj
index 3c221eddb59..650b394cce2 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e4.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e4.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e4_axi.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e4_axi.prj
index f6701aa24f6..e8bfbd73ec4 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e4_axi.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e4_axi.prj
@@ -12,7 +12,7 @@
                 <process_variable>temperature</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e4_neumann.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e4_neumann.prj
index 206dbb0e5d9..d4c9c92a0ea 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e4_neumann.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e4_neumann.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e5.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e5.prj
index a2538e7e171..fb71d9ba40f 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e5.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e5.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e5_neumann.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e5_neumann.prj
index ba677e575c9..a3e454b77f5 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e5_neumann.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e5_neumann.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6.prj
index 0e2a07ee838..b40597d2219 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6_neumann.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6_neumann.prj
index 34937982007..e383b2ef5c9 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6_neumann.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6_neumann.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6_with_nodal_sources.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6_with_nodal_sources.prj
index 4f4f1bddbae..c3903948740 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6_with_nodal_sources.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6_with_nodal_sources.prj
@@ -16,7 +16,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge_1e2_axi_ang_0.02.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge_1e2_axi_ang_0.02.prj
index 29b561bdf6b..92f9a49376c 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge_1e2_axi_ang_0.02.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge_1e2_axi_ang_0.02.prj
@@ -12,7 +12,7 @@
                 <process_variable>temperature</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge_1e2_axi_ang_0.2.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge_1e2_axi_ang_0.2.prj
index 5113e7fb32c..89983c2455f 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge_1e2_axi_ang_0.2.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge_1e2_axi_ang_0.2.prj
@@ -12,7 +12,7 @@
                 <process_variable>temperature</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge_1e4_axi_ang_0.02.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge_1e4_axi_ang_0.02.prj
index de8f112ad29..fc176992031 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge_1e4_axi_ang_0.02.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge_1e4_axi_ang_0.02.prj
@@ -12,7 +12,7 @@
                 <process_variable>temperature</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1e3_laplace_eq.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1e3_laplace_eq.prj
index bde274337e7..d8b1b22508d 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1e3_laplace_eq.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1e3_laplace_eq.prj
@@ -13,7 +13,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <jacobian_assembler>
                 <type>CentralDifferences</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1e3_poisson_sin_x_sin_y.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1e3_poisson_sin_x_sin_y.prj
index e643b146869..c7f95d4901d 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1e3_poisson_sin_x_sin_y.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1e3_poisson_sin_x_sin_y.prj
@@ -19,7 +19,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1e5_poisson_sin_x_sin_y.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1e5_poisson_sin_x_sin_y.prj
index e459828175f..b02c9167683 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1e5_poisson_sin_x_sin_y.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1e5_poisson_sin_x_sin_y.prj
@@ -19,7 +19,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1e3_prism_surfaceflux_diagonal.prj b/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1e3_prism_surfaceflux_diagonal.prj
index c4545c06bee..f4d72987e19 100644
--- a/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1e3_prism_surfaceflux_diagonal.prj
+++ b/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1e3_prism_surfaceflux_diagonal.prj
@@ -16,7 +16,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <calculatesurfaceflux>
                 <mesh>wedge_1x1x1_1e3_prism_complete_surface</mesh>
diff --git a/Tests/Data/EllipticPETSc/cube_1e3.prj b/Tests/Data/EllipticPETSc/cube_1e3.prj
index 6ce3ff3d6e4..a26ccc75609 100644
--- a/Tests/Data/EllipticPETSc/cube_1e3.prj
+++ b/Tests/Data/EllipticPETSc/cube_1e3.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/EllipticPETSc/cube_1e3_neumann.prj b/Tests/Data/EllipticPETSc/cube_1e3_neumann.prj
index 40a78331f5f..45b58ebeb7a 100644
--- a/Tests/Data/EllipticPETSc/cube_1e3_neumann.prj
+++ b/Tests/Data/EllipticPETSc/cube_1e3_neumann.prj
@@ -19,7 +19,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/EllipticPETSc/quad_20x10_GroundWaterFlow.prj b/Tests/Data/EllipticPETSc/quad_20x10_GroundWaterFlow.prj
index 9e4f655c78a..b14f6d2a545 100644
--- a/Tests/Data/EllipticPETSc/quad_20x10_GroundWaterFlow.prj
+++ b/Tests/Data/EllipticPETSc/quad_20x10_GroundWaterFlow.prj
@@ -12,7 +12,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/EllipticPETSc/square_1e1_neumann.prj b/Tests/Data/EllipticPETSc/square_1e1_neumann.prj
index 533409ff660..0dfd75a83fa 100644
--- a/Tests/Data/EllipticPETSc/square_1e1_neumann.prj
+++ b/Tests/Data/EllipticPETSc/square_1e1_neumann.prj
@@ -17,7 +17,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/HydroMechanics/IdealGas/flow_free_expansion/flow_free_expansion.prj b/Tests/Data/HydroMechanics/IdealGas/flow_free_expansion/flow_free_expansion.prj
index 695dbb47c0e..be2352f773c 100644
--- a/Tests/Data/HydroMechanics/IdealGas/flow_free_expansion/flow_free_expansion.prj
+++ b/Tests/Data/HydroMechanics/IdealGas/flow_free_expansion/flow_free_expansion.prj
@@ -24,15 +24,15 @@
                 <pressure>pressure</pressure>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
-                <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
-                <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
-                <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
-                <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
-                <secondary_variable type="static" internal_name="velocity" output_name="velocity"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_zz" output_name="sigma_zz"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="epsilon_xx" output_name="epsilon_xx"/>
+                <secondary_variable internal_name="epsilon_yy" output_name="epsilon_yy"/>
+                <secondary_variable internal_name="epsilon_zz" output_name="epsilon_zz"/>
+                <secondary_variable internal_name="epsilon_xy" output_name="epsilon_xy"/>
+                <secondary_variable internal_name="velocity" output_name="velocity"/>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
             <fluid_type>ideal_gas</fluid_type>
diff --git a/Tests/Data/HydroMechanics/IdealGas/flow_no_strain/flow_no_strain.prj b/Tests/Data/HydroMechanics/IdealGas/flow_no_strain/flow_no_strain.prj
index ecd07b55ea2..5e55687a74c 100644
--- a/Tests/Data/HydroMechanics/IdealGas/flow_no_strain/flow_no_strain.prj
+++ b/Tests/Data/HydroMechanics/IdealGas/flow_no_strain/flow_no_strain.prj
@@ -24,15 +24,15 @@
                 <pressure>pressure</pressure>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
-                <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
-                <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
-                <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
-                <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
-                <secondary_variable type="static" internal_name="velocity" output_name="velocity"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_zz" output_name="sigma_zz"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="epsilon_xx" output_name="epsilon_xx"/>
+                <secondary_variable internal_name="epsilon_yy" output_name="epsilon_yy"/>
+                <secondary_variable internal_name="epsilon_zz" output_name="epsilon_zz"/>
+                <secondary_variable internal_name="epsilon_xy" output_name="epsilon_xy"/>
+                <secondary_variable internal_name="velocity" output_name="velocity"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
             <fluid_type>ideal_gas</fluid_type>
diff --git a/Tests/Data/HydroMechanics/IdealGas/flow_pressure_boundary/flow_pressure_boundary.prj b/Tests/Data/HydroMechanics/IdealGas/flow_pressure_boundary/flow_pressure_boundary.prj
index 6a9de5c9208..577c1aa8ed7 100644
--- a/Tests/Data/HydroMechanics/IdealGas/flow_pressure_boundary/flow_pressure_boundary.prj
+++ b/Tests/Data/HydroMechanics/IdealGas/flow_pressure_boundary/flow_pressure_boundary.prj
@@ -24,15 +24,15 @@
                 <pressure>pressure</pressure>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
-                <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
-                <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
-                <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
-                <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
-                <secondary_variable type="static" internal_name="velocity" output_name="velocity"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_zz" output_name="sigma_zz"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="epsilon_xx" output_name="epsilon_xx"/>
+                <secondary_variable internal_name="epsilon_yy" output_name="epsilon_yy"/>
+                <secondary_variable internal_name="epsilon_zz" output_name="epsilon_zz"/>
+                <secondary_variable internal_name="epsilon_xy" output_name="epsilon_xy"/>
+                <secondary_variable internal_name="velocity" output_name="velocity"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
             <fluid_type>ideal_gas</fluid_type>
diff --git a/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2.prj b/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2.prj
index 9bb973a7942..9ef92e43771 100644
--- a/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2.prj
+++ b/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2.prj
@@ -24,15 +24,15 @@
                 <pressure>pressure</pressure>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
-                <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
-                <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
-                <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
-                <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
-                <secondary_variable type="static" internal_name="velocity" output_name="velocity"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_zz" output_name="sigma_zz"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="epsilon_xx" output_name="epsilon_xx"/>
+                <secondary_variable internal_name="epsilon_yy" output_name="epsilon_yy"/>
+                <secondary_variable internal_name="epsilon_zz" output_name="epsilon_zz"/>
+                <secondary_variable internal_name="epsilon_xy" output_name="epsilon_xy"/>
+                <secondary_variable internal_name="velocity" output_name="velocity"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
             <fluid_type>incompressible_fluid</fluid_type>
diff --git a/Tests/Data/HydroMechanics/Linear/Gravity/flow_gravity.prj b/Tests/Data/HydroMechanics/Linear/Gravity/flow_gravity.prj
index d4387af5730..5be6d72f111 100644
--- a/Tests/Data/HydroMechanics/Linear/Gravity/flow_gravity.prj
+++ b/Tests/Data/HydroMechanics/Linear/Gravity/flow_gravity.prj
@@ -24,15 +24,15 @@
                 <pressure>pressure</pressure>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
-                <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
-                <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
-                <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
-                <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
-                <secondary_variable type="static" internal_name="velocity" output_name="velocity"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_zz" output_name="sigma_zz"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="epsilon_xx" output_name="epsilon_xx"/>
+                <secondary_variable internal_name="epsilon_yy" output_name="epsilon_yy"/>
+                <secondary_variable internal_name="epsilon_zz" output_name="epsilon_zz"/>
+                <secondary_variable internal_name="epsilon_xy" output_name="epsilon_xy"/>
+                <secondary_variable internal_name="velocity" output_name="velocity"/>
             </secondary_variables>
             <specific_body_force>0 -10</specific_body_force>
             <fluid_type>incompressible_fluid</fluid_type>
diff --git a/Tests/Data/HydroMechanics/Principal_Stress/Hollow_Sphere/sphere.prj b/Tests/Data/HydroMechanics/Principal_Stress/Hollow_Sphere/sphere.prj
index 5f39a597053..fec44639e72 100644
--- a/Tests/Data/HydroMechanics/Principal_Stress/Hollow_Sphere/sphere.prj
+++ b/Tests/Data/HydroMechanics/Principal_Stress/Hollow_Sphere/sphere.prj
@@ -29,15 +29,15 @@
                 <pressure>pressure</pressure>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
-                <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
-                <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
-                <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
-                <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
-                <secondary_variable type="static" internal_name="velocity" output_name="velocity"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_zz" output_name="sigma_zz"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="epsilon_xx" output_name="epsilon_xx"/>
+                <secondary_variable internal_name="epsilon_yy" output_name="epsilon_yy"/>
+                <secondary_variable internal_name="epsilon_zz" output_name="epsilon_zz"/>
+                <secondary_variable internal_name="epsilon_xy" output_name="epsilon_xy"/>
+                <secondary_variable internal_name="velocity" output_name="velocity"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
             <fluid_type>incompressible_fluid</fluid_type>
diff --git a/Tests/Data/HydroMechanics/Principal_Stress/Tube/tube.prj b/Tests/Data/HydroMechanics/Principal_Stress/Tube/tube.prj
index 910a1ee9ff8..ae3867c0708 100644
--- a/Tests/Data/HydroMechanics/Principal_Stress/Tube/tube.prj
+++ b/Tests/Data/HydroMechanics/Principal_Stress/Tube/tube.prj
@@ -29,15 +29,15 @@
                 <pressure>pressure</pressure>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
-                <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
-                <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
-                <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
-                <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
-                <secondary_variable type="static" internal_name="velocity" output_name="velocity"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_zz" output_name="sigma_zz"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="epsilon_xx" output_name="epsilon_xx"/>
+                <secondary_variable internal_name="epsilon_yy" output_name="epsilon_yy"/>
+                <secondary_variable internal_name="epsilon_zz" output_name="epsilon_zz"/>
+                <secondary_variable internal_name="epsilon_xy" output_name="epsilon_xy"/>
+                <secondary_variable internal_name="velocity" output_name="velocity"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
             <fluid_type>incompressible_fluid</fluid_type>
diff --git a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D.prj b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D.prj
index f0a7d36cb42..277ce9aee8c 100644
--- a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D.prj
+++ b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D.prj
@@ -25,15 +25,15 @@
                 <displacement>displacement</displacement>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
-                <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
-                <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
-                <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
-                <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
-                <secondary_variable type="static" internal_name="velocity" output_name="velocity"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_zz" output_name="sigma_zz"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="epsilon_xx" output_name="epsilon_xx"/>
+                <secondary_variable internal_name="epsilon_yy" output_name="epsilon_yy"/>
+                <secondary_variable internal_name="epsilon_zz" output_name="epsilon_zz"/>
+                <secondary_variable internal_name="epsilon_xy" output_name="epsilon_xy"/>
+                <secondary_variable internal_name="velocity" output_name="velocity"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
             <fluid_type>compressible_fluid</fluid_type>
diff --git a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/RerefenceSolutionByMonolithicScheme/InjectionProduction1DMono.prj b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/RerefenceSolutionByMonolithicScheme/InjectionProduction1DMono.prj
index e1c8b8c1df1..b6328c4c002 100644
--- a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/RerefenceSolutionByMonolithicScheme/InjectionProduction1DMono.prj
+++ b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/RerefenceSolutionByMonolithicScheme/InjectionProduction1DMono.prj
@@ -24,15 +24,15 @@
                 <displacement>displacement</displacement>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
-                <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
-                <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
-                <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
-                <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
-                <secondary_variable type="static" internal_name="velocity" output_name="velocity"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_zz" output_name="sigma_zz"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="epsilon_xx" output_name="epsilon_xx"/>
+                <secondary_variable internal_name="epsilon_yy" output_name="epsilon_yy"/>
+                <secondary_variable internal_name="epsilon_zz" output_name="epsilon_zz"/>
+                <secondary_variable internal_name="epsilon_xy" output_name="epsilon_xy"/>
+                <secondary_variable internal_name="velocity" output_name="velocity"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
             <fluid_type>compressible_fluid</fluid_type>
diff --git a/Tests/Data/HydroMechanics/Verification/hm1_1Dbeam.prj b/Tests/Data/HydroMechanics/Verification/hm1_1Dbeam.prj
index 0a1f540888a..522dc4a9b71 100755
--- a/Tests/Data/HydroMechanics/Verification/hm1_1Dbeam.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm1_1Dbeam.prj
@@ -25,19 +25,19 @@
                 <displacement>displacement</displacement>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="velocity" output_name="q"/>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
-                <secondary_variable type="static" internal_name="sigma_xz" output_name="sigma_xz"/>
-                <secondary_variable type="static" internal_name="sigma_yz" output_name="sigma_yz"/>
-                <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
-                <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
-                <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
-                <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
-                <secondary_variable type="static" internal_name="epsilon_xz" output_name="epsilon_xz"/>
-                <secondary_variable type="static" internal_name="epsilon_yz" output_name="epsilon_yz"/>
+                <secondary_variable internal_name="velocity" output_name="q"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_zz" output_name="sigma_zz"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="sigma_xz" output_name="sigma_xz"/>
+                <secondary_variable internal_name="sigma_yz" output_name="sigma_yz"/>
+                <secondary_variable internal_name="epsilon_xx" output_name="epsilon_xx"/>
+                <secondary_variable internal_name="epsilon_yy" output_name="epsilon_yy"/>
+                <secondary_variable internal_name="epsilon_zz" output_name="epsilon_zz"/>
+                <secondary_variable internal_name="epsilon_xy" output_name="epsilon_xy"/>
+                <secondary_variable internal_name="epsilon_xz" output_name="epsilon_xz"/>
+                <secondary_variable internal_name="epsilon_yz" output_name="epsilon_yz"/>
             </secondary_variables>
             <specific_body_force> 0 0 0 </specific_body_force>
             <fluid_type>incompressible_fluid</fluid_type>
diff --git a/Tests/Data/HydroMechanics/Verification/hm1_2Dsquare.prj b/Tests/Data/HydroMechanics/Verification/hm1_2Dsquare.prj
index 477a7495bcf..8f5b21f32b8 100755
--- a/Tests/Data/HydroMechanics/Verification/hm1_2Dsquare.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm1_2Dsquare.prj
@@ -25,19 +25,19 @@
                 <displacement>displacement</displacement>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="velocity" output_name="q"/>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
-                <secondary_variable type="static" internal_name="sigma_xz" output_name="sigma_xz"/>
-                <secondary_variable type="static" internal_name="sigma_yz" output_name="sigma_yz"/>
-                <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
-                <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
-                <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
-                <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
-                <secondary_variable type="static" internal_name="epsilon_xz" output_name="epsilon_xz"/>
-                <secondary_variable type="static" internal_name="epsilon_yz" output_name="epsilon_yz"/>
+                <secondary_variable internal_name="velocity" output_name="q"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_zz" output_name="sigma_zz"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="sigma_xz" output_name="sigma_xz"/>
+                <secondary_variable internal_name="sigma_yz" output_name="sigma_yz"/>
+                <secondary_variable internal_name="epsilon_xx" output_name="epsilon_xx"/>
+                <secondary_variable internal_name="epsilon_yy" output_name="epsilon_yy"/>
+                <secondary_variable internal_name="epsilon_zz" output_name="epsilon_zz"/>
+                <secondary_variable internal_name="epsilon_xy" output_name="epsilon_xy"/>
+                <secondary_variable internal_name="epsilon_xz" output_name="epsilon_xz"/>
+                <secondary_variable internal_name="epsilon_yz" output_name="epsilon_yz"/>
             </secondary_variables>
             <specific_body_force> 0 0 0 </specific_body_force>
             <fluid_type>incompressible_fluid</fluid_type>
diff --git a/Tests/Data/HydroMechanics/Verification/hm1_3Dcube.prj b/Tests/Data/HydroMechanics/Verification/hm1_3Dcube.prj
index 88588a196fa..4b1db05aac1 100755
--- a/Tests/Data/HydroMechanics/Verification/hm1_3Dcube.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm1_3Dcube.prj
@@ -25,19 +25,19 @@
                 <displacement>displacement</displacement>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="velocity" output_name="q"/>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
-                <secondary_variable type="static" internal_name="sigma_xz" output_name="sigma_xz"/>
-                <secondary_variable type="static" internal_name="sigma_yz" output_name="sigma_yz"/>
-                <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
-                <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
-                <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
-                <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
-                <secondary_variable type="static" internal_name="epsilon_xz" output_name="epsilon_xz"/>
-                <secondary_variable type="static" internal_name="epsilon_yz" output_name="epsilon_yz"/>
+                <secondary_variable internal_name="velocity" output_name="q"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_zz" output_name="sigma_zz"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="sigma_xz" output_name="sigma_xz"/>
+                <secondary_variable internal_name="sigma_yz" output_name="sigma_yz"/>
+                <secondary_variable internal_name="epsilon_xx" output_name="epsilon_xx"/>
+                <secondary_variable internal_name="epsilon_yy" output_name="epsilon_yy"/>
+                <secondary_variable internal_name="epsilon_zz" output_name="epsilon_zz"/>
+                <secondary_variable internal_name="epsilon_xy" output_name="epsilon_xy"/>
+                <secondary_variable internal_name="epsilon_xz" output_name="epsilon_xz"/>
+                <secondary_variable internal_name="epsilon_yz" output_name="epsilon_yz"/>
             </secondary_variables>
             <specific_body_force> 0 0 0 </specific_body_force>
             <fluid_type>incompressible_fluid</fluid_type>
diff --git a/Tests/Data/HydroMechanics/Verification/hm1_3Dgravity.prj b/Tests/Data/HydroMechanics/Verification/hm1_3Dgravity.prj
index 716f8fd439a..3e891def502 100755
--- a/Tests/Data/HydroMechanics/Verification/hm1_3Dgravity.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm1_3Dgravity.prj
@@ -25,19 +25,19 @@
                 <displacement>displacement</displacement>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="velocity" output_name="q"/>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
-                <secondary_variable type="static" internal_name="sigma_xz" output_name="sigma_xz"/>
-                <secondary_variable type="static" internal_name="sigma_yz" output_name="sigma_yz"/>
-                <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
-                <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
-                <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
-                <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
-                <secondary_variable type="static" internal_name="epsilon_xz" output_name="epsilon_xz"/>
-                <secondary_variable type="static" internal_name="epsilon_yz" output_name="epsilon_yz"/>
+                <secondary_variable internal_name="velocity" output_name="q"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_zz" output_name="sigma_zz"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="sigma_xz" output_name="sigma_xz"/>
+                <secondary_variable internal_name="sigma_yz" output_name="sigma_yz"/>
+                <secondary_variable internal_name="epsilon_xx" output_name="epsilon_xx"/>
+                <secondary_variable internal_name="epsilon_yy" output_name="epsilon_yy"/>
+                <secondary_variable internal_name="epsilon_zz" output_name="epsilon_zz"/>
+                <secondary_variable internal_name="epsilon_xy" output_name="epsilon_xy"/>
+                <secondary_variable internal_name="epsilon_xz" output_name="epsilon_xz"/>
+                <secondary_variable internal_name="epsilon_yz" output_name="epsilon_yz"/>
             </secondary_variables>
             <specific_body_force> 0 0 -9.81 </specific_body_force>
             <fluid_type>incompressible_fluid</fluid_type>
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1D1bt.prj b/Tests/Data/HydroMechanics/Verification/hm2_1D1bt.prj
index bf0f5dc1769..591307cc95b 100755
--- a/Tests/Data/HydroMechanics/Verification/hm2_1D1bt.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm2_1D1bt.prj
@@ -24,19 +24,19 @@
                 <displacement>displacement</displacement>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="velocity" output_name="q"/>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
-                <secondary_variable type="static" internal_name="sigma_xz" output_name="sigma_xz"/>
-                <secondary_variable type="static" internal_name="sigma_yz" output_name="sigma_yz"/>
-                <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
-                <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
-                <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
-               <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
-               <secondary_variable type="static" internal_name="epsilon_xz" output_name="epsilon_xz"/>
-               <secondary_variable type="static" internal_name="epsilon_yz" output_name="epsilon_yz"/>
+                <secondary_variable internal_name="velocity" output_name="q"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_zz" output_name="sigma_zz"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="sigma_xz" output_name="sigma_xz"/>
+                <secondary_variable internal_name="sigma_yz" output_name="sigma_yz"/>
+                <secondary_variable internal_name="epsilon_xx" output_name="epsilon_xx"/>
+                <secondary_variable internal_name="epsilon_yy" output_name="epsilon_yy"/>
+                <secondary_variable internal_name="epsilon_zz" output_name="epsilon_zz"/>
+               <secondary_variable internal_name="epsilon_xy" output_name="epsilon_xy"/>
+               <secondary_variable internal_name="epsilon_xz" output_name="epsilon_xz"/>
+               <secondary_variable internal_name="epsilon_yz" output_name="epsilon_yz"/>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
             <fluid_type>incompressible_fluid</fluid_type>
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1D2bt.prj b/Tests/Data/HydroMechanics/Verification/hm2_1D2bt.prj
index 2f1945b6b9d..4d81bde9c75 100755
--- a/Tests/Data/HydroMechanics/Verification/hm2_1D2bt.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm2_1D2bt.prj
@@ -24,19 +24,19 @@
                 <displacement>displacement</displacement>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="velocity" output_name="q"/>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
-                <secondary_variable type="static" internal_name="sigma_xz" output_name="sigma_xz"/>
-                <secondary_variable type="static" internal_name="sigma_yz" output_name="sigma_yz"/>
-                <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
-                <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
-                <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
-                <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
-                <secondary_variable type="static" internal_name="epsilon_xz" output_name="epsilon_xz"/>
-                <secondary_variable type="static" internal_name="epsilon_yz" output_name="epsilon_yz"/>
+                <secondary_variable internal_name="velocity" output_name="q"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_zz" output_name="sigma_zz"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="sigma_xz" output_name="sigma_xz"/>
+                <secondary_variable internal_name="sigma_yz" output_name="sigma_yz"/>
+                <secondary_variable internal_name="epsilon_xx" output_name="epsilon_xx"/>
+                <secondary_variable internal_name="epsilon_yy" output_name="epsilon_yy"/>
+                <secondary_variable internal_name="epsilon_zz" output_name="epsilon_zz"/>
+                <secondary_variable internal_name="epsilon_xy" output_name="epsilon_xy"/>
+                <secondary_variable internal_name="epsilon_xz" output_name="epsilon_xz"/>
+                <secondary_variable internal_name="epsilon_yz" output_name="epsilon_yz"/>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
             <fluid_type>incompressible_fluid</fluid_type>
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1Dbiot.prj b/Tests/Data/HydroMechanics/Verification/hm2_1Dbiot.prj
index 4cc2face5c3..81120b9069b 100755
--- a/Tests/Data/HydroMechanics/Verification/hm2_1Dbiot.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm2_1Dbiot.prj
@@ -24,19 +24,19 @@
                 <displacement>displacement</displacement>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="velocity" output_name="q"/>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
-                <secondary_variable type="static" internal_name="sigma_xz" output_name="sigma_xz"/>
-                <secondary_variable type="static" internal_name="sigma_yz" output_name="sigma_yz"/>
-                <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
-                <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
-                <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
-                <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
-                <secondary_variable type="static" internal_name="epsilon_xz" output_name="epsilon_xz"/>
-                <secondary_variable type="static" internal_name="epsilon_yz" output_name="epsilon_yz"/>
+                <secondary_variable internal_name="velocity" output_name="q"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_zz" output_name="sigma_zz"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="sigma_xz" output_name="sigma_xz"/>
+                <secondary_variable internal_name="sigma_yz" output_name="sigma_yz"/>
+                <secondary_variable internal_name="epsilon_xx" output_name="epsilon_xx"/>
+                <secondary_variable internal_name="epsilon_yy" output_name="epsilon_yy"/>
+                <secondary_variable internal_name="epsilon_zz" output_name="epsilon_zz"/>
+                <secondary_variable internal_name="epsilon_xy" output_name="epsilon_xy"/>
+                <secondary_variable internal_name="epsilon_xz" output_name="epsilon_xz"/>
+                <secondary_variable internal_name="epsilon_yz" output_name="epsilon_yz"/>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
             <fluid_type>incompressible_fluid</fluid_type>
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn1.prj b/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn1.prj
index 338e3ae40cb..cf07cef70a6 100755
--- a/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn1.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn1.prj
@@ -24,19 +24,19 @@
                 <displacement>displacement</displacement>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="velocity" output_name="q"/>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
-                <secondary_variable type="static" internal_name="sigma_xz" output_name="sigma_xz"/>
-                <secondary_variable type="static" internal_name="sigma_yz" output_name="sigma_yz"/>
-                <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
-                <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
-                <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
-                <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
-                <secondary_variable type="static" internal_name="epsilon_xz" output_name="epsilon_xz"/>
-                <secondary_variable type="static" internal_name="epsilon_yz" output_name="epsilon_yz"/>
+                <secondary_variable internal_name="velocity" output_name="q"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_zz" output_name="sigma_zz"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="sigma_xz" output_name="sigma_xz"/>
+                <secondary_variable internal_name="sigma_yz" output_name="sigma_yz"/>
+                <secondary_variable internal_name="epsilon_xx" output_name="epsilon_xx"/>
+                <secondary_variable internal_name="epsilon_yy" output_name="epsilon_yy"/>
+                <secondary_variable internal_name="epsilon_zz" output_name="epsilon_zz"/>
+                <secondary_variable internal_name="epsilon_xy" output_name="epsilon_xy"/>
+                <secondary_variable internal_name="epsilon_xz" output_name="epsilon_xz"/>
+                <secondary_variable internal_name="epsilon_yz" output_name="epsilon_yz"/>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
             <fluid_type>incompressible_fluid</fluid_type>
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn2.prj b/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn2.prj
index eea967213e5..3472ecd81b3 100755
--- a/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn2.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn2.prj
@@ -24,19 +24,19 @@
                 <displacement>displacement</displacement>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="velocity" output_name="q"/>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
-                <secondary_variable type="static" internal_name="sigma_xz" output_name="sigma_xz"/>
-                <secondary_variable type="static" internal_name="sigma_yz" output_name="sigma_yz"/>
-                <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
-                <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
-                <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
-                <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
-                <secondary_variable type="static" internal_name="epsilon_xz" output_name="epsilon_xz"/>
-                <secondary_variable type="static" internal_name="epsilon_yz" output_name="epsilon_yz"/>
+                <secondary_variable internal_name="velocity" output_name="q"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_zz" output_name="sigma_zz"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="sigma_xz" output_name="sigma_xz"/>
+                <secondary_variable internal_name="sigma_yz" output_name="sigma_yz"/>
+                <secondary_variable internal_name="epsilon_xx" output_name="epsilon_xx"/>
+                <secondary_variable internal_name="epsilon_yy" output_name="epsilon_yy"/>
+                <secondary_variable internal_name="epsilon_zz" output_name="epsilon_zz"/>
+                <secondary_variable internal_name="epsilon_xy" output_name="epsilon_xy"/>
+                <secondary_variable internal_name="epsilon_xz" output_name="epsilon_xz"/>
+                <secondary_variable internal_name="epsilon_yz" output_name="epsilon_yz"/>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
             <fluid_type>incompressible_fluid</fluid_type>
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_2Dmandel.prj b/Tests/Data/HydroMechanics/Verification/hm2_2Dmandel.prj
index 87534d1bd54..888966cb080 100755
--- a/Tests/Data/HydroMechanics/Verification/hm2_2Dmandel.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm2_2Dmandel.prj
@@ -24,19 +24,19 @@
                 <displacement>displacement</displacement>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="velocity" output_name="q"/>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
-                <secondary_variable type="static" internal_name="sigma_xz" output_name="sigma_xz"/>
-                <secondary_variable type="static" internal_name="sigma_yz" output_name="sigma_yz"/>
-                <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
-                <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
-                <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
-                <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
-                <secondary_variable type="static" internal_name="epsilon_xz" output_name="epsilon_xz"/>
-                <secondary_variable type="static" internal_name="epsilon_yz" output_name="epsilon_yz"/>
+                <secondary_variable internal_name="velocity" output_name="q"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_zz" output_name="sigma_zz"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="sigma_xz" output_name="sigma_xz"/>
+                <secondary_variable internal_name="sigma_yz" output_name="sigma_yz"/>
+                <secondary_variable internal_name="epsilon_xx" output_name="epsilon_xx"/>
+                <secondary_variable internal_name="epsilon_yy" output_name="epsilon_yy"/>
+                <secondary_variable internal_name="epsilon_zz" output_name="epsilon_zz"/>
+                <secondary_variable internal_name="epsilon_xy" output_name="epsilon_xy"/>
+                <secondary_variable internal_name="epsilon_xz" output_name="epsilon_xz"/>
+                <secondary_variable internal_name="epsilon_yz" output_name="epsilon_yz"/>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
             <fluid_type>incompressible_fluid</fluid_type>
diff --git a/Tests/Data/LIE/Mechanics/cohesive_zone_load_path.prj b/Tests/Data/LIE/Mechanics/cohesive_zone_load_path.prj
index 00b6376213f..a85e32d0524 100644
--- a/Tests/Data/LIE/Mechanics/cohesive_zone_load_path.prj
+++ b/Tests/Data/LIE/Mechanics/cohesive_zone_load_path.prj
@@ -31,10 +31,10 @@
                 <initial_aperture>aperture0</initial_aperture>
             </fracture_properties>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_zz" output_name="sigma_zz"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/LIE/Mechanics/mohr_coulomb_load_path.prj b/Tests/Data/LIE/Mechanics/mohr_coulomb_load_path.prj
index bc9d676c85d..64df4ac640e 100644
--- a/Tests/Data/LIE/Mechanics/mohr_coulomb_load_path.prj
+++ b/Tests/Data/LIE/Mechanics/mohr_coulomb_load_path.prj
@@ -36,9 +36,9 @@
                 <initial_aperture>aperture0</initial_aperture>
             </fracture_properties>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/LIE/Mechanics/sfrac.q.prj b/Tests/Data/LIE/Mechanics/sfrac.q.prj
index 5a757a36ef2..86186f25c1b 100644
--- a/Tests/Data/LIE/Mechanics/sfrac.q.prj
+++ b/Tests/Data/LIE/Mechanics/sfrac.q.prj
@@ -41,9 +41,9 @@
             </fracture_properties>
             <!--
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
             </secondary_variables>
             -->
         </process>
diff --git a/Tests/Data/LIE/Mechanics/single_joint.prj b/Tests/Data/LIE/Mechanics/single_joint.prj
index b5ef84fbfda..8a201875dd1 100644
--- a/Tests/Data/LIE/Mechanics/single_joint.prj
+++ b/Tests/Data/LIE/Mechanics/single_joint.prj
@@ -29,9 +29,9 @@
                 <initial_aperture>aperture0</initial_aperture>
             </fracture_properties>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/LIE/Mechanics/single_joint_3D.prj b/Tests/Data/LIE/Mechanics/single_joint_3D.prj
index f7ac96745cb..f04de3a8ab7 100644
--- a/Tests/Data/LIE/Mechanics/single_joint_3D.prj
+++ b/Tests/Data/LIE/Mechanics/single_joint_3D.prj
@@ -33,18 +33,18 @@
                 <initial_aperture>aperture0</initial_aperture>
             </fracture_properties>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_zz" output_name="sigma_zz"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
-                <secondary_variable type="static" internal_name="sigma_xz" output_name="sigma_xz"/>
-                <secondary_variable type="static" internal_name="sigma_yz" output_name="sigma_yz"/>
-                <secondary_variable type="static" internal_name="epsilon_xx" output_name="epsilon_xx"/>
-                <secondary_variable type="static" internal_name="epsilon_yy" output_name="epsilon_yy"/>
-                <secondary_variable type="static" internal_name="epsilon_zz" output_name="epsilon_zz"/>
-                <secondary_variable type="static" internal_name="epsilon_xy" output_name="epsilon_xy"/>
-                <secondary_variable type="static" internal_name="epsilon_xz" output_name="epsilon_xz"/>
-                <secondary_variable type="static" internal_name="epsilon_yz" output_name="epsilon_yz"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_zz" output_name="sigma_zz"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="sigma_xz" output_name="sigma_xz"/>
+                <secondary_variable internal_name="sigma_yz" output_name="sigma_yz"/>
+                <secondary_variable internal_name="epsilon_xx" output_name="epsilon_xx"/>
+                <secondary_variable internal_name="epsilon_yy" output_name="epsilon_yy"/>
+                <secondary_variable internal_name="epsilon_zz" output_name="epsilon_zz"/>
+                <secondary_variable internal_name="epsilon_xy" output_name="epsilon_xy"/>
+                <secondary_variable internal_name="epsilon_xz" output_name="epsilon_xz"/>
+                <secondary_variable internal_name="epsilon_yz" output_name="epsilon_yz"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/LIE/Mechanics/single_joint_displacement_controlled.prj b/Tests/Data/LIE/Mechanics/single_joint_displacement_controlled.prj
index b8deb674a90..1eca35eb710 100644
--- a/Tests/Data/LIE/Mechanics/single_joint_displacement_controlled.prj
+++ b/Tests/Data/LIE/Mechanics/single_joint_displacement_controlled.prj
@@ -36,9 +36,9 @@
                 <initial_aperture>aperture0</initial_aperture>
             </fracture_properties>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/LIE/Mechanics/single_joint_inside.prj b/Tests/Data/LIE/Mechanics/single_joint_inside.prj
index 627aff008cf..a014c9f1113 100644
--- a/Tests/Data/LIE/Mechanics/single_joint_inside.prj
+++ b/Tests/Data/LIE/Mechanics/single_joint_inside.prj
@@ -29,9 +29,9 @@
                 <initial_aperture>aperture0</initial_aperture>
             </fracture_properties>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/LIE/Mechanics/single_joint_negative_aperture.prj b/Tests/Data/LIE/Mechanics/single_joint_negative_aperture.prj
index d6309400d68..e4e4ebc7e11 100644
--- a/Tests/Data/LIE/Mechanics/single_joint_negative_aperture.prj
+++ b/Tests/Data/LIE/Mechanics/single_joint_negative_aperture.prj
@@ -29,9 +29,9 @@
                 <initial_aperture>aperture0</initial_aperture>
             </fracture_properties>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/LIE/Mechanics/two_cracks_branch_pull.prj b/Tests/Data/LIE/Mechanics/two_cracks_branch_pull.prj
index 04062ac0371..22affe29e71 100644
--- a/Tests/Data/LIE/Mechanics/two_cracks_branch_pull.prj
+++ b/Tests/Data/LIE/Mechanics/two_cracks_branch_pull.prj
@@ -34,9 +34,9 @@
                 <initial_aperture>aperture0</initial_aperture>
             </fracture_properties>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/LIE/Mechanics/two_cracks_junction_pull.prj b/Tests/Data/LIE/Mechanics/two_cracks_junction_pull.prj
index 8411360693e..d12089b1814 100644
--- a/Tests/Data/LIE/Mechanics/two_cracks_junction_pull.prj
+++ b/Tests/Data/LIE/Mechanics/two_cracks_junction_pull.prj
@@ -35,9 +35,9 @@
                 <initial_aperture>aperture0</initial_aperture>
             </fracture_properties>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/LIE/Mechanics/two_joints.prj b/Tests/Data/LIE/Mechanics/two_joints.prj
index a7cad73b481..bc5153f3528 100644
--- a/Tests/Data/LIE/Mechanics/two_joints.prj
+++ b/Tests/Data/LIE/Mechanics/two_joints.prj
@@ -34,9 +34,9 @@
                 <initial_aperture>aperture0</initial_aperture>
             </fracture_properties>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma_xx" output_name="sigma_xx"/>
-                <secondary_variable type="static" internal_name="sigma_yy" output_name="sigma_yy"/>
-                <secondary_variable type="static" internal_name="sigma_xy" output_name="sigma_xy"/>
+                <secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
+                <secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
+                <secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Burgers/cube_1e0.prj b/Tests/Data/Mechanics/Burgers/cube_1e0.prj
index ad3e9c5cdc4..4b37d503811 100644
--- a/Tests/Data/Mechanics/Burgers/cube_1e0.prj
+++ b/Tests/Data/Mechanics/Burgers/cube_1e0.prj
@@ -28,7 +28,7 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Burgers/cube_1e3.prj b/Tests/Data/Mechanics/Burgers/cube_1e3.prj
index ce7c3883b2a..9e377e3aadc 100644
--- a/Tests/Data/Mechanics/Burgers/cube_1e3.prj
+++ b/Tests/Data/Mechanics/Burgers/cube_1e3.prj
@@ -28,7 +28,7 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Ehlers/MFront/cube_1e0_dp.prj b/Tests/Data/Mechanics/Ehlers/MFront/cube_1e0_dp.prj
index 8693f035896..6be4852c7c2 100644
--- a/Tests/Data/Mechanics/Ehlers/MFront/cube_1e0_dp.prj
+++ b/Tests/Data/Mechanics/Ehlers/MFront/cube_1e0_dp.prj
@@ -50,8 +50,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Ehlers/axisymmetric_sphere_pl.prj b/Tests/Data/Mechanics/Ehlers/axisymmetric_sphere_pl.prj
index a939aeeba27..50fc7905a3b 100644
--- a/Tests/Data/Mechanics/Ehlers/axisymmetric_sphere_pl.prj
+++ b/Tests/Data/Mechanics/Ehlers/axisymmetric_sphere_pl.prj
@@ -41,7 +41,7 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Ehlers/cube_1e0.prj b/Tests/Data/Mechanics/Ehlers/cube_1e0.prj
index bed2dc8872f..5438f3f2d1d 100644
--- a/Tests/Data/Mechanics/Ehlers/cube_1e0.prj
+++ b/Tests/Data/Mechanics/Ehlers/cube_1e0.prj
@@ -37,8 +37,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Ehlers/cube_1e0_dp.prj b/Tests/Data/Mechanics/Ehlers/cube_1e0_dp.prj
index 7e3f2526313..0b61f350380 100644
--- a/Tests/Data/Mechanics/Ehlers/cube_1e0_dp.prj
+++ b/Tests/Data/Mechanics/Ehlers/cube_1e0_dp.prj
@@ -37,8 +37,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Ehlers/cube_1e1.prj b/Tests/Data/Mechanics/Ehlers/cube_1e1.prj
index 74070b4e1e2..a73069d1216 100644
--- a/Tests/Data/Mechanics/Ehlers/cube_1e1.prj
+++ b/Tests/Data/Mechanics/Ehlers/cube_1e1.prj
@@ -37,8 +37,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Ehlers/cube_1e3.prj b/Tests/Data/Mechanics/Ehlers/cube_1e3.prj
index 9f02f09a852..6b6f74e7408 100644
--- a/Tests/Data/Mechanics/Ehlers/cube_1e3.prj
+++ b/Tests/Data/Mechanics/Ehlers/cube_1e3.prj
@@ -37,8 +37,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/CrackedSolid/griffith.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/CrackedSolid/griffith.prj
index a07600f1f03..77103efbc6d 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/CrackedSolid/griffith.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/CrackedSolid/griffith.prj
@@ -47,9 +47,9 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="damage" output_name="damage"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="damage" output_name="damage"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/coarse/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/coarse/bar.prj
index 30dd86cba5d..770d9209832 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/coarse/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/coarse/bar.prj
@@ -47,9 +47,9 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="damage" output_name="damage"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="damage" output_name="damage"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/coarse_elastic_tangent/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/coarse_elastic_tangent/bar.prj
index 3f05ea34674..2feeccd3538 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/coarse_elastic_tangent/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/coarse_elastic_tangent/bar.prj
@@ -47,9 +47,9 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="damage" output_name="damage"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="damage" output_name="damage"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/fine/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/fine/bar.prj
index 81e5bd5748d..9a4ab55206e 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/fine/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/fine/bar.prj
@@ -47,9 +47,9 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="damage" output_name="damage"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="damage" output_name="damage"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/medium/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/medium/bar.prj
index 9fba797dab3..579d493aa9d 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/medium/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/medium/bar.prj
@@ -47,9 +47,9 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="damage" output_name="damage"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="damage" output_name="damage"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p1/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p1/bar.prj
index 45d3effb97a..5a6d53fa91c 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p1/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p1/bar.prj
@@ -47,9 +47,9 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="damage" output_name="damage"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="damage" output_name="damage"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p2/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p2/bar.prj
index 37c4268c23d..901ca9c2875 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p2/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p2/bar.prj
@@ -47,9 +47,9 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="damage" output_name="damage"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="damage" output_name="damage"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p3/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p3/bar.prj
index 7c4487a7819..931e1448284 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p3/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p3/bar.prj
@@ -47,9 +47,9 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="damage" output_name="damage"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="damage" output_name="damage"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/t1/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/t1/bar.prj
index 73f51ffe0b7..0ebf41ab6a8 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/t1/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/t1/bar.prj
@@ -47,9 +47,9 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="damage" output_name="damage"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="damage" output_name="damage"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/t2/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/t2/bar.prj
index 53f19c5a638..5a78790d429 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/t2/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/t2/bar.prj
@@ -47,9 +47,9 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="damage" output_name="damage"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="damage" output_name="damage"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/veryfine/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/veryfine/bar.prj
index cb843c9c560..69bfd949ae9 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/veryfine/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/veryfine/bar.prj
@@ -47,9 +47,9 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="damage" output_name="damage"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="damage" output_name="damage"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/3D_hexa/beam.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/3D_hexa/beam.prj
index ed14178bceb..b5a7ec79948 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/3D_hexa/beam.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/3D_hexa/beam.prj
@@ -43,9 +43,9 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="damage" output_name="damage"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="damage" output_name="damage"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/3D_tetr/beam.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/3D_tetr/beam.prj
index de0c20c6238..b12daf1780b 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/3D_tetr/beam.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/3D_tetr/beam.prj
@@ -43,9 +43,9 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="damage" output_name="damage"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="damage" output_name="damage"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse/beam.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse/beam.prj
index 01c265ef3df..e02206b0f42 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse/beam.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse/beam.prj
@@ -43,9 +43,9 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="damage" output_name="damage"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="damage" output_name="damage"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse_quad/beam.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse_quad/beam.prj
index b38aa1d59dd..736134427e3 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse_quad/beam.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse_quad/beam.prj
@@ -43,9 +43,9 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="damage" output_name="damage"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="damage" output_name="damage"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse_tria/beam.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse_tria/beam.prj
index 28646c87561..95458d95dfd 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse_tria/beam.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse_tria/beam.prj
@@ -43,9 +43,9 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="damage" output_name="damage"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="damage" output_name="damage"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/fine/beam.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/fine/beam.prj
index 67fb8c2d649..f3a589eeb50 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/fine/beam.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/fine/beam.prj
@@ -43,9 +43,9 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="damage" output_name="damage"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="damage" output_name="damage"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/medium/beam.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/medium/beam.prj
index ff9b3f9d0ff..ca39c25ceb9 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/medium/beam.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/medium/beam.prj
@@ -43,9 +43,9 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="damage" output_name="damage"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="damage" output_name="damage"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/holed_beam/holed_beam.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/holed_beam/holed_beam.prj
index 169e4437c2e..11a6eb2f8b5 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/holed_beam/holed_beam.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/holed_beam/holed_beam.prj
@@ -48,9 +48,9 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="damage" output_name="damage"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="damage" output_name="damage"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/notched_beam/smallbeam_3D.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/notched_beam/smallbeam_3D.prj
index e6a88df7bd1..e15f46c6c67 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/notched_beam/smallbeam_3D.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/notched_beam/smallbeam_3D.prj
@@ -48,9 +48,9 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="damage" output_name="damage"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="damage" output_name="damage"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/InitialStates/equilibrium_restart.prj b/Tests/Data/Mechanics/InitialStates/equilibrium_restart.prj
index 6e5a63daa18..7225cfad847 100644
--- a/Tests/Data/Mechanics/InitialStates/equilibrium_restart.prj
+++ b/Tests/Data/Mechanics/InitialStates/equilibrium_restart.prj
@@ -23,8 +23,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/InitialStates/into_initial_state.prj b/Tests/Data/Mechanics/InitialStates/into_initial_state.prj
index a0c5dded82c..b26825a8d93 100644
--- a/Tests/Data/Mechanics/InitialStates/into_initial_state.prj
+++ b/Tests/Data/Mechanics/InitialStates/into_initial_state.prj
@@ -23,8 +23,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/InitialStates/non_equilibrium_initial_state.prj b/Tests/Data/Mechanics/InitialStates/non_equilibrium_initial_state.prj
index a7a0c9682a1..263e2370809 100644
--- a/Tests/Data/Mechanics/InitialStates/non_equilibrium_initial_state.prj
+++ b/Tests/Data/Mechanics/InitialStates/non_equilibrium_initial_state.prj
@@ -23,8 +23,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <initial_stress>nonequilibrium_stress</initial_stress>
         </process>
diff --git a/Tests/Data/Mechanics/Linear/MFront/axisymm_ring/ring_plane_strain.prj b/Tests/Data/Mechanics/Linear/MFront/axisymm_ring/ring_plane_strain.prj
index c0eaff4ea8c..fa091ac381f 100644
--- a/Tests/Data/Mechanics/Linear/MFront/axisymm_ring/ring_plane_strain.prj
+++ b/Tests/Data/Mechanics/Linear/MFront/axisymm_ring/ring_plane_strain.prj
@@ -21,7 +21,7 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/MFront/cube_standard_elasticity_brick.prj b/Tests/Data/Mechanics/Linear/MFront/cube_standard_elasticity_brick.prj
index fd8e8f9eb0d..b5a3ccbc407 100644
--- a/Tests/Data/Mechanics/Linear/MFront/cube_standard_elasticity_brick.prj
+++ b/Tests/Data/Mechanics/Linear/MFront/cube_standard_elasticity_brick.prj
@@ -22,7 +22,7 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/MFront/disc_with_hole/disc_with_hole.prj b/Tests/Data/Mechanics/Linear/MFront/disc_with_hole/disc_with_hole.prj
index b1d4633edbf..a0d0c8f406f 100644
--- a/Tests/Data/Mechanics/Linear/MFront/disc_with_hole/disc_with_hole.prj
+++ b/Tests/Data/Mechanics/Linear/MFront/disc_with_hole/disc_with_hole.prj
@@ -21,7 +21,7 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/MaterialForces/bar.prj b/Tests/Data/Mechanics/Linear/MaterialForces/bar.prj
index 987db81dab5..9c561e94ae8 100644
--- a/Tests/Data/Mechanics/Linear/MaterialForces/bar.prj
+++ b/Tests/Data/Mechanics/Linear/MaterialForces/bar.prj
@@ -18,9 +18,9 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="free_energy_density" output_name="free_energy_density"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="free_energy_density" output_name="free_energy_density"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/MaterialForces/bar_3D.prj b/Tests/Data/Mechanics/Linear/MaterialForces/bar_3D.prj
index 691ea02e885..164ba75aa45 100644
--- a/Tests/Data/Mechanics/Linear/MaterialForces/bar_3D.prj
+++ b/Tests/Data/Mechanics/Linear/MaterialForces/bar_3D.prj
@@ -18,9 +18,9 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="free_energy_density" output_name="free_energy_density"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="free_energy_density" output_name="free_energy_density"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/Orthotropy/cube_1e0_orthotropic_xyz.prj b/Tests/Data/Mechanics/Linear/Orthotropy/cube_1e0_orthotropic_xyz.prj
index c6322c4045f..d52751873b7 100644
--- a/Tests/Data/Mechanics/Linear/Orthotropy/cube_1e0_orthotropic_xyz.prj
+++ b/Tests/Data/Mechanics/Linear/Orthotropy/cube_1e0_orthotropic_xyz.prj
@@ -19,8 +19,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/Orthotropy/cube_1e0_orthotropic_yzx.prj b/Tests/Data/Mechanics/Linear/Orthotropy/cube_1e0_orthotropic_yzx.prj
index e00b351b661..605ef0011cd 100644
--- a/Tests/Data/Mechanics/Linear/Orthotropy/cube_1e0_orthotropic_yzx.prj
+++ b/Tests/Data/Mechanics/Linear/Orthotropy/cube_1e0_orthotropic_yzx.prj
@@ -19,8 +19,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/Orthotropy/cube_1e0_orthotropic_zxy.prj b/Tests/Data/Mechanics/Linear/Orthotropy/cube_1e0_orthotropic_zxy.prj
index 67a069a1b00..d570e0e2cb1 100644
--- a/Tests/Data/Mechanics/Linear/Orthotropy/cube_1e0_orthotropic_zxy.prj
+++ b/Tests/Data/Mechanics/Linear/Orthotropy/cube_1e0_orthotropic_zxy.prj
@@ -19,8 +19,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dshearz.prj b/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dshearz.prj
index 5d28a9505b7..22564da5c13 100644
--- a/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dshearz.prj
+++ b/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dshearz.prj
@@ -20,8 +20,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dshearz_rot.prj b/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dshearz_rot.prj
index d4bd6da2afb..c4516d0d201 100644
--- a/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dshearz_rot.prj
+++ b/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dshearz_rot.prj
@@ -21,8 +21,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dtopload.prj b/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dtopload.prj
index 99e12cd8733..441eb289cdb 100644
--- a/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dtopload.prj
+++ b/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dtopload.prj
@@ -20,8 +20,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dtoploadlc.prj b/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dtoploadlc.prj
index 3e1ae4fe258..b6345a2d3dc 100644
--- a/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dtoploadlc.prj
+++ b/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dtoploadlc.prj
@@ -21,8 +21,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/Orthotropy/square_1e0_orthotropic_xyz.prj b/Tests/Data/Mechanics/Linear/Orthotropy/square_1e0_orthotropic_xyz.prj
index 2c052f1534f..39a48777cef 100644
--- a/Tests/Data/Mechanics/Linear/Orthotropy/square_1e0_orthotropic_xyz.prj
+++ b/Tests/Data/Mechanics/Linear/Orthotropy/square_1e0_orthotropic_xyz.prj
@@ -19,8 +19,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/Orthotropy/square_1e0_orthotropic_yzx.prj b/Tests/Data/Mechanics/Linear/Orthotropy/square_1e0_orthotropic_yzx.prj
index 16955b89cb5..3c4f6259f77 100644
--- a/Tests/Data/Mechanics/Linear/Orthotropy/square_1e0_orthotropic_yzx.prj
+++ b/Tests/Data/Mechanics/Linear/Orthotropy/square_1e0_orthotropic_yzx.prj
@@ -19,8 +19,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/Orthotropy/square_1e0_orthotropic_zxy.prj b/Tests/Data/Mechanics/Linear/Orthotropy/square_1e0_orthotropic_zxy.prj
index 91bef595c6f..90cfce10d38 100644
--- a/Tests/Data/Mechanics/Linear/Orthotropy/square_1e0_orthotropic_zxy.prj
+++ b/Tests/Data/Mechanics/Linear/Orthotropy/square_1e0_orthotropic_zxy.prj
@@ -19,8 +19,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/PressureBC/axisymmetric_pipe.prj b/Tests/Data/Mechanics/Linear/PressureBC/axisymmetric_pipe.prj
index c23ea96cb7c..e551bbec1a6 100644
--- a/Tests/Data/Mechanics/Linear/PressureBC/axisymmetric_pipe.prj
+++ b/Tests/Data/Mechanics/Linear/PressureBC/axisymmetric_pipe.prj
@@ -18,7 +18,7 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/PressureBC/axisymmetric_sphere.prj b/Tests/Data/Mechanics/Linear/PressureBC/axisymmetric_sphere.prj
index fdf439f9c81..e0bc85a9d04 100644
--- a/Tests/Data/Mechanics/Linear/PressureBC/axisymmetric_sphere.prj
+++ b/Tests/Data/Mechanics/Linear/PressureBC/axisymmetric_sphere.prj
@@ -18,7 +18,7 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/PressureBC/hollow_sphere.prj b/Tests/Data/Mechanics/Linear/PressureBC/hollow_sphere.prj
index 9891a768dab..b27cecffd96 100644
--- a/Tests/Data/Mechanics/Linear/PressureBC/hollow_sphere.prj
+++ b/Tests/Data/Mechanics/Linear/PressureBC/hollow_sphere.prj
@@ -18,7 +18,7 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/PythonHertzContact/hertz_contact.prj b/Tests/Data/Mechanics/Linear/PythonHertzContact/hertz_contact.prj
index 1ecf59d8cba..e1605561b10 100644
--- a/Tests/Data/Mechanics/Linear/PythonHertzContact/hertz_contact.prj
+++ b/Tests/Data/Mechanics/Linear/PythonHertzContact/hertz_contact.prj
@@ -19,8 +19,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/PythonPiston/piston.prj b/Tests/Data/Mechanics/Linear/PythonPiston/piston.prj
index 72ad9ac9877..103cc948604 100644
--- a/Tests/Data/Mechanics/Linear/PythonPiston/piston.prj
+++ b/Tests/Data/Mechanics/Linear/PythonPiston/piston.prj
@@ -19,8 +19,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/cube_1e0.prj b/Tests/Data/Mechanics/Linear/cube_1e0.prj
index 36a73e65e8d..80526c918ed 100644
--- a/Tests/Data/Mechanics/Linear/cube_1e0.prj
+++ b/Tests/Data/Mechanics/Linear/cube_1e0.prj
@@ -18,8 +18,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/cube_1e0_simple_shear.prj b/Tests/Data/Mechanics/Linear/cube_1e0_simple_shear.prj
index 20d7db5ea80..a6aceb58e96 100644
--- a/Tests/Data/Mechanics/Linear/cube_1e0_simple_shear.prj
+++ b/Tests/Data/Mechanics/Linear/cube_1e0_simple_shear.prj
@@ -18,8 +18,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/disc_with_hole.prj b/Tests/Data/Mechanics/Linear/disc_with_hole.prj
index 3d3d1832996..8b5701bd9df 100644
--- a/Tests/Data/Mechanics/Linear/disc_with_hole.prj
+++ b/Tests/Data/Mechanics/Linear/disc_with_hole.prj
@@ -18,7 +18,7 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/plain_strain_pipe.prj b/Tests/Data/Mechanics/Linear/plain_strain_pipe.prj
index 030053ef806..97134266191 100644
--- a/Tests/Data/Mechanics/Linear/plain_strain_pipe.prj
+++ b/Tests/Data/Mechanics/Linear/plain_strain_pipe.prj
@@ -18,7 +18,7 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/ring_plane_strain.prj b/Tests/Data/Mechanics/Linear/ring_plane_strain.prj
index dd4566c5c32..f253ef1b52f 100644
--- a/Tests/Data/Mechanics/Linear/ring_plane_strain.prj
+++ b/Tests/Data/Mechanics/Linear/ring_plane_strain.prj
@@ -18,7 +18,7 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/square_1e0.prj b/Tests/Data/Mechanics/Linear/square_1e0.prj
index 151580344af..2ab6485c6e4 100644
--- a/Tests/Data/Mechanics/Linear/square_1e0.prj
+++ b/Tests/Data/Mechanics/Linear/square_1e0.prj
@@ -18,7 +18,7 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/square_1e2.prj b/Tests/Data/Mechanics/Linear/square_1e2.prj
index 5393f76dfb9..1d5be0b5202 100644
--- a/Tests/Data/Mechanics/Linear/square_1e2.prj
+++ b/Tests/Data/Mechanics/Linear/square_1e2.prj
@@ -18,7 +18,7 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/square_1e2_quad8_traction_top.prj b/Tests/Data/Mechanics/Linear/square_1e2_quad8_traction_top.prj
index 902079af99b..d92ef57e2b1 100644
--- a/Tests/Data/Mechanics/Linear/square_1e2_quad8_traction_top.prj
+++ b/Tests/Data/Mechanics/Linear/square_1e2_quad8_traction_top.prj
@@ -18,7 +18,7 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/square_1e5.prj b/Tests/Data/Mechanics/Linear/square_1e5.prj
index dac71001953..bdacae9674d 100644
--- a/Tests/Data/Mechanics/Linear/square_1e5.prj
+++ b/Tests/Data/Mechanics/Linear/square_1e5.prj
@@ -18,7 +18,7 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/square_with_deactivated_hole.prj b/Tests/Data/Mechanics/Linear/square_with_deactivated_hole.prj
index f73b0986d99..65e39d9f948 100644
--- a/Tests/Data/Mechanics/Linear/square_with_deactivated_hole.prj
+++ b/Tests/Data/Mechanics/Linear/square_with_deactivated_hole.prj
@@ -23,7 +23,7 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/two_material_gravity.prj b/Tests/Data/Mechanics/Linear/two_material_gravity.prj
index d113f04350b..9aa5de4d872 100644
--- a/Tests/Data/Mechanics/Linear/two_material_gravity.prj
+++ b/Tests/Data/Mechanics/Linear/two_material_gravity.prj
@@ -18,8 +18,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/Linear/two_material_gravity_Emodulus.prj b/Tests/Data/Mechanics/Linear/two_material_gravity_Emodulus.prj
index d09d25148a5..8caf42b9c39 100644
--- a/Tests/Data/Mechanics/Linear/two_material_gravity_Emodulus.prj
+++ b/Tests/Data/Mechanics/Linear/two_material_gravity_Emodulus.prj
@@ -23,8 +23,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/MohrCoulombAbboSloan/displacement_load.prj b/Tests/Data/Mechanics/MohrCoulombAbboSloan/displacement_load.prj
index fe9afc27dc9..70cc244a5e8 100644
--- a/Tests/Data/Mechanics/MohrCoulombAbboSloan/displacement_load.prj
+++ b/Tests/Data/Mechanics/MohrCoulombAbboSloan/displacement_load.prj
@@ -27,10 +27,10 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="ElasticStrain" output_name="ElasticStrain"/>
-                <secondary_variable type="static" internal_name="EquivalentPlasticStrain" output_name="EquivalentPlasticStrain"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="ElasticStrain" output_name="ElasticStrain"/>
+                <secondary_variable internal_name="EquivalentPlasticStrain" output_name="EquivalentPlasticStrain"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/MohrCoulombAbboSloan/load_test_elastic.prj b/Tests/Data/Mechanics/MohrCoulombAbboSloan/load_test_elastic.prj
index df50eabbde5..ddc8b34beba 100644
--- a/Tests/Data/Mechanics/MohrCoulombAbboSloan/load_test_elastic.prj
+++ b/Tests/Data/Mechanics/MohrCoulombAbboSloan/load_test_elastic.prj
@@ -23,8 +23,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/MohrCoulombAbboSloan/load_test_mc.prj b/Tests/Data/Mechanics/MohrCoulombAbboSloan/load_test_mc.prj
index c86ddbb586d..4c6222cf041 100644
--- a/Tests/Data/Mechanics/MohrCoulombAbboSloan/load_test_mc.prj
+++ b/Tests/Data/Mechanics/MohrCoulombAbboSloan/load_test_mc.prj
@@ -31,10 +31,10 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="ElasticStrain" output_name="ElasticStrain"/>
-                <secondary_variable type="static" internal_name="EquivalentPlasticStrain" output_name="EquivalentPlasticStrain"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="ElasticStrain" output_name="ElasticStrain"/>
+                <secondary_variable internal_name="EquivalentPlasticStrain" output_name="EquivalentPlasticStrain"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/MohrCoulombAbboSloan/load_test_mc_nonassociated.prj b/Tests/Data/Mechanics/MohrCoulombAbboSloan/load_test_mc_nonassociated.prj
index faa340203e3..12cbe46ea7a 100644
--- a/Tests/Data/Mechanics/MohrCoulombAbboSloan/load_test_mc_nonassociated.prj
+++ b/Tests/Data/Mechanics/MohrCoulombAbboSloan/load_test_mc_nonassociated.prj
@@ -31,10 +31,10 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="ElasticStrain" output_name="ElasticStrain"/>
-                <secondary_variable type="static" internal_name="EquivalentPlasticStrain" output_name="EquivalentPlasticStrain"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="ElasticStrain" output_name="ElasticStrain"/>
+                <secondary_variable internal_name="EquivalentPlasticStrain" output_name="EquivalentPlasticStrain"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/m1_1Dload/m1_1Dload.prj b/Tests/Data/Mechanics/m1_1Dload/m1_1Dload.prj
index daf18098e00..22bf6e52dbd 100755
--- a/Tests/Data/Mechanics/m1_1Dload/m1_1Dload.prj
+++ b/Tests/Data/Mechanics/m1_1Dload/m1_1Dload.prj
@@ -18,8 +18,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/m1_1Dlozenge/m1_1Dlozenge.prj b/Tests/Data/Mechanics/m1_1Dlozenge/m1_1Dlozenge.prj
index eaf241e8915..67254d680bf 100755
--- a/Tests/Data/Mechanics/m1_1Dlozenge/m1_1Dlozenge.prj
+++ b/Tests/Data/Mechanics/m1_1Dlozenge/m1_1Dlozenge.prj
@@ -18,8 +18,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/m1_2Dload/m1_2Dload.prj b/Tests/Data/Mechanics/m1_2Dload/m1_2Dload.prj
index 69766ad88a9..97d28ed8a23 100755
--- a/Tests/Data/Mechanics/m1_2Dload/m1_2Dload.prj
+++ b/Tests/Data/Mechanics/m1_2Dload/m1_2Dload.prj
@@ -18,8 +18,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/m1_3Dbottom/m1_3Dbottom.prj b/Tests/Data/Mechanics/m1_3Dbottom/m1_3Dbottom.prj
index 16006a97aa8..3a2247592e4 100755
--- a/Tests/Data/Mechanics/m1_3Dbottom/m1_3Dbottom.prj
+++ b/Tests/Data/Mechanics/m1_3Dbottom/m1_3Dbottom.prj
@@ -18,8 +18,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/m1_3Dgravity/m1_3Dgravity.prj b/Tests/Data/Mechanics/m1_3Dgravity/m1_3Dgravity.prj
index 5fe8e33ede7..97719beeb7b 100755
--- a/Tests/Data/Mechanics/m1_3Dgravity/m1_3Dgravity.prj
+++ b/Tests/Data/Mechanics/m1_3Dgravity/m1_3Dgravity.prj
@@ -18,8 +18,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/m1_3Dload/m1_3Dload.prj b/Tests/Data/Mechanics/m1_3Dload/m1_3Dload.prj
index 178c9ebff05..6d9184efd16 100755
--- a/Tests/Data/Mechanics/m1_3Dload/m1_3Dload.prj
+++ b/Tests/Data/Mechanics/m1_3Dload/m1_3Dload.prj
@@ -18,8 +18,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/m1_3Dsquare/m1_3Dsquare.prj b/Tests/Data/Mechanics/m1_3Dsquare/m1_3Dsquare.prj
index ca992ca27d1..cc1b4b10f8b 100755
--- a/Tests/Data/Mechanics/m1_3Dsquare/m1_3Dsquare.prj
+++ b/Tests/Data/Mechanics/m1_3Dsquare/m1_3Dsquare.prj
@@ -18,8 +18,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/m1_3Dtopload/m1_3Dtopload.prj b/Tests/Data/Mechanics/m1_3Dtopload/m1_3Dtopload.prj
index 2d58e483a9f..e8a7f3c9716 100755
--- a/Tests/Data/Mechanics/m1_3Dtopload/m1_3Dtopload.prj
+++ b/Tests/Data/Mechanics/m1_3Dtopload/m1_3Dtopload.prj
@@ -18,8 +18,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/m3_3Dshearz/m3_3Dshearz.prj b/Tests/Data/Mechanics/m3_3Dshearz/m3_3Dshearz.prj
index c20b58f183d..e69e04c67a6 100755
--- a/Tests/Data/Mechanics/m3_3Dshearz/m3_3Dshearz.prj
+++ b/Tests/Data/Mechanics/m3_3Dshearz/m3_3Dshearz.prj
@@ -19,8 +19,8 @@
         <process_variable>displacement</process_variable>
       </process_variables>
       <secondary_variables>
-        <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-        <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+        <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+        <secondary_variable internal_name="sigma" output_name="sigma"/>
       </secondary_variables>
     </process>
   </processes>
diff --git a/Tests/Data/Mechanics/m3_3Dshearz_rot/m3_3Dshearz_rot.prj b/Tests/Data/Mechanics/m3_3Dshearz_rot/m3_3Dshearz_rot.prj
index 253d89ac702..eb9966e55fb 100755
--- a/Tests/Data/Mechanics/m3_3Dshearz_rot/m3_3Dshearz_rot.prj
+++ b/Tests/Data/Mechanics/m3_3Dshearz_rot/m3_3Dshearz_rot.prj
@@ -19,8 +19,8 @@
         <process_variable>displacement</process_variable>
       </process_variables>
       <secondary_variables>
-        <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-        <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+        <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+        <secondary_variable internal_name="sigma" output_name="sigma"/>
       </secondary_variables>
     </process>
   </processes>
diff --git a/Tests/Data/Mechanics/m3_3Dtopload/m3_3Dtopload.prj b/Tests/Data/Mechanics/m3_3Dtopload/m3_3Dtopload.prj
index 61d63e7d4cb..3bc315ada3c 100755
--- a/Tests/Data/Mechanics/m3_3Dtopload/m3_3Dtopload.prj
+++ b/Tests/Data/Mechanics/m3_3Dtopload/m3_3Dtopload.prj
@@ -20,8 +20,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Mechanics/m3_3Dtoploadlc/m3_3Dtoploadlc.prj b/Tests/Data/Mechanics/m3_3Dtoploadlc/m3_3Dtoploadlc.prj
index d6a8ef8df4f..a9e834697da 100755
--- a/Tests/Data/Mechanics/m3_3Dtoploadlc/m3_3Dtoploadlc.prj
+++ b/Tests/Data/Mechanics/m3_3Dtoploadlc/m3_3Dtoploadlc.prj
@@ -20,8 +20,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d.prj b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d.prj
index 156f3cfd75c..97df674e3e0 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d.prj
@@ -14,7 +14,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_2d.prj b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_2d.prj
index 7448f129302..74b8fafac54 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_2d.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_2d.prj
@@ -14,7 +14,7 @@
             </process_variables>
             <specific_body_force>0 -9.81</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/MassConservation/mass_conservation.prj b/Tests/Data/Parabolic/ComponentTransport/MassConservation/mass_conservation.prj
index ca127eba216..ac24f43a460 100644
--- a/Tests/Data/Parabolic/ComponentTransport/MassConservation/mass_conservation.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/MassConservation/mass_conservation.prj
@@ -17,7 +17,7 @@
             <non_advective_form>true</non_advective_form>
             <specific_body_force>0 0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/OpenBoundaryWithTets/box_flow.prj b/Tests/Data/Parabolic/ComponentTransport/OpenBoundaryWithTets/box_flow.prj
index df5e3cb2e57..f9ea6eda69d 100644
--- a/Tests/Data/Parabolic/ComponentTransport/OpenBoundaryWithTets/box_flow.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/OpenBoundaryWithTets/box_flow.prj
@@ -17,7 +17,7 @@
             </process_variables>
             <specific_body_force>0 0 -9.81</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/EquilibriumPhase/calcite.prj b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/EquilibriumPhase/calcite.prj
index edd596896f4..1b52b150394 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/EquilibriumPhase/calcite.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/EquilibriumPhase/calcite.prj
@@ -18,7 +18,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac.prj b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac.prj
index 7c2f81def55..09124902654 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac.prj
@@ -16,7 +16,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac_flag_formula.prj b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac_flag_formula.prj
index f1d4ba7873a..c93ea0f08be 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac_flag_formula.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac_flag_formula.prj
@@ -16,7 +16,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac_phreeqckernel.prj b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac_phreeqckernel.prj
index c913e3a90bb..b3c903115c5 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac_phreeqckernel.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac_phreeqckernel.prj
@@ -16,7 +16,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2.prj b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2.prj
index f1bcfd9ab37..8b077a0f535 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2.prj
@@ -17,7 +17,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_2d.prj b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_2d.prj
index e0781446a83..c8f980f882d 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_2d.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_2d.prj
@@ -17,7 +17,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/Wetland/Wetland_1d.prj b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/Wetland/Wetland_1d.prj
index 9158e6fc310..0911a90c413 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/Wetland/Wetland_1d.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/Wetland/Wetland_1d.prj
@@ -24,7 +24,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj
index f37ddb167c2..8e98dd2a1e7 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj
@@ -13,7 +13,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly.prj
index c767a399737..fbefb5b3cfc 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly.prj
@@ -13,7 +13,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly_3Components.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly_3Components.prj
index 5283d573c82..a64d9f0850e 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly_3Components.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly_3Components.prj
@@ -15,7 +15,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj
index 023cf051c5c..073be4fe853 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj
@@ -13,7 +13,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj
index b120bcf44a7..71fce9e886b 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj
@@ -13,7 +13,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj
index 8844f562b9e..943c798722b 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj
@@ -13,7 +13,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj
index 5db426768b7..eae566dfbb8 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj
@@ -13,7 +13,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj
index 5160d1e6421..5fbd3d69d5a 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj
@@ -13,7 +13,7 @@
             </process_variables>
             <specific_body_force>0 -1</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/open_boundary_component-transport_cube_1e3.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/open_boundary_component-transport_cube_1e3.prj
index 910a3cb2dc4..3dfd6c194a6 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/open_boundary_component-transport_cube_1e3.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/open_boundary_component-transport_cube_1e3.prj
@@ -18,7 +18,7 @@
             </process_variables>
             <specific_body_force>0 0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/open_boundary_component-transport_cube_1e3_advective_form.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/open_boundary_component-transport_cube_1e3_advective_form.prj
index 42a66eb92b8..1f7d8207abb 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/open_boundary_component-transport_cube_1e3_advective_form.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/open_boundary_component-transport_cube_1e3_advective_form.prj
@@ -17,7 +17,7 @@
             </process_variables>
             <specific_body_force>0 0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/surfaceflux_component-transport_cube_1e3.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/surfaceflux_component-transport_cube_1e3.prj
index fe31e082412..5561bb6c03a 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/surfaceflux_component-transport_cube_1e3.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/surfaceflux_component-transport_cube_1e3.prj
@@ -17,7 +17,7 @@
             </process_variables>
             <specific_body_force>0 0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
             <calculatesurfaceflux>
                 <mesh>cube_1x1x1_hex_1e3_complete_surface</mesh>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionAndStorage.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionAndStorage.prj
index f7dd9328dc5..09b86c06be1 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionAndStorage.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionAndStorage.prj
@@ -14,7 +14,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionOnly.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionOnly.prj
index 84f75150ef2..9a4f3a7f7e1 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionOnly.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionOnly.prj
@@ -14,7 +14,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvection.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvection.prj
index f11d366b254..fc64e904f49 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvection.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvection.prj
@@ -14,7 +14,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDecay.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDecay.prj
index 4832a790c53..9575822011e 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDecay.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDecay.prj
@@ -14,7 +14,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion.prj
index 26283062ecd..6a71d324321 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion.prj
@@ -14,7 +14,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj
index b01cbaae345..5234b6daeb2 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj
@@ -14,7 +14,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion_3Components.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion_3Components.prj
index ddc9cd1a069..23e3b24881b 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion_3Components.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion_3Components.prj
@@ -16,7 +16,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndGravityAndDispersionHalf.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndGravityAndDispersionHalf.prj
index 0261d42979e..bce0476742f 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndGravityAndDispersionHalf.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndGravityAndDispersionHalf.prj
@@ -14,7 +14,7 @@
             </process_variables>
             <specific_body_force>0 -1</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/surfaceflux_component-transport_cube_1e3.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/surfaceflux_component-transport_cube_1e3.prj
index 5fc72418f64..5a5f8876016 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/surfaceflux_component-transport_cube_1e3.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/surfaceflux_component-transport_cube_1e3.prj
@@ -18,7 +18,7 @@
             </process_variables>
             <specific_body_force>0 0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
             <calculatesurfaceflux>
                 <mesh>cube_1x1x1_hex_1e3_complete_surface</mesh>
diff --git a/Tests/Data/Parabolic/ComponentTransport/Theis/theis.prj b/Tests/Data/Parabolic/ComponentTransport/Theis/theis.prj
index 4e12d2e40ba..39bf35bc8ca 100644
--- a/Tests/Data/Parabolic/ComponentTransport/Theis/theis.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/Theis/theis.prj
@@ -15,7 +15,7 @@
                 <pressure>pressure</pressure>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
             <!-- <calculatesurfaceflux>
                 <mesh>abstraction_whole_surf</mesh>
diff --git a/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/TracerSimulation.prj b/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/TracerSimulation.prj
index 7c309477ce6..250cc2ef118 100644
--- a/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/TracerSimulation.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/TracerSimulation.prj
@@ -17,7 +17,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/VariableNeumannBoundary/vdbc_input.prj b/Tests/Data/Parabolic/ComponentTransport/VariableNeumannBoundary/vdbc_input.prj
index d8dfc6e3b69..afe5500525b 100644
--- a/Tests/Data/Parabolic/ComponentTransport/VariableNeumannBoundary/vdbc_input.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/VariableNeumannBoundary/vdbc_input.prj
@@ -16,7 +16,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/elder/elder-python.prj b/Tests/Data/Parabolic/ComponentTransport/elder/elder-python.prj
index 82b5cfbbd2b..1e6d5266050 100644
--- a/Tests/Data/Parabolic/ComponentTransport/elder/elder-python.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/elder/elder-python.prj
@@ -16,7 +16,7 @@
             </process_variables>
             <specific_body_force>0 0 -9.81</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/elder/elder.prj b/Tests/Data/Parabolic/ComponentTransport/elder/elder.prj
index e46ad820107..29413348f39 100644
--- a/Tests/Data/Parabolic/ComponentTransport/elder/elder.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/elder/elder.prj
@@ -13,7 +13,7 @@
             </process_variables>
             <specific_body_force>0 0 -9.81</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj
index abd3d4e8064..b79a40cbed9 100644
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj
@@ -16,7 +16,7 @@
             </process_variables>
             <specific_body_force>0 -9.81</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_2D/ogs5_H_2d.prj b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_2D/ogs5_H_2d.prj
index 40b914a0548..e09725f97aa 100644
--- a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_2D/ogs5_H_2d.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_2D/ogs5_H_2d.prj
@@ -13,7 +13,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.prj b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.prj
index 15e3d0ecc62..506d2fbc438 100644
--- a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.prj
@@ -16,7 +16,7 @@
             </process_variables>
             <specific_body_force>0 0 -9.81</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/HT/ConstViscosity/square_5500x5500.prj b/Tests/Data/Parabolic/HT/ConstViscosity/square_5500x5500.prj
index 2023e72c4d7..794c31e0e95 100644
--- a/Tests/Data/Parabolic/HT/ConstViscosity/square_5500x5500.prj
+++ b/Tests/Data/Parabolic/HT/ConstViscosity/square_5500x5500.prj
@@ -13,7 +13,7 @@
             </process_variables>
             <specific_body_force>0 -9.81</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/HT/FaultedCube/Ra_795_fault_bcgs_jacobi.prj b/Tests/Data/Parabolic/HT/FaultedCube/Ra_795_fault_bcgs_jacobi.prj
index 52a5d34d67f..8ad6f38b783 100644
--- a/Tests/Data/Parabolic/HT/FaultedCube/Ra_795_fault_bcgs_jacobi.prj
+++ b/Tests/Data/Parabolic/HT/FaultedCube/Ra_795_fault_bcgs_jacobi.prj
@@ -20,7 +20,7 @@
             </process_variables>
             <specific_body_force>0 0 -9.81</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolic.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolic.prj
index 203ae577d26..5a86a009071 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolic.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolic.prj
@@ -13,7 +13,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolicStaggered.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolicStaggered.prj
index 5fbfe4bdfd9..0f86591ca84 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolicStaggered.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolicStaggered.prj
@@ -14,7 +14,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlow.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlow.prj
index 64afdf7db39..f74e9776499 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlow.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlow.prj
@@ -13,7 +13,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowStaggered.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowStaggered.prj
index aa302401a5e..7b9ce75f3b0 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowStaggered.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowStaggered.prj
@@ -14,7 +14,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravity.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravity.prj
index a9a479a176d..bb81e448504 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravity.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravity.prj
@@ -13,7 +13,7 @@
             </process_variables>
             <specific_body_force>0 -9.81</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravityStaggered.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravityStaggered.prj
index 13e95a27982..630b377411f 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravityStaggered.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravityStaggered.prj
@@ -14,7 +14,7 @@
             </process_variables>
             <specific_body_force>0 -9.81</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusion.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusion.prj
index 6256ead736a..bc4426bfd23 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusion.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusion.prj
@@ -13,7 +13,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusionStaggered.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusionStaggered.prj
index a99a78f3f64..f60c463cd4a 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusionStaggered.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusionStaggered.prj
@@ -14,7 +14,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolic.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolic.prj
index a0943adc75b..a18fcceabd6 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolic.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolic.prj
@@ -13,7 +13,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolicStaggered.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolicStaggered.prj
index 0f37143055a..3019de54251 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolicStaggered.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolicStaggered.prj
@@ -14,7 +14,7 @@
             </process_variables>
             <specific_body_force>0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e3.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e3.prj
index 4075265f15f..2eee1ae010e 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e3.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e3.prj
@@ -17,7 +17,7 @@
             </process_variables>
             <specific_body_force>0 0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
             <calculatesurfaceflux>
                 <mesh>cube_1x1x1_hex_1e3_complete_surface</mesh>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e4.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e4.prj
index d8510136635..3a3f6a6383e 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e4.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e4.prj
@@ -17,7 +17,7 @@
             </process_variables>
             <specific_body_force>0 0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
             <calculatesurfaceflux>
                 <mesh>cube_1x1x1_hex_1e4_complete_surface</mesh>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3.prj
index 3de2a6cd82b..cdffda125ca 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3.prj
@@ -13,7 +13,7 @@
             </process_variables>
             <specific_body_force>0 0 0</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample/th_decovalex.prj b/Tests/Data/Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample/th_decovalex.prj
index 7398fae862a..beb27cfa660 100644
--- a/Tests/Data/Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample/th_decovalex.prj
+++ b/Tests/Data/Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample/th_decovalex.prj
@@ -14,7 +14,7 @@
             </process_variables>
             <specific_body_force>0 -9.81</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500_staggered_scheme.prj b/Tests/Data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500_staggered_scheme.prj
index 0d2f8962a93..adf8c68cfbf 100644
--- a/Tests/Data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500_staggered_scheme.prj
+++ b/Tests/Data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500_staggered_scheme.prj
@@ -14,7 +14,7 @@
             </process_variables>
             <specific_body_force>0 -9.81</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500_staggered_scheme_adaptive_dt.prj b/Tests/Data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500_staggered_scheme_adaptive_dt.prj
index a3d03c24ae4..8bb2036a90f 100644
--- a/Tests/Data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500_staggered_scheme_adaptive_dt.prj
+++ b/Tests/Data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500_staggered_scheme_adaptive_dt.prj
@@ -14,7 +14,7 @@
             </process_variables>
             <specific_body_force>0 -9.81</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/LiquidFlow/AxiSymTheis/axisym_theis.prj b/Tests/Data/Parabolic/LiquidFlow/AxiSymTheis/axisym_theis.prj
index f09b66f4610..219b6b75908 100644
--- a/Tests/Data/Parabolic/LiquidFlow/AxiSymTheis/axisym_theis.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/AxiSymTheis/axisym_theis.prj
@@ -17,7 +17,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <material_property>
                 <fluid>
diff --git a/Tests/Data/Parabolic/LiquidFlow/BuildupTest/buildup_test.prj b/Tests/Data/Parabolic/LiquidFlow/BuildupTest/buildup_test.prj
index 708c2d8ebfe..c606bebc361 100644
--- a/Tests/Data/Parabolic/LiquidFlow/BuildupTest/buildup_test.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/BuildupTest/buildup_test.prj
@@ -17,7 +17,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <material_property>
                 <fluid>
diff --git a/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC/TestSet_01.prj b/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC/TestSet_01.prj
index e171946aca0..f940af89ec1 100644
--- a/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC/TestSet_01.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC/TestSet_01.prj
@@ -20,7 +20,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <material_property>
                 <fluid>
diff --git a/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC_RECHARGE/TestSet_01.prj b/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC_RECHARGE/TestSet_01.prj
index 6a4d2fd405d..3a2ad00aa77 100644
--- a/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC_RECHARGE/TestSet_01.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC_RECHARGE/TestSet_01.prj
@@ -21,7 +21,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <material_property>
                 <fluid>
diff --git a/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC_RECHARGE2/TestSet_01.prj b/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC_RECHARGE2/TestSet_01.prj
index 521306b4ad3..bb1ce9d48dd 100644
--- a/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC_RECHARGE2/TestSet_01.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC_RECHARGE2/TestSet_01.prj
@@ -21,7 +21,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <material_property>
                 <fluid>
diff --git a/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC_STORAGE/TestSet_01.prj b/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC_STORAGE/TestSet_01.prj
index fd21934b72a..f76ca957222 100644
--- a/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC_STORAGE/TestSet_01.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC_STORAGE/TestSet_01.prj
@@ -21,7 +21,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <material_property>
                 <fluid>
diff --git a/Tests/Data/Parabolic/LiquidFlow/GravityDriven/gravity_driven.prj b/Tests/Data/Parabolic/LiquidFlow/GravityDriven/gravity_driven.prj
index 0e9295c8cbe..2af4a28e9cd 100644
--- a/Tests/Data/Parabolic/LiquidFlow/GravityDriven/gravity_driven.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/GravityDriven/gravity_driven.prj
@@ -17,7 +17,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <material_property>
                 <fluid>
diff --git a/Tests/Data/Parabolic/LiquidFlow/GravityDriven3D/anisotropic_gravity_driven3D.prj b/Tests/Data/Parabolic/LiquidFlow/GravityDriven3D/anisotropic_gravity_driven3D.prj
index 70069536c72..4441f3a030b 100644
--- a/Tests/Data/Parabolic/LiquidFlow/GravityDriven3D/anisotropic_gravity_driven3D.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/GravityDriven3D/anisotropic_gravity_driven3D.prj
@@ -17,7 +17,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <material_property>
                 <fluid>
diff --git a/Tests/Data/Parabolic/LiquidFlow/GravityDriven3D/isotropic_gravity_driven3D.prj b/Tests/Data/Parabolic/LiquidFlow/GravityDriven3D/isotropic_gravity_driven3D.prj
index 29472b98917..bf82165ef4b 100644
--- a/Tests/Data/Parabolic/LiquidFlow/GravityDriven3D/isotropic_gravity_driven3D.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/GravityDriven3D/isotropic_gravity_driven3D.prj
@@ -17,7 +17,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <material_property>
                 <fluid>
diff --git a/Tests/Data/Parabolic/LiquidFlow/LineDirichletNeumannBC/line_dirichlet_neumannBC.prj b/Tests/Data/Parabolic/LiquidFlow/LineDirichletNeumannBC/line_dirichlet_neumannBC.prj
index aa65675ee5c..5791d545c4d 100644
--- a/Tests/Data/Parabolic/LiquidFlow/LineDirichletNeumannBC/line_dirichlet_neumannBC.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/LineDirichletNeumannBC/line_dirichlet_neumannBC.prj
@@ -17,7 +17,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <material_property>
                 <fluid>
diff --git a/Tests/Data/Parabolic/LiquidFlow/PressureBCatCornerOfAnisotropicSquare/pressureBC_at_corner_of_anisotropic_square.prj b/Tests/Data/Parabolic/LiquidFlow/PressureBCatCornerOfAnisotropicSquare/pressureBC_at_corner_of_anisotropic_square.prj
index 250114341c3..58b752f3737 100644
--- a/Tests/Data/Parabolic/LiquidFlow/PressureBCatCornerOfAnisotropicSquare/pressureBC_at_corner_of_anisotropic_square.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/PressureBCatCornerOfAnisotropicSquare/pressureBC_at_corner_of_anisotropic_square.prj
@@ -17,7 +17,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <material_property>
                 <fluid>
diff --git a/Tests/Data/Parabolic/LiquidFlow/TimeDependentHeterogeneousBoundaryConditions/TimeDependentHeterogeneousBoundaryConditions.prj b/Tests/Data/Parabolic/LiquidFlow/TimeDependentHeterogeneousBoundaryConditions/TimeDependentHeterogeneousBoundaryConditions.prj
index 50168fc9502..136932a66c5 100644
--- a/Tests/Data/Parabolic/LiquidFlow/TimeDependentHeterogeneousBoundaryConditions/TimeDependentHeterogeneousBoundaryConditions.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/TimeDependentHeterogeneousBoundaryConditions/TimeDependentHeterogeneousBoundaryConditions.prj
@@ -20,7 +20,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <material_property>
                 <fluid>
diff --git a/Tests/Data/Parabolic/LiquidFlow/TimeDependentHeterogeneousSourceTerm/TimeDependentHeterogeneousSourceTerm.prj b/Tests/Data/Parabolic/LiquidFlow/TimeDependentHeterogeneousSourceTerm/TimeDependentHeterogeneousSourceTerm.prj
index ac70478dddc..91da3d2d0c3 100644
--- a/Tests/Data/Parabolic/LiquidFlow/TimeDependentHeterogeneousSourceTerm/TimeDependentHeterogeneousSourceTerm.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/TimeDependentHeterogeneousSourceTerm/TimeDependentHeterogeneousSourceTerm.prj
@@ -21,7 +21,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <material_property>
                 <fluid>
diff --git a/Tests/Data/Parabolic/LiquidFlow/TimeIntervalDirichletBC/TimeIntervalDirichletBC.prj b/Tests/Data/Parabolic/LiquidFlow/TimeIntervalDirichletBC/TimeIntervalDirichletBC.prj
index 74fbaf4d1c0..ae93efdf6b5 100644
--- a/Tests/Data/Parabolic/LiquidFlow/TimeIntervalDirichletBC/TimeIntervalDirichletBC.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/TimeIntervalDirichletBC/TimeIntervalDirichletBC.prj
@@ -20,7 +20,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <material_property>
                 <fluid>
diff --git a/Tests/Data/Parabolic/LiquidFlow/Verification/h1_1Dsource/h1_1Dsource.prj b/Tests/Data/Parabolic/LiquidFlow/Verification/h1_1Dsource/h1_1Dsource.prj
index 5c8b67f8fbb..b6025a18299 100755
--- a/Tests/Data/Parabolic/LiquidFlow/Verification/h1_1Dsource/h1_1Dsource.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/Verification/h1_1Dsource/h1_1Dsource.prj
@@ -15,7 +15,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="q"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="q"/>
             </secondary_variables>
             <material_property>
                 <fluid>
diff --git a/Tests/Data/Parabolic/LiquidFlow/Verification/h1_1Dsteady/h1_1Dsteady.prj b/Tests/Data/Parabolic/LiquidFlow/Verification/h1_1Dsteady/h1_1Dsteady.prj
index 4c95635b956..09437df95be 100755
--- a/Tests/Data/Parabolic/LiquidFlow/Verification/h1_1Dsteady/h1_1Dsteady.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/Verification/h1_1Dsteady/h1_1Dsteady.prj
@@ -15,7 +15,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="q"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="q"/>
             </secondary_variables>
             <material_property>
                 <fluid>
diff --git a/Tests/Data/Parabolic/LiquidFlow/Verification/h1_3Dhydstat/h1_3Dhydstat.prj b/Tests/Data/Parabolic/LiquidFlow/Verification/h1_3Dhydstat/h1_3Dhydstat.prj
index 1779f43f818..0ba3bcd2f9a 100755
--- a/Tests/Data/Parabolic/LiquidFlow/Verification/h1_3Dhydstat/h1_3Dhydstat.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/Verification/h1_3Dhydstat/h1_3Dhydstat.prj
@@ -15,7 +15,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="q"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="q"/>
             </secondary_variables>
             <material_property>
                 <fluid>
diff --git a/Tests/Data/Parabolic/LiquidFlow/Verification/h2_1D1bt/h2_1D1bt.prj b/Tests/Data/Parabolic/LiquidFlow/Verification/h2_1D1bt/h2_1D1bt.prj
index b948fb1cfaa..41eb641d1b2 100755
--- a/Tests/Data/Parabolic/LiquidFlow/Verification/h2_1D1bt/h2_1D1bt.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/Verification/h2_1D1bt/h2_1D1bt.prj
@@ -15,7 +15,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="q"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="q"/>
             </secondary_variables>
             <material_property>
                 <fluid>
diff --git a/Tests/Data/Parabolic/LiquidFlow/Verification/h2_1D2bt/h2_1D2bt.prj b/Tests/Data/Parabolic/LiquidFlow/Verification/h2_1D2bt/h2_1D2bt.prj
index ca252b147a3..19a9958c5c4 100755
--- a/Tests/Data/Parabolic/LiquidFlow/Verification/h2_1D2bt/h2_1D2bt.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/Verification/h2_1D2bt/h2_1D2bt.prj
@@ -15,7 +15,7 @@
                 <process_variable>pressure</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="q"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="q"/>
             </secondary_variables>
             <material_property>
                 <fluid>
diff --git a/Tests/Data/Parabolic/Richards/RichardsFlow_2d_compare_ogs5.prj b/Tests/Data/Parabolic/Richards/RichardsFlow_2d_compare_ogs5.prj
index ff9af645b0c..0e176d75ce2 100644
--- a/Tests/Data/Parabolic/Richards/RichardsFlow_2d_compare_ogs5.prj
+++ b/Tests/Data/Parabolic/Richards/RichardsFlow_2d_compare_ogs5.prj
@@ -62,7 +62,7 @@
                 </porous_medium>
             </material_property>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
             </secondary_variables>
             <specific_body_force>0 -9.81</specific_body_force>
             <mass_lumping>true</mass_lumping>
diff --git a/Tests/Data/Parabolic/Richards/RichardsFlow_2d_large.prj b/Tests/Data/Parabolic/Richards/RichardsFlow_2d_large.prj
index b275b3198e6..d33ec755cc0 100644
--- a/Tests/Data/Parabolic/Richards/RichardsFlow_2d_large.prj
+++ b/Tests/Data/Parabolic/Richards/RichardsFlow_2d_large.prj
@@ -62,7 +62,7 @@
                 </porous_medium>
             </material_property>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
             </secondary_variables>
             <specific_body_force>0 -9.81</specific_body_force>
             <mass_lumping>true</mass_lumping>
diff --git a/Tests/Data/Parabolic/Richards/RichardsFlow_2d_small.prj b/Tests/Data/Parabolic/Richards/RichardsFlow_2d_small.prj
index e1c6cce545f..aed9bcb2292 100644
--- a/Tests/Data/Parabolic/Richards/RichardsFlow_2d_small.prj
+++ b/Tests/Data/Parabolic/Richards/RichardsFlow_2d_small.prj
@@ -62,7 +62,7 @@
                 </porous_medium>
             </material_property>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
             </secondary_variables>
             <specific_body_force>0 -9.81</specific_body_force>
             <mass_lumping>true</mass_lumping>
diff --git a/Tests/Data/Parabolic/Richards/RichardsFlow_2d_small_PID_adaptive_dt.prj b/Tests/Data/Parabolic/Richards/RichardsFlow_2d_small_PID_adaptive_dt.prj
index db04a5a1cd9..3b1f82e94f0 100644
--- a/Tests/Data/Parabolic/Richards/RichardsFlow_2d_small_PID_adaptive_dt.prj
+++ b/Tests/Data/Parabolic/Richards/RichardsFlow_2d_small_PID_adaptive_dt.prj
@@ -62,7 +62,7 @@
                 </porous_medium>
             </material_property>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
             </secondary_variables>
             <specific_body_force>0 -9.81</specific_body_force>
             <mass_lumping>true</mass_lumping>
diff --git a/Tests/Data/Parabolic/Richards/RichardsFlow_2d_small_iteration_adaptive_dt.prj b/Tests/Data/Parabolic/Richards/RichardsFlow_2d_small_iteration_adaptive_dt.prj
index bc678b56708..cb2f7f65041 100644
--- a/Tests/Data/Parabolic/Richards/RichardsFlow_2d_small_iteration_adaptive_dt.prj
+++ b/Tests/Data/Parabolic/Richards/RichardsFlow_2d_small_iteration_adaptive_dt.prj
@@ -62,7 +62,7 @@
                 </porous_medium>
             </material_property>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
             </secondary_variables>
             <specific_body_force>0 -9.81</specific_body_force>
             <mass_lumping>true</mass_lumping>
diff --git a/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1/Padilla_NaCl1.prj b/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1/Padilla_NaCl1.prj
index eda0f93b71f..7084d0125db 100644
--- a/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1/Padilla_NaCl1.prj
+++ b/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1/Padilla_NaCl1.prj
@@ -61,8 +61,8 @@
             <molecular_diffusion_coefficient>Dm</molecular_diffusion_coefficient>
             <specific_body_force>-9.81</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1/Padilla_NaCl1_quadratic.prj b/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1/Padilla_NaCl1_quadratic.prj
index 3e69bd8f2b5..3db52db586e 100644
--- a/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1/Padilla_NaCl1_quadratic.prj
+++ b/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1/Padilla_NaCl1_quadratic.prj
@@ -61,8 +61,8 @@
             <molecular_diffusion_coefficient>Dm</molecular_diffusion_coefficient>
             <specific_body_force>-9.81</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl6/Padilla_NaCl6.prj b/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl6/Padilla_NaCl6.prj
index e9732d869af..a0866e9448d 100644
--- a/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl6/Padilla_NaCl6.prj
+++ b/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl6/Padilla_NaCl6.prj
@@ -61,8 +61,8 @@
             <molecular_diffusion_coefficient>Dm</molecular_diffusion_coefficient>
             <specific_body_force>-9.81</specific_body_force>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/T/1D_dirichlet/line_60_heat.prj b/Tests/Data/Parabolic/T/1D_dirichlet/line_60_heat.prj
index 3bf4f1eae0b..23057009c0e 100644
--- a/Tests/Data/Parabolic/T/1D_dirichlet/line_60_heat.prj
+++ b/Tests/Data/Parabolic/T/1D_dirichlet/line_60_heat.prj
@@ -14,7 +14,7 @@
                 <process_variable>temperature</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="heat_flux_x" output_name="heat_flux_x"/>
+                <secondary_variable internal_name="heat_flux_x" output_name="heat_flux_x"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/T/1D_dirichlet_source-term/line_1_line_1e2_source_term.prj b/Tests/Data/Parabolic/T/1D_dirichlet_source-term/line_1_line_1e2_source_term.prj
index 74783fc89d9..3fe87d7f1ea 100644
--- a/Tests/Data/Parabolic/T/1D_dirichlet_source-term/line_1_line_1e2_source_term.prj
+++ b/Tests/Data/Parabolic/T/1D_dirichlet_source-term/line_1_line_1e2_source_term.prj
@@ -18,7 +18,7 @@
                 <process_variable>temperature</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="heat_flux_x" output_name="heat_flux_x"/>
+                <secondary_variable internal_name="heat_flux_x" output_name="heat_flux_x"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/T/1D_line_source_term_tests/line_source_term.prj b/Tests/Data/Parabolic/T/1D_line_source_term_tests/line_source_term.prj
index 87ed0bf495c..55bab453a9f 100644
--- a/Tests/Data/Parabolic/T/1D_line_source_term_tests/line_source_term.prj
+++ b/Tests/Data/Parabolic/T/1D_line_source_term_tests/line_source_term.prj
@@ -18,7 +18,7 @@
                 <process_variable>temperature</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="heat_flux_x" output_name="heat_flux_x"/>
+                <secondary_variable internal_name="heat_flux_x" output_name="heat_flux_x"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/T/1D_neumann/line_60_heat.prj b/Tests/Data/Parabolic/T/1D_neumann/line_60_heat.prj
index 5d16e5aed1d..4bc247317c1 100644
--- a/Tests/Data/Parabolic/T/1D_neumann/line_60_heat.prj
+++ b/Tests/Data/Parabolic/T/1D_neumann/line_60_heat.prj
@@ -14,7 +14,7 @@
                 <process_variable>temperature</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="heat_flux_x" output_name="heat_flux_x"/>
+                <secondary_variable internal_name="heat_flux_x" output_name="heat_flux_x"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/T/2D_BHE_array/bhe2d.prj b/Tests/Data/Parabolic/T/2D_BHE_array/bhe2d.prj
index d51160cbc56..482eb104b1f 100644
--- a/Tests/Data/Parabolic/T/2D_BHE_array/bhe2d.prj
+++ b/Tests/Data/Parabolic/T/2D_BHE_array/bhe2d.prj
@@ -14,7 +14,7 @@
                 <process_variable>temperature</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="heat_flux_x" output_name="heat_flux_x"/>
+                <secondary_variable internal_name="heat_flux_x" output_name="heat_flux_x"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/T/2D_axially_symmetric/square_1e2_axi.prj b/Tests/Data/Parabolic/T/2D_axially_symmetric/square_1e2_axi.prj
index 5ab895984a3..3758160ec24 100644
--- a/Tests/Data/Parabolic/T/2D_axially_symmetric/square_1e2_axi.prj
+++ b/Tests/Data/Parabolic/T/2D_axially_symmetric/square_1e2_axi.prj
@@ -14,7 +14,7 @@
                 <process_variable>temperature</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="heat_flux_x" output_name="heat_flux_x"/>
+                <secondary_variable internal_name="heat_flux_x" output_name="heat_flux_x"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/T/2D_axially_symmetric/wedge_1e2_axi_ang_0.02.prj b/Tests/Data/Parabolic/T/2D_axially_symmetric/wedge_1e2_axi_ang_0.02.prj
index b8f15f5939a..084aefe5046 100644
--- a/Tests/Data/Parabolic/T/2D_axially_symmetric/wedge_1e2_axi_ang_0.02.prj
+++ b/Tests/Data/Parabolic/T/2D_axially_symmetric/wedge_1e2_axi_ang_0.02.prj
@@ -14,7 +14,7 @@
                 <process_variable>temperature</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="heat_flux_x" output_name="heat_flux_x"/>
+                <secondary_variable internal_name="heat_flux_x" output_name="heat_flux_x"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_left/source_term_left.prj b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_left/source_term_left.prj
index 9ebc0387f09..15d2f333535 100644
--- a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_left/source_term_left.prj
+++ b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_left/source_term_left.prj
@@ -17,7 +17,7 @@
                 <process_variable>temperature</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="heat_flux_x" output_name="heat_flux_x"/>
+                <secondary_variable internal_name="heat_flux_x" output_name="heat_flux_x"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5/line_source_term_x_0.5.prj b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5/line_source_term_x_0.5.prj
index feaccd674a3..882da39c16b 100644
--- a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5/line_source_term_x_0.5.prj
+++ b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5/line_source_term_x_0.5.prj
@@ -18,7 +18,7 @@
                 <process_variable>temperature</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="heat_flux_x" output_name="heat_flux_x"/>
+                <secondary_variable internal_name="heat_flux_x" output_name="heat_flux_x"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5_restricted_to_middle/line_source_term_x_0.5.prj b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5_restricted_to_middle/line_source_term_x_0.5.prj
index cc4e7c5cf10..f50d1b307c3 100644
--- a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5_restricted_to_middle/line_source_term_x_0.5.prj
+++ b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5_restricted_to_middle/line_source_term_x_0.5.prj
@@ -17,7 +17,7 @@
                 <process_variable>temperature</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="heat_flux_x" output_name="heat_flux_x"/>
+                <secondary_variable internal_name="heat_flux_x" output_name="heat_flux_x"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_5/line_source_term_x=5.prj b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_5/line_source_term_x=5.prj
index 2c9edd9f927..159f81e1b13 100644
--- a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_5/line_source_term_x=5.prj
+++ b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_5/line_source_term_x=5.prj
@@ -17,7 +17,7 @@
                 <process_variable>temperature</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="heat_flux_x" output_name="heat_flux_x"/>
+                <secondary_variable internal_name="heat_flux_x" output_name="heat_flux_x"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/286k_prisms/line_source_term_in_cylinder.prj b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/286k_prisms/line_source_term_in_cylinder.prj
index e334b119c2a..74eb8388e47 100644
--- a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/286k_prisms/line_source_term_in_cylinder.prj
+++ b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/286k_prisms/line_source_term_in_cylinder.prj
@@ -17,7 +17,7 @@
                 <process_variable>temperature</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="heat_flux_x" output_name="heat_flux_x"/>
+                <secondary_variable internal_name="heat_flux_x" output_name="heat_flux_x"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/49k_prisms/line_source_term_in_cylinder.prj b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/49k_prisms/line_source_term_in_cylinder.prj
index 9b9a9b06f6a..a961077c938 100644
--- a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/49k_prisms/line_source_term_in_cylinder.prj
+++ b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/49k_prisms/line_source_term_in_cylinder.prj
@@ -17,7 +17,7 @@
                 <process_variable>temperature</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="heat_flux_x" output_name="heat_flux_x"/>
+                <secondary_variable internal_name="heat_flux_x" output_name="heat_flux_x"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder_axisymmetric/line_source_term_in_cylinder.prj b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder_axisymmetric/line_source_term_in_cylinder.prj
index 6198ef1cba4..da4449d9d7d 100644
--- a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder_axisymmetric/line_source_term_in_cylinder.prj
+++ b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder_axisymmetric/line_source_term_in_cylinder.prj
@@ -17,7 +17,7 @@
                 <process_variable>temperature</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="heat_flux_x" output_name="heat_flux_x"/>
+                <secondary_variable internal_name="heat_flux_x" output_name="heat_flux_x"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle/line_source_term_x_0.5_y_0.5.prj b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle/line_source_term_x_0.5_y_0.5.prj
index 425cbf538bc..477d2e44490 100644
--- a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle/line_source_term_x_0.5_y_0.5.prj
+++ b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle/line_source_term_x_0.5_y_0.5.prj
@@ -17,7 +17,7 @@
                 <process_variable>temperature</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="heat_flux_x" output_name="heat_flux_x"/>
+                <secondary_variable internal_name="heat_flux_x" output_name="heat_flux_x"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle_restricted/line_source_term_x_0.5_y_0.5_restricted.prj b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle_restricted/line_source_term_x_0.5_y_0.5_restricted.prj
index cc64447acf6..431892dac59 100644
--- a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle_restricted/line_source_term_x_0.5_y_0.5_restricted.prj
+++ b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle_restricted/line_source_term_x_0.5_y_0.5_restricted.prj
@@ -17,7 +17,7 @@
                 <process_variable>temperature</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="heat_flux_x" output_name="heat_flux_x"/>
+                <secondary_variable internal_name="heat_flux_x" output_name="heat_flux_x"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/Parabolic/TES/1D/tes-1D-zeolite-discharge-large.prj b/Tests/Data/Parabolic/TES/1D/tes-1D-zeolite-discharge-large.prj
index 4c3cdfd692d..48cfd2065b6 100644
--- a/Tests/Data/Parabolic/TES/1D/tes-1D-zeolite-discharge-large.prj
+++ b/Tests/Data/Parabolic/TES/1D/tes-1D-zeolite-discharge-large.prj
@@ -13,14 +13,14 @@
                 <vapour_mass_fraction> v_mass_frac </vapour_mass_fraction>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="solid_density" output_name="solid_density"/>
-                <secondary_variable type="static" internal_name="reaction_rate" output_name="reaction_rate"/>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
-                <secondary_variable type="static" internal_name="vapour_partial_pressure" output_name="vapour_partial_pressure"/>
-                <secondary_variable type="static" internal_name="relative_humidity" output_name="relative_humidity"/>
-                <secondary_variable type="static" internal_name="loading" output_name="loading"/>
-                <secondary_variable type="static" internal_name="equilibrium_loading" output_name="equilibrium_loading"/>
-                <secondary_variable type="static" internal_name="reaction_damping_factor" output_name="reaction_damping_factor"/>
+                <secondary_variable internal_name="solid_density" output_name="solid_density"/>
+                <secondary_variable internal_name="reaction_rate" output_name="reaction_rate"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="vapour_partial_pressure" output_name="vapour_partial_pressure"/>
+                <secondary_variable internal_name="relative_humidity" output_name="relative_humidity"/>
+                <secondary_variable internal_name="loading" output_name="loading"/>
+                <secondary_variable internal_name="equilibrium_loading" output_name="equilibrium_loading"/>
+                <secondary_variable internal_name="reaction_damping_factor" output_name="reaction_damping_factor"/>
             </secondary_variables>
             <reactive_system>
                 <type>Z13XBF</type>
diff --git a/Tests/Data/Parabolic/TES/1D/tes-1D-zeolite-discharge-small-newton.prj b/Tests/Data/Parabolic/TES/1D/tes-1D-zeolite-discharge-small-newton.prj
index 402b6ea000d..8f505aac4a9 100644
--- a/Tests/Data/Parabolic/TES/1D/tes-1D-zeolite-discharge-small-newton.prj
+++ b/Tests/Data/Parabolic/TES/1D/tes-1D-zeolite-discharge-small-newton.prj
@@ -18,14 +18,14 @@
                 <vapour_mass_fraction> v_mass_frac </vapour_mass_fraction>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="solid_density" output_name="solid_density"/>
-                <secondary_variable type="static" internal_name="reaction_rate" output_name="reaction_rate"/>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
-                <secondary_variable type="static" internal_name="vapour_partial_pressure" output_name="vapour_partial_pressure"/>
-                <secondary_variable type="static" internal_name="relative_humidity" output_name="relative_humidity"/>
-                <secondary_variable type="static" internal_name="loading" output_name="loading"/>
-                <secondary_variable type="static" internal_name="equilibrium_loading" output_name="equilibrium_loading"/>
-                <secondary_variable type="static" internal_name="reaction_damping_factor" output_name="reaction_damping_factor"/>
+                <secondary_variable internal_name="solid_density" output_name="solid_density"/>
+                <secondary_variable internal_name="reaction_rate" output_name="reaction_rate"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="vapour_partial_pressure" output_name="vapour_partial_pressure"/>
+                <secondary_variable internal_name="relative_humidity" output_name="relative_humidity"/>
+                <secondary_variable internal_name="loading" output_name="loading"/>
+                <secondary_variable internal_name="equilibrium_loading" output_name="equilibrium_loading"/>
+                <secondary_variable internal_name="reaction_damping_factor" output_name="reaction_damping_factor"/>
             </secondary_variables>
             <reactive_system>
                 <type>Z13XBF</type>
diff --git a/Tests/Data/Parabolic/TES/1D/tes-1D-zeolite-discharge-small.prj b/Tests/Data/Parabolic/TES/1D/tes-1D-zeolite-discharge-small.prj
index f9f8bf918f0..3eec55120d9 100644
--- a/Tests/Data/Parabolic/TES/1D/tes-1D-zeolite-discharge-small.prj
+++ b/Tests/Data/Parabolic/TES/1D/tes-1D-zeolite-discharge-small.prj
@@ -13,14 +13,14 @@
                 <vapour_mass_fraction> v_mass_frac </vapour_mass_fraction>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="solid_density" output_name="solid_density"/>
-                <secondary_variable type="static" internal_name="reaction_rate" output_name="reaction_rate"/>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
-                <secondary_variable type="static" internal_name="vapour_partial_pressure" output_name="vapour_partial_pressure"/>
-                <secondary_variable type="static" internal_name="relative_humidity" output_name="relative_humidity"/>
-                <secondary_variable type="static" internal_name="loading" output_name="loading"/>
-                <secondary_variable type="static" internal_name="equilibrium_loading" output_name="equilibrium_loading"/>
-                <secondary_variable type="static" internal_name="reaction_damping_factor" output_name="reaction_damping_factor"/>
+                <secondary_variable internal_name="solid_density" output_name="solid_density"/>
+                <secondary_variable internal_name="reaction_rate" output_name="reaction_rate"/>
+                <secondary_variable internal_name="darcy_velocity" output_name="darcy_velocity"/>
+                <secondary_variable internal_name="vapour_partial_pressure" output_name="vapour_partial_pressure"/>
+                <secondary_variable internal_name="relative_humidity" output_name="relative_humidity"/>
+                <secondary_variable internal_name="loading" output_name="loading"/>
+                <secondary_variable internal_name="equilibrium_loading" output_name="equilibrium_loading"/>
+                <secondary_variable internal_name="reaction_damping_factor" output_name="reaction_damping_factor"/>
             </secondary_variables>
             <reactive_system>
                 <type>Z13XBF</type>
diff --git a/Tests/Data/Parabolic/ThermalTwoPhaseFlowPP/HeatPipe/Twophase_HeatPipe_quad_curve_large.prj b/Tests/Data/Parabolic/ThermalTwoPhaseFlowPP/HeatPipe/Twophase_HeatPipe_quad_curve_large.prj
index 5299972dd5d..9e2e1de1958 100644
--- a/Tests/Data/Parabolic/ThermalTwoPhaseFlowPP/HeatPipe/Twophase_HeatPipe_quad_curve_large.prj
+++ b/Tests/Data/Parabolic/ThermalTwoPhaseFlowPP/HeatPipe/Twophase_HeatPipe_quad_curve_large.prj
@@ -103,8 +103,8 @@
                 </porous_medium>
             </material_property>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
-                <secondary_variable type="static" internal_name="pressure_wetting" output_name="pressure_wetting"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="pressure_wetting" output_name="pressure_wetting"/>
             </secondary_variables>
             <specific_body_force>0</specific_body_force>
             <mass_lumping> true </mass_lumping>
diff --git a/Tests/Data/Parabolic/ThermalTwoPhaseFlowPP/HeatPipe/Twophase_HeatPipe_quad_curve_small.prj b/Tests/Data/Parabolic/ThermalTwoPhaseFlowPP/HeatPipe/Twophase_HeatPipe_quad_curve_small.prj
index 2273ecd85dc..1319cd34f02 100644
--- a/Tests/Data/Parabolic/ThermalTwoPhaseFlowPP/HeatPipe/Twophase_HeatPipe_quad_curve_small.prj
+++ b/Tests/Data/Parabolic/ThermalTwoPhaseFlowPP/HeatPipe/Twophase_HeatPipe_quad_curve_small.prj
@@ -103,8 +103,8 @@
                 </porous_medium>
             </material_property>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
-                <secondary_variable type="static" internal_name="pressure_wetting" output_name="pressure_wetting"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="pressure_wetting" output_name="pressure_wetting"/>
             </secondary_variables>
             <specific_body_force>0</specific_body_force>
             <mass_lumping> true </mass_lumping>
diff --git a/Tests/Data/Parabolic/TwoPhaseFlowPP/Liakopoulos/TwoPhase_Lia_quad_large.prj b/Tests/Data/Parabolic/TwoPhaseFlowPP/Liakopoulos/TwoPhase_Lia_quad_large.prj
index d4851385f5d..43ea5d34d72 100644
--- a/Tests/Data/Parabolic/TwoPhaseFlowPP/Liakopoulos/TwoPhase_Lia_quad_large.prj
+++ b/Tests/Data/Parabolic/TwoPhaseFlowPP/Liakopoulos/TwoPhase_Lia_quad_large.prj
@@ -17,7 +17,7 @@
                 <capillary_pressure>capillary_pressure</capillary_pressure>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
             </secondary_variables>
             <specific_body_force>0 -9.81</specific_body_force>
             <mass_lumping> true </mass_lumping>
diff --git a/Tests/Data/Parabolic/TwoPhaseFlowPP/Liakopoulos/TwoPhase_Lia_quad_short.prj b/Tests/Data/Parabolic/TwoPhaseFlowPP/Liakopoulos/TwoPhase_Lia_quad_short.prj
index d4e4a13982c..2fd9c5bf1be 100644
--- a/Tests/Data/Parabolic/TwoPhaseFlowPP/Liakopoulos/TwoPhase_Lia_quad_short.prj
+++ b/Tests/Data/Parabolic/TwoPhaseFlowPP/Liakopoulos/TwoPhase_Lia_quad_short.prj
@@ -17,7 +17,7 @@
                 <capillary_pressure>capillary_pressure</capillary_pressure>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
             </secondary_variables>
             <specific_body_force>0 -9.81</specific_body_force>
             <mass_lumping> true </mass_lumping>
diff --git a/Tests/Data/Parabolic/TwoPhaseFlowPP/McWhorter/TwoPhase_mcwt_line.prj b/Tests/Data/Parabolic/TwoPhaseFlowPP/McWhorter/TwoPhase_mcwt_line.prj
index 9e05c08e158..58683dc886a 100644
--- a/Tests/Data/Parabolic/TwoPhaseFlowPP/McWhorter/TwoPhase_mcwt_line.prj
+++ b/Tests/Data/Parabolic/TwoPhaseFlowPP/McWhorter/TwoPhase_mcwt_line.prj
@@ -17,7 +17,7 @@
                 <gas_pressure>gas_pressure</gas_pressure>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
             <mass_lumping> true </mass_lumping>
diff --git a/Tests/Data/Parabolic/TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_quad.prj b/Tests/Data/Parabolic/TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_quad.prj
index 11cb2caf4c9..079f5477b19 100644
--- a/Tests/Data/Parabolic/TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_quad.prj
+++ b/Tests/Data/Parabolic/TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_quad.prj
@@ -78,8 +78,8 @@
                 </porous_medium>
             </material_property>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
-                <secondary_variable type="static" internal_name="pressure_nonwetting" output_name="pressure_nonwetting"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="pressure_nonwetting" output_name="pressure_nonwetting"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
             <mass_lumping> true </mass_lumping>
diff --git a/Tests/Data/Parabolic/TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_quad_adaptive_dt.prj b/Tests/Data/Parabolic/TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_quad_adaptive_dt.prj
index df1617ded83..52bad38cf80 100644
--- a/Tests/Data/Parabolic/TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_quad_adaptive_dt.prj
+++ b/Tests/Data/Parabolic/TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_quad_adaptive_dt.prj
@@ -78,8 +78,8 @@
                 </porous_medium>
             </material_property>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
-                <secondary_variable type="static" internal_name="pressure_nonwetting" output_name="pressure_nonwetting"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="pressure_nonwetting" output_name="pressure_nonwetting"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
             <mass_lumping> true </mass_lumping>
diff --git a/Tests/Data/Parabolic/TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_small.prj b/Tests/Data/Parabolic/TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_small.prj
index 7b9212b4573..df159b252a1 100644
--- a/Tests/Data/Parabolic/TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_small.prj
+++ b/Tests/Data/Parabolic/TwoPhaseFlowPrho/MoMaS/Twophase_MoMaS_small.prj
@@ -78,8 +78,8 @@
                 </porous_medium>
             </material_property>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
-                <secondary_variable type="static" internal_name="pressure_nonwetting" output_name="pressure_nonwetting"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="pressure_nonwetting" output_name="pressure_nonwetting"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
             <mass_lumping> true </mass_lumping>
diff --git a/Tests/Data/PhaseField/beam3d.prj b/Tests/Data/PhaseField/beam3d.prj
index d855397a42a..213fb7e3d77 100644
--- a/Tests/Data/PhaseField/beam3d.prj
+++ b/Tests/Data/PhaseField/beam3d.prj
@@ -25,8 +25,8 @@
                 <phasefield>phasefield</phasefield>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/RichardsMechanics/RichardsFlow_2d_quasinewton.prj b/Tests/Data/RichardsMechanics/RichardsFlow_2d_quasinewton.prj
index e92ab00575c..4887a434ee5 100644
--- a/Tests/Data/RichardsMechanics/RichardsFlow_2d_quasinewton.prj
+++ b/Tests/Data/RichardsMechanics/RichardsFlow_2d_quasinewton.prj
@@ -70,10 +70,10 @@
                 </porous_medium>
             </material_property>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="velocity" output_name="velocity"/>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="velocity" output_name="velocity"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
             </secondary_variables>
             <specific_body_force>0 -9.81</specific_body_force>
             <temperature> temp </temperature>
diff --git a/Tests/Data/RichardsMechanics/RichardsFlow_2d_richardsflow.prj b/Tests/Data/RichardsMechanics/RichardsFlow_2d_richardsflow.prj
index d02f55285d1..64d61581d38 100644
--- a/Tests/Data/RichardsMechanics/RichardsFlow_2d_richardsflow.prj
+++ b/Tests/Data/RichardsMechanics/RichardsFlow_2d_richardsflow.prj
@@ -59,7 +59,7 @@
                 </porous_medium>
             </material_property>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
             </secondary_variables>
             <specific_body_force>0 -9.81</specific_body_force>
             <mass_lumping>false</mass_lumping>
diff --git a/Tests/Data/RichardsMechanics/RichardsFlow_2d_small.prj b/Tests/Data/RichardsMechanics/RichardsFlow_2d_small.prj
index daaa372891c..b0ae4b5900a 100644
--- a/Tests/Data/RichardsMechanics/RichardsFlow_2d_small.prj
+++ b/Tests/Data/RichardsMechanics/RichardsFlow_2d_small.prj
@@ -65,10 +65,10 @@
                 </porous_medium>
             </material_property>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="velocity" output_name="velocity"/>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="velocity" output_name="velocity"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
             </secondary_variables>
             <specific_body_force>0 -9.81</specific_body_force>
             <temperature> temp </temperature>
diff --git a/Tests/Data/RichardsMechanics/RichardsFlow_2d_small_masslumping.prj b/Tests/Data/RichardsMechanics/RichardsFlow_2d_small_masslumping.prj
index 04229297977..3acd61fc1f6 100644
--- a/Tests/Data/RichardsMechanics/RichardsFlow_2d_small_masslumping.prj
+++ b/Tests/Data/RichardsMechanics/RichardsFlow_2d_small_masslumping.prj
@@ -65,10 +65,10 @@
                 </porous_medium>
             </material_property>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="velocity" output_name="velocity"/>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="velocity" output_name="velocity"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
             </secondary_variables>
             <specific_body_force>0 -9.81</specific_body_force>
             <mass_lumping>true</mass_lumping>
diff --git a/Tests/Data/RichardsMechanics/confined_compression_fully_saturated.prj b/Tests/Data/RichardsMechanics/confined_compression_fully_saturated.prj
index 829d6feb2a7..78dfb5c9fde 100644
--- a/Tests/Data/RichardsMechanics/confined_compression_fully_saturated.prj
+++ b/Tests/Data/RichardsMechanics/confined_compression_fully_saturated.prj
@@ -71,10 +71,10 @@
                 </porous_medium>
             </material_property>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="velocity" output_name="velocity"/>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="velocity" output_name="velocity"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
             <temperature> temp </temperature>
diff --git a/Tests/Data/RichardsMechanics/flow_fully_saturated.prj b/Tests/Data/RichardsMechanics/flow_fully_saturated.prj
index f919f42a3c8..6f6be407cae 100644
--- a/Tests/Data/RichardsMechanics/flow_fully_saturated.prj
+++ b/Tests/Data/RichardsMechanics/flow_fully_saturated.prj
@@ -68,10 +68,10 @@
                 </porous_medium>
             </material_property>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="velocity" output_name="velocity"/>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="velocity" output_name="velocity"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
             <temperature> temp </temperature>
diff --git a/Tests/Data/RichardsMechanics/flow_fully_saturated_anisotropic.prj b/Tests/Data/RichardsMechanics/flow_fully_saturated_anisotropic.prj
index c3cda888358..513532d1f62 100644
--- a/Tests/Data/RichardsMechanics/flow_fully_saturated_anisotropic.prj
+++ b/Tests/Data/RichardsMechanics/flow_fully_saturated_anisotropic.prj
@@ -68,10 +68,10 @@
                 </porous_medium>
             </material_property>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="velocity" output_name="velocity"/>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="velocity" output_name="velocity"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
             <temperature> temp </temperature>
diff --git a/Tests/Data/RichardsMechanics/flow_fully_saturated_coordinate_system.prj b/Tests/Data/RichardsMechanics/flow_fully_saturated_coordinate_system.prj
index f47c1db013f..79daad1e14d 100644
--- a/Tests/Data/RichardsMechanics/flow_fully_saturated_coordinate_system.prj
+++ b/Tests/Data/RichardsMechanics/flow_fully_saturated_coordinate_system.prj
@@ -68,10 +68,10 @@
                 </porous_medium>
             </material_property>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="velocity" output_name="velocity"/>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="velocity" output_name="velocity"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
             <temperature> temp </temperature>
diff --git a/Tests/Data/RichardsMechanics/gravity.prj b/Tests/Data/RichardsMechanics/gravity.prj
index 3e492acb986..6bbc06f5068 100644
--- a/Tests/Data/RichardsMechanics/gravity.prj
+++ b/Tests/Data/RichardsMechanics/gravity.prj
@@ -72,10 +72,10 @@
                 </porous_medium>
             </material_property>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="velocity" output_name="velocity"/>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="velocity" output_name="velocity"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
             </secondary_variables>
             <specific_body_force>0 -9.81</specific_body_force>
             <temperature> temp </temperature>
diff --git a/Tests/Data/RichardsMechanics/mechanics_linear.prj b/Tests/Data/RichardsMechanics/mechanics_linear.prj
index 74dfa775872..68ca5838cc0 100644
--- a/Tests/Data/RichardsMechanics/mechanics_linear.prj
+++ b/Tests/Data/RichardsMechanics/mechanics_linear.prj
@@ -81,10 +81,10 @@
                 </porous_medium>
             </material_property>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="velocity" output_name="velocity"/>
-                <secondary_variable type="static" internal_name="saturation" output_name="saturation"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="velocity" output_name="velocity"/>
+                <secondary_variable internal_name="saturation" output_name="saturation"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
             <temperature> temp </temperature>
diff --git a/Tests/Data/ThermoHydroMechanics/Linear/Beam_sealed_bimaterial/square_1e2.prj b/Tests/Data/ThermoHydroMechanics/Linear/Beam_sealed_bimaterial/square_1e2.prj
index a57349b8cbe..fb7794ab1a8 100644
--- a/Tests/Data/ThermoHydroMechanics/Linear/Beam_sealed_bimaterial/square_1e2.prj
+++ b/Tests/Data/ThermoHydroMechanics/Linear/Beam_sealed_bimaterial/square_1e2.prj
@@ -20,8 +20,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoHydroMechanics/Linear/Beam_unsealed_bimaterial/square_1e2.prj b/Tests/Data/ThermoHydroMechanics/Linear/Beam_unsealed_bimaterial/square_1e2.prj
index 16a7e8e03d5..8ae08c4919b 100644
--- a/Tests/Data/ThermoHydroMechanics/Linear/Beam_unsealed_bimaterial/square_1e2.prj
+++ b/Tests/Data/ThermoHydroMechanics/Linear/Beam_unsealed_bimaterial/square_1e2.prj
@@ -20,8 +20,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoHydroMechanics/Linear/Point_injection/square_1e2.prj b/Tests/Data/ThermoHydroMechanics/Linear/Point_injection/square_1e2.prj
index 6a5a6554797..00da8b8f4a2 100644
--- a/Tests/Data/ThermoHydroMechanics/Linear/Point_injection/square_1e2.prj
+++ b/Tests/Data/ThermoHydroMechanics/Linear/Point_injection/square_1e2.prj
@@ -20,8 +20,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoHydroMechanics/Linear/Square_sealed_homogeneous/square_1e0.prj b/Tests/Data/ThermoHydroMechanics/Linear/Square_sealed_homogeneous/square_1e0.prj
index 204ccefeed8..909846a7e80 100644
--- a/Tests/Data/ThermoHydroMechanics/Linear/Square_sealed_homogeneous/square_1e0.prj
+++ b/Tests/Data/ThermoHydroMechanics/Linear/Square_sealed_homogeneous/square_1e0.prj
@@ -20,8 +20,8 @@
                 <displacement>displacement</displacement>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanicalPhaseField/beam3d.prj b/Tests/Data/ThermoMechanicalPhaseField/beam3d.prj
index 6583e0131e3..718fa09384f 100644
--- a/Tests/Data/ThermoMechanicalPhaseField/beam3d.prj
+++ b/Tests/Data/ThermoMechanicalPhaseField/beam3d.prj
@@ -32,9 +32,9 @@
                 <phasefield>phasefield</phasefield>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="heat_flux" output_name="heat_flux"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="heat_flux" output_name="heat_flux"/>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanicalPhaseField/slab_5.prj b/Tests/Data/ThermoMechanicalPhaseField/slab_5.prj
index 8987a69f615..e70dcd12023 100644
--- a/Tests/Data/ThermoMechanicalPhaseField/slab_5.prj
+++ b/Tests/Data/ThermoMechanicalPhaseField/slab_5.prj
@@ -32,9 +32,9 @@
                 <phasefield>phasefield</phasefield>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="heat_flux" output_name="heat_flux"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="heat_flux" output_name="heat_flux"/>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanicalPhaseField/tes_hx3_iglu.prj b/Tests/Data/ThermoMechanicalPhaseField/tes_hx3_iglu.prj
index f4f2beb5b59..711e1785176 100644
--- a/Tests/Data/ThermoMechanicalPhaseField/tes_hx3_iglu.prj
+++ b/Tests/Data/ThermoMechanicalPhaseField/tes_hx3_iglu.prj
@@ -36,9 +36,9 @@
                 <phasefield>phasefield</phasefield>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="heat_flux" output_name="heat_flux"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="heat_flux" output_name="heat_flux"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanics/BDT/cube_1e0_bdt.prj b/Tests/Data/ThermoMechanics/BDT/cube_1e0_bdt.prj
index 9c4f219694c..d18f1ca56ce 100644
--- a/Tests/Data/ThermoMechanics/BDT/cube_1e0_bdt.prj
+++ b/Tests/Data/ThermoMechanics/BDT/cube_1e0_bdt.prj
@@ -42,8 +42,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/CreepAfterExcavation/CreepAfterExcavation.prj b/Tests/Data/ThermoMechanics/CreepBGRa/CreepAfterExcavation/CreepAfterExcavation.prj
index 65faa33854b..8d3fad94f76 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/CreepAfterExcavation/CreepAfterExcavation.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/CreepAfterExcavation/CreepAfterExcavation.prj
@@ -38,8 +38,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 -9.81</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreep.prj b/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreep.prj
index f041aa12c62..a7d87820ebb 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreep.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreep.prj
@@ -29,8 +29,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreepWithAnalyticSolution.prj b/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreepWithAnalyticSolution.prj
index a461ac6f149..570da88c313 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreepWithAnalyticSolution.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreepWithAnalyticSolution.prj
@@ -29,8 +29,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D1bt/m2_1D1bt.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D1bt/m2_1D1bt.prj
index 01934d23140..e66107a86a3 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D1bt/m2_1D1bt.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D1bt/m2_1D1bt.prj
@@ -29,8 +29,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D2bt/m2_1D2bt.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D2bt/m2_1D2bt.prj
index 007681d7a39..d0275de3c43 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D2bt/m2_1D2bt.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D2bt/m2_1D2bt.prj
@@ -29,8 +29,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dcreep/m2_1Dcreep.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dcreep/m2_1Dcreep.prj
index 877184fb63a..8057c602114 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dcreep/m2_1Dcreep.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dcreep/m2_1Dcreep.prj
@@ -29,8 +29,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozenge/m2_1Dlozenge.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozenge/m2_1Dlozenge.prj
index cd85f21fc8d..2febdbe7946 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozenge/m2_1Dlozenge.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozenge/m2_1Dlozenge.prj
@@ -29,8 +29,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozengebt/m2_1Dlozengebt.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozengebt/m2_1Dlozengebt.prj
index c3a3abe5071..96a840c8851 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozengebt/m2_1Dlozengebt.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozengebt/m2_1Dlozengebt.prj
@@ -29,8 +29,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Drelax/m2_1Drelax.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Drelax/m2_1Drelax.prj
index 574809a1b0a..330131ce2ff 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Drelax/m2_1Drelax.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Drelax/m2_1Drelax.prj
@@ -29,8 +29,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload.prj
index 708265a68b9..da78e5c90a4 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload.prj
@@ -29,8 +29,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload_ym45.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload_ym45.prj
index 8c96fbe0fa2..dfc94f08180 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload_ym45.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload_ym45.prj
@@ -26,8 +26,8 @@
                 <process_variable>displacement</process_variable>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dloadbt/m2_2Dloadbt.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dloadbt/m2_2Dloadbt.prj
index 61201fc6a0f..2ea1870a4bd 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dloadbt/m2_2Dloadbt.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dloadbt/m2_2Dloadbt.prj
@@ -29,8 +29,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dload/m2_3Dload.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dload/m2_3Dload.prj
index fd061360a6d..d6dd862d983 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dload/m2_3Dload.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dload/m2_3Dload.prj
@@ -29,8 +29,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dloadbt/m2_3Dloadbt.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dloadbt/m2_3Dloadbt.prj
index d3c4c48f484..14f89bd4f2d 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dloadbt/m2_3Dloadbt.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dloadbt/m2_3Dloadbt.prj
@@ -29,8 +29,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanics/InitialStates/equilibrium_restart.prj b/Tests/Data/ThermoMechanics/InitialStates/equilibrium_restart.prj
index 18140625993..b925f6a32f3 100644
--- a/Tests/Data/ThermoMechanics/InitialStates/equilibrium_restart.prj
+++ b/Tests/Data/ThermoMechanics/InitialStates/equilibrium_restart.prj
@@ -27,8 +27,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/ThermoMechanics/InitialStates/into_initial_state.prj b/Tests/Data/ThermoMechanics/InitialStates/into_initial_state.prj
index f2cb5ab147d..f3bae43e2e3 100644
--- a/Tests/Data/ThermoMechanics/InitialStates/into_initial_state.prj
+++ b/Tests/Data/ThermoMechanics/InitialStates/into_initial_state.prj
@@ -27,8 +27,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/ThermoMechanics/InitialStates/non_equilibrium_initial_state.prj b/Tests/Data/ThermoMechanics/InitialStates/non_equilibrium_initial_state.prj
index aec9f363617..f9781fedaae 100644
--- a/Tests/Data/ThermoMechanics/InitialStates/non_equilibrium_initial_state.prj
+++ b/Tests/Data/ThermoMechanics/InitialStates/non_equilibrium_initial_state.prj
@@ -27,8 +27,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <initial_stress>nonequilibrium_stress</initial_stress>
         </process>
diff --git a/Tests/Data/ThermoMechanics/LinearMFront/cube_1e0_lin.prj b/Tests/Data/ThermoMechanics/LinearMFront/cube_1e0_lin.prj
index cf3dcc9c588..ecffca9dffa 100644
--- a/Tests/Data/ThermoMechanics/LinearMFront/cube_1e0_lin.prj
+++ b/Tests/Data/ThermoMechanics/LinearMFront/cube_1e0_lin.prj
@@ -24,8 +24,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanics/StaggeredScheme/CreepAfterExcavation/CreepAfterExcavation.prj b/Tests/Data/ThermoMechanics/StaggeredScheme/CreepAfterExcavation/CreepAfterExcavation.prj
index a74e0080608..4812e1f4a3c 100644
--- a/Tests/Data/ThermoMechanics/StaggeredScheme/CreepAfterExcavation/CreepAfterExcavation.prj
+++ b/Tests/Data/ThermoMechanics/StaggeredScheme/CreepAfterExcavation/CreepAfterExcavation.prj
@@ -39,8 +39,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 -9.81</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanics/StaggeredScheme/TM_Quad/iglu_quarter_plane_strain_quad.prj b/Tests/Data/ThermoMechanics/StaggeredScheme/TM_Quad/iglu_quarter_plane_strain_quad.prj
index 9c9eb8fbd12..9e0a8eec659 100644
--- a/Tests/Data/ThermoMechanics/StaggeredScheme/TM_Quad/iglu_quarter_plane_strain_quad.prj
+++ b/Tests/Data/ThermoMechanics/StaggeredScheme/TM_Quad/iglu_quarter_plane_strain_quad.prj
@@ -26,8 +26,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanics/cube_1e3.prj b/Tests/Data/ThermoMechanics/cube_1e3.prj
index a27b31a6b2b..c83c6e115bc 100644
--- a/Tests/Data/ThermoMechanics/cube_1e3.prj
+++ b/Tests/Data/ThermoMechanics/cube_1e3.prj
@@ -21,8 +21,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain.prj b/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain.prj
index a5d8d66ba93..f56bcffc560 100644
--- a/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain.prj
+++ b/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain.prj
@@ -21,8 +21,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain_quad.prj b/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain_quad.prj
index dc9f2363f3e..df22afcf1fd 100644
--- a/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain_quad.prj
+++ b/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain_quad.prj
@@ -21,8 +21,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain.prj b/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain.prj
index c546c7971b9..74a606252ea 100644
--- a/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain.prj
+++ b/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain.prj
@@ -25,8 +25,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain_quad.prj b/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain_quad.prj
index f009e9a5619..3f0a3a47892 100644
--- a/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain_quad.prj
+++ b/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain_quad.prj
@@ -25,8 +25,8 @@
                 <temperature>temperature</temperature>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
         </process>
diff --git a/Tests/Data/ThermoMechanics/tm1_1Dbeam/tm1_1Dbeam.prj b/Tests/Data/ThermoMechanics/tm1_1Dbeam/tm1_1Dbeam.prj
index c288d1f5bf5..4af92f92751 100755
--- a/Tests/Data/ThermoMechanics/tm1_1Dbeam/tm1_1Dbeam.prj
+++ b/Tests/Data/ThermoMechanics/tm1_1Dbeam/tm1_1Dbeam.prj
@@ -22,8 +22,8 @@
                 <displacement>displacement</displacement>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/ThermoMechanics/tm1_1Dfixa/tm1_1Dfixa.prj b/Tests/Data/ThermoMechanics/tm1_1Dfixa/tm1_1Dfixa.prj
index c24ca2e549b..ecb78604d87 100755
--- a/Tests/Data/ThermoMechanics/tm1_1Dfixa/tm1_1Dfixa.prj
+++ b/Tests/Data/ThermoMechanics/tm1_1Dfixa/tm1_1Dfixa.prj
@@ -22,8 +22,8 @@
                 <displacement>displacement</displacement>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/ThermoMechanics/tm1_1Dfixb/tm1_1Dfixb.prj b/Tests/Data/ThermoMechanics/tm1_1Dfixb/tm1_1Dfixb.prj
index cda7f113ad8..9c362736eab 100755
--- a/Tests/Data/ThermoMechanics/tm1_1Dfixb/tm1_1Dfixb.prj
+++ b/Tests/Data/ThermoMechanics/tm1_1Dfixb/tm1_1Dfixb.prj
@@ -22,8 +22,8 @@
                 <displacement>displacement</displacement>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/ThermoMechanics/tm1_2Dbeam/tm1_2Dbeam.prj b/Tests/Data/ThermoMechanics/tm1_2Dbeam/tm1_2Dbeam.prj
index 198924f5da7..eb4680eac98 100755
--- a/Tests/Data/ThermoMechanics/tm1_2Dbeam/tm1_2Dbeam.prj
+++ b/Tests/Data/ThermoMechanics/tm1_2Dbeam/tm1_2Dbeam.prj
@@ -22,8 +22,8 @@
                 <displacement>displacement</displacement>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/ThermoMechanics/tm1_2Dsquare/tm1_2Dsquare.prj b/Tests/Data/ThermoMechanics/tm1_2Dsquare/tm1_2Dsquare.prj
index 715db388487..970343c0351 100755
--- a/Tests/Data/ThermoMechanics/tm1_2Dsquare/tm1_2Dsquare.prj
+++ b/Tests/Data/ThermoMechanics/tm1_2Dsquare/tm1_2Dsquare.prj
@@ -22,8 +22,8 @@
                 <displacement>displacement</displacement>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/ThermoMechanics/tm1_3Dcube/tm1_3Dcube.prj b/Tests/Data/ThermoMechanics/tm1_3Dcube/tm1_3Dcube.prj
index 63349fbaa26..32efc776455 100755
--- a/Tests/Data/ThermoMechanics/tm1_3Dcube/tm1_3Dcube.prj
+++ b/Tests/Data/ThermoMechanics/tm1_3Dcube/tm1_3Dcube.prj
@@ -22,8 +22,8 @@
                 <displacement>displacement</displacement>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/ThermoMechanics/tm1_3Dgravity/tm1_3Dgravity.prj b/Tests/Data/ThermoMechanics/tm1_3Dgravity/tm1_3Dgravity.prj
index 14de6b75a65..e62c7522560 100755
--- a/Tests/Data/ThermoMechanics/tm1_3Dgravity/tm1_3Dgravity.prj
+++ b/Tests/Data/ThermoMechanics/tm1_3Dgravity/tm1_3Dgravity.prj
@@ -22,8 +22,8 @@
                 <displacement>displacement</displacement>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/ThermoMechanics/tm1_3Dorigin/tm1_3Dorigin.prj b/Tests/Data/ThermoMechanics/tm1_3Dorigin/tm1_3Dorigin.prj
index f383f30bfc2..532a7e0806e 100755
--- a/Tests/Data/ThermoMechanics/tm1_3Dorigin/tm1_3Dorigin.prj
+++ b/Tests/Data/ThermoMechanics/tm1_3Dorigin/tm1_3Dorigin.prj
@@ -22,8 +22,8 @@
                 <displacement>displacement</displacement>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/ThermoMechanics/tm1_3Dsquare/tm1_3Dsquare.prj b/Tests/Data/ThermoMechanics/tm1_3Dsquare/tm1_3Dsquare.prj
index b3f3d5fc4f0..aae348a84fd 100755
--- a/Tests/Data/ThermoMechanics/tm1_3Dsquare/tm1_3Dsquare.prj
+++ b/Tests/Data/ThermoMechanics/tm1_3Dsquare/tm1_3Dsquare.prj
@@ -22,8 +22,8 @@
                 <displacement>displacement</displacement>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/ThermoMechanics/tm2_1D1bt/tm2_1D1bt.prj b/Tests/Data/ThermoMechanics/tm2_1D1bt/tm2_1D1bt.prj
index 12d51eb2538..9bc17ae1d34 100755
--- a/Tests/Data/ThermoMechanics/tm2_1D1bt/tm2_1D1bt.prj
+++ b/Tests/Data/ThermoMechanics/tm2_1D1bt/tm2_1D1bt.prj
@@ -22,8 +22,8 @@
                 <displacement>displacement</displacement>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
diff --git a/Tests/Data/ThermoMechanics/tm2_1Dfixc/tm2_1Dfixc.prj b/Tests/Data/ThermoMechanics/tm2_1Dfixc/tm2_1Dfixc.prj
index 5a91b238994..d08a3b76ef8 100755
--- a/Tests/Data/ThermoMechanics/tm2_1Dfixc/tm2_1Dfixc.prj
+++ b/Tests/Data/ThermoMechanics/tm2_1Dfixc/tm2_1Dfixc.prj
@@ -22,8 +22,8 @@
                 <displacement>displacement</displacement>
             </process_variables>
             <secondary_variables>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
+                <secondary_variable internal_name="epsilon" output_name="epsilon"/>
+                <secondary_variable internal_name="sigma" output_name="sigma"/>
             </secondary_variables>
         </process>
     </processes>
-- 
GitLab