diff --git a/Tests/Data/LIE/HydroMechanics/expected_TaskB_pcs_0_ts_4_t_18.000000.vtu b/Tests/Data/LIE/HydroMechanics/expected_TaskB_ts_4_t_18.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/HydroMechanics/expected_TaskB_pcs_0_ts_4_t_18.000000.vtu
rename to Tests/Data/LIE/HydroMechanics/expected_TaskB_ts_4_t_18.000000.vtu
diff --git a/Tests/Data/LIE/HydroMechanics/expected_single_fracture_3D_pcs_0_ts_10_t_100.000000.vtu b/Tests/Data/LIE/HydroMechanics/expected_single_fracture_3D_ts_10_t_100.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/HydroMechanics/expected_single_fracture_3D_pcs_0_ts_10_t_100.000000.vtu
rename to Tests/Data/LIE/HydroMechanics/expected_single_fracture_3D_ts_10_t_100.000000.vtu
diff --git a/Tests/Data/LIE/HydroMechanics/expected_single_fracture_3compartments_flow_CHZ_sigma0_pcs_0_ts_356_t_500.000000.vtu b/Tests/Data/LIE/HydroMechanics/expected_single_fracture_3compartments_flow_CHZ_sigma0_ts_356_t_500.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/HydroMechanics/expected_single_fracture_3compartments_flow_CHZ_sigma0_pcs_0_ts_356_t_500.000000.vtu
rename to Tests/Data/LIE/HydroMechanics/expected_single_fracture_3compartments_flow_CHZ_sigma0_ts_356_t_500.000000.vtu
diff --git a/Tests/Data/LIE/HydroMechanics/expected_single_fracture_3compartments_flow_CHZ_pcs_0_ts_356_t_500.000000.vtu b/Tests/Data/LIE/HydroMechanics/expected_single_fracture_3compartments_flow_CHZ_ts_356_t_500.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/HydroMechanics/expected_single_fracture_3compartments_flow_CHZ_pcs_0_ts_356_t_500.000000.vtu
rename to Tests/Data/LIE/HydroMechanics/expected_single_fracture_3compartments_flow_CHZ_ts_356_t_500.000000.vtu
diff --git a/Tests/Data/LIE/HydroMechanics/expected_single_fracture_3compartments_flow_linear_aperture0_e_pcs_0_ts_1108_t_10000.000000.vtu b/Tests/Data/LIE/HydroMechanics/expected_single_fracture_3compartments_flow_linear_aperture0_e_ts_1108_t_10000.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/HydroMechanics/expected_single_fracture_3compartments_flow_linear_aperture0_e_pcs_0_ts_1108_t_10000.000000.vtu
rename to Tests/Data/LIE/HydroMechanics/expected_single_fracture_3compartments_flow_linear_aperture0_e_ts_1108_t_10000.000000.vtu
diff --git a/Tests/Data/LIE/HydroMechanics/expected_single_fracture_3compartments_flow_linear_aperture0_pcs_0_ts_1108_t_10000.000000.vtu b/Tests/Data/LIE/HydroMechanics/expected_single_fracture_3compartments_flow_linear_aperture0_ts_1108_t_10000.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/HydroMechanics/expected_single_fracture_3compartments_flow_linear_aperture0_pcs_0_ts_1108_t_10000.000000.vtu
rename to Tests/Data/LIE/HydroMechanics/expected_single_fracture_3compartments_flow_linear_aperture0_ts_1108_t_10000.000000.vtu
diff --git a/Tests/Data/LIE/HydroMechanics/expected_single_fracture_3compartments_flow_pcs_0_ts_1108_t_10000.000000.vtu b/Tests/Data/LIE/HydroMechanics/expected_single_fracture_3compartments_flow_ts_1108_t_10000.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/HydroMechanics/expected_single_fracture_3compartments_flow_pcs_0_ts_1108_t_10000.000000.vtu
rename to Tests/Data/LIE/HydroMechanics/expected_single_fracture_3compartments_flow_ts_1108_t_10000.000000.vtu
diff --git a/Tests/Data/LIE/HydroMechanics/expected_single_fracture_pcs_0_ts_10_t_100.000000.vtu b/Tests/Data/LIE/HydroMechanics/expected_single_fracture_ts_10_t_100.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/HydroMechanics/expected_single_fracture_pcs_0_ts_10_t_100.000000.vtu
rename to Tests/Data/LIE/HydroMechanics/expected_single_fracture_ts_10_t_100.000000.vtu
diff --git a/Tests/Data/LIE/HydroMechanics/single_fracture_constK_pcs_0_ts_10_t_100.000000.vtu b/Tests/Data/LIE/HydroMechanics/single_fracture_constK_ts_10_t_100.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/HydroMechanics/single_fracture_constK_pcs_0_ts_10_t_100.000000.vtu
rename to Tests/Data/LIE/HydroMechanics/single_fracture_constK_ts_10_t_100.000000.vtu
diff --git a/Tests/Data/LIE/HydroMechanics/single_fracture_constK_pcs_0_ts_1_t_10.000000.vtu b/Tests/Data/LIE/HydroMechanics/single_fracture_constK_ts_1_t_10.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/HydroMechanics/single_fracture_constK_pcs_0_ts_1_t_10.000000.vtu
rename to Tests/Data/LIE/HydroMechanics/single_fracture_constK_ts_1_t_10.000000.vtu
diff --git a/Tests/Data/LIE/HydroMechanics/single_fracture_constK_pcs_0_ts_2_t_20.000000.vtu b/Tests/Data/LIE/HydroMechanics/single_fracture_constK_ts_2_t_20.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/HydroMechanics/single_fracture_constK_pcs_0_ts_2_t_20.000000.vtu
rename to Tests/Data/LIE/HydroMechanics/single_fracture_constK_ts_2_t_20.000000.vtu
diff --git a/Tests/Data/LIE/HydroMechanics/single_fracture_constK_pcs_0_ts_3_t_30.000000.vtu b/Tests/Data/LIE/HydroMechanics/single_fracture_constK_ts_3_t_30.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/HydroMechanics/single_fracture_constK_pcs_0_ts_3_t_30.000000.vtu
rename to Tests/Data/LIE/HydroMechanics/single_fracture_constK_ts_3_t_30.000000.vtu
diff --git a/Tests/Data/LIE/HydroMechanics/single_fracture_constK_pcs_0_ts_4_t_40.000000.vtu b/Tests/Data/LIE/HydroMechanics/single_fracture_constK_ts_4_t_40.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/HydroMechanics/single_fracture_constK_pcs_0_ts_4_t_40.000000.vtu
rename to Tests/Data/LIE/HydroMechanics/single_fracture_constK_ts_4_t_40.000000.vtu
diff --git a/Tests/Data/LIE/HydroMechanics/single_fracture_constK_pcs_0_ts_5_t_50.000000.vtu b/Tests/Data/LIE/HydroMechanics/single_fracture_constK_ts_5_t_50.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/HydroMechanics/single_fracture_constK_pcs_0_ts_5_t_50.000000.vtu
rename to Tests/Data/LIE/HydroMechanics/single_fracture_constK_ts_5_t_50.000000.vtu
diff --git a/Tests/Data/LIE/HydroMechanics/single_fracture_constK_pcs_0_ts_6_t_60.000000.vtu b/Tests/Data/LIE/HydroMechanics/single_fracture_constK_ts_6_t_60.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/HydroMechanics/single_fracture_constK_pcs_0_ts_6_t_60.000000.vtu
rename to Tests/Data/LIE/HydroMechanics/single_fracture_constK_ts_6_t_60.000000.vtu
diff --git a/Tests/Data/LIE/HydroMechanics/single_fracture_constK_pcs_0_ts_7_t_70.000000.vtu b/Tests/Data/LIE/HydroMechanics/single_fracture_constK_ts_7_t_70.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/HydroMechanics/single_fracture_constK_pcs_0_ts_7_t_70.000000.vtu
rename to Tests/Data/LIE/HydroMechanics/single_fracture_constK_ts_7_t_70.000000.vtu
diff --git a/Tests/Data/LIE/HydroMechanics/single_fracture_constK_pcs_0_ts_8_t_80.000000.vtu b/Tests/Data/LIE/HydroMechanics/single_fracture_constK_ts_8_t_80.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/HydroMechanics/single_fracture_constK_pcs_0_ts_8_t_80.000000.vtu
rename to Tests/Data/LIE/HydroMechanics/single_fracture_constK_ts_8_t_80.000000.vtu
diff --git a/Tests/Data/LIE/HydroMechanics/single_fracture_constK_pcs_0_ts_9_t_90.000000.vtu b/Tests/Data/LIE/HydroMechanics/single_fracture_constK_ts_9_t_90.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/HydroMechanics/single_fracture_constK_pcs_0_ts_9_t_90.000000.vtu
rename to Tests/Data/LIE/HydroMechanics/single_fracture_constK_ts_9_t_90.000000.vtu
diff --git a/Tests/Data/LIE/Mechanics/cohesive_zone_load_path_pcs_0_ts_0_t_0.000000.vtu b/Tests/Data/LIE/Mechanics/cohesive_zone_load_path_ts_0_t_0.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/Mechanics/cohesive_zone_load_path_pcs_0_ts_0_t_0.000000.vtu
rename to Tests/Data/LIE/Mechanics/cohesive_zone_load_path_ts_0_t_0.000000.vtu
diff --git a/Tests/Data/LIE/Mechanics/cohesive_zone_load_path_pcs_0_ts_100_t_100.000000.vtu b/Tests/Data/LIE/Mechanics/cohesive_zone_load_path_ts_100_t_100.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/Mechanics/cohesive_zone_load_path_pcs_0_ts_100_t_100.000000.vtu
rename to Tests/Data/LIE/Mechanics/cohesive_zone_load_path_ts_100_t_100.000000.vtu
diff --git a/Tests/Data/LIE/Mechanics/cohesive_zone_load_path_pcs_0_ts_10_t_10.000000.vtu b/Tests/Data/LIE/Mechanics/cohesive_zone_load_path_ts_10_t_10.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/Mechanics/cohesive_zone_load_path_pcs_0_ts_10_t_10.000000.vtu
rename to Tests/Data/LIE/Mechanics/cohesive_zone_load_path_ts_10_t_10.000000.vtu
diff --git a/Tests/Data/LIE/Mechanics/cohesive_zone_load_path_pcs_0_ts_20_t_20.000000.vtu b/Tests/Data/LIE/Mechanics/cohesive_zone_load_path_ts_20_t_20.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/Mechanics/cohesive_zone_load_path_pcs_0_ts_20_t_20.000000.vtu
rename to Tests/Data/LIE/Mechanics/cohesive_zone_load_path_ts_20_t_20.000000.vtu
diff --git a/Tests/Data/LIE/Mechanics/cohesive_zone_load_path_pcs_0_ts_30_t_30.000000.vtu b/Tests/Data/LIE/Mechanics/cohesive_zone_load_path_ts_30_t_30.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/Mechanics/cohesive_zone_load_path_pcs_0_ts_30_t_30.000000.vtu
rename to Tests/Data/LIE/Mechanics/cohesive_zone_load_path_ts_30_t_30.000000.vtu
diff --git a/Tests/Data/LIE/Mechanics/cohesive_zone_load_path_pcs_0_ts_40_t_40.000000.vtu b/Tests/Data/LIE/Mechanics/cohesive_zone_load_path_ts_40_t_40.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/Mechanics/cohesive_zone_load_path_pcs_0_ts_40_t_40.000000.vtu
rename to Tests/Data/LIE/Mechanics/cohesive_zone_load_path_ts_40_t_40.000000.vtu
diff --git a/Tests/Data/LIE/Mechanics/cohesive_zone_load_path_pcs_0_ts_50_t_50.000000.vtu b/Tests/Data/LIE/Mechanics/cohesive_zone_load_path_ts_50_t_50.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/Mechanics/cohesive_zone_load_path_pcs_0_ts_50_t_50.000000.vtu
rename to Tests/Data/LIE/Mechanics/cohesive_zone_load_path_ts_50_t_50.000000.vtu
diff --git a/Tests/Data/LIE/Mechanics/cohesive_zone_load_path_pcs_0_ts_60_t_60.000000.vtu b/Tests/Data/LIE/Mechanics/cohesive_zone_load_path_ts_60_t_60.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/Mechanics/cohesive_zone_load_path_pcs_0_ts_60_t_60.000000.vtu
rename to Tests/Data/LIE/Mechanics/cohesive_zone_load_path_ts_60_t_60.000000.vtu
diff --git a/Tests/Data/LIE/Mechanics/cohesive_zone_load_path_pcs_0_ts_70_t_70.000000.vtu b/Tests/Data/LIE/Mechanics/cohesive_zone_load_path_ts_70_t_70.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/Mechanics/cohesive_zone_load_path_pcs_0_ts_70_t_70.000000.vtu
rename to Tests/Data/LIE/Mechanics/cohesive_zone_load_path_ts_70_t_70.000000.vtu
diff --git a/Tests/Data/LIE/Mechanics/cohesive_zone_load_path_pcs_0_ts_80_t_80.000000.vtu b/Tests/Data/LIE/Mechanics/cohesive_zone_load_path_ts_80_t_80.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/Mechanics/cohesive_zone_load_path_pcs_0_ts_80_t_80.000000.vtu
rename to Tests/Data/LIE/Mechanics/cohesive_zone_load_path_ts_80_t_80.000000.vtu
diff --git a/Tests/Data/LIE/Mechanics/cohesive_zone_load_path_pcs_0_ts_90_t_90.000000.vtu b/Tests/Data/LIE/Mechanics/cohesive_zone_load_path_ts_90_t_90.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/Mechanics/cohesive_zone_load_path_pcs_0_ts_90_t_90.000000.vtu
rename to Tests/Data/LIE/Mechanics/cohesive_zone_load_path_ts_90_t_90.000000.vtu
diff --git a/Tests/Data/LIE/Mechanics/expected_coulomb_load_path_pcs_0_ts_100_t_1.000000.vtu b/Tests/Data/LIE/Mechanics/expected_coulomb_load_path_ts_100_t_1.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/Mechanics/expected_coulomb_load_path_pcs_0_ts_100_t_1.000000.vtu
rename to Tests/Data/LIE/Mechanics/expected_coulomb_load_path_ts_100_t_1.000000.vtu
diff --git a/Tests/Data/LIE/Mechanics/expected_coulomb_load_path_pcs_0_ts_200_t_2.000000.vtu b/Tests/Data/LIE/Mechanics/expected_coulomb_load_path_ts_200_t_2.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/Mechanics/expected_coulomb_load_path_pcs_0_ts_200_t_2.000000.vtu
rename to Tests/Data/LIE/Mechanics/expected_coulomb_load_path_ts_200_t_2.000000.vtu
diff --git a/Tests/Data/LIE/Mechanics/expected_coulomb_load_path_pcs_0_ts_401_t_4.000000.vtu b/Tests/Data/LIE/Mechanics/expected_coulomb_load_path_ts_401_t_4.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/Mechanics/expected_coulomb_load_path_pcs_0_ts_401_t_4.000000.vtu
rename to Tests/Data/LIE/Mechanics/expected_coulomb_load_path_ts_401_t_4.000000.vtu
diff --git a/Tests/Data/LIE/Mechanics/expected_sfrac_pcs_0_ts_1_t_1.000000.vtu b/Tests/Data/LIE/Mechanics/expected_sfrac_ts_1_t_1.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/Mechanics/expected_sfrac_pcs_0_ts_1_t_1.000000.vtu
rename to Tests/Data/LIE/Mechanics/expected_sfrac_ts_1_t_1.000000.vtu
diff --git a/Tests/Data/LIE/Mechanics/expected_single_joint_displacement_controlled_pcs_0_ts_10_t_1.000000.vtu b/Tests/Data/LIE/Mechanics/expected_single_joint_displacement_controlled_ts_10_t_1.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/Mechanics/expected_single_joint_displacement_controlled_pcs_0_ts_10_t_1.000000.vtu
rename to Tests/Data/LIE/Mechanics/expected_single_joint_displacement_controlled_ts_10_t_1.000000.vtu
diff --git a/Tests/Data/LIE/Mechanics/expected_single_joint_negative_aperture_pcs_0_ts_1_t_1.000000.vtu b/Tests/Data/LIE/Mechanics/expected_single_joint_negative_aperture_ts_1_t_1.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/Mechanics/expected_single_joint_negative_aperture_pcs_0_ts_1_t_1.000000.vtu
rename to Tests/Data/LIE/Mechanics/expected_single_joint_negative_aperture_ts_1_t_1.000000.vtu
diff --git a/Tests/Data/LIE/Mechanics/expected_two_cracks_branch_pull_pcs_0_ts_1_t_1.000000.vtu b/Tests/Data/LIE/Mechanics/expected_two_cracks_branch_pull_ts_1_t_1.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/Mechanics/expected_two_cracks_branch_pull_pcs_0_ts_1_t_1.000000.vtu
rename to Tests/Data/LIE/Mechanics/expected_two_cracks_branch_pull_ts_1_t_1.000000.vtu
diff --git a/Tests/Data/LIE/Mechanics/expected_two_cracks_junction_pull_pcs_0_ts_1_t_1.000000.vtu b/Tests/Data/LIE/Mechanics/expected_two_cracks_junction_pull_ts_1_t_1.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/Mechanics/expected_two_cracks_junction_pull_pcs_0_ts_1_t_1.000000.vtu
rename to Tests/Data/LIE/Mechanics/expected_two_cracks_junction_pull_ts_1_t_1.000000.vtu
diff --git a/Tests/Data/LIE/Mechanics/single_joint_3D_expected_pcs_0_ts_1_t_1.000000.vtu b/Tests/Data/LIE/Mechanics/single_joint_3D_expected_ts_1_t_1.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/Mechanics/single_joint_3D_expected_pcs_0_ts_1_t_1.000000.vtu
rename to Tests/Data/LIE/Mechanics/single_joint_3D_expected_ts_1_t_1.000000.vtu
diff --git a/Tests/Data/LIE/Mechanics/single_joint_expected_pcs_0_ts_1_t_1.000000.vtu b/Tests/Data/LIE/Mechanics/single_joint_expected_ts_1_t_1.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/Mechanics/single_joint_expected_pcs_0_ts_1_t_1.000000.vtu
rename to Tests/Data/LIE/Mechanics/single_joint_expected_ts_1_t_1.000000.vtu
diff --git a/Tests/Data/LIE/Mechanics/single_joint_inside_expected_pcs_0_ts_1_t_1.000000.vtu b/Tests/Data/LIE/Mechanics/single_joint_inside_expected_ts_1_t_1.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/Mechanics/single_joint_inside_expected_pcs_0_ts_1_t_1.000000.vtu
rename to Tests/Data/LIE/Mechanics/single_joint_inside_expected_ts_1_t_1.000000.vtu
diff --git a/Tests/Data/LIE/Mechanics/two_joints_expected_pcs_0_ts_1_t_1.000000.vtu b/Tests/Data/LIE/Mechanics/two_joints_expected_ts_1_t_1.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/Mechanics/two_joints_expected_pcs_0_ts_1_t_1.000000.vtu
rename to Tests/Data/LIE/Mechanics/two_joints_expected_ts_1_t_1.000000.vtu
diff --git a/Tests/Data/LIE/PostProcessing/expected_post_single_joint_pcs_0_ts_1_t_1.000000.vtu b/Tests/Data/LIE/PostProcessing/expected_post_single_joint_ts_1_t_1.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/PostProcessing/expected_post_single_joint_pcs_0_ts_1_t_1.000000.vtu
rename to Tests/Data/LIE/PostProcessing/expected_post_single_joint_ts_1_t_1.000000.vtu
diff --git a/Tests/Data/LIE/PostProcessing/single_joint_pcs_0.pvd b/Tests/Data/LIE/PostProcessing/single_joint.pvd
similarity index 100%
rename from Tests/Data/LIE/PostProcessing/single_joint_pcs_0.pvd
rename to Tests/Data/LIE/PostProcessing/single_joint.pvd
diff --git a/Tests/Data/LIE/PostProcessing/single_joint_pcs_0_ts_0_t_0.000000.vtu b/Tests/Data/LIE/PostProcessing/single_joint_ts_0_t_0.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/PostProcessing/single_joint_pcs_0_ts_0_t_0.000000.vtu
rename to Tests/Data/LIE/PostProcessing/single_joint_ts_0_t_0.000000.vtu
diff --git a/Tests/Data/LIE/PostProcessing/single_joint_pcs_0_ts_1_t_1.000000.vtu b/Tests/Data/LIE/PostProcessing/single_joint_ts_1_t_1.000000.vtu
similarity index 100%
rename from Tests/Data/LIE/PostProcessing/single_joint_pcs_0_ts_1_t_1.000000.vtu
rename to Tests/Data/LIE/PostProcessing/single_joint_ts_1_t_1.000000.vtu