diff --git a/Tests/Data/ThermoMechanics/BDT/cube_1e0_bdt.prj b/Tests/Data/ThermoMechanics/BDT/cube_1e0_bdt.prj
index bf2c2bca681a9e44023215e6c4ce07fd38445766..619607cf2f2eb51d1f7463eda73bbebec851ae5c 100644
--- a/Tests/Data/ThermoMechanics/BDT/cube_1e0_bdt.prj
+++ b/Tests/Data/ThermoMechanics/BDT/cube_1e0_bdt.prj
@@ -75,7 +75,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>cube_1e0_bdt_pcs_{:process_id}</prefix>
+            <prefix>cube_1e0_bdt</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/CreepAfterExcavation/CreepAfterExcavation.prj b/Tests/Data/ThermoMechanics/CreepBGRa/CreepAfterExcavation/CreepAfterExcavation.prj
index 82ca318af869a31dcaec761b2314a429df3e8793..6e9dccf835d3772ed353b2cd5cfc99c835cc1ee3 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/CreepAfterExcavation/CreepAfterExcavation.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/CreepAfterExcavation/CreepAfterExcavation.prj
@@ -79,7 +79,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>CreepAfterExcavation_pcs_{:process_id}</prefix>
+            <prefix>CreepAfterExcavation</prefix>
             <timesteps>
                 <pair>
                     <repeat>10</repeat>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreep.prj b/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreep.prj
index 4967c5387e9a5716763740d28c5078d3ad6b022d..bec567b5e715ba02c52f3343b2e1056f48c63eee 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreep.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreep.prj
@@ -70,7 +70,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>SimpleAxisymmetricCreep_pcs_{:process_id}</prefix>
+            <prefix>SimpleAxisymmetricCreep</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreepWithAnalyticSolution.prj b/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreepWithAnalyticSolution.prj
index 4e6a964bb2620dd3ce562b2f35d741fea6585be1..e2f29ee6634d189c88676a371cb7d8aa00023ebf 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreepWithAnalyticSolution.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreepWithAnalyticSolution.prj
@@ -62,7 +62,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>SimpleAxisymmetricCreepWithAnalyticalSolution_pcs_{:process_id}</prefix>
+            <prefix>SimpleAxisymmetricCreepWithAnalyticalSolution</prefix>
             <timesteps>
                 <pair>
                     <repeat>10</repeat>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D1bt/m2_1D1bt.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D1bt/m2_1D1bt.prj
index d31c12ba00b68687d54cea713a801d54a7f9a1f1..ae2f50b8c58829934a2fef1237c99a355d1e721a 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D1bt/m2_1D1bt.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D1bt/m2_1D1bt.prj
@@ -62,7 +62,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m2_1D1bt_pcs_{:process_id}</prefix>
+            <prefix>m2_1D1bt</prefix>
             <timesteps>
                 <pair>
                     <repeat>2</repeat>
@@ -255,37 +255,37 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>m2_1D1bt_pcs_0_ts_200_t_1.500000.vtu</file>
+            <file>m2_1D1bt_ts_200_t_1.500000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>3e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1D1bt_pcs_0_ts_200_t_1.500000.vtu</file>
+            <file>m2_1D1bt_ts_200_t_1.500000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>3.0e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1D1bt_pcs_0_ts_200_t_1.500000.vtu</file>
+            <file>m2_1D1bt_ts_200_t_1.500000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1D1bt_pcs_0_ts_400_t_3.000000.vtu</file>
+            <file>m2_1D1bt_ts_400_t_3.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1D1bt_pcs_0_ts_400_t_3.000000.vtu</file>
+            <file>m2_1D1bt_ts_400_t_3.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>7e-10</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1D1bt_pcs_0_ts_400_t_3.000000.vtu</file>
+            <file>m2_1D1bt_ts_400_t_3.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D2bt/m2_1D2bt.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D2bt/m2_1D2bt.prj
index 6ac50ed33754aeca425947d6412a7e6d9ce43ed5..12cfbe6475aee8f0e77cb4f208190fe15a85c33a 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D2bt/m2_1D2bt.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D2bt/m2_1D2bt.prj
@@ -62,7 +62,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m2_1D2bt_pcs_{:process_id}</prefix>
+            <prefix>m2_1D2bt</prefix>
             <timesteps>
                 <pair>
                     <repeat>2</repeat>
@@ -249,37 +249,37 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>m2_1D2bt_pcs_0_ts_201_t_15.000000.vtu</file>
+            <file>m2_1D2bt_ts_201_t_15.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1D2bt_pcs_0_ts_201_t_15.000000.vtu</file>
+            <file>m2_1D2bt_ts_201_t_15.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1D2bt_pcs_0_ts_201_t_15.000000.vtu</file>
+            <file>m2_1D2bt_ts_201_t_15.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1D2bt_pcs_0_ts_402_t_30.000000.vtu</file>
+            <file>m2_1D2bt_ts_402_t_30.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1D2bt_pcs_0_ts_402_t_30.000000.vtu</file>
+            <file>m2_1D2bt_ts_402_t_30.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1D2bt_pcs_0_ts_402_t_30.000000.vtu</file>
+            <file>m2_1D2bt_ts_402_t_30.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dcreep/m2_1Dcreep.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dcreep/m2_1Dcreep.prj
index 1c83ab3d822e91666a0dfdcbd96de5d04d86765e..59eaebb5d450db4bbb934f26b6734c945f8677e1 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dcreep/m2_1Dcreep.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dcreep/m2_1Dcreep.prj
@@ -62,7 +62,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m2_1Dcreep_pcs_{:process_id}</prefix>
+            <prefix>m2_1Dcreep</prefix>
             <timesteps>
                 <pair>
                     <repeat>2</repeat>
@@ -236,37 +236,37 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>m2_1Dcreep_pcs_0_ts_200_t_10.000000.vtu</file>
+            <file>m2_1Dcreep_ts_200_t_10.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1Dcreep_pcs_0_ts_200_t_10.000000.vtu</file>
+            <file>m2_1Dcreep_ts_200_t_10.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1Dcreep_pcs_0_ts_200_t_10.000000.vtu</file>
+            <file>m2_1Dcreep_ts_200_t_10.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1Dcreep_pcs_0_ts_400_t_20.000000.vtu</file>
+            <file>m2_1Dcreep_ts_400_t_20.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1Dcreep_pcs_0_ts_400_t_20.000000.vtu</file>
+            <file>m2_1Dcreep_ts_400_t_20.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1Dcreep_pcs_0_ts_400_t_20.000000.vtu</file>
+            <file>m2_1Dcreep_ts_400_t_20.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozenge/m2_1Dlozenge.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozenge/m2_1Dlozenge.prj
index a5c13497f82780739d14b82644bb9e4c518e173d..011295ff2fddddee8758dc8d2ed60cd830b6cab5 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozenge/m2_1Dlozenge.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozenge/m2_1Dlozenge.prj
@@ -66,7 +66,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m2_1Dlozenge_pcs_{:process_id}</prefix>
+            <prefix>m2_1Dlozenge</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -270,55 +270,55 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>m2_1Dlozenge_pcs_0_ts_1_t_0.000000.vtu</file>
+            <file>m2_1Dlozenge_ts_1_t_0.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1Dlozenge_pcs_0_ts_1_t_0.000000.vtu</file>
+            <file>m2_1Dlozenge_ts_1_t_0.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>5e-9</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1Dlozenge_pcs_0_ts_1_t_0.000000.vtu</file>
+            <file>m2_1Dlozenge_ts_1_t_0.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1Dlozenge_pcs_0_ts_51_t_5.000000.vtu</file>
+            <file>m2_1Dlozenge_ts_51_t_5.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1Dlozenge_pcs_0_ts_51_t_5.000000.vtu</file>
+            <file>m2_1Dlozenge_ts_51_t_5.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1Dlozenge_pcs_0_ts_51_t_5.000000.vtu</file>
+            <file>m2_1Dlozenge_ts_51_t_5.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1Dlozenge_pcs_0_ts_101_t_10.000000.vtu</file>
+            <file>m2_1Dlozenge_ts_101_t_10.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1Dlozenge_pcs_0_ts_101_t_10.000000.vtu</file>
+            <file>m2_1Dlozenge_ts_101_t_10.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1Dlozenge_pcs_0_ts_101_t_10.000000.vtu</file>
+            <file>m2_1Dlozenge_ts_101_t_10.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozengebt/m2_1Dlozengebt.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozengebt/m2_1Dlozengebt.prj
index d40504d9b4ac029ec2f500dbf134e5cb015a9265..c08061eb38c164c9e464a03fd80f75f44f285526 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozengebt/m2_1Dlozengebt.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozengebt/m2_1Dlozengebt.prj
@@ -62,7 +62,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m2_1Dlozengebt_pcs_{:process_id}</prefix>
+            <prefix>m2_1Dlozengebt</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -285,37 +285,37 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>m2_1Dlozengebt_pcs_0_ts_350_t_0.700000.vtu</file>
+            <file>m2_1Dlozengebt_ts_350_t_0.700000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1Dlozengebt_pcs_0_ts_350_t_0.700000.vtu</file>
+            <file>m2_1Dlozengebt_ts_350_t_0.700000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>5.0e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1Dlozengebt_pcs_0_ts_350_t_0.700000.vtu</file>
+            <file>m2_1Dlozengebt_ts_350_t_0.700000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1Dlozengebt_pcs_0_ts_500_t_1.000000.vtu</file>
+            <file>m2_1Dlozengebt_ts_500_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>7e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1Dlozengebt_pcs_0_ts_500_t_1.000000.vtu</file>
+            <file>m2_1Dlozengebt_ts_500_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>7e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1Dlozengebt_pcs_0_ts_500_t_1.000000.vtu</file>
+            <file>m2_1Dlozengebt_ts_500_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Drelax/m2_1Drelax.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Drelax/m2_1Drelax.prj
index f4b814bf990ff3f5ed2f5dc85adb1340ee2b720f..0f757465577f963b0561a5a31dd5e15fba16b69e 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Drelax/m2_1Drelax.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Drelax/m2_1Drelax.prj
@@ -66,7 +66,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m2_1Drelax_pcs_{:process_id}</prefix>
+            <prefix>m2_1Drelax</prefix>
             <timesteps>
                 <pair>
                     <repeat>2</repeat>
@@ -240,37 +240,37 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>m2_1Drelax_pcs_0_ts_100_t_0.100000.vtu</file>
+            <file>m2_1Drelax_ts_100_t_0.100000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1Drelax_pcs_0_ts_100_t_0.100000.vtu</file>
+            <file>m2_1Drelax_ts_100_t_0.100000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1Drelax_pcs_0_ts_100_t_0.100000.vtu</file>
+            <file>m2_1Drelax_ts_100_t_0.100000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1Drelax_pcs_0_ts_200_t_1.100000.vtu</file>
+            <file>m2_1Drelax_ts_200_t_1.100000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1Drelax_pcs_0_ts_200_t_1.100000.vtu</file>
+            <file>m2_1Drelax_ts_200_t_1.100000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_1Drelax_pcs_0_ts_200_t_1.100000.vtu</file>
+            <file>m2_1Drelax_ts_200_t_1.100000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload.prj
index 34fea25fb43bfc7d4ce925a8ad1ea214f976545a..98319179148c8d22e2405891a31bbb68555ead45 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload.prj
@@ -66,7 +66,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m2_2Dload_pcs_{:process_id}</prefix>
+            <prefix>m2_2Dload</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -263,37 +263,37 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>m2_2Dload_pcs_0_ts_6_t_0.500000.vtu</file>
+            <file>m2_2Dload_ts_6_t_0.500000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-10</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_2Dload_pcs_0_ts_6_t_0.500000.vtu</file>
+            <file>m2_2Dload_ts_6_t_0.500000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_2Dload_pcs_0_ts_6_t_0.500000.vtu</file>
+            <file>m2_2Dload_ts_6_t_0.500000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_2Dload_pcs_0_ts_11_t_1.000000.vtu</file>
+            <file>m2_2Dload_ts_11_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_2Dload_pcs_0_ts_11_t_1.000000.vtu</file>
+            <file>m2_2Dload_ts_11_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_2Dload_pcs_0_ts_11_t_1.000000.vtu</file>
+            <file>m2_2Dload_ts_11_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2.0e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload_ym45.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload_ym45.prj
index 50ed0081aa8863c5ba4aff4cf12aec2d78e9817f..be04fbc19f43dbc94c3bfe18ac60b74efb79e5a5 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload_ym45.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload_ym45.prj
@@ -63,7 +63,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m2_2Dload_ym45_pcs_{:process_id}</prefix>
+            <prefix>m2_2Dload_ym45</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -240,55 +240,55 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>m2_2Dload_ym45_pcs_0_ts_1_t_0.000000.vtu</file>
+            <file>m2_2Dload_ym45_ts_1_t_0.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_2Dload_ym45_pcs_0_ts_1_t_0.000000.vtu</file>
+            <file>m2_2Dload_ym45_ts_1_t_0.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_2Dload_ym45_pcs_0_ts_1_t_0.000000.vtu</file>
+            <file>m2_2Dload_ym45_ts_1_t_0.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_2Dload_ym45_pcs_0_ts_51_t_0.500000.vtu</file>
+            <file>m2_2Dload_ym45_ts_51_t_0.500000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_2Dload_ym45_pcs_0_ts_51_t_0.500000.vtu</file>
+            <file>m2_2Dload_ym45_ts_51_t_0.500000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2.0e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_2Dload_ym45_pcs_0_ts_51_t_0.500000.vtu</file>
+            <file>m2_2Dload_ym45_ts_51_t_0.500000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_2Dload_ym45_pcs_0_ts_101_t_1.000000.vtu</file>
+            <file>m2_2Dload_ym45_ts_101_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_2Dload_ym45_pcs_0_ts_101_t_1.000000.vtu</file>
+            <file>m2_2Dload_ym45_ts_101_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_2Dload_ym45_pcs_0_ts_101_t_1.000000.vtu</file>
+            <file>m2_2Dload_ym45_ts_101_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2.1e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dloadbt/m2_2Dloadbt.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dloadbt/m2_2Dloadbt.prj
index f8d628d907eed010f2e92f99388ffaf28e000d52..98ab36269548659ba84613e96be86a9f80035e46 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dloadbt/m2_2Dloadbt.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dloadbt/m2_2Dloadbt.prj
@@ -62,7 +62,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m2_2Dloadbt_pcs_{:process_id}</prefix>
+            <prefix>m2_2Dloadbt</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -278,37 +278,37 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>m2_2Dloadbt_pcs_0_ts_300_t_0.600000.vtu</file>
+            <file>m2_2Dloadbt_ts_300_t_0.600000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_2Dloadbt_pcs_0_ts_300_t_0.600000.vtu</file>
+            <file>m2_2Dloadbt_ts_300_t_0.600000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>5e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_2Dloadbt_pcs_0_ts_300_t_0.600000.vtu</file>
+            <file>m2_2Dloadbt_ts_300_t_0.600000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_2Dloadbt_pcs_0_ts_500_t_1.000000.vtu</file>
+            <file>m2_2Dloadbt_ts_500_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_2Dloadbt_pcs_0_ts_500_t_1.000000.vtu</file>
+            <file>m2_2Dloadbt_ts_500_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_2Dloadbt_pcs_0_ts_500_t_1.000000.vtu</file>
+            <file>m2_2Dloadbt_ts_500_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dload/m2_3Dload.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dload/m2_3Dload.prj
index 99fd0d577023d74126cf16cd54258b5ff38a9fc7..2be5b39d5d22a1b56b64592c13cc0cdfa0a5441c 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dload/m2_3Dload.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dload/m2_3Dload.prj
@@ -66,7 +66,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m2_3Dload_pcs_{:process_id}</prefix>
+            <prefix>m2_3Dload</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -286,37 +286,37 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>m2_3Dload_pcs_0_ts_51_t_0.500000.vtu</file>
+            <file>m2_3Dload_ts_51_t_0.500000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-10</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_3Dload_pcs_0_ts_51_t_0.500000.vtu</file>
+            <file>m2_3Dload_ts_51_t_0.500000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_3Dload_pcs_0_ts_51_t_0.500000.vtu</file>
+            <file>m2_3Dload_ts_51_t_0.500000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>2.0e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_3Dload_pcs_0_ts_101_t_1.000000.vtu</file>
+            <file>m2_3Dload_ts_101_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_3Dload_pcs_0_ts_101_t_1.000000.vtu</file>
+            <file>m2_3Dload_ts_101_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>3.0e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_3Dload_pcs_0_ts_101_t_1.000000.vtu</file>
+            <file>m2_3Dload_ts_101_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dloadbt/m2_3Dloadbt.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dloadbt/m2_3Dloadbt.prj
index e8d4dfad1305ae24e576b20a084c7505d60ddd24..b350ff602f43efb3a279f20ba7c6543dee2dff71 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dloadbt/m2_3Dloadbt.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dloadbt/m2_3Dloadbt.prj
@@ -62,7 +62,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>m2_3Dloadbt_pcs_{:process_id}</prefix>
+            <prefix>m2_3Dloadbt</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
@@ -301,37 +301,37 @@
     </linear_solvers>
     <test_definition>
         <vtkdiff>
-            <file>m2_3Dloadbt_pcs_0_ts_250_t_0.500000.vtu</file>
+            <file>m2_3Dloadbt_ts_250_t_0.500000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_3Dloadbt_pcs_0_ts_250_t_0.500000.vtu</file>
+            <file>m2_3Dloadbt_ts_250_t_0.500000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_3Dloadbt_pcs_0_ts_250_t_0.500000.vtu</file>
+            <file>m2_3Dloadbt_ts_250_t_0.500000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_3Dloadbt_pcs_0_ts_500_t_1.000000.vtu</file>
+            <file>m2_3Dloadbt_ts_500_t_1.000000.vtu</file>
             <field>displacement</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_3Dloadbt_pcs_0_ts_500_t_1.000000.vtu</file>
+            <file>m2_3Dloadbt_ts_500_t_1.000000.vtu</file>
             <field>epsilon</field>
             <absolute_tolerance>1e-12</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
         </vtkdiff>
         <vtkdiff>
-            <file>m2_3Dloadbt_pcs_0_ts_500_t_1.000000.vtu</file>
+            <file>m2_3Dloadbt_ts_500_t_1.000000.vtu</file>
             <field>sigma</field>
             <absolute_tolerance>1.0e-11</absolute_tolerance>
             <relative_tolerance>0</relative_tolerance>
diff --git a/Tests/Data/ThermoMechanics/InitialStates/equilibrium_restart.prj b/Tests/Data/ThermoMechanics/InitialStates/equilibrium_restart.prj
index 3264cbb0d532619902ac65dab671d7566dbbac57..47f3837e7a2e0f31cfdadca6babe510f1d194f02 100644
--- a/Tests/Data/ThermoMechanics/InitialStates/equilibrium_restart.prj
+++ b/Tests/Data/ThermoMechanics/InitialStates/equilibrium_restart.prj
@@ -59,7 +59,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>equilibrium_restart_pcs_{:process_id}</prefix>
+            <prefix>equilibrium_restart</prefix>
             <timesteps>
                 <pair>
                     <repeat>2</repeat>
@@ -227,13 +227,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/ThermoMechanics/InitialStates/into_initial_state.prj b/Tests/Data/ThermoMechanics/InitialStates/into_initial_state.prj
index 6e9a4f32560d5f7e240cd80cb2fac5c40208c5ea..86dcb8195c3184a2b408d55509198b798ce21bd7 100644
--- a/Tests/Data/ThermoMechanics/InitialStates/into_initial_state.prj
+++ b/Tests/Data/ThermoMechanics/InitialStates/into_initial_state.prj
@@ -59,7 +59,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>into_initial_state_pcs_{:process_id}</prefix>
+            <prefix>into_initial_state</prefix>
             <timesteps>
                 <pair>
                     <repeat>2</repeat>
@@ -227,13 +227,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/ThermoMechanics/InitialStates/non_equilibrium_initial_state.prj b/Tests/Data/ThermoMechanics/InitialStates/non_equilibrium_initial_state.prj
index 93c765b0d3b2b0208e0a0d942dc87fa9f59cdf27..1e7da65a2b205a2ec323e4d99b5f31cf43d8ec2b 100644
--- a/Tests/Data/ThermoMechanics/InitialStates/non_equilibrium_initial_state.prj
+++ b/Tests/Data/ThermoMechanics/InitialStates/non_equilibrium_initial_state.prj
@@ -61,7 +61,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>
@@ -238,13 +238,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/ThermoMechanics/LinearMFront/cube_1e0_lin.prj b/Tests/Data/ThermoMechanics/LinearMFront/cube_1e0_lin.prj
index eee25c26babd1c2a12df3f78b102e004a6ef0a1b..d8944a72fdef848fc77e2c517c7351b65041d169 100644
--- a/Tests/Data/ThermoMechanics/LinearMFront/cube_1e0_lin.prj
+++ b/Tests/Data/ThermoMechanics/LinearMFront/cube_1e0_lin.prj
@@ -57,7 +57,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>cube_1e0_lin_pcs_{:process_id}</prefix>
+            <prefix>cube_1e0_lin</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
diff --git a/Tests/Data/ThermoMechanics/cube_1e3.prj b/Tests/Data/ThermoMechanics/cube_1e3.prj
index 7b8da677f9d8f71817f538fb89f1ca17e97cc620..112fce530e151fbc468e07d505a82a77e49d9cc1 100644
--- a/Tests/Data/ThermoMechanics/cube_1e3.prj
+++ b/Tests/Data/ThermoMechanics/cube_1e3.prj
@@ -58,7 +58,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>cube_1e3_tm_pcs_{:process_id}</prefix>
+            <prefix>cube_1e3_tm</prefix>
             <timesteps>
                 <pair>
                     <repeat>1</repeat>
diff --git a/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain.prj b/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain.prj
index f34aff07368b77e4778ffec02b13c8fdbd9292a4..470522e152b7e26b988b06e590736b0125887b4c 100644
--- a/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain.prj
+++ b/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain.prj
@@ -54,7 +54,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>tm_a_pcs_{:process_id}</prefix>
+            <prefix>tm_a</prefix>
             <timesteps>
                 <pair>
                     <repeat>20</repeat>
diff --git a/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain_quad.prj b/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain_quad.prj
index a56e0fe6973b9696bf9073256fc8687524184f0a..c98cc4907e71ab4c6def1f7f21180782f738a817 100644
--- a/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain_quad.prj
+++ b/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain_quad.prj
@@ -54,7 +54,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>tm_a_quad_pcs_{:process_id}</prefix>
+            <prefix>tm_a_quad</prefix>
             <timesteps>
                 <pair>
                     <repeat>20</repeat>
diff --git a/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain.prj b/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain.prj
index 9d88cd31d03a9977d7c256042187ff14a921edc1..44421ababac84255ee8c9d8966ceb79a8551f36c 100644
--- a/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain.prj
+++ b/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain.prj
@@ -58,7 +58,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>tm_q_pcs_{:process_id}</prefix>
+            <prefix>tm_q</prefix>
             <timesteps>
                 <pair>
                     <repeat>20</repeat>
diff --git a/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain_quad.prj b/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain_quad.prj
index a31596ae3f440bb53bb9efbd29a8008859f26336..41665b427b264eaa80907e49b856d667ee04271c 100644
--- a/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain_quad.prj
+++ b/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain_quad.prj
@@ -58,7 +58,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>tm_q_quad_pcs_{:process_id}</prefix>
+            <prefix>tm_q_quad</prefix>
             <timesteps>
                 <pair>
                     <repeat>20</repeat>
diff --git a/Tests/Data/ThermoMechanics/tm1_1Dbeam/tm1_1Dbeam.prj b/Tests/Data/ThermoMechanics/tm1_1Dbeam/tm1_1Dbeam.prj
index f56301700d0a762536748f5f09783b7a46262b87..65a3b2a3b00b2501961a0724ee54f9cea2121fe2 100755
--- a/Tests/Data/ThermoMechanics/tm1_1Dbeam/tm1_1Dbeam.prj
+++ b/Tests/Data/ThermoMechanics/tm1_1Dbeam/tm1_1Dbeam.prj
@@ -54,7 +54,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>tm1_1Dbeam_pcs_{:process_id}</prefix>
+            <prefix>tm1_1Dbeam</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
diff --git a/Tests/Data/ThermoMechanics/tm1_1Dfixa/tm1_1Dfixa.prj b/Tests/Data/ThermoMechanics/tm1_1Dfixa/tm1_1Dfixa.prj
index 6e29ab4d1f05cf8808caac3910c0bac95e7f42d9..71f8f032efd970be458cdf1d459e04224dcaa0ad 100755
--- a/Tests/Data/ThermoMechanics/tm1_1Dfixa/tm1_1Dfixa.prj
+++ b/Tests/Data/ThermoMechanics/tm1_1Dfixa/tm1_1Dfixa.prj
@@ -54,7 +54,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>tm1_1Dfixa_pcs_{:process_id}</prefix>
+            <prefix>tm1_1Dfixa</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
diff --git a/Tests/Data/ThermoMechanics/tm1_1Dfixb/tm1_1Dfixb.prj b/Tests/Data/ThermoMechanics/tm1_1Dfixb/tm1_1Dfixb.prj
index 49465c56ce91556fad335370c01848d446874ccc..15f590633aede95cd38c6dd4bcfd2ae7848f0d0c 100755
--- a/Tests/Data/ThermoMechanics/tm1_1Dfixb/tm1_1Dfixb.prj
+++ b/Tests/Data/ThermoMechanics/tm1_1Dfixb/tm1_1Dfixb.prj
@@ -54,7 +54,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>tm1_1Dfixb_pcs_{:process_id}</prefix>
+            <prefix>tm1_1Dfixb</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
diff --git a/Tests/Data/ThermoMechanics/tm1_2Dbeam/tm1_2Dbeam.prj b/Tests/Data/ThermoMechanics/tm1_2Dbeam/tm1_2Dbeam.prj
index f70415c78d581ef6e214b969dbd4b5a287efb0cc..9b552fe4e731df43cca37ee18b5f6e0d90cfe0a1 100755
--- a/Tests/Data/ThermoMechanics/tm1_2Dbeam/tm1_2Dbeam.prj
+++ b/Tests/Data/ThermoMechanics/tm1_2Dbeam/tm1_2Dbeam.prj
@@ -54,7 +54,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>tm1_2Dbeam_pcs_{:process_id}</prefix>
+            <prefix>tm1_2Dbeam</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
diff --git a/Tests/Data/ThermoMechanics/tm1_2Dsquare/tm1_2Dsquare.prj b/Tests/Data/ThermoMechanics/tm1_2Dsquare/tm1_2Dsquare.prj
index ac044d7050b9e9b01cc5a67c01d26f6aa4a60747..a48adc3c519c94c1e88842dc84d885f9b2b1de28 100755
--- a/Tests/Data/ThermoMechanics/tm1_2Dsquare/tm1_2Dsquare.prj
+++ b/Tests/Data/ThermoMechanics/tm1_2Dsquare/tm1_2Dsquare.prj
@@ -54,7 +54,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>tm1_2Dsquare_pcs_{:process_id}</prefix>
+            <prefix>tm1_2Dsquare</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
diff --git a/Tests/Data/ThermoMechanics/tm1_3Dcube/tm1_3Dcube.prj b/Tests/Data/ThermoMechanics/tm1_3Dcube/tm1_3Dcube.prj
index a3075b23b938525063cb53c5658c4634abf23401..aa383f45dfc9ba575ad7fe8a64230cd8add099cd 100755
--- a/Tests/Data/ThermoMechanics/tm1_3Dcube/tm1_3Dcube.prj
+++ b/Tests/Data/ThermoMechanics/tm1_3Dcube/tm1_3Dcube.prj
@@ -54,7 +54,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>tm1_3Dcube_pcs_{:process_id}</prefix>
+            <prefix>tm1_3Dcube</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
diff --git a/Tests/Data/ThermoMechanics/tm1_3Dgravity/tm1_3Dgravity.prj b/Tests/Data/ThermoMechanics/tm1_3Dgravity/tm1_3Dgravity.prj
index f4a3a2213f616b4cde25a1c41b41028d6a3bde5c..b835ae379725f64f62406e53b525b66aec946c3e 100755
--- a/Tests/Data/ThermoMechanics/tm1_3Dgravity/tm1_3Dgravity.prj
+++ b/Tests/Data/ThermoMechanics/tm1_3Dgravity/tm1_3Dgravity.prj
@@ -54,7 +54,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>tm1_3Dgravity_pcs_{:process_id}</prefix>
+            <prefix>tm1_3Dgravity</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
diff --git a/Tests/Data/ThermoMechanics/tm1_3Dorigin/tm1_3Dorigin.prj b/Tests/Data/ThermoMechanics/tm1_3Dorigin/tm1_3Dorigin.prj
index 0f6b9a6c6dca0ec148d5a6cc766267d0f822ec04..b325ee64a90d6ee22761198e7d7636e12a622a0c 100755
--- a/Tests/Data/ThermoMechanics/tm1_3Dorigin/tm1_3Dorigin.prj
+++ b/Tests/Data/ThermoMechanics/tm1_3Dorigin/tm1_3Dorigin.prj
@@ -54,7 +54,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>tm1_3Dorigin_pcs_{:process_id}</prefix>
+            <prefix>tm1_3Dorigin</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
diff --git a/Tests/Data/ThermoMechanics/tm1_3Dsquare/tm1_3Dsquare.prj b/Tests/Data/ThermoMechanics/tm1_3Dsquare/tm1_3Dsquare.prj
index 086b77af8f69033f7554044e4a5b7f414ca36bdb..94e2c0196b31d330ddc19c6fb8af8ceb199ceafe 100755
--- a/Tests/Data/ThermoMechanics/tm1_3Dsquare/tm1_3Dsquare.prj
+++ b/Tests/Data/ThermoMechanics/tm1_3Dsquare/tm1_3Dsquare.prj
@@ -54,7 +54,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>tm1_3Dsquare_pcs_{:process_id}</prefix>
+            <prefix>tm1_3Dsquare</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
diff --git a/Tests/Data/ThermoMechanics/tm2_1D1bt/tm2_1D1bt.prj b/Tests/Data/ThermoMechanics/tm2_1D1bt/tm2_1D1bt.prj
index 340ac60aea1c18dc736b96225c9c528683a45133..5ee94e9eb7ad23a5763ef6ccc9bd7d1473880434 100755
--- a/Tests/Data/ThermoMechanics/tm2_1D1bt/tm2_1D1bt.prj
+++ b/Tests/Data/ThermoMechanics/tm2_1D1bt/tm2_1D1bt.prj
@@ -54,7 +54,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>tm2_1D1bt_pcs_{:process_id}</prefix>
+            <prefix>tm2_1D1bt</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>
diff --git a/Tests/Data/ThermoMechanics/tm2_1Dfixc/tm2_1Dfixc.prj b/Tests/Data/ThermoMechanics/tm2_1Dfixc/tm2_1Dfixc.prj
index ce1013a57e9ab8d36edb45c7cc6a007b85e80d83..c9a0f0cda62a63e41b21d08383ded83f9d5bb92e 100755
--- a/Tests/Data/ThermoMechanics/tm2_1Dfixc/tm2_1Dfixc.prj
+++ b/Tests/Data/ThermoMechanics/tm2_1Dfixc/tm2_1Dfixc.prj
@@ -54,7 +54,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>tm2_1Dfixc_pcs_{:process_id}</prefix>
+            <prefix>tm2_1Dfixc</prefix>
             <data_mode>Ascii</data_mode>
             <compress_output>false</compress_output>
             <timesteps>