diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/209kW_7c7l.veng b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/209kW_7c7l.veng
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/209kW_7c7l.veng
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/209kW_7c7l.veng
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/209kW_ICE_Map.vmap b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/209kW_ICE_Map.vmap
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/209kW_ICE_Map.vmap
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/209kW_ICE_Map.vmap
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/209kW_ICE_fld.vfld b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/209kW_ICE_fld.vfld
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/209kW_ICE_fld.vfld
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/209kW_ICE_fld.vfld
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/3speedAPT-N.vgbx b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/3speedAPT-N.vgbx
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/3speedAPT-N.vgbx
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/3speedAPT-N.vgbx
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Axle_4x2_LH.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Axle_4x2_LH.vtlm
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Axle_4x2_LH.vtlm
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Axle_4x2_LH.vtlm
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/BEV_Group5_EM.vem b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/BEV_Group5_EM.vem
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/BEV_Group5_EM.vem
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/BEV_Group5_EM.vem
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/BEV_Group5_REESS.vreess b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/BEV_Group5_REESS.vreess
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/BEV_Group5_REESS.vreess
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/BEV_Group5_REESS.vreess
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/EM_Map.vemo b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/EM_Map.vemo
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/EM_Map.vemo
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/EM_Map.vemo
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/EM_drag.vemd b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/EM_drag.vemd
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/EM_drag.vemd
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/EM_drag.vemd
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/EM_fld.vemp b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/EM_fld.vemp
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/EM_fld.vemp
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/EM_fld.vemp
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Gear_indirect.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Gear_indirect.vtlm
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Gear_indirect.vtlm
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Gear_indirect.vtlm
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Gen_Map.vemo b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Gen_Map.vemo
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Gen_Map.vemo
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Gen_Map.vemo
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Gen_drag.vemd b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Gen_drag.vemd
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Gen_drag.vemd
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Gen_drag.vemd
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Gen_fld.vemp b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Gen_fld.vemp
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Gen_fld.vemp
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Gen_fld.vemp
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/GenericBattery_PEV_800V.vbat b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/GenericBattery_PEV_800V.vbat
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/GenericBattery_PEV_800V.vbat
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/GenericBattery_PEV_800V.vbat
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/GenericBattery_PEV_800V.vbatr b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/GenericBattery_PEV_800V.vbatr
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/GenericBattery_PEV_800V.vbatr
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/GenericBattery_PEV_800V.vbatr
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/GenericBattery_PEV_800V.vbatv b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/GenericBattery_PEV_800V.vbatv
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/GenericBattery_PEV_800V.vbatv
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/GenericBattery_PEV_800V.vbatv
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/GenericGen.vem b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/GenericGen.vem
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/GenericGen.vem
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/GenericGen.vem
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/HEV_S2_Group5LH_rl_APTN.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/HEV_S2_Group5LH_rl_APTN.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/HEV_S2_Group5LH_rl_APTN.vecto
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/HEV_S2_Group5LH_rl_APTN.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/HEV_S2_Group5_LH_rl.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/HEV_S2_Group5_LH_rl.vveh
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/HEV_S2_Group5_LH_rl.vveh
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/HEV_S2_Group5_LH_rl.vveh
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Hybrid_Parameters.vhctl b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Hybrid_Parameters.vhctl
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Hybrid_Parameters.vhctl
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Hybrid_Parameters.vhctl
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/MaxCurrent.vimax b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/MaxCurrent.vimax
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/MaxCurrent.vimax
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/MaxCurrent.vimax
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/NoCompressor.ACMP b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/NoCompressor.ACMP
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/NoCompressor.ACMP
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/NoCompressor.ACMP
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/REESS_SOC_curve.vbatv b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/REESS_SOC_curve.vbatv
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/REESS_SOC_curve.vbatv
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/REESS_SOC_curve.vbatv
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/ShiftParameters.vtcu b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/ShiftParameters.vtcu
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/ShiftParameters.vtcu
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/ShiftParameters.vtcu
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Truck.vacc b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Truck.vacc
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Truck.vacc
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Truck.vacc
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/xEV_Aux.vaux b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/xEV_Aux.vaux
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/xEV_Aux.vaux
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/xEV_Aux.vaux