From d3473090fea158ae92b84ee565ab760728687b7b Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Mon, 2 Nov 2020 08:39:50 +0100
Subject: [PATCH] [T/M] Rm '_pcs_0' / '_pcs_{:process_id}' pattern.

---
 Tests/Data/Mechanics/Burgers/cube_1e0.prj     |  4 +-
 .../Mechanics/Burgers/cube_1e0_mfront.prj     |  6 +--
 .../Mechanics/Burgers/cube_1e0_mfront_mod.prj |  6 +--
 Tests/Data/Mechanics/Burgers/cube_1e3.prj     |  6 +--
 .../Mechanics/Ehlers/MFront/cube_1e0_dp.prj   |  2 +-
 .../Ehlers/axisymmetric_sphere_pl.prj         |  6 +--
 Tests/Data/Mechanics/Ehlers/cube_1e0.prj      | 10 ++--
 Tests/Data/Mechanics/Ehlers/cube_1e0_dp.prj   |  8 +--
 Tests/Data/Mechanics/Ehlers/cube_1e1.prj      | 10 ++--
 Tests/Data/Mechanics/Ehlers/cube_1e3.prj      | 10 ++--
 .../CrackedSolid/griffith.prj                 |  2 +-
 .../EhlersDamageNonLocal/bar/coarse/bar.prj   | 26 +++++-----
 .../bar/coarse_elastic_tangent/bar.prj        | 26 +++++-----
 .../EhlersDamageNonLocal/bar/fine/bar.prj     | 26 +++++-----
 .../EhlersDamageNonLocal/bar/medium/bar.prj   | 26 +++++-----
 .../EhlersDamageNonLocal/bar/p1/bar.prj       | 26 +++++-----
 .../EhlersDamageNonLocal/bar/p2/bar.prj       | 26 +++++-----
 .../EhlersDamageNonLocal/bar/p3/bar.prj       | 26 +++++-----
 .../EhlersDamageNonLocal/bar/t1/bar.prj       | 26 +++++-----
 .../EhlersDamageNonLocal/bar/t2/bar.prj       | 26 +++++-----
 .../EhlersDamageNonLocal/bar/veryfine/bar.prj | 26 +++++-----
 .../beam/3D_hexa/beam.prj                     | 34 ++++++-------
 .../beam/3D_tetr/beam.prj                     | 34 ++++++-------
 .../EhlersDamageNonLocal/beam/coarse/beam.prj | 34 ++++++-------
 .../beam/coarse_quad/beam.prj                 | 34 ++++++-------
 .../beam/coarse_tria/beam.prj                 | 34 ++++++-------
 .../EhlersDamageNonLocal/beam/medium/beam.prj | 34 ++++++-------
 .../holed_beam/holed_beam.prj                 | 34 ++++++-------
 .../notched_beam/smallbeam_3D.prj             |  2 +-
 .../InitialStates/equilibrium_restart.prj     |  6 +--
 .../InitialStates/into_initial_state.prj      |  6 +--
 .../non_equilibrium_initial_state.prj         |  6 +--
 .../element_deactivation_M_3D.prj             |  6 +--
 .../MFront/axisymm_ring/ring_plane_strain.prj |  2 +-
 .../MFront/cube_1e0_orthotropic_xyz.prj       | 10 ++--
 .../MFront/cube_1e0_orthotropic_yzx.prj       | 10 ++--
 .../MFront/cube_1e0_orthotropic_zxy.prj       | 10 ++--
 .../MFront/cube_standard_elasticity_brick.prj |  2 +-
 .../MFront/disc_with_hole/disc_with_hole.prj  |  2 +-
 .../MFront/square_1e0_orthotropic_45xy_z.prj  | 10 ++--
 .../MFront/square_1e0_orthotropic_xyz.prj     | 10 ++--
 .../MFront/square_1e0_orthotropic_y-xz.prj    | 10 ++--
 .../Mechanics/Linear/MaterialForces/bar.prj   |  8 +--
 .../Linear/MaterialForces/bar_3D.prj          |  8 +--
 .../Orthotropy/cube_1e0_orthotropic_xyz.prj   | 10 ++--
 .../Orthotropy/cube_1e0_orthotropic_yzx.prj   | 10 ++--
 .../Orthotropy/cube_1e0_orthotropic_zxy.prj   | 10 ++--
 .../Linear/Orthotropy/m3_3Dshearz.prj         |  8 +--
 .../Linear/Orthotropy/m3_3Dshearz_rot.prj     |  8 +--
 .../Linear/Orthotropy/m3_3Dtopload.prj        |  8 +--
 .../Linear/Orthotropy/m3_3Dtoploadlc.prj      |  8 +--
 .../square_1e0_orthotropic_45xy_z.prj         | 10 ++--
 .../Orthotropy/square_1e0_orthotropic_xyz.prj | 10 ++--
 .../square_1e0_orthotropic_y-xz.prj           | 10 ++--
 .../Linear/PressureBC/axisymmetric_pipe.prj   |  6 +--
 .../Linear/PressureBC/axisymmetric_sphere.prj |  6 +--
 .../Linear/PressureBC/hollow_sphere.prj       |  6 +--
 .../Linear/PrincipalStress/sphere.prj         |  2 +-
 .../PythonHertzContact/hertz_contact.prj      | 14 +++---
 .../Mechanics/Linear/PythonPiston/piston.prj  | 14 +++---
 Tests/Data/Mechanics/Linear/cube_1e0.prj      | 10 ++--
 .../Linear/cube_1e0_simple_shear.prj          | 10 ++--
 .../Data/Mechanics/Linear/disc_with_hole.prj  |  4 +-
 .../Mechanics/Linear/plain_strain_pipe.prj    |  6 +--
 .../Mechanics/Linear/ring_plane_strain.prj    |  6 +--
 Tests/Data/Mechanics/Linear/square_1e0.prj    |  6 +--
 Tests/Data/Mechanics/Linear/square_1e2.prj    |  6 +--
 .../Linear/square_1e2_quad8_traction_top.prj  |  6 +--
 Tests/Data/Mechanics/Linear/square_1e5.prj    |  6 +--
 .../Linear/square_with_deactivated_hole.prj   |  6 +--
 .../Mechanics/Linear/two_material_gravity.prj |  8 +--
 .../Linear/two_material_gravity_Emodulus.prj  |  8 +--
 .../displacement_load.prj                     |  2 +-
 .../load_test_elastic.prj                     |  2 +-
 .../MohrCoulombAbboSloan/load_test_mc.prj     | 50 +++++++++----------
 .../load_test_mc_nonassociated.prj            |  2 +-
 .../MohrCoulombAbboSloan/oedometer.prj        | 26 +++++-----
 .../oedometer_fixed_timestepping.prj          |  2 +-
 .../Mechanics/MohrCoulombAbboSloan/slope.prj  | 14 +++---
 .../triax_1e0_47.prj                          |  6 +--
 .../triax_ORTHO_original.prj                  |  2 +-
 .../triax_aniso_1e0_47.prj                    |  6 +--
 .../triax_aniso_original.prj                  |  2 +-
 .../triax_original.prj                        |  2 +-
 .../triax_ortho_1e0_47.prj                    |  6 +--
 Tests/Data/Mechanics/m1_1Dload/m1_1Dload.prj  |  2 +-
 .../Mechanics/m1_1Dlozenge/m1_1Dlozenge.prj   |  2 +-
 Tests/Data/Mechanics/m1_2Dload/m1_2Dload.prj  |  2 +-
 .../Mechanics/m1_3Dbottom/m1_3Dbottom.prj     |  2 +-
 .../Mechanics/m1_3Dgravity/m1_3Dgravity.prj   |  2 +-
 Tests/Data/Mechanics/m1_3Dload/m1_3Dload.prj  |  2 +-
 .../Mechanics/m1_3Dsquare/m1_3Dsquare.prj     |  2 +-
 .../Mechanics/m1_3Dtopload/m1_3Dtopload.prj   |  2 +-
 .../Mechanics/m3_3Dshearz/m3_3Dshearz.prj     |  2 +-
 .../m3_3Dshearz_rot/m3_3Dshearz_rot.prj       |  2 +-
 .../Mechanics/m3_3Dtopload/m3_3Dtopload.prj   |  2 +-
 .../m3_3Dtoploadlc/m3_3Dtoploadlc.prj         |  2 +-
 97 files changed, 522 insertions(+), 522 deletions(-)

diff --git a/Tests/Data/Mechanics/Burgers/cube_1e0.prj b/Tests/Data/Mechanics/Burgers/cube_1e0.prj
index 4f1913e1702..ac2f4cdd7a3 100644
--- a/Tests/Data/Mechanics/Burgers/cube_1e0.prj
+++ b/Tests/Data/Mechanics/Burgers/cube_1e0.prj
@@ -63,7 +63,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>cube_1e0_pcs_{:process_id}</prefix>
+            <prefix>cube_1e0</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -238,7 +238,7 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <regex>cube_1e0_pcs_0_ts_.*_t_.*.vtu</regex>
+            <regex>cube_1e0_ts_.*_t_.*.vtu</regex>
             <field>displacement</field>
             <absolute_tolerance>1e-16</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Burgers/cube_1e0_mfront.prj b/Tests/Data/Mechanics/Burgers/cube_1e0_mfront.prj
index b000abfc23f..e1b8883434a 100644
--- a/Tests/Data/Mechanics/Burgers/cube_1e0_mfront.prj
+++ b/Tests/Data/Mechanics/Burgers/cube_1e0_mfront.prj
@@ -62,7 +62,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>cube_1e0_mfront_pcs_{:process_id}</prefix>
+            <prefix>cube_1e0_mfront</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -237,13 +237,13 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>cube_1e0_mfront_pcs_0_ts_1_t_0.000100.vtu</file>
+            <file>cube_1e0_mfront_ts_1_t_0.000100.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-16</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_mfront_pcs_0_ts_101_t_1.000000.vtu</file>
+            <file>cube_1e0_mfront_ts_101_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-16</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Burgers/cube_1e0_mfront_mod.prj b/Tests/Data/Mechanics/Burgers/cube_1e0_mfront_mod.prj
index 12237ab5c1f..b085a35ba00 100644
--- a/Tests/Data/Mechanics/Burgers/cube_1e0_mfront_mod.prj
+++ b/Tests/Data/Mechanics/Burgers/cube_1e0_mfront_mod.prj
@@ -62,7 +62,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>cube_1e0_mfront_mod_pcs_{:process_id}</prefix>
+            <prefix>cube_1e0_mfront_mod</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -237,13 +237,13 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>cube_1e0_mfront_mod_pcs_0_ts_1_t_0.000100.vtu</file>
+            <file>cube_1e0_mfront_mod_ts_1_t_0.000100.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>5e-16</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_mfront_mod_pcs_0_ts_101_t_1.000000.vtu</file>
+            <file>cube_1e0_mfront_mod_ts_101_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>5e-16</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Burgers/cube_1e3.prj b/Tests/Data/Mechanics/Burgers/cube_1e3.prj
index 805d9025958..ef4b0d7cd8c 100644
--- a/Tests/Data/Mechanics/Burgers/cube_1e3.prj
+++ b/Tests/Data/Mechanics/Burgers/cube_1e3.prj
@@ -63,7 +63,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>cube_1e3_pcs_{:process_id}</prefix>
+            <prefix>cube_1e3</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -238,13 +238,13 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>cube_1e3_pcs_0_ts_1_t_0.000100.vtu</file>
+            <file>cube_1e3_ts_1_t_0.000100.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-16</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e3_pcs_0_ts_101_t_1.000000.vtu</file>
+            <file>cube_1e3_ts_101_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-16</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Ehlers/MFront/cube_1e0_dp.prj b/Tests/Data/Mechanics/Ehlers/MFront/cube_1e0_dp.prj
index a4cc0b48e52..d78de38a8da 100644
--- a/Tests/Data/Mechanics/Ehlers/MFront/cube_1e0_dp.prj
+++ b/Tests/Data/Mechanics/Ehlers/MFront/cube_1e0_dp.prj
@@ -86,7 +86,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>cube_1e0_dp_pcs_{:process_id}</prefix>
+            <prefix>cube_1e0_dp</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
diff --git a/Tests/Data/Mechanics/Ehlers/axisymmetric_sphere_pl.prj b/Tests/Data/Mechanics/Ehlers/axisymmetric_sphere_pl.prj
index d5aa4249b15..3a40bef47ba 100644
--- a/Tests/Data/Mechanics/Ehlers/axisymmetric_sphere_pl.prj
+++ b/Tests/Data/Mechanics/Ehlers/axisymmetric_sphere_pl.prj
@@ -72,7 +72,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>axisymmetric_sphere_pl_pcs_{:process_id}</prefix>
+            <prefix>axisymmetric_sphere_pl</prefix>
             <timesteps>
                 <pair>
                     <repeat>1000000</repeat>
@@ -260,13 +260,13 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>axisymmetric_sphere_pl_pcs_0_ts_100_t_1.000000.vtu</file>
+            <file>axisymmetric_sphere_pl_ts_100_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-15</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>axisymmetric_sphere_pl_pcs_0_ts_100_t_1.000000.vtu</file>
+            <file>axisymmetric_sphere_pl_ts_100_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-5</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Ehlers/cube_1e0.prj b/Tests/Data/Mechanics/Ehlers/cube_1e0.prj
index 91690fe4931..6aa588a3457 100644
--- a/Tests/Data/Mechanics/Ehlers/cube_1e0.prj
+++ b/Tests/Data/Mechanics/Ehlers/cube_1e0.prj
@@ -73,7 +73,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>cube_1e0_pcs_{:process_id}</prefix>
+            <prefix>cube_1e0</prefix>
             <timesteps>
                 <pair>
                     <repeat>10000000</repeat>
@@ -320,25 +320,25 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>cube_1e0_pcs_0_ts_101_t_2.550000.vtu</file>
+            <file>cube_1e0_ts_101_t_2.550000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-17</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_pcs_0_ts_101_t_2.550000.vtu</file>
+            <file>cube_1e0_ts_101_t_2.550000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-15</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_pcs_0_ts_203_t_5.100000.vtu</file>
+            <file>cube_1e0_ts_203_t_5.100000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-17</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_pcs_0_ts_203_t_5.100000.vtu</file>
+            <file>cube_1e0_ts_203_t_5.100000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-15</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Ehlers/cube_1e0_dp.prj b/Tests/Data/Mechanics/Ehlers/cube_1e0_dp.prj
index 65f118d1ff5..9ad2d237e28 100644
--- a/Tests/Data/Mechanics/Ehlers/cube_1e0_dp.prj
+++ b/Tests/Data/Mechanics/Ehlers/cube_1e0_dp.prj
@@ -73,7 +73,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>cube_1e0_dp_pcs_{:process_id}</prefix>
+            <prefix>cube_1e0_dp</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -320,19 +320,19 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>cube_1e0_dp_pcs_0_ts_203_t_5.100000.vtu</file>
+            <file>cube_1e0_dp_ts_203_t_5.100000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_dp_pcs_0_ts_203_t_5.100000.vtu</file>
+            <file>cube_1e0_dp_ts_203_t_5.100000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_dp_pcs_0_ts_203_t_5.100000.vtu</file>
+            <file>cube_1e0_dp_ts_203_t_5.100000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Ehlers/cube_1e1.prj b/Tests/Data/Mechanics/Ehlers/cube_1e1.prj
index b58f22c2404..96a5b367cb4 100644
--- a/Tests/Data/Mechanics/Ehlers/cube_1e1.prj
+++ b/Tests/Data/Mechanics/Ehlers/cube_1e1.prj
@@ -73,7 +73,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>cube_1e1_pcs_{:process_id}</prefix>
+            <prefix>cube_1e1</prefix>
             <timesteps>
                 <pair>
                     <repeat>101</repeat>
@@ -324,25 +324,25 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>cube_1e1_pcs_0_ts_101_t_2.550000.vtu</file>
+            <file>cube_1e1_ts_101_t_2.550000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e1_pcs_0_ts_101_t_2.550000.vtu</file>
+            <file>cube_1e1_ts_101_t_2.550000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e1_pcs_0_ts_203_t_5.100000.vtu</file>
+            <file>cube_1e1_ts_203_t_5.100000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e1_pcs_0_ts_203_t_5.100000.vtu</file>
+            <file>cube_1e1_ts_203_t_5.100000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Ehlers/cube_1e3.prj b/Tests/Data/Mechanics/Ehlers/cube_1e3.prj
index 56a301d10d8..d02bca8e3a1 100644
--- a/Tests/Data/Mechanics/Ehlers/cube_1e3.prj
+++ b/Tests/Data/Mechanics/Ehlers/cube_1e3.prj
@@ -73,7 +73,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>cube_1e3_pcs_{:process_id}</prefix>
+            <prefix>cube_1e3</prefix>
             <timesteps>
                 <pair>
                     <repeat>101</repeat>
@@ -324,25 +324,25 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>cube_1e3_pcs_0_ts_101_t_2.550000.vtu</file>
+            <file>cube_1e3_ts_101_t_2.550000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>3e-13</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e3_pcs_0_ts_101_t_2.550000.vtu</file>
+            <file>cube_1e3_ts_101_t_2.550000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>3e-13</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e3_pcs_0_ts_203_t_5.100000.vtu</file>
+            <file>cube_1e3_ts_203_t_5.100000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>3e-13</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e3_pcs_0_ts_203_t_5.100000.vtu</file>
+            <file>cube_1e3_ts_203_t_5.100000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>3e-13</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/CrackedSolid/griffith.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/CrackedSolid/griffith.prj
index e490eadacf6..2adc4b1e0d0 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/CrackedSolid/griffith.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/CrackedSolid/griffith.prj
@@ -80,7 +80,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>out_crack_pcs_{:process_id}</prefix>
+            <prefix>out_crack</prefix>
             <timesteps>
                 <pair>
                     <repeat>10000</repeat>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/coarse/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/coarse/bar.prj
index 060dbc5043f..5ff1bbe32db 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/coarse/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/coarse/bar.prj
@@ -80,7 +80,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>out_bar_coarse_ED_pcs_{:process_id}</prefix>
+            <prefix>out_bar_coarse_ED</prefix>
             <timesteps>
                 <pair>
                     <repeat>10000</repeat>
@@ -279,73 +279,73 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_30_t_0.300000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_30_t_0.300000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_30_t_0.300000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>5e-8</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_30_t_0.300000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1.5e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_90_t_0.900000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_90_t_0.900000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_90_t_0.900000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>3e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_90_t_0.900000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
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 4389cedd396..2ce4f6e10ff 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/coarse_elastic_tangent/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/coarse_elastic_tangent/bar.prj
@@ -80,7 +80,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>out_bar_coarse_ED_pcs_{:process_id}</prefix>
+            <prefix>out_bar_coarse_ED</prefix>
             <timesteps>
                 <pair>
                     <repeat>10000</repeat>
@@ -279,73 +279,73 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_30_t_0.300000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_30_t_0.300000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>3e-10</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_30_t_0.300000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>5e-3</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_30_t_0.300000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-10</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>5e-3</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_90_t_0.900000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_90_t_0.900000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-10</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_90_t_0.900000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-3</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_90_t_0.900000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/fine/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/fine/bar.prj
index 9699576c154..52a2e2ff848 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/fine/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/fine/bar.prj
@@ -80,7 +80,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>out_bar_fine_ED_pcs_{:process_id}</prefix>
+            <prefix>out_bar_fine_ED</prefix>
             <timesteps>
                 <pair>
                     <repeat>10000</repeat>
@@ -279,73 +279,73 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>out_bar_fine_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_fine_ED_ts_30_t_0.300000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_fine_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_fine_ED_ts_30_t_0.300000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_fine_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_fine_ED_ts_30_t_0.300000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>5e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_fine_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_fine_ED_ts_30_t_0.300000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_fine_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_fine_ED_ts_60_t_0.600000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_fine_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_fine_ED_ts_60_t_0.600000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_fine_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_fine_ED_ts_60_t_0.600000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>5e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_fine_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_fine_ED_ts_60_t_0.600000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_fine_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_fine_ED_ts_90_t_0.900000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_fine_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_fine_ED_ts_90_t_0.900000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_fine_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_fine_ED_ts_90_t_0.900000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>6e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_fine_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_fine_ED_ts_90_t_0.900000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/medium/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/medium/bar.prj
index b2add8f42e3..94dc2602a41 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/medium/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/medium/bar.prj
@@ -80,7 +80,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>out_bar_medium_ED_pcs_{:process_id}</prefix>
+            <prefix>out_bar_medium_ED</prefix>
             <timesteps>
                 <pair>
                     <repeat>10000</repeat>
@@ -279,73 +279,73 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>out_bar_medium_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_medium_ED_ts_30_t_0.300000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_medium_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_medium_ED_ts_30_t_0.300000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_medium_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_medium_ED_ts_30_t_0.300000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_medium_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_medium_ED_ts_30_t_0.300000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_medium_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_medium_ED_ts_60_t_0.600000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_medium_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_medium_ED_ts_60_t_0.600000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_medium_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_medium_ED_ts_60_t_0.600000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2.1e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_medium_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_medium_ED_ts_60_t_0.600000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_medium_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_medium_ED_ts_90_t_0.900000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_medium_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_medium_ED_ts_90_t_0.900000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_medium_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_medium_ED_ts_90_t_0.900000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>3e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_medium_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_medium_ED_ts_90_t_0.900000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p1/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p1/bar.prj
index e27fdadaa06..61c101d5109 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p1/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p1/bar.prj
@@ -80,7 +80,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>out_bar_coarse_ED_pcs_{:process_id}</prefix>
+            <prefix>out_bar_coarse_ED</prefix>
             <timesteps>
                 <pair>
                     <repeat>10000</repeat>
@@ -279,73 +279,73 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_30_t_0.300000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_30_t_0.300000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_30_t_0.300000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>6e-8</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_30_t_0.300000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_90_t_0.900000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_90_t_0.900000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_90_t_0.900000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_90_t_0.900000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p2/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p2/bar.prj
index 168e4aaffcf..cec6d4db3ea 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p2/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p2/bar.prj
@@ -80,7 +80,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>out_bar_coarse_ED_pcs_{:process_id}</prefix>
+            <prefix>out_bar_coarse_ED</prefix>
             <timesteps>
                 <pair>
                     <repeat>10000</repeat>
@@ -279,73 +279,73 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_30_t_0.300000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_30_t_0.300000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_30_t_0.300000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>7e-8</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_30_t_0.300000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_90_t_0.900000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_90_t_0.900000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_90_t_0.900000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_90_t_0.900000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p3/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p3/bar.prj
index ac7f5582234..76466694823 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p3/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p3/bar.prj
@@ -80,7 +80,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>out_bar_coarse_ED_pcs_{:process_id}</prefix>
+            <prefix>out_bar_coarse_ED</prefix>
             <timesteps>
                 <pair>
                     <repeat>10000</repeat>
@@ -279,73 +279,73 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_30_t_0.300000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_30_t_0.300000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_30_t_0.300000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>8e-8</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_30_t_0.300000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_90_t_0.900000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_90_t_0.900000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_90_t_0.900000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_90_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_90_t_0.900000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/t1/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/t1/bar.prj
index 41e48677d51..aa12be4ecc9 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/t1/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/t1/bar.prj
@@ -80,7 +80,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>out_bar_coarse_ED_pcs_{:process_id}</prefix>
+            <prefix>out_bar_coarse_ED</prefix>
             <timesteps>
                 <pair>
                     <repeat>10000</repeat>
@@ -279,73 +279,73 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_300_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_300_t_0.300000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_300_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_300_t_0.300000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_300_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_300_t_0.300000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>5e-8</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_300_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_300_t_0.300000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_600_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_600_t_0.600000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_600_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_600_t_0.600000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_600_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_600_t_0.600000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_600_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_600_t_0.600000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_900_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_900_t_0.900000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_900_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_900_t_0.900000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_900_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_900_t_0.900000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_900_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_900_t_0.900000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/t2/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/t2/bar.prj
index 907ba8f4d35..6f17c0464a9 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/t2/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/t2/bar.prj
@@ -80,7 +80,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>out_bar_coarse_ED_pcs_{:process_id}</prefix>
+            <prefix>out_bar_coarse_ED</prefix>
             <timesteps>
                 <pair>
                     <repeat>2000</repeat>
@@ -279,73 +279,73 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_600_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_600_t_0.300000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_600_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_600_t_0.300000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_600_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_600_t_0.300000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>5e-8</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_600_t_0.300000.vtu</file>
+            <file>out_bar_coarse_ED_ts_600_t_0.300000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_1200_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_1200_t_0.600000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_1200_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_1200_t_0.600000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_1200_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_1200_t_0.600000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_1200_t_0.600000.vtu</file>
+            <file>out_bar_coarse_ED_ts_1200_t_0.600000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_1800_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_1800_t_0.900000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_1800_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_1800_t_0.900000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_1800_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_1800_t_0.900000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_coarse_ED_pcs_0_ts_1800_t_0.900000.vtu</file>
+            <file>out_bar_coarse_ED_ts_1800_t_0.900000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/veryfine/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/veryfine/bar.prj
index 5d8a65ff124..654d06873c6 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/veryfine/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/veryfine/bar.prj
@@ -80,7 +80,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>out_bar_veryfine_ED_pcs_{:process_id}</prefix>
+            <prefix>out_bar_veryfine_ED</prefix>
             <timesteps>
                 <pair>
                     <repeat>10000</repeat>
@@ -279,73 +279,73 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>out_bar_veryfine_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_veryfine_ED_ts_30_t_0.300000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_veryfine_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_veryfine_ED_ts_30_t_0.300000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_veryfine_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_veryfine_ED_ts_30_t_0.300000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>6e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_veryfine_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_bar_veryfine_ED_ts_30_t_0.300000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_veryfine_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_veryfine_ED_ts_60_t_0.600000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_veryfine_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_veryfine_ED_ts_60_t_0.600000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_veryfine_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_veryfine_ED_ts_60_t_0.600000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-6</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_veryfine_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_bar_veryfine_ED_ts_60_t_0.600000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_veryfine_ED_pcs_0_ts_70_t_0.700000.vtu</file>
+            <file>out_bar_veryfine_ED_ts_70_t_0.700000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_veryfine_ED_pcs_0_ts_70_t_0.700000.vtu</file>
+            <file>out_bar_veryfine_ED_ts_70_t_0.700000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_veryfine_ED_pcs_0_ts_70_t_0.700000.vtu</file>
+            <file>out_bar_veryfine_ED_ts_70_t_0.700000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-6</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_bar_veryfine_ED_pcs_0_ts_70_t_0.700000.vtu</file>
+            <file>out_bar_veryfine_ED_ts_70_t_0.700000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/3D_hexa/beam.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/3D_hexa/beam.prj
index 834ba42e4c1..9fef4c156f1 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/3D_hexa/beam.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/3D_hexa/beam.prj
@@ -76,7 +76,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>out_beam_coarse_ED_pcs_{:process_id}</prefix>
+            <prefix>out_beam_coarse_ED</prefix>
             <timesteps>
                 <pair>
                     <repeat>10000</repeat>
@@ -289,97 +289,97 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_40_t_0.400000.vtu</file>
+            <file>out_beam_coarse_ED_ts_40_t_0.400000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_40_t_0.400000.vtu</file>
+            <file>out_beam_coarse_ED_ts_40_t_0.400000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_40_t_0.400000.vtu</file>
+            <file>out_beam_coarse_ED_ts_40_t_0.400000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>3e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_40_t_0.400000.vtu</file>
+            <file>out_beam_coarse_ED_ts_40_t_0.400000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_beam_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_beam_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_beam_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>4e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_beam_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_80_t_0.800000.vtu</file>
+            <file>out_beam_coarse_ED_ts_80_t_0.800000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_80_t_0.800000.vtu</file>
+            <file>out_beam_coarse_ED_ts_80_t_0.800000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_80_t_0.800000.vtu</file>
+            <file>out_beam_coarse_ED_ts_80_t_0.800000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>5e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_80_t_0.800000.vtu</file>
+            <file>out_beam_coarse_ED_ts_80_t_0.800000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_100_t_1.000000.vtu</file>
+            <file>out_beam_coarse_ED_ts_100_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_100_t_1.000000.vtu</file>
+            <file>out_beam_coarse_ED_ts_100_t_1.000000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_100_t_1.000000.vtu</file>
+            <file>out_beam_coarse_ED_ts_100_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>5e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_100_t_1.000000.vtu</file>
+            <file>out_beam_coarse_ED_ts_100_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/3D_tetr/beam.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/3D_tetr/beam.prj
index a61f835c0df..e51ab74cab1 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/3D_tetr/beam.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/3D_tetr/beam.prj
@@ -76,7 +76,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>out_beam_coarse_ED_pcs_{:process_id}</prefix>
+            <prefix>out_beam_coarse_ED</prefix>
             <timesteps>
                 <pair>
                     <repeat>10000</repeat>
@@ -289,97 +289,97 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_10_t_0.100000.vtu</file>
+            <file>out_beam_coarse_ED_ts_10_t_0.100000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_10_t_0.100000.vtu</file>
+            <file>out_beam_coarse_ED_ts_10_t_0.100000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_10_t_0.100000.vtu</file>
+            <file>out_beam_coarse_ED_ts_10_t_0.100000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>5e-8</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_10_t_0.100000.vtu</file>
+            <file>out_beam_coarse_ED_ts_10_t_0.100000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_20_t_0.200000.vtu</file>
+            <file>out_beam_coarse_ED_ts_20_t_0.200000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_20_t_0.200000.vtu</file>
+            <file>out_beam_coarse_ED_ts_20_t_0.200000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_20_t_0.200000.vtu</file>
+            <file>out_beam_coarse_ED_ts_20_t_0.200000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>7e-8</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_20_t_0.200000.vtu</file>
+            <file>out_beam_coarse_ED_ts_20_t_0.200000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_beam_coarse_ED_ts_30_t_0.300000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_beam_coarse_ED_ts_30_t_0.300000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_beam_coarse_ED_ts_30_t_0.300000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_30_t_0.300000.vtu</file>
+            <file>out_beam_coarse_ED_ts_30_t_0.300000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_40_t_0.400000.vtu</file>
+            <file>out_beam_coarse_ED_ts_40_t_0.400000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_40_t_0.400000.vtu</file>
+            <file>out_beam_coarse_ED_ts_40_t_0.400000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_40_t_0.400000.vtu</file>
+            <file>out_beam_coarse_ED_ts_40_t_0.400000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_40_t_0.400000.vtu</file>
+            <file>out_beam_coarse_ED_ts_40_t_0.400000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse/beam.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse/beam.prj
index 73e8bda23be..57ded5d6323 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse/beam.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse/beam.prj
@@ -76,7 +76,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>out_beam_coarse_ED_pcs_{:process_id}</prefix>
+            <prefix>out_beam_coarse_ED</prefix>
             <timesteps>
                 <pair>
                     <repeat>10000</repeat>
@@ -282,97 +282,97 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_40_t_0.400000.vtu</file>
+            <file>out_beam_coarse_ED_ts_40_t_0.400000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_40_t_0.400000.vtu</file>
+            <file>out_beam_coarse_ED_ts_40_t_0.400000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_40_t_0.400000.vtu</file>
+            <file>out_beam_coarse_ED_ts_40_t_0.400000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_40_t_0.400000.vtu</file>
+            <file>out_beam_coarse_ED_ts_40_t_0.400000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_beam_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_beam_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_beam_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>3e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_beam_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_80_t_0.800000.vtu</file>
+            <file>out_beam_coarse_ED_ts_80_t_0.800000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_80_t_0.800000.vtu</file>
+            <file>out_beam_coarse_ED_ts_80_t_0.800000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_80_t_0.800000.vtu</file>
+            <file>out_beam_coarse_ED_ts_80_t_0.800000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>4e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_80_t_0.800000.vtu</file>
+            <file>out_beam_coarse_ED_ts_80_t_0.800000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_100_t_1.000000.vtu</file>
+            <file>out_beam_coarse_ED_ts_100_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_100_t_1.000000.vtu</file>
+            <file>out_beam_coarse_ED_ts_100_t_1.000000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_100_t_1.000000.vtu</file>
+            <file>out_beam_coarse_ED_ts_100_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>4e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_100_t_1.000000.vtu</file>
+            <file>out_beam_coarse_ED_ts_100_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse_quad/beam.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse_quad/beam.prj
index 9a040c32213..8c7609cbc94 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse_quad/beam.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse_quad/beam.prj
@@ -76,7 +76,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>out_beam_coarse_ED_pcs_{:process_id}</prefix>
+            <prefix>out_beam_coarse_ED</prefix>
             <timesteps>
                 <pair>
                     <repeat>10000</repeat>
@@ -282,97 +282,97 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_40_t_0.400000.vtu</file>
+            <file>out_beam_coarse_ED_ts_40_t_0.400000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_40_t_0.400000.vtu</file>
+            <file>out_beam_coarse_ED_ts_40_t_0.400000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_40_t_0.400000.vtu</file>
+            <file>out_beam_coarse_ED_ts_40_t_0.400000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-6</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_40_t_0.400000.vtu</file>
+            <file>out_beam_coarse_ED_ts_40_t_0.400000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_beam_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_beam_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_beam_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-6</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_beam_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_80_t_0.800000.vtu</file>
+            <file>out_beam_coarse_ED_ts_80_t_0.800000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_80_t_0.800000.vtu</file>
+            <file>out_beam_coarse_ED_ts_80_t_0.800000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_80_t_0.800000.vtu</file>
+            <file>out_beam_coarse_ED_ts_80_t_0.800000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>3e-6</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_80_t_0.800000.vtu</file>
+            <file>out_beam_coarse_ED_ts_80_t_0.800000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_100_t_1.000000.vtu</file>
+            <file>out_beam_coarse_ED_ts_100_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_100_t_1.000000.vtu</file>
+            <file>out_beam_coarse_ED_ts_100_t_1.000000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_100_t_1.000000.vtu</file>
+            <file>out_beam_coarse_ED_ts_100_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>4e-6</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_100_t_1.000000.vtu</file>
+            <file>out_beam_coarse_ED_ts_100_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse_tria/beam.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse_tria/beam.prj
index 45190f716ae..fa0310c9279 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse_tria/beam.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse_tria/beam.prj
@@ -76,7 +76,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>out_beam_coarse_ED_pcs_{:process_id}</prefix>
+            <prefix>out_beam_coarse_ED</prefix>
             <timesteps>
                 <pair>
                     <repeat>10000</repeat>
@@ -282,97 +282,97 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_40_t_0.400000.vtu</file>
+            <file>out_beam_coarse_ED_ts_40_t_0.400000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_40_t_0.400000.vtu</file>
+            <file>out_beam_coarse_ED_ts_40_t_0.400000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_40_t_0.400000.vtu</file>
+            <file>out_beam_coarse_ED_ts_40_t_0.400000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_40_t_0.400000.vtu</file>
+            <file>out_beam_coarse_ED_ts_40_t_0.400000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_beam_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_beam_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_beam_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>5e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_beam_coarse_ED_ts_60_t_0.600000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_80_t_0.800000.vtu</file>
+            <file>out_beam_coarse_ED_ts_80_t_0.800000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_80_t_0.800000.vtu</file>
+            <file>out_beam_coarse_ED_ts_80_t_0.800000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_80_t_0.800000.vtu</file>
+            <file>out_beam_coarse_ED_ts_80_t_0.800000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>4e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_80_t_0.800000.vtu</file>
+            <file>out_beam_coarse_ED_ts_80_t_0.800000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_100_t_1.000000.vtu</file>
+            <file>out_beam_coarse_ED_ts_100_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_100_t_1.000000.vtu</file>
+            <file>out_beam_coarse_ED_ts_100_t_1.000000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_100_t_1.000000.vtu</file>
+            <file>out_beam_coarse_ED_ts_100_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>6e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_coarse_ED_pcs_0_ts_100_t_1.000000.vtu</file>
+            <file>out_beam_coarse_ED_ts_100_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/medium/beam.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/medium/beam.prj
index 8a661c4c4a4..fb3697154ce 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/medium/beam.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/medium/beam.prj
@@ -76,7 +76,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>out_beam_medium_ED_pcs_{:process_id}</prefix>
+            <prefix>out_beam_medium_ED</prefix>
             <timesteps>
                 <pair>
                     <repeat>10000</repeat>
@@ -282,97 +282,97 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>out_beam_medium_ED_pcs_0_ts_40_t_0.400000.vtu</file>
+            <file>out_beam_medium_ED_ts_40_t_0.400000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_medium_ED_pcs_0_ts_40_t_0.400000.vtu</file>
+            <file>out_beam_medium_ED_ts_40_t_0.400000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_medium_ED_pcs_0_ts_40_t_0.400000.vtu</file>
+            <file>out_beam_medium_ED_ts_40_t_0.400000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>4e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_medium_ED_pcs_0_ts_40_t_0.400000.vtu</file>
+            <file>out_beam_medium_ED_ts_40_t_0.400000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_medium_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_beam_medium_ED_ts_60_t_0.600000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_medium_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_beam_medium_ED_ts_60_t_0.600000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_medium_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_beam_medium_ED_ts_60_t_0.600000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>7e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_medium_ED_pcs_0_ts_60_t_0.600000.vtu</file>
+            <file>out_beam_medium_ED_ts_60_t_0.600000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_medium_ED_pcs_0_ts_80_t_0.800000.vtu</file>
+            <file>out_beam_medium_ED_ts_80_t_0.800000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_medium_ED_pcs_0_ts_80_t_0.800000.vtu</file>
+            <file>out_beam_medium_ED_ts_80_t_0.800000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_medium_ED_pcs_0_ts_80_t_0.800000.vtu</file>
+            <file>out_beam_medium_ED_ts_80_t_0.800000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>8e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_medium_ED_pcs_0_ts_80_t_0.800000.vtu</file>
+            <file>out_beam_medium_ED_ts_80_t_0.800000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_medium_ED_pcs_0_ts_100_t_1.000000.vtu</file>
+            <file>out_beam_medium_ED_ts_100_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_medium_ED_pcs_0_ts_100_t_1.000000.vtu</file>
+            <file>out_beam_medium_ED_ts_100_t_1.000000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_medium_ED_pcs_0_ts_100_t_1.000000.vtu</file>
+            <file>out_beam_medium_ED_ts_100_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-6</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_medium_ED_pcs_0_ts_100_t_1.000000.vtu</file>
+            <file>out_beam_medium_ED_ts_100_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/holed_beam/holed_beam.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/holed_beam/holed_beam.prj
index f03910a688f..65f99710d9a 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/holed_beam/holed_beam.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/holed_beam/holed_beam.prj
@@ -81,7 +81,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>out_beam_hole_ED_pcs_{:process_id}</prefix>
+            <prefix>out_beam_hole_ED</prefix>
             <timesteps>
                 <pair>
                     <repeat>10000</repeat>
@@ -283,97 +283,97 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>out_beam_hole_ED_pcs_0_ts_100_t_0.250000.vtu</file>
+            <file>out_beam_hole_ED_ts_100_t_0.250000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_hole_ED_pcs_0_ts_100_t_0.250000.vtu</file>
+            <file>out_beam_hole_ED_ts_100_t_0.250000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_hole_ED_pcs_0_ts_100_t_0.250000.vtu</file>
+            <file>out_beam_hole_ED_ts_100_t_0.250000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>3e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_hole_ED_pcs_0_ts_100_t_0.250000.vtu</file>
+            <file>out_beam_hole_ED_ts_100_t_0.250000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_hole_ED_pcs_0_ts_200_t_0.500000.vtu</file>
+            <file>out_beam_hole_ED_ts_200_t_0.500000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_hole_ED_pcs_0_ts_200_t_0.500000.vtu</file>
+            <file>out_beam_hole_ED_ts_200_t_0.500000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_hole_ED_pcs_0_ts_200_t_0.500000.vtu</file>
+            <file>out_beam_hole_ED_ts_200_t_0.500000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>5e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_hole_ED_pcs_0_ts_200_t_0.500000.vtu</file>
+            <file>out_beam_hole_ED_ts_200_t_0.500000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_hole_ED_pcs_0_ts_300_t_0.750000.vtu</file>
+            <file>out_beam_hole_ED_ts_300_t_0.750000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_hole_ED_pcs_0_ts_300_t_0.750000.vtu</file>
+            <file>out_beam_hole_ED_ts_300_t_0.750000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_hole_ED_pcs_0_ts_300_t_0.750000.vtu</file>
+            <file>out_beam_hole_ED_ts_300_t_0.750000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>8e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_hole_ED_pcs_0_ts_300_t_0.750000.vtu</file>
+            <file>out_beam_hole_ED_ts_300_t_0.750000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_hole_ED_pcs_0_ts_400_t_1.000000.vtu</file>
+            <file>out_beam_hole_ED_ts_400_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_hole_ED_pcs_0_ts_400_t_1.000000.vtu</file>
+            <file>out_beam_hole_ED_ts_400_t_1.000000.vtu</file>
             <field>damage</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_hole_ED_pcs_0_ts_400_t_1.000000.vtu</file>
+            <file>out_beam_hole_ED_ts_400_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-6</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>out_beam_hole_ED_pcs_0_ts_400_t_1.000000.vtu</file>
+            <file>out_beam_hole_ED_ts_400_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/notched_beam/smallbeam_3D.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/notched_beam/smallbeam_3D.prj
index 35727533b78..de959e2c992 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/notched_beam/smallbeam_3D.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/notched_beam/smallbeam_3D.prj
@@ -81,7 +81,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>sm_out_pcs_{:process_id}</prefix>
+            <prefix>sm_out</prefix>
             <timesteps>
                 <pair>
                     <repeat>10000</repeat>
diff --git a/Tests/Data/Mechanics/InitialStates/equilibrium_restart.prj b/Tests/Data/Mechanics/InitialStates/equilibrium_restart.prj
index f14ed6a9317..766d980340a 100644
--- a/Tests/Data/Mechanics/InitialStates/equilibrium_restart.prj
+++ b/Tests/Data/Mechanics/InitialStates/equilibrium_restart.prj
@@ -55,7 +55,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>equilibrium_restart_pcs_{:process_id}</prefix>
+            <prefix>equilibrium_restart</prefix>
             <timesteps>
                 <pair>
                     <repeat>2</repeat>
@@ -189,13 +189,13 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>equilibrium_restart_pcs_0_ts_1_t_2.000000.vtu</file>
+            <file>equilibrium_restart_ts_1_t_2.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-15</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>equilibrium_restart_pcs_0_ts_1_t_2.000000.vtu</file>
+            <file>equilibrium_restart_ts_1_t_2.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/InitialStates/into_initial_state.prj b/Tests/Data/Mechanics/InitialStates/into_initial_state.prj
index f94af1ff6b8..87556e42ee2 100644
--- a/Tests/Data/Mechanics/InitialStates/into_initial_state.prj
+++ b/Tests/Data/Mechanics/InitialStates/into_initial_state.prj
@@ -55,7 +55,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>into_initial_state_pcs_{:process_id}</prefix>
+            <prefix>into_initial_state</prefix>
             <timesteps>
                 <pair>
                     <repeat>2</repeat>
@@ -189,13 +189,13 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>into_initial_state_pcs_0_ts_2_t_2.000000.vtu</file>
+            <file>into_initial_state_ts_2_t_2.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-15</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>into_initial_state_pcs_0_ts_2_t_2.000000.vtu</file>
+            <file>into_initial_state_ts_2_t_2.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/InitialStates/non_equilibrium_initial_state.prj b/Tests/Data/Mechanics/InitialStates/non_equilibrium_initial_state.prj
index 566ad1347c9..18943a23dfb 100644
--- a/Tests/Data/Mechanics/InitialStates/non_equilibrium_initial_state.prj
+++ b/Tests/Data/Mechanics/InitialStates/non_equilibrium_initial_state.prj
@@ -57,7 +57,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>non_equilibrium_initial_state_pcs_{:process_id}</prefix>
+            <prefix>non_equilibrium_initial_state</prefix>
             <timesteps>
                 <pair>
                     <repeat>2</repeat>
@@ -200,13 +200,13 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>non_equilibrium_initial_state_pcs_0_ts_1_t_2.000000.vtu</file>
+            <file>non_equilibrium_initial_state_ts_1_t_2.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-15</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>non_equilibrium_initial_state_pcs_0_ts_1_t_2.000000.vtu</file>
+            <file>non_equilibrium_initial_state_ts_1_t_2.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/ElementDeactivation3D/element_deactivation_M_3D.prj b/Tests/Data/Mechanics/Linear/ElementDeactivation3D/element_deactivation_M_3D.prj
index de49a074eae..825af507563 100644
--- a/Tests/Data/Mechanics/Linear/ElementDeactivation3D/element_deactivation_M_3D.prj
+++ b/Tests/Data/Mechanics/Linear/ElementDeactivation3D/element_deactivation_M_3D.prj
@@ -60,7 +60,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>element_deactivation_M_3D_pcs_{:process_id}</prefix>
+            <prefix>element_deactivation_M_3D</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -187,13 +187,13 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>element_deactivation_M_3D_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>element_deactivation_M_3D_ts_4_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-14</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>element_deactivation_M_3D_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>element_deactivation_M_3D_ts_4_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-14</relative_tolerance>
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 da9983932ea..36efeb1e8a9 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
@@ -44,7 +44,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>ring_plane_strain_pcs_{:process_id}</prefix>
+            <prefix>ring_plane_strain</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
diff --git a/Tests/Data/Mechanics/Linear/MFront/cube_1e0_orthotropic_xyz.prj b/Tests/Data/Mechanics/Linear/MFront/cube_1e0_orthotropic_xyz.prj
index 9e3c350f3d8..f255fdead09 100644
--- a/Tests/Data/Mechanics/Linear/MFront/cube_1e0_orthotropic_xyz.prj
+++ b/Tests/Data/Mechanics/Linear/MFront/cube_1e0_orthotropic_xyz.prj
@@ -61,7 +61,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>cube_1e0_xyz_orthotropic_pcs_{:process_id}</prefix>
+            <prefix>cube_1e0_xyz_orthotropic</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -226,25 +226,25 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>cube_1e0_xyz_orthotropic_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_xyz_orthotropic_ts_4_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_xyz_orthotropic_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_xyz_orthotropic_ts_4_t_1.000000.vtu</file>
             <field>NodalForces</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_xyz_orthotropic_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_xyz_orthotropic_ts_4_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_xyz_orthotropic_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_xyz_orthotropic_ts_4_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/MFront/cube_1e0_orthotropic_yzx.prj b/Tests/Data/Mechanics/Linear/MFront/cube_1e0_orthotropic_yzx.prj
index d27b001dcbd..f0c194bf2dd 100644
--- a/Tests/Data/Mechanics/Linear/MFront/cube_1e0_orthotropic_yzx.prj
+++ b/Tests/Data/Mechanics/Linear/MFront/cube_1e0_orthotropic_yzx.prj
@@ -61,7 +61,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>cube_1e0_yzx_orthotropic_pcs_{:process_id}</prefix>
+            <prefix>cube_1e0_yzx_orthotropic</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -226,25 +226,25 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>cube_1e0_yzx_orthotropic_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_yzx_orthotropic_ts_4_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_yzx_orthotropic_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_yzx_orthotropic_ts_4_t_1.000000.vtu</file>
             <field>NodalForces</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_yzx_orthotropic_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_yzx_orthotropic_ts_4_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_yzx_orthotropic_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_yzx_orthotropic_ts_4_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/MFront/cube_1e0_orthotropic_zxy.prj b/Tests/Data/Mechanics/Linear/MFront/cube_1e0_orthotropic_zxy.prj
index 201d59ae6f2..fee768e852a 100644
--- a/Tests/Data/Mechanics/Linear/MFront/cube_1e0_orthotropic_zxy.prj
+++ b/Tests/Data/Mechanics/Linear/MFront/cube_1e0_orthotropic_zxy.prj
@@ -61,7 +61,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>cube_1e0_zxy_orthotropic_pcs_{:process_id}</prefix>
+            <prefix>cube_1e0_zxy_orthotropic</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -226,25 +226,25 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>cube_1e0_zxy_orthotropic_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_zxy_orthotropic_ts_4_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_zxy_orthotropic_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_zxy_orthotropic_ts_4_t_1.000000.vtu</file>
             <field>NodalForces</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_zxy_orthotropic_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_zxy_orthotropic_ts_4_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_zxy_orthotropic_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_zxy_orthotropic_ts_4_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
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 3e8f205179b..0e5882cddc7 100644
--- a/Tests/Data/Mechanics/Linear/MFront/cube_standard_elasticity_brick.prj
+++ b/Tests/Data/Mechanics/Linear/MFront/cube_standard_elasticity_brick.prj
@@ -53,7 +53,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>cube_1e0_pcs_{:process_id}</prefix>
+            <prefix>cube_1e0</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
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 5b7f5957bc6..0eb5ddfaec9 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
@@ -52,7 +52,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>disc_with_hole_pcs_{:process_id}</prefix>
+            <prefix>disc_with_hole</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
diff --git a/Tests/Data/Mechanics/Linear/MFront/square_1e0_orthotropic_45xy_z.prj b/Tests/Data/Mechanics/Linear/MFront/square_1e0_orthotropic_45xy_z.prj
index 261aa2caab8..c706c916b94 100644
--- a/Tests/Data/Mechanics/Linear/MFront/square_1e0_orthotropic_45xy_z.prj
+++ b/Tests/Data/Mechanics/Linear/MFront/square_1e0_orthotropic_45xy_z.prj
@@ -59,7 +59,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>square_1e0_orthotropic_45xy_z_pcs_{:process_id}</prefix>
+            <prefix>square_1e0_orthotropic_45xy_z</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -201,25 +201,25 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>square_1e0_orthotropic_45xy_z_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_orthotropic_45xy_z_ts_4_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-16</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>square_1e0_orthotropic_45xy_z_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_orthotropic_45xy_z_ts_4_t_1.000000.vtu</file>
             <field>NodalForces</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>square_1e0_orthotropic_45xy_z_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_orthotropic_45xy_z_ts_4_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-16</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>square_1e0_orthotropic_45xy_z_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_orthotropic_45xy_z_ts_4_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/MFront/square_1e0_orthotropic_xyz.prj b/Tests/Data/Mechanics/Linear/MFront/square_1e0_orthotropic_xyz.prj
index a7e4016366f..3df7b14847f 100644
--- a/Tests/Data/Mechanics/Linear/MFront/square_1e0_orthotropic_xyz.prj
+++ b/Tests/Data/Mechanics/Linear/MFront/square_1e0_orthotropic_xyz.prj
@@ -59,7 +59,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>square_1e0_orthotropic_xyz_pcs_{:process_id}</prefix>
+            <prefix>square_1e0_orthotropic_xyz</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -201,25 +201,25 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>square_1e0_orthotropic_xyz_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_orthotropic_xyz_ts_4_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-16</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>square_1e0_orthotropic_xyz_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_orthotropic_xyz_ts_4_t_1.000000.vtu</file>
             <field>NodalForces</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>square_1e0_orthotropic_xyz_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_orthotropic_xyz_ts_4_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-16</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>square_1e0_orthotropic_xyz_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_orthotropic_xyz_ts_4_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/MFront/square_1e0_orthotropic_y-xz.prj b/Tests/Data/Mechanics/Linear/MFront/square_1e0_orthotropic_y-xz.prj
index a0dac42bb6e..c86c6150adb 100644
--- a/Tests/Data/Mechanics/Linear/MFront/square_1e0_orthotropic_y-xz.prj
+++ b/Tests/Data/Mechanics/Linear/MFront/square_1e0_orthotropic_y-xz.prj
@@ -59,7 +59,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>square_1e0_orthotropic_y-xz_pcs_{:process_id}</prefix>
+            <prefix>square_1e0_orthotropic_y-xz</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -201,25 +201,25 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>square_1e0_orthotropic_y-xz_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_orthotropic_y-xz_ts_4_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-16</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>square_1e0_orthotropic_y-xz_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_orthotropic_y-xz_ts_4_t_1.000000.vtu</file>
             <field>NodalForces</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>square_1e0_orthotropic_y-xz_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_orthotropic_y-xz_ts_4_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-16</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>square_1e0_orthotropic_y-xz_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_orthotropic_y-xz_ts_4_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/MaterialForces/bar.prj b/Tests/Data/Mechanics/Linear/MaterialForces/bar.prj
index e644961d1be..88d132d01ba 100644
--- a/Tests/Data/Mechanics/Linear/MaterialForces/bar.prj
+++ b/Tests/Data/Mechanics/Linear/MaterialForces/bar.prj
@@ -51,7 +51,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>bar_out_pcs_{:process_id}</prefix>
+            <prefix>bar_out</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -178,19 +178,19 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>bar_out_pcs_0_ts_2_t_1.000000.vtu</file>
+            <file>bar_out_ts_2_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>bar_out_pcs_0_ts_2_t_1.000000.vtu</file>
+            <file>bar_out_ts_2_t_1.000000.vtu</file>
             <field>MaterialForces</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>bar_out_pcs_0_ts_2_t_1.000000.vtu</file>
+            <file>bar_out_ts_2_t_1.000000.vtu</file>
             <field>free_energy_density</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/MaterialForces/bar_3D.prj b/Tests/Data/Mechanics/Linear/MaterialForces/bar_3D.prj
index b33bd9d9ac1..690a80c56fd 100644
--- a/Tests/Data/Mechanics/Linear/MaterialForces/bar_3D.prj
+++ b/Tests/Data/Mechanics/Linear/MaterialForces/bar_3D.prj
@@ -51,7 +51,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>bar_3D_out_pcs_{:process_id}</prefix>
+            <prefix>bar_3D_out</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -192,19 +192,19 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>bar_3D_out_pcs_0_ts_2_t_1.000000.vtu</file>
+            <file>bar_3D_out_ts_2_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>bar_3D_out_pcs_0_ts_2_t_1.000000.vtu</file>
+            <file>bar_3D_out_ts_2_t_1.000000.vtu</file>
             <field>MaterialForces</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>bar_3D_out_pcs_0_ts_2_t_1.000000.vtu</file>
+            <file>bar_3D_out_ts_2_t_1.000000.vtu</file>
             <field>free_energy_density</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
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 dac96791303..1cf3dc28832 100644
--- a/Tests/Data/Mechanics/Linear/Orthotropy/cube_1e0_orthotropic_xyz.prj
+++ b/Tests/Data/Mechanics/Linear/Orthotropy/cube_1e0_orthotropic_xyz.prj
@@ -51,7 +51,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>cube_1e0_xyz_orthotropic_pcs_{:process_id}</prefix>
+            <prefix>cube_1e0_xyz_orthotropic</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -188,25 +188,25 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>cube_1e0_xyz_orthotropic_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_xyz_orthotropic_ts_4_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_xyz_orthotropic_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_xyz_orthotropic_ts_4_t_1.000000.vtu</file>
             <field>NodalForces</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_xyz_orthotropic_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_xyz_orthotropic_ts_4_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_xyz_orthotropic_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_xyz_orthotropic_ts_4_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
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 29e598d2fea..dc1ebd7ae8b 100644
--- a/Tests/Data/Mechanics/Linear/Orthotropy/cube_1e0_orthotropic_yzx.prj
+++ b/Tests/Data/Mechanics/Linear/Orthotropy/cube_1e0_orthotropic_yzx.prj
@@ -51,7 +51,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>cube_1e0_yzx_orthotropic_pcs_{:process_id}</prefix>
+            <prefix>cube_1e0_yzx_orthotropic</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -188,25 +188,25 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>cube_1e0_yzx_orthotropic_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_yzx_orthotropic_ts_4_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_yzx_orthotropic_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_yzx_orthotropic_ts_4_t_1.000000.vtu</file>
             <field>NodalForces</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_yzx_orthotropic_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_yzx_orthotropic_ts_4_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_yzx_orthotropic_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_yzx_orthotropic_ts_4_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
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 36ef63d1a21..c7625e32032 100644
--- a/Tests/Data/Mechanics/Linear/Orthotropy/cube_1e0_orthotropic_zxy.prj
+++ b/Tests/Data/Mechanics/Linear/Orthotropy/cube_1e0_orthotropic_zxy.prj
@@ -51,7 +51,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>cube_1e0_zxy_orthotropic_pcs_{:process_id}</prefix>
+            <prefix>cube_1e0_zxy_orthotropic</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -188,25 +188,25 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>cube_1e0_zxy_orthotropic_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_zxy_orthotropic_ts_4_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_zxy_orthotropic_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_zxy_orthotropic_ts_4_t_1.000000.vtu</file>
             <field>NodalForces</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_zxy_orthotropic_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_zxy_orthotropic_ts_4_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_zxy_orthotropic_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_zxy_orthotropic_ts_4_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dshearz.prj b/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dshearz.prj
index 777fee873a1..d0c5616f49c 100644
--- a/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dshearz.prj
+++ b/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dshearz.prj
@@ -52,7 +52,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m3_3Dshearz_pcs_{:process_id}</prefix>
+            <prefix>m3_3Dshearz</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
@@ -218,19 +218,19 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>m3_3Dshearz_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>m3_3Dshearz_ts_1_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m3_3Dshearz_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>m3_3Dshearz_ts_1_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-7</absolute_tolerance>
             <relative_tolerance>1e-10</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m3_3Dshearz_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>m3_3Dshearz_ts_1_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dshearz_rot.prj b/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dshearz_rot.prj
index 9d3c6c42dd7..acec8418a74 100644
--- a/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dshearz_rot.prj
+++ b/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dshearz_rot.prj
@@ -53,7 +53,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m3_3Dshearz_rot_pcs_{:process_id}</prefix>
+            <prefix>m3_3Dshearz_rot</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
@@ -277,19 +277,19 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>m3_3Dshearz_rot_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>m3_3Dshearz_rot_ts_1_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m3_3Dshearz_rot_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>m3_3Dshearz_rot_ts_1_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>5e-5</absolute_tolerance>
             <relative_tolerance>1e-10</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m3_3Dshearz_rot_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>m3_3Dshearz_rot_ts_1_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dtopload.prj b/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dtopload.prj
index cff0efc84d9..4479138c243 100644
--- a/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dtopload.prj
+++ b/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dtopload.prj
@@ -52,7 +52,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m3_3Dtopload_pcs_{:process_id}</prefix>
+            <prefix>m3_3Dtopload</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
@@ -218,19 +218,19 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>m3_3Dtopload_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>m3_3Dtopload_ts_1_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m3_3Dtopload_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>m3_3Dtopload_ts_1_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>5e-6</absolute_tolerance>
             <relative_tolerance>1e-10</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m3_3Dtopload_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>m3_3Dtopload_ts_1_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dtoploadlc.prj b/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dtoploadlc.prj
index 5809903cf50..b902b08b395 100644
--- a/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dtoploadlc.prj
+++ b/Tests/Data/Mechanics/Linear/Orthotropy/m3_3Dtoploadlc.prj
@@ -53,7 +53,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m3_3Dtoploadlc_pcs_{:process_id}</prefix>
+            <prefix>m3_3Dtoploadlc</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
@@ -239,19 +239,19 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>m3_3Dtoploadlc_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>m3_3Dtoploadlc_ts_1_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m3_3Dtoploadlc_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>m3_3Dtoploadlc_ts_1_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>5e-6</absolute_tolerance>
             <relative_tolerance>1e-10</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m3_3Dtoploadlc_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>m3_3Dtoploadlc_ts_1_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/Orthotropy/square_1e0_orthotropic_45xy_z.prj b/Tests/Data/Mechanics/Linear/Orthotropy/square_1e0_orthotropic_45xy_z.prj
index f01efe9c927..4242203c02a 100644
--- a/Tests/Data/Mechanics/Linear/Orthotropy/square_1e0_orthotropic_45xy_z.prj
+++ b/Tests/Data/Mechanics/Linear/Orthotropy/square_1e0_orthotropic_45xy_z.prj
@@ -51,7 +51,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>square_1e0_orthotropic_45xy_z_pcs_{:process_id}</prefix>
+            <prefix>square_1e0_orthotropic_45xy_z</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -175,25 +175,25 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>square_1e0_orthotropic_45xy_z_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_orthotropic_45xy_z_ts_4_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-16</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>square_1e0_orthotropic_45xy_z_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_orthotropic_45xy_z_ts_4_t_1.000000.vtu</file>
             <field>NodalForces</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>square_1e0_orthotropic_45xy_z_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_orthotropic_45xy_z_ts_4_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-16</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>square_1e0_orthotropic_45xy_z_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_orthotropic_45xy_z_ts_4_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
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 e38fd37a51b..ea5767c859f 100644
--- a/Tests/Data/Mechanics/Linear/Orthotropy/square_1e0_orthotropic_xyz.prj
+++ b/Tests/Data/Mechanics/Linear/Orthotropy/square_1e0_orthotropic_xyz.prj
@@ -51,7 +51,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>square_1e0_orthotropic_xyz_pcs_{:process_id}</prefix>
+            <prefix>square_1e0_orthotropic_xyz</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -175,25 +175,25 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>square_1e0_orthotropic_xyz_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_orthotropic_xyz_ts_4_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-16</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>square_1e0_orthotropic_xyz_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_orthotropic_xyz_ts_4_t_1.000000.vtu</file>
             <field>NodalForces</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>square_1e0_orthotropic_xyz_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_orthotropic_xyz_ts_4_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-16</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>square_1e0_orthotropic_xyz_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_orthotropic_xyz_ts_4_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/Orthotropy/square_1e0_orthotropic_y-xz.prj b/Tests/Data/Mechanics/Linear/Orthotropy/square_1e0_orthotropic_y-xz.prj
index 7c0f0b3a13a..8c7250f7040 100644
--- a/Tests/Data/Mechanics/Linear/Orthotropy/square_1e0_orthotropic_y-xz.prj
+++ b/Tests/Data/Mechanics/Linear/Orthotropy/square_1e0_orthotropic_y-xz.prj
@@ -51,7 +51,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>square_1e0_orthotropic_y-xz_pcs_{:process_id}</prefix>
+            <prefix>square_1e0_orthotropic_y-xz</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -175,25 +175,25 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>square_1e0_orthotropic_y-xz_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_orthotropic_y-xz_ts_4_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-16</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>square_1e0_orthotropic_y-xz_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_orthotropic_y-xz_ts_4_t_1.000000.vtu</file>
             <field>NodalForces</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>square_1e0_orthotropic_y-xz_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_orthotropic_y-xz_ts_4_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-16</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>square_1e0_orthotropic_y-xz_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_orthotropic_y-xz_ts_4_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/PressureBC/axisymmetric_pipe.prj b/Tests/Data/Mechanics/Linear/PressureBC/axisymmetric_pipe.prj
index 94610f0d00a..2ab53e25b65 100644
--- a/Tests/Data/Mechanics/Linear/PressureBC/axisymmetric_pipe.prj
+++ b/Tests/Data/Mechanics/Linear/PressureBC/axisymmetric_pipe.prj
@@ -49,7 +49,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>axisymmetric_pipe_pcs_{:process_id}</prefix>
+            <prefix>axisymmetric_pipe</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -162,13 +162,13 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>axisymmetric_pipe_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>axisymmetric_pipe_ts_1_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>axisymmetric_pipe_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>axisymmetric_pipe_ts_1_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/PressureBC/axisymmetric_sphere.prj b/Tests/Data/Mechanics/Linear/PressureBC/axisymmetric_sphere.prj
index 9aef3c0bd6b..ad82e38a53f 100644
--- a/Tests/Data/Mechanics/Linear/PressureBC/axisymmetric_sphere.prj
+++ b/Tests/Data/Mechanics/Linear/PressureBC/axisymmetric_sphere.prj
@@ -49,7 +49,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>axisymmetric_sphere_pcs_{:process_id}</prefix>
+            <prefix>axisymmetric_sphere</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -165,13 +165,13 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>axisymmetric_sphere_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>axisymmetric_sphere_ts_1_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-15</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>axisymmetric_sphere_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>axisymmetric_sphere_ts_1_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-8</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/PressureBC/hollow_sphere.prj b/Tests/Data/Mechanics/Linear/PressureBC/hollow_sphere.prj
index 086e13ba24e..e4e52ed9583 100644
--- a/Tests/Data/Mechanics/Linear/PressureBC/hollow_sphere.prj
+++ b/Tests/Data/Mechanics/Linear/PressureBC/hollow_sphere.prj
@@ -49,7 +49,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>hollow_sphere_pcs_{:process_id}</prefix>
+            <prefix>hollow_sphere</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -189,13 +189,13 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>hollow_sphere_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>hollow_sphere_ts_1_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-15</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>hollow_sphere_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>hollow_sphere_ts_1_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/PrincipalStress/sphere.prj b/Tests/Data/Mechanics/Linear/PrincipalStress/sphere.prj
index 503b4b741a7..d658cf04dc6 100644
--- a/Tests/Data/Mechanics/Linear/PrincipalStress/sphere.prj
+++ b/Tests/Data/Mechanics/Linear/PrincipalStress/sphere.prj
@@ -55,7 +55,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>output_pcs_{:process_id}</prefix>
+            <prefix>output</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
diff --git a/Tests/Data/Mechanics/Linear/PythonHertzContact/hertz_contact.prj b/Tests/Data/Mechanics/Linear/PythonHertzContact/hertz_contact.prj
index 731a4e228fb..6610eac95fb 100644
--- a/Tests/Data/Mechanics/Linear/PythonHertzContact/hertz_contact.prj
+++ b/Tests/Data/Mechanics/Linear/PythonHertzContact/hertz_contact.prj
@@ -51,7 +51,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>hertz_pcs_{:process_id}</prefix>
+            <prefix>hertz</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -153,37 +153,37 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>hertz_pcs_0_ts_5_t_5.000000.vtu</file>
+            <file>hertz_ts_5_t_5.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-16</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>hertz_pcs_0_ts_5_t_5.000000.vtu</file>
+            <file>hertz_ts_5_t_5.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>5e-15</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>hertz_pcs_0_ts_5_t_5.000000.vtu</file>
+            <file>hertz_ts_5_t_5.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>5e-15</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>hertz_pcs_0_ts_10_t_10.000000.vtu</file>
+            <file>hertz_ts_10_t_10.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-16</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>hertz_pcs_0_ts_10_t_10.000000.vtu</file>
+            <file>hertz_ts_10_t_10.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>5e-15</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>hertz_pcs_0_ts_10_t_10.000000.vtu</file>
+            <file>hertz_ts_10_t_10.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>5e-15</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/PythonPiston/piston.prj b/Tests/Data/Mechanics/Linear/PythonPiston/piston.prj
index 5affc1d93e3..2bbca410fa4 100644
--- a/Tests/Data/Mechanics/Linear/PythonPiston/piston.prj
+++ b/Tests/Data/Mechanics/Linear/PythonPiston/piston.prj
@@ -51,7 +51,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>piston_pcs_{:process_id}</prefix>
+            <prefix>piston</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -152,37 +152,37 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>piston_pcs_0_ts_5_t_5.000000.vtu</file>
+            <file>piston_ts_5_t_5.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-16</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>piston_pcs_0_ts_5_t_5.000000.vtu</file>
+            <file>piston_ts_5_t_5.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>piston_pcs_0_ts_5_t_5.000000.vtu</file>
+            <file>piston_ts_5_t_5.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-8</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>piston_pcs_0_ts_10_t_10.000000.vtu</file>
+            <file>piston_ts_10_t_10.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-16</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>piston_pcs_0_ts_10_t_10.000000.vtu</file>
+            <file>piston_ts_10_t_10.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-13</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>piston_pcs_0_ts_10_t_10.000000.vtu</file>
+            <file>piston_ts_10_t_10.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-7</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/cube_1e0.prj b/Tests/Data/Mechanics/Linear/cube_1e0.prj
index 6be7966a2de..5439c3e016f 100644
--- a/Tests/Data/Mechanics/Linear/cube_1e0.prj
+++ b/Tests/Data/Mechanics/Linear/cube_1e0.prj
@@ -50,7 +50,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>cube_1e0_pcs_{:process_id}</prefix>
+            <prefix>cube_1e0</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -172,25 +172,25 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>cube_1e0_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_ts_4_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_ts_4_t_1.000000.vtu</file>
             <field>NodalForces</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_ts_4_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_ts_4_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/cube_1e0_simple_shear.prj b/Tests/Data/Mechanics/Linear/cube_1e0_simple_shear.prj
index 4bb8fbd9178..bf37fdbf731 100644
--- a/Tests/Data/Mechanics/Linear/cube_1e0_simple_shear.prj
+++ b/Tests/Data/Mechanics/Linear/cube_1e0_simple_shear.prj
@@ -50,7 +50,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>cube_1e0_simple_shear_pcs_{:process_id}</prefix>
+            <prefix>cube_1e0_simple_shear</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -190,25 +190,25 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>cube_1e0_simple_shear_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_simple_shear_ts_4_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_simple_shear_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_simple_shear_ts_4_t_1.000000.vtu</file>
             <field>NodalForces</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_simple_shear_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_simple_shear_ts_4_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>cube_1e0_simple_shear_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>cube_1e0_simple_shear_ts_4_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/disc_with_hole.prj b/Tests/Data/Mechanics/Linear/disc_with_hole.prj
index 7c97e88e655..ae212d2755f 100644
--- a/Tests/Data/Mechanics/Linear/disc_with_hole.prj
+++ b/Tests/Data/Mechanics/Linear/disc_with_hole.prj
@@ -49,7 +49,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>disc_with_hole_pcs_{:process_id}</prefix>
+            <prefix>disc_with_hole</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -157,7 +157,7 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>disc_with_hole_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>disc_with_hole_ts_4_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-16</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/plain_strain_pipe.prj b/Tests/Data/Mechanics/Linear/plain_strain_pipe.prj
index 41007b18d8a..de192e86339 100644
--- a/Tests/Data/Mechanics/Linear/plain_strain_pipe.prj
+++ b/Tests/Data/Mechanics/Linear/plain_strain_pipe.prj
@@ -49,7 +49,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>plain_strain_pipe_pcs_{:process_id}</prefix>
+            <prefix>plain_strain_pipe</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -165,13 +165,13 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>plain_strain_pipe_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>plain_strain_pipe_ts_1_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>plain_strain_pipe_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>plain_strain_pipe_ts_1_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/ring_plane_strain.prj b/Tests/Data/Mechanics/Linear/ring_plane_strain.prj
index a0a2062aef3..2eb3fa02918 100644
--- a/Tests/Data/Mechanics/Linear/ring_plane_strain.prj
+++ b/Tests/Data/Mechanics/Linear/ring_plane_strain.prj
@@ -41,7 +41,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>ring_plane_strain_pcs_{:process_id}</prefix>
+            <prefix>ring_plane_strain</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -156,13 +156,13 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>ring_plane_strain_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>ring_plane_strain_ts_1_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>6e-4</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>ring_plane_strain_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>ring_plane_strain_ts_1_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>6e-4</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/square_1e0.prj b/Tests/Data/Mechanics/Linear/square_1e0.prj
index ee0440c04e9..abd19f29c8b 100644
--- a/Tests/Data/Mechanics/Linear/square_1e0.prj
+++ b/Tests/Data/Mechanics/Linear/square_1e0.prj
@@ -49,7 +49,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>square_1e0_pcs_{:process_id}</prefix>
+            <prefix>square_1e0</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -152,13 +152,13 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>square_1e0_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_ts_4_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-16</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>square_1e0_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e0_ts_4_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-16</absolute_tolerance>
             <relative_tolerance>1e-16</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/square_1e2.prj b/Tests/Data/Mechanics/Linear/square_1e2.prj
index 3c30ca903c8..80ee66e40b9 100644
--- a/Tests/Data/Mechanics/Linear/square_1e2.prj
+++ b/Tests/Data/Mechanics/Linear/square_1e2.prj
@@ -49,7 +49,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>square_1e2_pcs_{:process_id}</prefix>
+            <prefix>square_1e2</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -152,13 +152,13 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>square_1e2_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e2_ts_4_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-15</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>square_1e2_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e2_ts_4_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-15</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
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 64f428e28ba..61467a7176c 100644
--- a/Tests/Data/Mechanics/Linear/square_1e2_quad8_traction_top.prj
+++ b/Tests/Data/Mechanics/Linear/square_1e2_quad8_traction_top.prj
@@ -49,7 +49,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>square_1e2_quad8_traction_topBC_pcs_{:process_id}</prefix>
+            <prefix>square_1e2_quad8_traction_topBC</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -152,13 +152,13 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>square_1e2_quad8_traction_topBC_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e2_quad8_traction_topBC_ts_4_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>square_1e2_quad8_traction_topBC_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e2_quad8_traction_topBC_ts_4_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>3e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/square_1e5.prj b/Tests/Data/Mechanics/Linear/square_1e5.prj
index 23490a812dd..c6821b2e5e6 100644
--- a/Tests/Data/Mechanics/Linear/square_1e5.prj
+++ b/Tests/Data/Mechanics/Linear/square_1e5.prj
@@ -49,7 +49,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>square_1e5_pcs_{:process_id}</prefix>
+            <prefix>square_1e5</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -152,13 +152,13 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>square_1e5_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e5_ts_4_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-15</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>square_1e5_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_1e5_ts_4_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-13</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/square_with_deactivated_hole.prj b/Tests/Data/Mechanics/Linear/square_with_deactivated_hole.prj
index edcddc0d50b..ac68e0e820c 100644
--- a/Tests/Data/Mechanics/Linear/square_with_deactivated_hole.prj
+++ b/Tests/Data/Mechanics/Linear/square_with_deactivated_hole.prj
@@ -54,7 +54,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>square_with_deactivated_hole_pcs_{:process_id}</prefix>
+            <prefix>square_with_deactivated_hole</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -172,13 +172,13 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>square_with_deactivated_hole_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_with_deactivated_hole_ts_4_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-14</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>square_with_deactivated_hole_pcs_0_ts_4_t_1.000000.vtu</file>
+            <file>square_with_deactivated_hole_ts_4_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-14</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/two_material_gravity.prj b/Tests/Data/Mechanics/Linear/two_material_gravity.prj
index e7573759ebb..c8772b5b0ab 100644
--- a/Tests/Data/Mechanics/Linear/two_material_gravity.prj
+++ b/Tests/Data/Mechanics/Linear/two_material_gravity.prj
@@ -50,7 +50,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>two_material_gravity_pcs_{:process_id}</prefix>
+            <prefix>two_material_gravity</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -149,19 +149,19 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>two_material_gravity_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>two_material_gravity_ts_1_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>5e-14</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>two_material_gravity_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>two_material_gravity_ts_1_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>5e-13</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>two_material_gravity_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>two_material_gravity_ts_1_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>5e-14</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/Linear/two_material_gravity_Emodulus.prj b/Tests/Data/Mechanics/Linear/two_material_gravity_Emodulus.prj
index 8fe3b25c792..e987f367a70 100644
--- a/Tests/Data/Mechanics/Linear/two_material_gravity_Emodulus.prj
+++ b/Tests/Data/Mechanics/Linear/two_material_gravity_Emodulus.prj
@@ -55,7 +55,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>two_material_gravity_Emodulus_pcs_{:process_id}</prefix>
+            <prefix>two_material_gravity_Emodulus</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -159,19 +159,19 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>two_material_gravity_Emodulus_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>two_material_gravity_Emodulus_ts_1_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>5e-14</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>two_material_gravity_Emodulus_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>two_material_gravity_Emodulus_ts_1_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-13</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>two_material_gravity_Emodulus_pcs_0_ts_1_t_1.000000.vtu</file>
+            <file>two_material_gravity_Emodulus_ts_1_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>5e-14</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/MohrCoulombAbboSloan/displacement_load.prj b/Tests/Data/Mechanics/MohrCoulombAbboSloan/displacement_load.prj
index 911851adf5b..d6f404bd9a1 100644
--- a/Tests/Data/Mechanics/MohrCoulombAbboSloan/displacement_load.prj
+++ b/Tests/Data/Mechanics/MohrCoulombAbboSloan/displacement_load.prj
@@ -61,7 +61,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>displacement_load_pcs_{:process_id}</prefix>
+            <prefix>displacement_load</prefix>
             <timesteps>
                 <pair>
                     <repeat>100000</repeat>
diff --git a/Tests/Data/Mechanics/MohrCoulombAbboSloan/load_test_elastic.prj b/Tests/Data/Mechanics/MohrCoulombAbboSloan/load_test_elastic.prj
index 550a1fbbe79..8a3a9a01639 100644
--- a/Tests/Data/Mechanics/MohrCoulombAbboSloan/load_test_elastic.prj
+++ b/Tests/Data/Mechanics/MohrCoulombAbboSloan/load_test_elastic.prj
@@ -67,7 +67,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>load_test_elastic_pcs_{:process_id}</prefix>
+            <prefix>load_test_elastic</prefix>
             <timesteps>
                 <pair>
                     <repeat>40</repeat>
diff --git a/Tests/Data/Mechanics/MohrCoulombAbboSloan/load_test_mc.prj b/Tests/Data/Mechanics/MohrCoulombAbboSloan/load_test_mc.prj
index e73d0daa950..dbfaca31d3e 100644
--- a/Tests/Data/Mechanics/MohrCoulombAbboSloan/load_test_mc.prj
+++ b/Tests/Data/Mechanics/MohrCoulombAbboSloan/load_test_mc.prj
@@ -65,7 +65,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>load_test_mc_pcs_{:process_id}</prefix>
+            <prefix>load_test_mc</prefix>
             <timesteps>
                 <pair>
                     <repeat>40</repeat>
@@ -221,145 +221,145 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>load_test_mc_pcs_0_ts_10_t_10.000000.vtu</file>
+            <file>load_test_mc_ts_10_t_10.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-13</absolute_tolerance>
             <relative_tolerance>1e-14</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>load_test_mc_pcs_0_ts_10_t_10.000000.vtu</file>
+            <file>load_test_mc_ts_10_t_10.000000.vtu</file>
             <field>NodalForces</field>
             <absolute_tolerance>1e-4</absolute_tolerance>
             <relative_tolerance>1e-11</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>load_test_mc_pcs_0_ts_10_t_10.000000.vtu</file>
+            <file>load_test_mc_ts_10_t_10.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>1e-12</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>load_test_mc_pcs_0_ts_10_t_10.000000.vtu</file>
+            <file>load_test_mc_ts_10_t_10.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>load_test_mc_pcs_0_ts_10_t_10.000000.vtu</file>
+            <file>load_test_mc_ts_10_t_10.000000.vtu</file>
             <field>ElasticStrain</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>load_test_mc_pcs_0_ts_10_t_10.000000.vtu</file>
+            <file>load_test_mc_ts_10_t_10.000000.vtu</file>
             <field>EquivalentPlasticStrain</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>load_test_mc_pcs_0_ts_20_t_20.000000.vtu</file>
+            <file>load_test_mc_ts_20_t_20.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-13</absolute_tolerance>
             <relative_tolerance>2e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>load_test_mc_pcs_0_ts_20_t_20.000000.vtu</file>
+            <file>load_test_mc_ts_20_t_20.000000.vtu</file>
             <field>NodalForces</field>
             <absolute_tolerance>2e-5</absolute_tolerance>
             <relative_tolerance>1e-9</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>load_test_mc_pcs_0_ts_20_t_20.000000.vtu</file>
+            <file>load_test_mc_ts_20_t_20.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-11</absolute_tolerance>
             <relative_tolerance>1e-11</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>load_test_mc_pcs_0_ts_20_t_20.000000.vtu</file>
+            <file>load_test_mc_ts_20_t_20.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>load_test_mc_pcs_0_ts_20_t_20.000000.vtu</file>
+            <file>load_test_mc_ts_20_t_20.000000.vtu</file>
             <field>ElasticStrain</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>load_test_mc_pcs_0_ts_20_t_20.000000.vtu</file>
+            <file>load_test_mc_ts_20_t_20.000000.vtu</file>
             <field>EquivalentPlasticStrain</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>load_test_mc_pcs_0_ts_30_t_30.000000.vtu</file>
+            <file>load_test_mc_ts_30_t_30.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-13</absolute_tolerance>
             <relative_tolerance>1e-14</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>load_test_mc_pcs_0_ts_30_t_30.000000.vtu</file>
+            <file>load_test_mc_ts_30_t_30.000000.vtu</file>
             <field>NodalForces</field>
             <absolute_tolerance>1e-3</absolute_tolerance>
             <relative_tolerance>1e-11</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>load_test_mc_pcs_0_ts_30_t_30.000000.vtu</file>
+            <file>load_test_mc_ts_30_t_30.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-12</absolute_tolerance>
             <relative_tolerance>1e-12</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>load_test_mc_pcs_0_ts_30_t_30.000000.vtu</file>
+            <file>load_test_mc_ts_30_t_30.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>load_test_mc_pcs_0_ts_30_t_30.000000.vtu</file>
+            <file>load_test_mc_ts_30_t_30.000000.vtu</file>
             <field>ElasticStrain</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>load_test_mc_pcs_0_ts_30_t_30.000000.vtu</file>
+            <file>load_test_mc_ts_30_t_30.000000.vtu</file>
             <field>EquivalentPlasticStrain</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>load_test_mc_pcs_0_ts_40_t_40.000000.vtu</file>
+            <file>load_test_mc_ts_40_t_40.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>2e-13</absolute_tolerance>
             <relative_tolerance>1e-14</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>load_test_mc_pcs_0_ts_40_t_40.000000.vtu</file>
+            <file>load_test_mc_ts_40_t_40.000000.vtu</file>
             <field>NodalForces</field>
             <absolute_tolerance>1e-4</absolute_tolerance>
             <relative_tolerance>1e-12</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>load_test_mc_pcs_0_ts_40_t_40.000000.vtu</file>
+            <file>load_test_mc_ts_40_t_40.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-11</absolute_tolerance>
             <relative_tolerance>1e-11</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>load_test_mc_pcs_0_ts_40_t_40.000000.vtu</file>
+            <file>load_test_mc_ts_40_t_40.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>load_test_mc_pcs_0_ts_40_t_40.000000.vtu</file>
+            <file>load_test_mc_ts_40_t_40.000000.vtu</file>
             <field>ElasticStrain</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>load_test_mc_pcs_0_ts_40_t_40.000000.vtu</file>
+            <file>load_test_mc_ts_40_t_40.000000.vtu</file>
             <field>EquivalentPlasticStrain</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
diff --git a/Tests/Data/Mechanics/MohrCoulombAbboSloan/load_test_mc_nonassociated.prj b/Tests/Data/Mechanics/MohrCoulombAbboSloan/load_test_mc_nonassociated.prj
index 29ecefdf839..8e5b444e596 100644
--- a/Tests/Data/Mechanics/MohrCoulombAbboSloan/load_test_mc_nonassociated.prj
+++ b/Tests/Data/Mechanics/MohrCoulombAbboSloan/load_test_mc_nonassociated.prj
@@ -77,7 +77,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>load_test_mc_pcs_{:process_id}</prefix>
+            <prefix>load_test_mc</prefix>
             <timesteps>
                 <pair>
                     <repeat>40</repeat>
diff --git a/Tests/Data/Mechanics/MohrCoulombAbboSloan/oedometer.prj b/Tests/Data/Mechanics/MohrCoulombAbboSloan/oedometer.prj
index d90f4f21bea..4fc8a9a2341 100644
--- a/Tests/Data/Mechanics/MohrCoulombAbboSloan/oedometer.prj
+++ b/Tests/Data/Mechanics/MohrCoulombAbboSloan/oedometer.prj
@@ -65,7 +65,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>oedometer_pcs_{:process_id}</prefix>
+            <prefix>oedometer</prefix>
             <timesteps>
                 <pair>
                     <repeat>100000</repeat>
@@ -202,73 +202,73 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>oedometer_pcs_0_ts_5_t_79811.437500.vtu</file>
+            <file>oedometer_ts_5_t_79811.437500.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-13</absolute_tolerance>
             <relative_tolerance>1e-14</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>oedometer_pcs_0_ts_5_t_79811.437500.vtu</file>
+            <file>oedometer_ts_5_t_79811.437500.vtu</file>
             <field>NodalForces</field>
             <absolute_tolerance>1e-4</absolute_tolerance>
             <relative_tolerance>1e-11</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>oedometer_pcs_0_ts_5_t_79811.437500.vtu</file>
+            <file>oedometer_ts_5_t_79811.437500.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>1e-12</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>oedometer_pcs_0_ts_5_t_79811.437500.vtu</file>
+            <file>oedometer_ts_5_t_79811.437500.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>oedometer_pcs_0_ts_5_t_79811.437500.vtu</file>
+            <file>oedometer_ts_5_t_79811.437500.vtu</file>
             <field>ElasticStrain</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>oedometer_pcs_0_ts_5_t_79811.437500.vtu</file>
+            <file>oedometer_ts_5_t_79811.437500.vtu</file>
             <field>EquivalentPlasticStrain</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>oedometer_pcs_0_ts_376_t_240000.000000.vtu</file>
+            <file>oedometer_ts_376_t_240000.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-13</absolute_tolerance>
             <relative_tolerance>1e-13</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>oedometer_pcs_0_ts_376_t_240000.000000.vtu</file>
+            <file>oedometer_ts_376_t_240000.000000.vtu</file>
             <field>NodalForces</field>
             <absolute_tolerance>2e-5</absolute_tolerance>
             <relative_tolerance>1e-9</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>oedometer_pcs_0_ts_376_t_240000.000000.vtu</file>
+            <file>oedometer_ts_376_t_240000.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-11</absolute_tolerance>
             <relative_tolerance>1e-11</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>oedometer_pcs_0_ts_376_t_240000.000000.vtu</file>
+            <file>oedometer_ts_376_t_240000.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>oedometer_pcs_0_ts_376_t_240000.000000.vtu</file>
+            <file>oedometer_ts_376_t_240000.000000.vtu</file>
             <field>ElasticStrain</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>oedometer_pcs_0_ts_376_t_240000.000000.vtu</file>
+            <file>oedometer_ts_376_t_240000.000000.vtu</file>
             <field>EquivalentPlasticStrain</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-15</relative_tolerance>
diff --git a/Tests/Data/Mechanics/MohrCoulombAbboSloan/oedometer_fixed_timestepping.prj b/Tests/Data/Mechanics/MohrCoulombAbboSloan/oedometer_fixed_timestepping.prj
index 682fdf83286..db4388dfe1c 100644
--- a/Tests/Data/Mechanics/MohrCoulombAbboSloan/oedometer_fixed_timestepping.prj
+++ b/Tests/Data/Mechanics/MohrCoulombAbboSloan/oedometer_fixed_timestepping.prj
@@ -70,7 +70,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>oedometer_fixed_timestepping_pcs_{:process_id}</prefix>
+            <prefix>oedometer_fixed_timestepping</prefix>
             <timesteps>
                 <pair>
                     <repeat>100000</repeat>
diff --git a/Tests/Data/Mechanics/MohrCoulombAbboSloan/slope.prj b/Tests/Data/Mechanics/MohrCoulombAbboSloan/slope.prj
index 74b47d126d7..635d339e8e6 100644
--- a/Tests/Data/Mechanics/MohrCoulombAbboSloan/slope.prj
+++ b/Tests/Data/Mechanics/MohrCoulombAbboSloan/slope.prj
@@ -60,7 +60,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>slope_pcs_{:process_id}</prefix>
+            <prefix>slope</prefix>
             <timesteps>
                 <pair>
                     <repeat>10000</repeat>
@@ -255,37 +255,37 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <regex>slope_pcs_0_ts_.*.vtu</regex>
+            <regex>slope_ts_.*.vtu</regex>
             <field>displacement</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>0.0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <regex>slope_pcs_0_ts_.*.vtu</regex>
+            <regex>slope_ts_.*.vtu</regex>
             <field>sigma</field>
             <absolute_tolerance>2e-8</absolute_tolerance>
             <relative_tolerance>0.0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <regex>slope_pcs_0_ts_.*.vtu</regex>
+            <regex>slope_ts_.*.vtu</regex>
             <field>epsilon</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>0.0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <regex>slope_pcs_0_ts_.*.vtu</regex>
+            <regex>slope_ts_.*.vtu</regex>
             <field>NodalForces</field>
             <absolute_tolerance>1e-8</absolute_tolerance>
             <relative_tolerance>0.0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <regex>slope_pcs_0_ts_.*.vtu</regex>
+            <regex>slope_ts_.*.vtu</regex>
             <field>EquivalentPlasticStrain</field>
             <absolute_tolerance>1e-13</absolute_tolerance>
             <relative_tolerance>0.0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <regex>slope_pcs_0_ts_.*.vtu</regex>
+            <regex>slope_ts_.*.vtu</regex>
             <field>ElasticStrain</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>0.0</relative_tolerance>
diff --git a/Tests/Data/Mechanics/MohrCoulombAbboSloanAnisotropic/triax_1e0_47.prj b/Tests/Data/Mechanics/MohrCoulombAbboSloanAnisotropic/triax_1e0_47.prj
index 5b23ebe9ad8..3d879eb6d29 100644
--- a/Tests/Data/Mechanics/MohrCoulombAbboSloanAnisotropic/triax_1e0_47.prj
+++ b/Tests/Data/Mechanics/MohrCoulombAbboSloanAnisotropic/triax_1e0_47.prj
@@ -62,7 +62,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>triax_47_pcs_{:process_id}</prefix>
+            <prefix>triax_47</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -271,13 +271,13 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>triax_47_pcs_0_ts_200_t_2.000000.vtu</file>
+            <file>triax_47_ts_200_t_2.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-14</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>triax_47_pcs_0_ts_200_t_2.000000.vtu</file>
+            <file>triax_47_ts_200_t_2.000000.vtu</file>
             <field>sigma</field>
             <!-- E is 1e8 -> E * u_tol = 1e-6 -->
             <absolute_tolerance>1e-6</absolute_tolerance>
diff --git a/Tests/Data/Mechanics/MohrCoulombAbboSloanAnisotropic/triax_ORTHO_original.prj b/Tests/Data/Mechanics/MohrCoulombAbboSloanAnisotropic/triax_ORTHO_original.prj
index c2d15d787fc..93ff19aa105 100644
--- a/Tests/Data/Mechanics/MohrCoulombAbboSloanAnisotropic/triax_ORTHO_original.prj
+++ b/Tests/Data/Mechanics/MohrCoulombAbboSloanAnisotropic/triax_ORTHO_original.prj
@@ -69,7 +69,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>triax_ortho_0_pcs_{:process_id}</prefix>
+            <prefix>triax_ortho_0</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
diff --git a/Tests/Data/Mechanics/MohrCoulombAbboSloanAnisotropic/triax_aniso_1e0_47.prj b/Tests/Data/Mechanics/MohrCoulombAbboSloanAnisotropic/triax_aniso_1e0_47.prj
index 00bddb8dca1..761176c5fc9 100644
--- a/Tests/Data/Mechanics/MohrCoulombAbboSloanAnisotropic/triax_aniso_1e0_47.prj
+++ b/Tests/Data/Mechanics/MohrCoulombAbboSloanAnisotropic/triax_aniso_1e0_47.prj
@@ -68,7 +68,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>triax_aniso_47_pcs_{:process_id}</prefix>
+            <prefix>triax_aniso_47</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -308,13 +308,13 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>triax_aniso_47_pcs_0_ts_200_t_2.000000.vtu</file>
+            <file>triax_aniso_47_ts_200_t_2.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-14</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>triax_aniso_47_pcs_0_ts_200_t_2.000000.vtu</file>
+            <file>triax_aniso_47_ts_200_t_2.000000.vtu</file>
             <field>sigma</field>
             <!-- E is 1e10 -> E * u_tol = 1e-4 -->
             <absolute_tolerance>1e-4</absolute_tolerance>
diff --git a/Tests/Data/Mechanics/MohrCoulombAbboSloanAnisotropic/triax_aniso_original.prj b/Tests/Data/Mechanics/MohrCoulombAbboSloanAnisotropic/triax_aniso_original.prj
index e39250e98b8..7a4e207ea23 100644
--- a/Tests/Data/Mechanics/MohrCoulombAbboSloanAnisotropic/triax_aniso_original.prj
+++ b/Tests/Data/Mechanics/MohrCoulombAbboSloanAnisotropic/triax_aniso_original.prj
@@ -68,7 +68,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>triax_aniso_0_pcs_{:process_id}</prefix>
+            <prefix>triax_aniso_0</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
diff --git a/Tests/Data/Mechanics/MohrCoulombAbboSloanAnisotropic/triax_original.prj b/Tests/Data/Mechanics/MohrCoulombAbboSloanAnisotropic/triax_original.prj
index b57771f0604..1a3a81ddd7d 100644
--- a/Tests/Data/Mechanics/MohrCoulombAbboSloanAnisotropic/triax_original.prj
+++ b/Tests/Data/Mechanics/MohrCoulombAbboSloanAnisotropic/triax_original.prj
@@ -62,7 +62,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>triax_0_pcs_{:process_id}</prefix>
+            <prefix>triax_0</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
diff --git a/Tests/Data/Mechanics/MohrCoulombAbboSloanAnisotropic/triax_ortho_1e0_47.prj b/Tests/Data/Mechanics/MohrCoulombAbboSloanAnisotropic/triax_ortho_1e0_47.prj
index c7c8d7bb19a..d295ce5a909 100644
--- a/Tests/Data/Mechanics/MohrCoulombAbboSloanAnisotropic/triax_ortho_1e0_47.prj
+++ b/Tests/Data/Mechanics/MohrCoulombAbboSloanAnisotropic/triax_ortho_1e0_47.prj
@@ -69,7 +69,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>triax_ortho_47_pcs_{:process_id}</prefix>
+            <prefix>triax_ortho_47</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -313,13 +313,13 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>triax_ortho_47_pcs_0_ts_200_t_2.000000.vtu</file>
+            <file>triax_ortho_47_ts_200_t_2.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-14</absolute_tolerance>
             <relative_tolerance>1e-14</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>triax_ortho_47_pcs_0_ts_200_t_2.000000.vtu</file>
+            <file>triax_ortho_47_ts_200_t_2.000000.vtu</file>
             <field>sigma</field>
             <!-- E is 1e10 -> E * u_tol = 1e-4 -->
             <absolute_tolerance>1e-4</absolute_tolerance>
diff --git a/Tests/Data/Mechanics/m1_1Dload/m1_1Dload.prj b/Tests/Data/Mechanics/m1_1Dload/m1_1Dload.prj
index 90ea796c695..8571e064c44 100755
--- a/Tests/Data/Mechanics/m1_1Dload/m1_1Dload.prj
+++ b/Tests/Data/Mechanics/m1_1Dload/m1_1Dload.prj
@@ -50,7 +50,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m1_1Dload_pcs_{:process_id}</prefix>
+            <prefix>m1_1Dload</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
diff --git a/Tests/Data/Mechanics/m1_1Dlozenge/m1_1Dlozenge.prj b/Tests/Data/Mechanics/m1_1Dlozenge/m1_1Dlozenge.prj
index 0790f0e60a1..d75f6e9fbd0 100755
--- a/Tests/Data/Mechanics/m1_1Dlozenge/m1_1Dlozenge.prj
+++ b/Tests/Data/Mechanics/m1_1Dlozenge/m1_1Dlozenge.prj
@@ -50,7 +50,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m1_1Dlozenge_pcs_{:process_id}</prefix>
+            <prefix>m1_1Dlozenge</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
diff --git a/Tests/Data/Mechanics/m1_2Dload/m1_2Dload.prj b/Tests/Data/Mechanics/m1_2Dload/m1_2Dload.prj
index faeb9baa091..84c1de6c8a3 100755
--- a/Tests/Data/Mechanics/m1_2Dload/m1_2Dload.prj
+++ b/Tests/Data/Mechanics/m1_2Dload/m1_2Dload.prj
@@ -50,7 +50,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m1_2Dload_pcs_{:process_id}</prefix>
+            <prefix>m1_2Dload</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
diff --git a/Tests/Data/Mechanics/m1_3Dbottom/m1_3Dbottom.prj b/Tests/Data/Mechanics/m1_3Dbottom/m1_3Dbottom.prj
index 71caf848825..d3f108b765e 100755
--- a/Tests/Data/Mechanics/m1_3Dbottom/m1_3Dbottom.prj
+++ b/Tests/Data/Mechanics/m1_3Dbottom/m1_3Dbottom.prj
@@ -50,7 +50,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m1_3Dbottom_pcs_{:process_id}</prefix>
+            <prefix>m1_3Dbottom</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
diff --git a/Tests/Data/Mechanics/m1_3Dgravity/m1_3Dgravity.prj b/Tests/Data/Mechanics/m1_3Dgravity/m1_3Dgravity.prj
index 2407b89e6ec..0cf9b02d0ef 100755
--- a/Tests/Data/Mechanics/m1_3Dgravity/m1_3Dgravity.prj
+++ b/Tests/Data/Mechanics/m1_3Dgravity/m1_3Dgravity.prj
@@ -50,7 +50,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m1_3Dgravity_pcs_{:process_id}</prefix>
+            <prefix>m1_3Dgravity</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
diff --git a/Tests/Data/Mechanics/m1_3Dload/m1_3Dload.prj b/Tests/Data/Mechanics/m1_3Dload/m1_3Dload.prj
index 94fab099759..347bb4d940d 100755
--- a/Tests/Data/Mechanics/m1_3Dload/m1_3Dload.prj
+++ b/Tests/Data/Mechanics/m1_3Dload/m1_3Dload.prj
@@ -50,7 +50,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m1_3Dload_pcs_{:process_id}</prefix>
+            <prefix>m1_3Dload</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
diff --git a/Tests/Data/Mechanics/m1_3Dsquare/m1_3Dsquare.prj b/Tests/Data/Mechanics/m1_3Dsquare/m1_3Dsquare.prj
index 40fa05a6420..f4abe36d577 100755
--- a/Tests/Data/Mechanics/m1_3Dsquare/m1_3Dsquare.prj
+++ b/Tests/Data/Mechanics/m1_3Dsquare/m1_3Dsquare.prj
@@ -50,7 +50,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m1_3Dsquare_pcs_{:process_id}</prefix>
+            <prefix>m1_3Dsquare</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
diff --git a/Tests/Data/Mechanics/m1_3Dtopload/m1_3Dtopload.prj b/Tests/Data/Mechanics/m1_3Dtopload/m1_3Dtopload.prj
index a4824c911ca..38631559d48 100755
--- a/Tests/Data/Mechanics/m1_3Dtopload/m1_3Dtopload.prj
+++ b/Tests/Data/Mechanics/m1_3Dtopload/m1_3Dtopload.prj
@@ -50,7 +50,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m1_3Dtopload_pcs_{:process_id}</prefix>
+            <prefix>m1_3Dtopload</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
diff --git a/Tests/Data/Mechanics/m3_3Dshearz/m3_3Dshearz.prj b/Tests/Data/Mechanics/m3_3Dshearz/m3_3Dshearz.prj
index 7a735d68371..8582656e177 100755
--- a/Tests/Data/Mechanics/m3_3Dshearz/m3_3Dshearz.prj
+++ b/Tests/Data/Mechanics/m3_3Dshearz/m3_3Dshearz.prj
@@ -51,7 +51,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m3_3Dshearz_pcs_{:process_id}</prefix>
+            <prefix>m3_3Dshearz</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
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 78c61fa77d2..fd00f3f9032 100755
--- a/Tests/Data/Mechanics/m3_3Dshearz_rot/m3_3Dshearz_rot.prj
+++ b/Tests/Data/Mechanics/m3_3Dshearz_rot/m3_3Dshearz_rot.prj
@@ -51,7 +51,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m3_3Dshearz_rot_pcs_{:process_id}</prefix>
+            <prefix>m3_3Dshearz_rot</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
diff --git a/Tests/Data/Mechanics/m3_3Dtopload/m3_3Dtopload.prj b/Tests/Data/Mechanics/m3_3Dtopload/m3_3Dtopload.prj
index 178bf9a5553..b20c20d20a3 100755
--- a/Tests/Data/Mechanics/m3_3Dtopload/m3_3Dtopload.prj
+++ b/Tests/Data/Mechanics/m3_3Dtopload/m3_3Dtopload.prj
@@ -52,7 +52,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m3_3Dtopload_pcs_{:process_id}</prefix>
+            <prefix>m3_3Dtopload</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
diff --git a/Tests/Data/Mechanics/m3_3Dtoploadlc/m3_3Dtoploadlc.prj b/Tests/Data/Mechanics/m3_3Dtoploadlc/m3_3Dtoploadlc.prj
index c26d79f6aaa..5524d878a7a 100755
--- a/Tests/Data/Mechanics/m3_3Dtoploadlc/m3_3Dtoploadlc.prj
+++ b/Tests/Data/Mechanics/m3_3Dtoploadlc/m3_3Dtoploadlc.prj
@@ -52,7 +52,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m3_3Dtoploadlc_pcs_{:process_id}</prefix>
+            <prefix>m3_3Dtoploadlc</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
-- 
GitLab