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 cdef2d04c0c1393628291436896f1d60cc54ad0b..f6a2578f46a6f9b8114f4aeb58443fcbdc7fe9ce 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 3a17d49ec62b181298a6e7c2226521898b26f90c..184c22e47c71a0ff4597b2345154f69ca7dfb16d 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 4cfaa620d89c5ae2a1c8e0a941fc232425fa49c8..e871bafa8096ca2fa37a66c170333c3a1c905daa 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 6f169223f5684097a05b69c0361937e9ba596b7f..434e0fc982397e59879d9317b7513c611aa6866e 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 918bc944df431b285ef2f190562e6a54fff7b674..c62df8ea448060c75079d73b5b7b5354b3527a7f 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 3e4774b854dcebf1c6859ee83f0e0865c891a326..164171bbd169f1bd0106b05bd1043bf846e92258 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 41ac66e6b8f92c5a1604ca507fdf5f0b549dc35d..c309829114cb06ad01539f07b0b022ade1644a41 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 17ec3ba671cff24cdc1d3a53fd71a013f4c8a927..9fd4b526b60a034dbcf27f30c269287fed4f8af2 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 745f0fac1b39bd8e7104731256caf902e3a0aedd..aa6e07e5bb4d88a3853908c59b50a185c4f05c49 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 feda9c61be9325fcb2e00e1da3a5b8561e8e7b83..4edd8550694f54423d0114afb654735f80fe0633 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 ff5c1107d6a409c763fd239165b34c48f538e4cc..2e8b45969e1930ac5cb426030934e12f6eb6a42a 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 f1091841847eaf67ba2fbe96960de687ceff0be3..de178a40b0894405ea315c4efe6025573164cb47 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 b14d0397168fe8533a2dcd6894e978a3552b0c31..60d99876454d853d73582b0cdd3b0b3fd5688cba 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 8703856cdbcd775cf1930198c5329f6b5547636f..afd6f7a3fb6a634653e339b19264053a47db1cc5 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 5ee5743765c6a2cabb552927ef79ac5627e2ab30..cffead857083eaed0314bacc0193fadebae93545 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 963310604eae4fc4164fe3f6751c9fa25a103a71..2af8e9def81e589974004b6fd4e95b2d82acbbdd 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 63ccfab40382a89748cf7942e8f49db1c3680cb9..c0ee1e5e7dc5973b455c7cefc184881f7ceaf80a 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 5ff6df7cf7534cf008efb191959b99ad456952f6..5991272041659ce9a6e7dde736cb54582e0de631 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 63c20e8e97ac2d08e66fa68906e4ef305680920c..f7ea01441e713ef3da607a716b1e376619a2e4a3 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 a8e9d85105eac77b7a39beec1fb052379cd1a269..ec9a1b6ea1a7ea8404c5b22a3b68408d63cce3fc 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 9079b6909b09dbabdcff44268dddfb48453e0334..4da682e0255a6071793587b827ea3bdd4e62444b 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 d8b3187e18f9d4c128c763c20a21a53fd4226437..69a8794d7fc857a5a58b9ff1f023b5a0517855cf 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 c486020d8f60f446d038ad0f7c2ab3a459712b80..ddef55c40e682d7e8a765a6ebd23f6997e06de08 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 97d08d948ceee9672e7a171422ad07f4a10add0c..d74457c5f9d13bf74d63c3b4ae9b98899c116c00 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 86ad144b29faabd31d7be27be958067a4f3f3c53..1846d5608d98a43d3c34accb87e38c251a96d215 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 4c03401539dba727e6c8f9f51bb1df20f759f15b..1bde58382a00e7dd937514802a791f2fcafacdb5 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 873cfeda2410d23cfe29cb6433eef6317f615162..aa861751cdefed09c73ce5004e358ab331a8e0a6 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 db7ca3a0e9469f4958e5919ec961d6a24ebdc0e4..a7c4ce970b8ef54f724c40b39c27d3fd2f1f63de 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 54a482326bd2b96438e759db2da36748433ef136..37372ec3b5bee76e48bf5abf55d8b264c6840ff2 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 c6413bb7f80de43421760b2a7b7513205a8363c4..931bd42dfef12479039cde38bd2670bda99d0879 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 07061163998291ff69b8141c56e5d123df62a1c2..4ee3ca943442b4f8491617e538b9c580ceba2c91 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 aa7095782af75db341f6548f55852ce447f3f30c..bba20ef0c6684847455497fae30f5c767246233e 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 d7287b9e12a3879f04e8906f48702476174ae1d4..bfbf38cf3688d3663645c499c8ed7e650ea29e12 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 a039b967555693dca05fde68c3f6b6d142a17ce6..51f9eda2d21f74915ccb8d75fa53425d6a6c74ff 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 e8cf58a967a967359906fcd9b462c32782bdf1d6..4354d87bc67c6ea7e6e21aa127fd176ed79da3bb 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 2c3d3161d3aff3d899025076e65751d37ef507d6..dac304cddba9b8b63e19a0868cc1f9e71516416e 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 588ef689eb0d0de6048343ba07c241f487b3246d..4db9b7517b61b64d5b3a84e3a8e7069ca577f8e9 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 51cfaec4bb130a6b102d251a6d41025957f534d8..bd79b4cb102466419c2939b9e8427d6f22cda928 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 b501d5b8f988c684336c34968b205e41ca472254..c185a39eba528a394f4038571b920cceebc06b33 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 a3e760415fd30ad49a59e0a8c5d7cf26787925af..68dcb4e968c1d08b182a5bcceb430175a5971777 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 2af1f7d45b28b82e668d96cd07364008e43396ca..860aa3097391cda95797c733ed17921d5a4b6241 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 1d11866ca77f72a959e459da0f6caa398eec20b1..b81c0d15f94a35d57c3edeff085a0578d0dd9fb9 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 4b3f2a18d21cad4432d55cffd93717a751344f8f..6fde1a8c3f2a36334f6f8d4b031c5f42ea68abb6 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 eaa775043a928d8d4dc9c2d32682b61f0c4821dd..e8c97392e4079db6ec9b17ef4e3b69b3220ec45c 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 43cfb54641fe1e545777afc2a5093e538276ab6a..1d7e812c93419890d333f3c29de401a55ff71cd5 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 1b3033633a2ca188f4fc7619e5a4df88fe1d56cd..ff24721ab0f0adcccc41b5e621038911df98e4d0 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 20ac25b54faaac319211886ebf474fb063124ff0..98695821e58ecbcbab4777ff2fdc8f047ed97fba 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 5192a04c90d6de68901c6c06bff1778614680d5c..ce774933a8bd7b93659095cbeb999fc1b2b8f1bf 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 c4813074e603fcb681059b0cdbda6011e5e9e684..3509ce978f8ff3957b489a1dd671fbb541cf7fad 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 c30ee66bbe1267382f9e1e07fb3463b43e141d6d..612a2cc0036f9b07436f9f9f36e9574b734801aa 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 b2e30d62990b93ff8f4649a89338a506eec143a9..b0f4fdccd2153276cc13bf7cf95f8f78961551eb 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 135620b68cc5eeae2bb43a56eb203f45815cfca9..a43a10d4b8c7758d2006357a2dd3aab33f92ad8c 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 f122b6f5cc4ffaed39f25a53a9c6ee707504b189..53626ae68ef3d298585a558487327327dfe628f8 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 c3d75444315f9dabc4bed44cd367744a7c1f09f4..35fe277fd30957048d0f688f3687283d9a9df592 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 6f4fdfc8484032dd7fda438a17570a5d6d0a7fbc..cb2c9f282fd352521a4b3fa1d5c63528ad87892f 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 5e7f8039aa1164df56f4afc1f2d8332b01b1f7f7..3c18b6e6a804fd24029710dc7d030d66d14a4b49 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 b3b5f8f60acdeff385eff61ae26b82a0e211d4ea..87166a70ba2371389cbd795c2128e75ba790002b 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 ae0074bd87752daba5e7fd4a8a4488fe17dc745c..f35ae347aa172f3b881fb372c4da00f4f0e121e3 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 efaeb5faddab92406edfe25492cca8bf670b9fa5..a4cbfb8ee3ac3c83ebf19b29d0561ce8fff9d92c 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 def3f26fb263274d5d7f437ac19171878a9dba1c..d8021955422eabfe3554b423eef45fba61f3ccaf 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 2c6140be2fca7e0d1445edc861fd2fb13d731afd..3fd2835e4164b1cd85ef1e0058c993558e861901 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 c49926b2cbee7dda578fd911bffa6fdfef2a25ae..2e24501732dcedf0abc679142403cd6e67f56d76 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 c14933d35787f9f8614126ea2b6604f837a98527..1cbaaf46fa623a3343c42a05f284409a4fc03eea 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 9e403edb0cd740655d50cc810f75782607d29999..c00549d22e03024be0b92f15894e775c035e29f9 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 3c221eddb59408ee04aa1f0da16bb7e17b31e75d..650b394cce2aaf7616fa2ab29908be7e39645e84 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 f6701aa24f63abacf69fc3044ed62bf503c2965f..e8bfbd73ec4f9012098071ebe02387822b871f66 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 206dbb0e5d97889dd57453fa027c602f5cf2e66d..d4c9c92a0eaf0d7411e6881b841699d947288504 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 a2538e7e171e3c19c6738b06f6db29a8f0275c4c..fb71d9ba40f6a55dc7609c00a64e26548f70c0f5 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 ba677e575c9b0684c6771474cd75fc05cd06cfd2..a3e454b77f582b49463d2ccd6c6b8e6a88b19cec 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 0e2a07ee838ffd88f9e295c993a64e0586ca8404..b40597d22196d5035f390709633a806e716cd390 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 34937982007349c8000938096c1ef7efdb9a2c81..e383b2ef5c93bcd4a822892d18385c3546482e44 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 4f4f1bddbae31ba3bd4030bd0ef6470da1c804ab..c3903948740320deb5ab6fb2b05a97d3f0fcbb45 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 29b561bdf6b65882db1925d33d15be2b3f8b194a..92f9a49376c79beb0168edc3ea178c2338698e01 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 5113e7fb32cb82d279edd10fa65f4194b4faa1fa..89983c2455f5dccdc79fc51f0ce1480d2cd983d1 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 de8f112ad2940d1176ed1882793e97dac2ac1a1d..fc176992031f9a6b6cb7b37eecc8c714cff88a36 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 bde274337e70e66571302dabe37435ac34aa10ce..d8b1b22508d1d3dae016f0ae733d059bf4c327ab 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 e643b1468695f214e3b1aea21b6efc8edad694fc..c7f95d4901d9b08396435b33e3d953acabc2c102 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 e459828175f2f4c1583c93df31e83701140738ab..b02c9167683969e51ec13656ffccacd6926fc2df 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 c4545c06bee786d430d71faf0eb283aaf798105b..f4d72987e19b38f40e05c40890018a7cdb88d1b4 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 6ce3ff3d6e4d81f9287e2aea23ef4894149a99b2..a26ccc75609282060566c9da5265943f0f4d60c8 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 40a78331f5fd772fa2d0305e3acdd7327006add5..45b58ebeb7ad031a568386a4a891e22231a3ab08 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 9e4f655c78a28bbb612ae1236651d37e20a31495..b14f6d2a545ad78acd9662478ad868f6ad42fe83 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 533409ff6601fb14cb0013cbb81ad8c38411aaad..0dfd75a83faf40cb3f8e9986b9effaff0554733d 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 695dbb47c0e932ca91f053f824c5329845b62855..be2352f773c9284e5ee8ff1c7ad6cf8535926a6e 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 ecd07b55ea2446c1ac1d07358196a7443d2fe21d..5e55687a74ca5795a74ccec2e553cddf68983d3f 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 6a9de5c920895575dad6a1abc46b606a8da49dfe..577c1aa8ed755ab962f1d97da67250e8586b4573 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 9bb973a794214994f6ad0fcd1a891316d9033f26..9ef92e43771382f2b8cca605dd18c0e6facf4af1 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 d4387af5730f33b57ce1d64722c2349c0c657bfc..5be6d72f1116875cc6d96efffdaf4367316df274 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 5f39a5970538b6b7fdf91736675372cf190f0dc2..fec44639e72347e59f2a022870e13a7f2a951eee 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 910a1ee9ff8d970e93c0e3f6ed0f4f24050d45e5..ae3867c07086f957b110a61eaf9fb32bdfcfe7de 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 f0a7d36cb423625e3071e908dac4d98d072297cf..277ce9aee8ca07967eb96ce7723d92e5c596216e 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 e1c8b8c1df18e9602f6513b3cf722c1e34aabca9..b6328c4c002815dd02353328d7f8d1c987e8ef58 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 0a1f540888a2cb0684f66d0568ba961024891ca2..522dc4a9b71dcfe0285a7d4cc3ab245f6d7afa72 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 477a7495bcf7431d874eb8919dbabcee43671027..8f5b21f32b8b041fd37a55f92959282897bb7c41 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 88588a196fa84250f1e8cfa448b48e7991c6f91e..4b1db05aac18b44c2743179cd0e436ff558bd685 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 716f8fd439a25c1a50c612f549ed9fb215e2d1fc..3e891def502c393d018f8660e2559b8cf6e20cde 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 bf0f5dc1769d6d6d205f1608685bb46b2433c883..591307cc95b329ff0a26f23e46c9c5a5017d63cd 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 2f1945b6b9dc2b1281a83bf39b4d0d7aeaa059a9..4d81bde9c758f0e475d06778c34d37e41bbcb627 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 4cc2face5c3b36841e5ef7337b4f8dc31bf10bc2..81120b9069bcd3416a108a31232748c91ba439ca 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 338e3ae40cb2805fec0524d3b960b1310d4f3f9b..cf07cef70a6f3e5cc9bc69dcaad857bcd1e80c0d 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 eea967213e5b265c5d59f9cf329393abdeb5b0ab..3472ecd81b34a543c6dbb47e5af35776749a2945 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 87534d1bd5483da0b775c5a82661ff47a2d65cba..888966cb0807d975e7d9fca9d55faa81111b8026 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 00b6376213f99c2f8dad632f67353a752c126093..a85e32d0524c811925ff8c7be458a8c08c5bc392 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 bc9d676c85df48cd6731ddfaa2290875a6a88270..64df4ac640e0046ce02961e5a3b9b8d6acc3e576 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 5a757a36ef265c47fa04a785240e270d6d1e9fad..86186f25c1bdf81568276cfd3912da4a8f9e3041 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 b5ef84fbfdaf659c1877a195c72686fa1bc9a3cf..8a201875dd1eee45daf5a36d58c0b679b10a1e45 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 f7ac96745cb8573d28fa2db6ed8bff07cd2deb90..f04de3a8ab7efe095630465403786d0309a61ce8 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 b8deb674a9051eb709b1a9116c92c86a83988bef..1eca35eb710a230532913f7bc29afa46e6491566 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 627aff008cf06dae9b49735a3afe19563430f5cf..a014c9f1113293c1ba09e96ff7da7ab09e2262e1 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 d6309400d6852bff0a74a1167593b38e245904da..e4e4ebc7e114fb11238580f4c01faec214b6d147 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 04062ac0371025ff3a9e6d602809bdee791327cd..22affe29e71ff80026bdc0893b59e1583549ab53 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 8411360693e109989f37f13a48605b11181cc13b..d12089b1814e5ae650f3c42c0694dda80df932e0 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 a7cad73b48166d4e9da792df1217d6660c9ed02e..bc5153f352864c9ac8d9add3052a6cf041e1bbac 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 ad3e9c5cdc4645bd2804ad12fafa7d7c284b6832..4b37d5038116149894d5d8b9818b61f0b22a2c49 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 ce7c3883b2a232b81f7738e70832d6e3114c2742..9e377e3aadc62ddb7b88068c9b2e9a960d388603 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 8693f035896687a466af5d5437ab0cc8f2818609..6be4852c7c28dd0982c0c4bedf5243be23e20e63 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 a939aeeba273274070a795044147eb3c132610a6..50fc7905a3b677f3ab9e7ef2d12e88aee7b44dc9 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 bed2dc8872f21a9da1fdf75874ebe68b4bb096c0..5438f3f2d1d4a8de6084af6ee14de1708d3efe84 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 7e3f2526313d482ff5c16bce0923a33969f4b1d8..0b61f350380a7f3a192ea901f2beb8e5a03f524e 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 74070b4e1e2449fd1b6b80f25f15ce41a8163ad7..a73069d12161e7683ef031a5071031f8efafac44 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 9f02f09a852b6ef26760d081376c127d8957edce..6b6f74e740830343617eca972dbcb12e955f50e0 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 a07600f1f03179224a67cfc99c7993d45df3f5b1..77103efbc6da6df0f954c84319c8265d3fa515f4 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 30dd86cba5d39c89a8ceeb17c8c386bdfa40c1cc..770d92098322633725d253c3cb9fa8a82d726868 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 3f05ea34674d69e809bef87d3374c6408de7eaa0..2feeccd3538163d0f0f12d3a9b2db9d9888aeb9e 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 81e5bd5748d5f2dda5e23d2a23f2f0c213a10486..9a4ab55206ee49176300fe7cce41d5f72895961c 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 9fba797dab3d9b15c5beff88f0c613a12a33d8d1..579d493aa9d10e5967dd3e827ff79673010e4044 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 45d3effb97a14b67a203885b04e64b262be662d3..5a6d53fa91c4ed7905cc75b1f654f9dd77049f8b 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 37c4268c23d2cc5616be7e0d970d083be81a3d98..901ca9c28755566da0811a8661676e6159acea28 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 7c4487a781971ad40d2baabc46fbb79480ac9811..931e144828434ee86eb3bd0aa50971929906483d 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 73f51ffe0b7bf85284a609ee46a1b9a5eca98296..0ebf41ab6a86eef33fa094aac13fe871d397b73b 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 53f19c5a63826d9e09f9c6e0e32f0472c6d87015..5a78790d429b667179c5a64f5278d9a620225148 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 cb843c9c56059d452d028f1b3794168c60fffab8..69bfd949ae970bbadf05d65e95e198bbf177d0e4 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 ed14178bcebca9bb7af80b9ced3cf5fa2297338f..b5a7ec79948bcfb0cce37aeb064e671dd0089045 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 de0c20c6238362ed227659b6400f881ee31c055a..b12daf1780b46cb4112c8d64d3b2f57ba7be31e6 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 01c265ef3df5b3324cc877e96d9df94cf9b04b07..e02206b0f422b0ee424a38850e7c133439a0becd 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 b38aa1d59dd559533af05a1e7a7e295be72a88e5..736134427e390a119d2d433bf9128e755c95fc27 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 28646c875611f7aee08683e8bf6ee29d2177c715..95458d95dfd0dc3563021d9bc2eba0058b2a6bfe 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 67fb8c2d649d0d577c83a14e8cbd96e09b57f394..f3a589eeb50bf612a1e28c0875bb33daf6f32f22 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 ff9b3f9d0ff33db3a87457b1da38f4faf7bcb3ce..ca39c25ceb9374053f9907829c8f830b99c3d530 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 169e4437c2ebf604de4f287193b61c237baa89d8..11a6eb2f8b5831c759c169e92461c3b451d27ce2 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 e6a88df7bd1e45ef5890b472e684ce8ca4763199..e15f46c6c67d4b6265e2583581ab5a4fc8a8aea6 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 6e5a63daa180106157554a8618cae73615756ac4..7225cfad8476ad8b4a135de1148e80f84c63d8e4 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 a0c5dded82c3b2a32bcde2c2cc8d354ad8dd0601..b26825a8d935c8b75f73ff008b14b8d015c5316c 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 a7a0c9682a182713b304ebfbe021fa1b414336a6..263e2370809bf0fc0fd3b1ac2371454297157033 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 c0eaff4ea8c9968008798916de08ea76e94bba3d..fa091ac381f4faf6fb63a6feea06deb8c8b2975f 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 fd8e8f9eb0dedcd3c970bb9b50d244b6ee250da7..b5a3ccbc40789da6476315a9fbc7366cbd67f51e 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 b1d4633edbf7ae526ae3b18ce67d0916bf7f7ac6..a0d0c8f406f3687c26de34df90f584f7a5d1f4ea 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 987db81dab59165c6edf37a7f61c1115eca95d31..9c561e94ae8a196ea71a4bc373e670e192f36950 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 691ea02e88570dd3cf17ad7cdbeca2cc25488524..164ba75aa45bc6177a428ee8d21e73c99682eef6 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 c6322c4045f83528846abe051c4f3d135e4b38f6..d52751873b7d981bd5436f9e6904bf10230fd414 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 e00b351b661549057552a12bd1c364ede415bb7f..605ef0011cd2c33673f1e2916264428381239ad5 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 67a069a1b003e0d28f0776b109459b93ed8e7d16..d570e0e2cb1cfa6491103d043bdedee4b759d216 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 5d28a9505b72041309947dc45291d6d5b59eadd9..22564da5c1358f6397e52db2cf5301a7bff8ef1e 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 d4bd6da2afb82b901dcf0720873053eca6ac7a71..c4516d0d201739fb76dbdd224a52cadf13472ca2 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 99e12cd8733b1c5a10aa35598366cac0c87e004c..441eb289cdbcf75895d7e6ef41b3e6f141545903 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 3e1ae4fe258d20130e0e94e32617913463fb6f85..b6345a2d3dcc76a67101e8ddc20ee98e8e5ab644 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 2c052f1534fd81fee91dd3893dee532246326655..39a48777cefc11336be48bdf3286defa6978a761 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 16955b89cb5bb784376e3b39cb442485bd593512..3c4f6259f77db1476a145bc3c7f6e0c190441c06 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 91bef595c6f8fbc9d489243c9663ecc63bf48c1d..90cfce10d3873dfb8c68c3d90a11df565d9f9d53 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 c23ea96cb7c54b15c69478525928fc0dd8bf5cc4..e551bbec1a694e1c33695d1b4ebbfd021fcabf3a 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 fdf439f9c8148366cb9e77b790cca6c309d7aaa7..e0bc85a9d049c958c2ac040a8ca9090954b35824 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 9891a768dab302920802627766c21a38d3fc2502..b27cecffd96758a12a455e97f85b509440a765a8 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 1ecf59d8cba405eb3515b66c37b159a182d94bcf..e1605561b10a68e59e08961591373e5262b289a4 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 72ad9ac9877712786ad756f8c363150dcd372942..103cc948604f33a6c2249ac16fa131d8248bc915 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 36a73e65e8d18f59a183af698661d86e9abdb84f..80526c918ed3f62b4e83fb020f8de7d7f44272dd 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 20d7db5ea8030c20046e200879610a08fd5bb85e..a6aceb58e9625f8e61532ac0808ad34675fde28d 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 3d3d1832996fc4f172bd4997f20c06eb7e38f487..8b5701bd9dfd138e5691d4776d9695d8d9b5f42d 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 030053ef8063da7763ae70434bf878c6272af548..97134266191dda72f01c13b89309828c6ce05eff 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 dd4566c5c32b4682aa906fa7c92516a667fa0897..f253ef1b52fd77a483f7fc1d7aab2e8c346d6f8f 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 151580344afaa25066a72f1572b30acd33faa968..2ab6485c6e43cc1e56f927e90f902d3bc696a79c 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 5393f76dfb99a12b1ff6ba88a76fc133bf8cdde2..1d5be0b5202c4dde73c6c8408344869398aeecac 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 902079af99bace5e4f6874cf66f6ef4368530a5a..d92ef57e2b1a864af37e216970b9c53b6aaeb1fb 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 dac7100195379fa54d987d081fb80cf391bda8e7..bdacae9674d78220144cb8541fba01d65781b7b3 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 f73b0986d99225e0afabf1b6b0124800087f2dd0..65e39d9f948e34f65659eee6650712705f9bcb62 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 d113f04350bb7dff708bc2aa16bbce75ad18d7e3..9aa5de4d87286ef16ff999b82d0c17bcd10b017a 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 d09d25148a5f732e21b7e9c9f62eb76521479c5e..8caf42b9c398c846189681ea7addb126c15f3bd8 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 fe9afc27dc9cf590293a622cc822c83d547b91be..70cc244a5e8ffa7a2debc54e01b4fd06144b8ba8 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 df50eabbde50ac4fac7cfe876beaaa958b2b6374..ddc8b34beba75784ad15ccf1ff4332c6471a35ac 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 c86ddbb586d8f1ae0a0b4007b169b628f082447c..4c6222cf04148eb5336b4d99d8610eaacc55e21e 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 faa340203e3c7438f97d98ae465185bb8fa78c71..12cbe46ea7a065573581b6bf80ece35dbfafcea2 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 daf18098e0042e74af5fd520b6f60fb71fdbbf0e..22bf6e52dbde018155481f4c33a4a329de31d9ec 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 eaf241e8915aec0d48da02c22d8959308b65c93a..67254d680bfb724efd29bf3fe1208201c0e5f650 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 69766ad88a966366b0a9f5553469c32b9f6de958..97d28ed8a234fc4800fc72d7005ed23160e2eeb5 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 16006a97aa8c68a33f357ff7531763fef380c35e..3a2247592e42acab376be2dafda20c9f04429888 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 5fe8e33ede78591fead5bda4e8efd1dd9c17bd6e..97719beeb7b7c9958b54c3c74b9103624fba7e80 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 178c9ebff059eb324a9a57ae93beeb910df094be..6d9184efd1696650ae83495c88ab6246ab36363a 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 ca992ca27d1686f965167ca22b9b3493c4927bc6..cc1b4b10f8b111a4b44fa5a0fa0a1a1ee89379d7 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 2d58e483a9fe2b1c9a46e6a319a7589015147f10..e8a7f3c9716b33629d409565b04091045c06abc8 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 c20b58f183dd4f6ff1d6156328316776b1fc793d..e69e04c67a64414e7f8893f689960e585d8eb78f 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 253d89ac702731974f57913a15def83f1db2bd79..eb9966e55fb549c8d7ed5feb51382c4d46967f1a 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 61d63e7d4cb8005797f115e013be9ad95dd4ee8c..3bc315ada3c1bd945951d9072564d8a80a5dc869 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 d6a8ef8df4f731ec37124703455d8cc84f3799bd..a9e834697dada5de500a6a9c3cda758b312db050 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 156f3cfd75c569fe1a41405651d38ea4e25e1f5c..97df674e3e06bafe54c47092bde5f092104f752d 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 7448f129302b604322ff2653c5f72f64e26fd7b9..74b8fafac541c174724e5d6f54f9a608f126edd2 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 ca127eba21629fe4f85e599705515bfbbe1aa61f..ac24f43a46088fd6ba7cd014f77c9d87ec56a32f 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 df5e3cb2e57d01fc11b251312dc76fa8a3f795d9..f9ea6eda69d6ef57df6c520b8c3f3ad43f19ee6d 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 edd596896f4d89648e27d5250651fb87f498d8aa..1b52b150394866e9025c9474b0e3a111aae08ef5 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 7c2f81def55afc04a8d314b6e70c63924b966129..0912490265406109313d786f763da888fe3fe472 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 f1d4ba7873a07cd81777913843a5c9be9b7daa1e..c93ea0f08be7a1fa280e3abcf2b79c223f05782f 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 c913e3a90bb9af0258afc2a7b083fd226a361d75..b3c903115c5884897062822edf0df1ae29116ce0 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 f1bcfd9ab373ab12530fe7052e205d9585ff9853..8b077a0f535b8dde814561da458af4e0fa57f8a2 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 e0781446a83117568c3327d663c3827887d50627..c8f980f882daf9162b8271024f99539666f72511 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 9158e6fc310dfae373127f84bfee4093e0015da2..0911a90c413d615527bf28222c33122709d290af 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 f37ddb167c2a00e9092ca35e9ebbb93d6ee9b291..8e98dd2a1e73d069d519a3c47fbc0bf1540227b4 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 c767a3997373fd338641ce01f656c6946254f0e7..fbefb5b3cfcd669ee04bac65349be87b0d13c18f 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 5283d573c820a67ef09bba20e93452101946cd8e..a64d9f0850ea9fd961de8612454ed678934d920c 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 023cf051c5ca08974d0ebbabe00cf9350b7b7b75..073be4fe85376e63304716fc937c07cebfe54873 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 b120bcf44a788fc36e3c6eefcc923c51d6d7a1fd..71fce9e886b7df90be8eb29a04d7c86baef9a8e8 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 8844f562b9e06acdb65305ee67601b0e0150a1a3..943c798722b09e91d5e7f0c8e757ae0a3b24be4a 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 5db426768b733675043b79c047ca5db29eb399dd..eae566dfbb89046752888d2607d597389b9688d1 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 5160d1e64212cbba9a604ef4eb10c90198d2d3f0..5fbd3d69d5a5f2458f0ac516e08fb8abc4460de0 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 910a3cb2dc435a83caa62e43fa73daf5c637ca3d..3dfd6c194a64cbaa43671ca52b9b6c6cce26ef66 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 42a66eb92b8584daaf373c25519c0134f4123866..1f7d8207abbe5fe9a31869e6830c31af4d86a1cd 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 fe31e0824129f81c5c517c7b427b7efc65e2c476..5561bb6c03a8e1d53e2578d955e5695f99aeb330 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 f7dd9328dc5d5b259b73479e50c9f2bdc9e85b31..09b86c06be17e0ec0d5a7d87b9b0c3fd648a0c4a 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 84f75150ef2f6b9c1d570c179b7b88a613e9dc5b..9a4f3a7f7e15e53a6a9ba653443c181effb74222 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 f11d366b254acc9313becce86a3cc5a705f3fd0b..fc64e904f4969b24f64297f67db777620cd8810d 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 4832a790c53171c8a1afdc6decc8312a3b6c7689..9575822011ef21bf19cc7f3d5e2ea7ee9b0fd597 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 26283062ecddab8139d2fc24c920a6aca74a8f34..6a71d32432143851fae78e7cbe9ba4015b1e229e 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 b01cbaae345a0440d13e9f29eba026f98026045c..5234b6daeb22efbdcde05bda9c4e301b65ff7326 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 ddc9cd1a06909c8b3e70a2b5b2a4a99b39de217c..23e3b24881b03a50dbdbad062fd1bed55b5a0b38 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 0261d42979e0d8cfc65f6e09ab6ba782f4e2c25d..bce0476742f578c979290bbc93cd5e12e62c8570 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 5fc72418f647db4112f326c85b81629dfc0f5da5..5a5f88760161fd771e61b5cd904572c0950cd610 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 4e12d2e40ba48a6421b2b15f73557034262de4da..39bf35bc8cafddc4305fd95439c82d77fd838e71 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 7c309477ce641c52b9744b590ee6bc382e61c2f8..250cc2ef11878e1a3ba6498c95a074d936ce30ed 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 d8dfc6e3b69365c45f0efb2fb85c4470b903cd90..afe5500525b58c7ae7907efa612ff8816de2fb8d 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 82b5cfbbd2bd4ce2549c5417bcc68e33849146fa..1e6d526605081306a6342de09b8eec65b566b257 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 e46ad820107ab7669aa6c084699750296a032fa1..29413348f3956641af1466e5dc72ba13dcd32c91 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 abd3d4e80641df779440edcacd834e7ff44bdd5b..b79a40cbed97b95fca0578b508b506d4dfb2d93e 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 40b914a0548c3210adb39fcdef52764dbf3a5766..e09725f97aa300f0ed650e8e489b823086903704 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 15e3d0ecc6283d8b199bd368a693d28971a170f2..506d2fbc438b3eb6780540593218c7d23d2276fd 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 2023e72c4d78a6ea8d635aaead6c3359c06a8a64..794c31e0e95ad36ce07bb357efc23767d5ef32fa 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 52a5d34d67fc4f24bea0159c0736d2fcd4d3ca62..8ad6f38b78316c6e5572e22f1575ea4b0d0348f6 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 203ae577d268afbfb73aacef718f49c432ff79ff..5a86a0090713680337073f2edcc5494deb917924 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 5fbfe4bdfd910fedc5d3c87d7ac3fc16392526ae..0f86591ca848d4f118a86db190c6f74fa94de885 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 64afdf7db396df24a0eadd7ed5b1573bfed4bb1d..f74e977649949a00e9b26b7228529629dbd0dcb7 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 aa302401a5e522339468b2d9d6e9343a9ce7e334..7b9ce75f3b001a48ef88d5fccb85d6567a4fd0d0 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 a9a479a176ddb651c0c4d4caac6059ce91761c4a..bb81e448504821673d6fd26871b28198de1abbf6 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 13e95a279822e03ec2135efb671be9c211b8e325..630b377411ff89d0f5492d3b389ce9ce7e93b4cc 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 6256ead736aa797aebc8e7863cdf8402efa98669..bc4426bfd23fbbd8c1fe0639073117e5c06265a2 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 a99a78f3f64a5ec47a9bb9e69d8fdd7133ab30c9..f60c463cd4aa929bddbd16ba5ecafadd21885590 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 a0943adc75b40b3417f2b35e5d833c08d33e64e4..a18fcceabd65dd0386070938713104fa9766516c 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 0f37143055aedc06b9a56b416a049ad28dc67be3..3019de54251475651b7ef1e85780f9bdd053e1cd 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 4075265f15f06673987445b9926e9117ede708dd..2eee1ae010e18a67fa23c15652ef24e820c7ab5a 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 d8510136635b1c782d7d3c9e82bfb48410e8c3a2..3a3f6a6383ee47b9afb06f4a0caffa3a8ee6f7a9 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 3de2a6cd82ba068b3fc4e6c512adc9f807054106..cdffda125ca02b3812fe055b1ebb946fbcc2b49a 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 7398fae862ad21b6dedcc112c5083319f1e142e5..beb27cfa6606e47b5563da8cd18b15c9e77cb976 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 0d2f8962a93f9a5d523fa0ffc689985a6bfd6c88..adf8c68cfbf4109586a4ea41f9eb2641642fd517 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 a3d03c24ae443098986ca42d0d0ce8b0493147e6..8bb2036a90fa98d6ad8439fa8787bc75bc7be6d9 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 f09b66f4610033dbdf56b5bbec70c2afce6a0c53..219b6b759080e64c1843e86af99be5c4ae72d1cf 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 708c2d8ebfe6b23fe1ab472a13698bb41e159a56..c606bebc361b2614f004ac77b111f601d176248b 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 e171946aca068cfc4ce84b14c72e8ddc406137e9..f940af89ec1652d5d6ade6d453beeab8b1053e14 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 6a4d2fd405dd95bf4e45dada5034d6e4a1074d32..3a2ad00aa774e4415704e3c04a2fbff9075369af 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 521306b4ad32498b0e70aa2d8820efdab7e0217b..bb1ce9d48ddabb9165365ff93b1cfcd761199388 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 fd21934b72acf8c0213f5fa64e65966ef43e5e56..f76ca95722287ab177f029f98904979907a3ff29 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 0e9295c8cbed7963c7a54c9aeb02c5a7eb546f6e..2af4a28e9cd305435609db9903fdc6f17bd4fa6a 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 70069536c728d9650ccefaf694e63ccd208b77c6..4441f3a030b703eb5011d780eb79f2a0aac927ea 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 29472b9891734129db862ff18e747ec14e253e67..bf82165ef4bb1f9c5027085e459faeb88d4f6ae9 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 aa65675ee5c0b2748069d1bdad393a4582e6fb40..5791d545c4dd8530835dc3295812c0eb1d25cae5 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 250114341c33387e658e1c5c87f9eb9968ae1e83..58b752f3737b2c24955a185be2d08d7453c52519 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 50168fc950228543111dd2ae016e1c094496636b..136932a66c584d66d4fd69ce85dcd7203b16cc53 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 ac70478dddcfcb3467bb4acfeb974c667313cdd9..91da3d2d0c3a93dca1f2d50225a9bd4a1d5d2de8 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 74fbaf4d1c0b71ab1ec29fe536eb4e5e6c3e5324..ae93efdf6b5924839fcd8b0222026a65bd51856c 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 5c8b67f8fbb46d1408c9ac1a34038ca9cb06ff1b..b6025a1829933f099fc3aaa296c39d5a630e23ef 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 4c95635b95691f0c2774be9a140747fab67db87d..09437df95be8248e90c4e1c807b7657add44368e 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 1779f43f818254d1ac9e3315dda9d295818361e2..0ba3bcd2f9a22e31b46eb185e18c00fdcdd6dbd2 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 b948fb1cfaa937ee1eb57f518f01fd6c2067ca88..41eb641d1b21c9325cfd39f9e839686d35eeab74 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 ca252b147a3e8fbc70459e12f6d5acdfa313ca6d..19a9958c5c4545fd2ac81c297a599c217d03ccb1 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 ff9af645b0c10e3d12cb4f98a008ced51e0fb0c5..0e176d75ce230c19c09d192a6a853cd9c658842e 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 b275b3198e6bec824efa36fdccd7688c4dfcead6..d33ec755cc08a7f6df17e2788d3f6f10008cabd1 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 e1c6cce545f8b0dc56f5a7c34085bb1db47ffea5..aed9bcb2292c0b67658684a2a2bf760c115e5b26 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 db04a5a1cd9a9e60f8e8fa85613872096ddfa0df..3b1f82e94f09fac93cf8692258a0b3007d910f29 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 bc678b56708b60d0e74395f7291ed25cd8ad7cb3..cb2f7f65041a0e354b6a4a0a1560413ac31c6ea4 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 eda0f93b71f933ca06f5c417fb229e51d9f9c15f..7084d0125db707ab544fbcaec9089e12530b6fde 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 3e69bd8f2b5cc1e3a81ee8e872e6812df1ebd8fb..3db52db586e8208e49978b731a4f4860fe0abe0a 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 e9732d869af236ffbc9d78a2524ec5ec03d0adfb..a0866e9448d7286569924edee103620a21d0ce54 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 3bf4f1eae0b6ee430d58b7bd5caf3179162a2f36..23057009c0ec25723af59e697729dcbcb9411a73 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 74783fc89d9b4905294c02906639579e730a26e9..3fe87d7f1ea671e9d93b5950bcfe54c1b6ff2685 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 87ed0bf495cfd5ba96dd34d1ad909e25b160fccc..55bab453a9ff654ad558bd985877859f46bf49ad 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 5d16e5aed1dc6941876acd990564c47c55e8b877..4bc247317c12a6368b5e4c429886624819aa8921 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 d51160cbc561e2f1f8feae8f6c184dfdc337962c..482eb104b1f504bb8967a95e70851050ee903d30 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 5ab895984a33e9cb63a8e8d4fd5e8f9d78ac3bf5..3758160ec242a7fabfa0928bab936fa3827ffabc 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 b8f15f5939afcc2d8581316bf167ae6a3970c74a..084aefe5046733e65d22241abd89af76d46d3f51 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 9ebc0387f09849ebfa9e35f6bedb05792c202241..15d2f333535d8af4f708e055c351256773948911 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 feaccd674a33da4cfc4e9aae6af42628b1b3a02c..882da39c16bb733259b4301f9d4c0272aa496a9f 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 cc4e7c5cf1009f7e206a5ad0e335a81fb2022b08..f50d1b307c384cb78721885cea874fe2f01faf17 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 2c9edd9f927cb8b03a38c987fb41524ae2ac5b68..159f81e1b13e774dc369d18a3c2de7cfdddff99f 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 e334b119c2a5366d701ebb4757afe06ca406701a..74eb8388e47dfd57142e14e986dc380899e811b6 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 9b9a9b06f6a098a351172db37989b3011dac1b6a..a961077c938cb2c08c488e8b6e5b519c955ae654 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 6198ef1cba4d7e05adadec1d1b71661355d5fd00..da4449d9d7deb6a3af247a8ae94b2bd68e5a2132 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 425cbf538bc494b9af7e7d6fbdce373ec8153027..477d2e444900aa084ca114d614d47d97e2d74bcc 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 cc64447acf668bafedc317d164df08e84c9ac1e4..431892dac590df4242d4436990ff80a0b47e9c8e 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 4c3cdfd692da99be38855cc4250d484f9f76d458..48cfd2065b65709dfee924cb43ecb1efeed3ab45 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 402b6ea000d5d5cbcf4c98135673b6411c414798..8f505aac4a965bb975f47510f57a846fe58af472 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 f9f8bf918f01cd937f617d7f933d8f9feddb4c44..3eec55120d99e753fa20ffe1df337a97237518ee 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 5299972dd5dac311b0e04a10be62ed3032386a73..9e2e1de1958f6480c88f167b61bbcd788c82f69a 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 2273ecd85dcf79696666ca468e1d73e83f06a472..1319cd34f0207140d9712cd71243f1a980c639d6 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 d4851385f5d73499e3bd05ac3330aab7b3a33d80..43ea5d34d72477db7fe98f14e30b7284ac9f4009 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 d4e4a13982cf81e0a98f7fe2ec782aabf39674fe..2fd9c5bf1be34c007b24c991a86ec333ae32c85a 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 9e05c08e158a4e023b3b938aec3eec6d247fc5cd..58683dc886ac62bd703336f7325c4a9d7488bbba 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 11cb2caf4c9ae50afd660d19255ded6a1ed45b08..079f5477b1951e2b8d4d724f664f5f047c1f5517 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 df1617ded832b6ca96555890fe1a6b6a3fbf290b..52bad38cf808f6988ac825c4df2e7f3c5bc7ed7c 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 7b9212b4573067aee21ed6db73094c1429556fe7..df159b252a134deecd6b41d8d95d1b96e944e17a 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 d855397a42a58bb4c813f920d3ae55cb0162862f..213fb7e3d772496ecb705985c88a563aeb1558b6 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 e92ab00575c2406c49e3bda627ec3f20dba12e06..4887a434ee5f1e209932afd0bcc33a324b0afbc0 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 d02f55285d1dbe04568b9671ff28698242ef19c4..64d61581d3855f1331c748a657e0e4af50b2ac75 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 daaa372891c2328dabdea0610687bb9677765301..b0ae4b5900a817e749a4a8d79acb49a45e6b0854 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 0422929797780966ad4e6c92c7410cbff8e83270..3acd61fc1f66e9007c636cf616c187f62aafb721 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 829d6feb2a7b83a9f8540fd57ba8a16c22ca2208..78dfb5c9fde59e79fa3a46ea4a8b1a656c4cca97 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 f919f42a3c8285910d92a6ce00bbaa94da99b651..6f6be407cae9cb8e01f12bdf4403ac712c3739d2 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 c3cda888358588b821a4224000858b25c0a072e2..513532d1f62fd608300c4a2d7e4b8470fb502328 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 f47c1db013f5d1a58210b69efab045a2741ed995..79daad1e14dcfb1a16188a8b422609bad2427b4d 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 3e492acb986dc113fd3eac96603874453a9d56b2..6bbc06f5068646060cf1bb740fbe94d08f847523 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 74dfa7758729a16dedec7a434c589f26f3bcb6f3..68ca5838cc01f64ce468b466b98eb0462a640582 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 a57349b8cbe4e97574ad0c245750d47bb349b6c6..fb7794ab1a8214b87e7a8554dbe33db659612a57 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 16a7e8e03d5acbf20f8dbdc6e4dcbc8166674202..8ae08c4919b1ccd5557a81b2fec154855d29a6ba 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 6a5a6554797362047721c55859bbe31ab7b3d603..00da8b8f4a2b30dca08e254aca2e5046847a4b24 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 204ccefeed85d6b9ff93115a317222982f5f8570..909846a7e80e0166322861f2c39766caeb383fe6 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 6583e0131e3ba7d69710411fa95808ffc481a412..718fa09384f0faf0ca5ee7f9d568acb2985c1de3 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 8987a69f615e0523e36e0472ec3cc5bc3c70389b..e70dcd12023ba20d57ed6f84b05fc00b44f4b978 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 f4f2beb5b5918e890c7550e012ff6bd381afca80..711e17851764f88766081d66aa47c21352548016 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 9c4f219694cd179f2361e3365ec6c8a9cbb6065f..d18f1ca56ce5b2eafe371b77ab93b473354a2b04 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 65faa33854b9d76eea826b03de8916d5f12415e7..8d3fad94f763f67d19b1ae35b5ab51b169b509a7 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 f041aa12c627588fae2483de70cc6bad00ae4a83..a7d87820ebbc106ea42e0a9d9b03671753c22925 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 a461ac6f1495ce1f1c28678c61535c29f7e13999..570da88c313f882b6d553687ebfebcf5fbd0a033 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 01934d23140d530bcb4ef48c85b611c4752c8de7..e66107a86a3b5ce1d199607d76c21cac7912bc03 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 007681d7a39d9a47a5fcb33f5fde993fd133a516..d0275de3c43f0255efd818905523e797205a33ce 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 877184fb63a09e0c421d81c92da4ed601930de32..8057c602114cf7c4ebf08a99becd84bcdcd96629 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 cd85f21fc8dc8f4c5e8a6f4be9e719c27a9f0c50..2febdbe79465460e9a6cc2e8bfe50b823d7fac49 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 c3a3abe5071eea02dc4adccfcd3ee7a5b1dc701d..96a840c8851b6c47c8684aa890be385818d77dc1 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 574809a1b0a0d964e689da4aca8e3bb68713ec2a..330131ce2ffbf296bf38391367b730dbedb31785 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 708265a68b92b95a01b32e8e15d964a0f184c53a..da78e5c90a43491d735096410261882082e9f955 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 8c96fbe0fa2f4e28e487e8035beb5d59016d9d15..dfc94f08180eca8a08fa3079e5140cb944d8566f 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 61201fc6a0f0b65a2ccfb94404679bd5365bf31c..2ea1870a4bda77f35688ac91cb700d29e7da8274 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 fd061360a6d1794ff5a988321066ed494bcdc2a2..d6dd862d983638c3f7a78043c4c1e246f60cc43b 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 d3c4c48f4843f611c3177a2f25b71515383d2e7f..14f89bd4f2d73ccfa12ca3786ed00f69ba54bba4 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 181406259935cf80a3b0a706197243d41a59ca5d..b925f6a32f328ad743561ea10da5e324ef4ce8f1 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 f2cb5ab147d5ae9b6f0ea2a7f0dfff031c16e553..f3bae43e2e3ab0aa416951f89456825a00247fbf 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 aec9f3636171f33bced373c0e0696df510c31959..f9781fedaaee7a7d74b61d286198feda1f78c0c3 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 cf3dcc9c588b8ce3fc497e154377a559e8d53513..ecffca9dffa457ade111b3d9c4a4a26c5369777c 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 a74e00806086a758ed7a1c5f715c86396f72054a..4812e1f4a3cf7e20c39c8e31f1b8ac0b97a356d3 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 9c9eb8fbd12cf5d54718b2a1f070ad24074b9f58..9e0a8eec659942eb7f68d562b969609748f23ff3 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 a27b31a6b2b35d308fd832cc6d4d0ce99e2120dc..c83c6e115bcd766c0d34e6c4795eebdbdb8bc7a5 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 a5d8d66ba936f87415a99c7c8fb6ddf1dfa9833e..f56bcffc560d7ddf613235b2cfc8375cade83155 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 dc9f2363f3e0f420e2cfead9c62d88576ef4d8c4..df22afcf1fd490af2b86bb33ca72e79d69ce48c3 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 c546c7971b988dc7218ec8f156f012d5369a7534..74a606252ea95c42ccfd8c781ea5071e9b3806be 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 f009e9a5619e8a8ee7fdb0c84421c29636416e9b..3f0a3a47892a41f8c6c85e9eb5311d7c6033fc11 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 c288d1f5bf52485277850289c830a17c5997fb3c..4af92f92751b2f084fa1935e28183cab8a5cb9da 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 c24ca2e549b5f98a2e376ac6f422bb2b6a3deb6f..ecb78604d874d7100e828647e560e54fe2c3848e 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 cda7f113ad8390a18607239516db9abb85526ff7..9c362736eab4793da95defce5f468f5a37f07504 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 198924f5da787255fdcab571b73238e5d5d24b45..eb4680eac9894c64b2ad5bd17ac43f1a5e434b96 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 715db388487170fe3069bd1d508e8c386ba89f13..970343c0351a9fbf981f281933dd2464818e64f6 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 63349fbaa267971b3a06d277e02f4d449dbaf125..32efc776455eb33bafe5c985e38b237e6f698090 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 14de6b75a6519737680ad15c1e5bc5442add6018..e62c75225604419ecf4eb534eb82266d3915a7a4 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 f383f30bfc24ec58ee7fa05e557e152caf098f6e..532a7e0806e47292eb3102a7366b41de543cde8b 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 b3f3d5fc4f079f45a2d00e3d51f0c705918491d5..aae348a84fd7d3d7fd5e5b83ea08bbe932e123ef 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 12d51eb2538b2a0d78ec530cf32a34f9a4cdd3e4..9bc17ae1d3467c8e1c199a8b959ba37e6281ff32 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 5a91b238994d42fec751c6eaa8057b003b2f09d8..d08a3b76ef8383ba0f8e2f52632ead28ab14aad2 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>