diff --git a/Tests/Data/HydroMechanics/IdealGas/flow_free_expansion/flow_free_expansion_pcs_0_ts_1000_t_10000.000000.vtu b/Tests/Data/HydroMechanics/IdealGas/flow_free_expansion/flow_free_expansion_ts_1000_t_10000.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/IdealGas/flow_free_expansion/flow_free_expansion_pcs_0_ts_1000_t_10000.000000.vtu
rename to Tests/Data/HydroMechanics/IdealGas/flow_free_expansion/flow_free_expansion_ts_1000_t_10000.000000.vtu
diff --git a/Tests/Data/HydroMechanics/IdealGas/flow_no_strain/flow_no_strain_pcs_0_ts_1000_t_100.000000.vtu b/Tests/Data/HydroMechanics/IdealGas/flow_no_strain/flow_no_strain_ts_1000_t_100.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/IdealGas/flow_no_strain/flow_no_strain_pcs_0_ts_1000_t_100.000000.vtu
rename to Tests/Data/HydroMechanics/IdealGas/flow_no_strain/flow_no_strain_ts_1000_t_100.000000.vtu
diff --git a/Tests/Data/HydroMechanics/IdealGas/flow_pressure_boundary/flow_pressure_boundary_pcs_0_ts_100_t_4000.000000.vtu b/Tests/Data/HydroMechanics/IdealGas/flow_pressure_boundary/flow_pressure_boundary_ts_100_t_4000.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/IdealGas/flow_pressure_boundary/flow_pressure_boundary_pcs_0_ts_100_t_4000.000000.vtu
rename to Tests/Data/HydroMechanics/IdealGas/flow_pressure_boundary/flow_pressure_boundary_ts_100_t_4000.000000.vtu
diff --git a/Tests/Data/HydroMechanics/Linear/Confined_Compression/expected_cube_1e3_pcs_0_ts_1_t_5.000000.vtu b/Tests/Data/HydroMechanics/Linear/Confined_Compression/expected_cube_1e3_ts_1_t_5.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/Linear/Confined_Compression/expected_cube_1e3_pcs_0_ts_1_t_5.000000.vtu
rename to Tests/Data/HydroMechanics/Linear/Confined_Compression/expected_cube_1e3_ts_1_t_5.000000.vtu
diff --git a/Tests/Data/HydroMechanics/Linear/Confined_Compression/expected_square_1e2_quad9_pcs_0_ts_1_t_5.000000.vtu b/Tests/Data/HydroMechanics/Linear/Confined_Compression/expected_square_1e2_quad9_ts_1_t_5.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/Linear/Confined_Compression/expected_square_1e2_quad9_pcs_0_ts_1_t_5.000000.vtu
rename to Tests/Data/HydroMechanics/Linear/Confined_Compression/expected_square_1e2_quad9_ts_1_t_5.000000.vtu
diff --git a/Tests/Data/HydroMechanics/Linear/Confined_Compression/expected_square_1e2_tri_pcs_0_ts_1_t_5.000000.vtu b/Tests/Data/HydroMechanics/Linear/Confined_Compression/expected_square_1e2_tri_ts_1_t_5.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/Linear/Confined_Compression/expected_square_1e2_tri_pcs_0_ts_1_t_5.000000.vtu
rename to Tests/Data/HydroMechanics/Linear/Confined_Compression/expected_square_1e2_tri_ts_1_t_5.000000.vtu
diff --git a/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_pcs_0_ts_120_t_1000.000000.vtu b/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_ts_120_t_1000.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_pcs_0_ts_120_t_1000.000000.vtu
rename to Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_ts_120_t_1000.000000.vtu
diff --git a/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_pcs_0_ts_1_t_5.000000.vtu b/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_ts_1_t_5.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_pcs_0_ts_1_t_5.000000.vtu
rename to Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_ts_1_t_5.000000.vtu
diff --git a/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_pcs_0_ts_20_t_100.000000.vtu b/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_ts_20_t_100.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_pcs_0_ts_20_t_100.000000.vtu
rename to Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_ts_20_t_100.000000.vtu
diff --git a/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_pcs_0_ts_420_t_4000.000000.vtu b/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_ts_420_t_4000.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_pcs_0_ts_420_t_4000.000000.vtu
rename to Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_ts_420_t_4000.000000.vtu
diff --git a/Tests/Data/HydroMechanics/Linear/Gravity/flow_gravity_pcs_0_ts_16_t_40000000.000000.vtu b/Tests/Data/HydroMechanics/Linear/Gravity/flow_gravity_ts_16_t_40000000.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/Linear/Gravity/flow_gravity_pcs_0_ts_16_t_40000000.000000.vtu
rename to Tests/Data/HydroMechanics/Linear/Gravity/flow_gravity_ts_16_t_40000000.000000.vtu
diff --git a/Tests/Data/HydroMechanics/Linear/Unconfined_Compression_early/expected_square_1e2_UC_early_pcs_0_ts_10_t_1.000000.vtu b/Tests/Data/HydroMechanics/Linear/Unconfined_Compression_early/expected_square_1e2_UC_early_ts_10_t_1.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/Linear/Unconfined_Compression_early/expected_square_1e2_UC_early_pcs_0_ts_10_t_1.000000.vtu
rename to Tests/Data/HydroMechanics/Linear/Unconfined_Compression_early/expected_square_1e2_UC_early_ts_10_t_1.000000.vtu
diff --git a/Tests/Data/HydroMechanics/Linear/Unconfined_Compression_late/expected_square_1e2_UC_late_pcs_0_ts_10_t_1000.000000.vtu b/Tests/Data/HydroMechanics/Linear/Unconfined_Compression_late/expected_square_1e2_UC_late_ts_10_t_1000.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/Linear/Unconfined_Compression_late/expected_square_1e2_UC_late_pcs_0_ts_10_t_1000.000000.vtu
rename to Tests/Data/HydroMechanics/Linear/Unconfined_Compression_late/expected_square_1e2_UC_late_ts_10_t_1000.000000.vtu
diff --git a/Tests/Data/HydroMechanics/Principal_Stress/Hollow_Sphere/output_pcs_0_ts_1_t_1.000000.vtu b/Tests/Data/HydroMechanics/Principal_Stress/Hollow_Sphere/output_ts_1_t_1.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/Principal_Stress/Hollow_Sphere/output_pcs_0_ts_1_t_1.000000.vtu
rename to Tests/Data/HydroMechanics/Principal_Stress/Hollow_Sphere/output_ts_1_t_1.000000.vtu
diff --git a/Tests/Data/HydroMechanics/Principal_Stress/Tube/output_pcs_0_ts_1_t_1.000000.vtu b/Tests/Data/HydroMechanics/Principal_Stress/Tube/output_ts_1_t_1.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/Principal_Stress/Tube/output_pcs_0_ts_1_t_1.000000.vtu
rename to Tests/Data/HydroMechanics/Principal_Stress/Tube/output_ts_1_t_1.000000.vtu
diff --git a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D_Mono_pcs_0_ts_100_t_8640000.000000.vtu b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D_Mono_ts_100_t_8640000.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D_Mono_pcs_0_ts_100_t_8640000.000000.vtu
rename to Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D_Mono_ts_100_t_8640000.000000.vtu
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1D1bt_pcs_0_ts_100_t_10.000000.vtu b/Tests/Data/HydroMechanics/Verification/hm2_1D1bt_ts_100_t_10.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/Verification/hm2_1D1bt_pcs_0_ts_100_t_10.000000.vtu
rename to Tests/Data/HydroMechanics/Verification/hm2_1D1bt_ts_100_t_10.000000.vtu
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1D1bt_pcs_0_ts_50_t_5.000000.vtu b/Tests/Data/HydroMechanics/Verification/hm2_1D1bt_ts_50_t_5.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/Verification/hm2_1D1bt_pcs_0_ts_50_t_5.000000.vtu
rename to Tests/Data/HydroMechanics/Verification/hm2_1D1bt_ts_50_t_5.000000.vtu
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1D2bt_pcs_0_ts_125_t_5.000000.vtu b/Tests/Data/HydroMechanics/Verification/hm2_1D2bt_ts_125_t_5.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/Verification/hm2_1D2bt_pcs_0_ts_125_t_5.000000.vtu
rename to Tests/Data/HydroMechanics/Verification/hm2_1D2bt_ts_125_t_5.000000.vtu
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1D2bt_pcs_0_ts_250_t_10.000000.vtu b/Tests/Data/HydroMechanics/Verification/hm2_1D2bt_ts_250_t_10.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/Verification/hm2_1D2bt_pcs_0_ts_250_t_10.000000.vtu
rename to Tests/Data/HydroMechanics/Verification/hm2_1D2bt_ts_250_t_10.000000.vtu
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1Dbiot_pcs_0_ts_20_t_5.000000.vtu b/Tests/Data/HydroMechanics/Verification/hm2_1Dbiot_ts_20_t_5.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/Verification/hm2_1Dbiot_pcs_0_ts_20_t_5.000000.vtu
rename to Tests/Data/HydroMechanics/Verification/hm2_1Dbiot_ts_20_t_5.000000.vtu
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1Dbiot_pcs_0_ts_40_t_10.000000.vtu b/Tests/Data/HydroMechanics/Verification/hm2_1Dbiot_ts_40_t_10.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/Verification/hm2_1Dbiot_pcs_0_ts_40_t_10.000000.vtu
rename to Tests/Data/HydroMechanics/Verification/hm2_1Dbiot_ts_40_t_10.000000.vtu
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn1_pcs_0_ts_120_t_6.000000.vtu b/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn1_ts_120_t_6.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn1_pcs_0_ts_120_t_6.000000.vtu
rename to Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn1_ts_120_t_6.000000.vtu
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn1_pcs_0_ts_240_t_12.000000.vtu b/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn1_ts_240_t_12.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn1_pcs_0_ts_240_t_12.000000.vtu
rename to Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn1_ts_240_t_12.000000.vtu
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn2_pcs_0_ts_16_t_4.000000.vtu b/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn2_ts_16_t_4.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn2_pcs_0_ts_16_t_4.000000.vtu
rename to Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn2_ts_16_t_4.000000.vtu
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn2_pcs_0_ts_40_t_10.000000.vtu b/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn2_ts_40_t_10.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn2_pcs_0_ts_40_t_10.000000.vtu
rename to Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn2_ts_40_t_10.000000.vtu
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_2Dmandel_pcs_0_ts_160_t_8.000000.vtu b/Tests/Data/HydroMechanics/Verification/hm2_2Dmandel_ts_160_t_8.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/Verification/hm2_2Dmandel_pcs_0_ts_160_t_8.000000.vtu
rename to Tests/Data/HydroMechanics/Verification/hm2_2Dmandel_ts_160_t_8.000000.vtu
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_2Dmandel_pcs_0_ts_40_t_2.000000.vtu b/Tests/Data/HydroMechanics/Verification/hm2_2Dmandel_ts_40_t_2.000000.vtu
similarity index 100%
rename from Tests/Data/HydroMechanics/Verification/hm2_2Dmandel_pcs_0_ts_40_t_2.000000.vtu
rename to Tests/Data/HydroMechanics/Verification/hm2_2Dmandel_ts_40_t_2.000000.vtu