From b9329951a9ec74c91b46a8f547a80d5b78b9c173 Mon Sep 17 00:00:00 2001
From: Christos Anastopoulos <christos.anastopoulos@cern.ch>
Date: Fri, 7 Jul 2023 14:01:05 +0200
Subject: [PATCH] ART scripts/tests change master-> main. For 23.0
ART scripts/tests change master-> main. For 23.0
---
Control/AthenaMonitoring/test/test_run3dq_q442_aod.sh | 2 +-
Control/AthenaMonitoring/test/test_run3dq_q442_esd.sh | 2 +-
.../test/test_run3dq_q442_esd_cosmics.sh | 2 +-
.../test/test_run3dq_q445_aod_trigger.sh | 2 +-
.../test/test_run3dq_recotf_q442_rawtoall.sh | 2 +-
.../test/test_run3dq_recotf_q449_rawtoall.sh | 2 +-
.../test/test_run3dq_recotf_q449_rawtoall_mt_t2.sh | 2 +-
.../test/test_run3dq_recotf_q449_twostep.sh | 2 +-
.../test/test_ROBDataProviderSvcMT.sh | 2 +-
.../EvgenJobTransforms/test/deactiv_test_gen_qgsjet.sh | 4 ++--
.../test/test_full_chain_min_bias.sh | 4 ++--
.../test/test_gen_E2ESh_LepxTauQCDJetFilter.sh | 4 ++--
Generators/EvgenJobTransforms/test/test_gen_bphys.sh | 4 ++--
Generators/EvgenJobTransforms/test/test_gen_epos.sh | 4 ++--
.../EvgenJobTransforms/test/test_gen_hepmcToEVNT.sh | 4 ++--
.../EvgenJobTransforms/test/test_gen_herwig7_dijet.sh | 4 ++--
.../test/test_gen_herwig7_minbias.sh | 4 ++--
.../EvgenJobTransforms/test/test_gen_herwig7_wjets.sh | 4 ++--
.../EvgenJobTransforms/test/test_gen_herwig7_zjets.sh | 4 ++--
.../EvgenJobTransforms/test/test_gen_hijing_pp.sh | 4 ++--
.../EvgenJobTransforms/test/test_gen_mg_LHEonly_Zee.sh | 4 ++--
.../EvgenJobTransforms/test/test_gen_mgh7_VBF_HH.sh | 4 ++--
.../test/test_gen_mgpy8_TT_METorLepFilt.sh | 4 ++--
.../test/test_gen_mgpy8eg_tWgamma_madspin.sh | 4 ++--
.../test/test_gen_mgpythia8_Zmumu.sh | 4 ++--
.../EvgenJobTransforms/test/test_gen_mgpythia8_ttW.sh | 4 ++--
.../test/test_gen_mgpythia8_tt_NLO.sh | 4 ++--
.../EvgenJobTransforms/test/test_gen_phh7_WWlvlv.sh | 4 ++--
.../test/test_gen_phh7_Zmumu_gridpack.sh | 4 ++--
.../test/test_gen_phpy8_VBFNLO_Wev.sh | 4 ++--
.../EvgenJobTransforms/test/test_gen_phpy8_Wt_DR.sh | 4 ++--
.../test/test_gen_phpy8eg_13p6TeV_ttbar.sh | 4 ++--
.../test/test_gen_powhegLHEonly_ZZ.sh | 4 ++--
.../test/test_gen_powhegLHEonly_singleTop.sh | 4 ++--
.../EvgenJobTransforms/test/test_gen_powheg_ttbar.sh | 4 ++--
.../EvgenJobTransforms/test/test_gen_powheg_wenu.sh | 4 ++--
.../test/test_gen_py8_JZ2MultiBJetFilt.sh | 4 ++--
.../test/test_gen_py8tauola_DYto2tau.sh | 4 ++--
.../EvgenJobTransforms/test/test_gen_pythia8_jets.sh | 4 ++--
.../test/test_gen_pythia8_minbias.sh | 4 ++--
.../test/test_gen_pythia8_minbias_high.sh | 4 ++--
.../test/test_gen_pythia8_ztautau.sh | 4 ++--
.../EvgenJobTransforms/test/test_gen_rivet_athena.sh | 4 ++--
.../test/test_gen_rivet_standalone.sh | 4 ++--
.../EvgenJobTransforms/test/test_gen_sherpa_Z0.sh | 4 ++--
.../EvgenJobTransforms/test/test_gen_sherpa_dy.sh | 4 ++--
.../test/test_gen_sherpa_tttautau.sh | 4 ++--
Generators/EvgenJobTransforms/test/test_gen_single.sh | 4 ++--
.../EvgenJobTransforms/test/test_gen_starlight.sh | 4 ++--
.../EvgenJobTransforms/test/test_gen_starlight_lhe.sh | 4 ++--
.../test/test_gen_superchicPy8_gamgam_2sleptons.sh | 4 ++--
.../EvgenJobTransforms/test/test_gen_superchic_ALP2.sh | 4 ++--
.../EvgenJobTransforms/test/test_rel21_sim_reco.sh | 2 +-
Generators/Herwig7_i/test/test_00_dijet.sh | 2 +-
Generators/Herwig7_i/test/test_01_dijet_dipole.sh | 2 +-
Generators/Herwig7_i/test/test_02_Wjet.sh | 2 +-
Generators/Herwig7_i/test/test_03_Zjet.sh | 2 +-
Generators/Herwig7_i/test/test_04_WWlvlv_PH.sh | 2 +-
Generators/Herwig7_i/test/test_05_Zmumu_ph.sh | 2 +-
.../test/test_00_mc_MG_ttbar_LHEtest.sh | 4 ++--
.../test/test_01_mc_aMC_ttbar_LHEtest.sh | 4 ++--
.../test/test_02_mc_MG_ttbar_LHAPDFTest.sh | 4 ++--
.../test/test_03_mc_MG_ttbar_BaseFragmentTest.sh | 4 ++--
.../test_04_mc_aMC_ttbar_BaseFragmentGridpackTest.sh | 2 +-
.../test/test_05_mc_MG_ttbar_SystTest.sh | 2 +-
.../test/test_06_mc_aMC_ttbar_SystTest.sh | 2 +-
.../test/test_07_mc_MG_ttbar_MadSpinTest.sh | 2 +-
.../test/test_08_mc_aMC_ttbar_MadSpinTest.sh | 2 +-
.../test/test_09_mc_MG_ttbar_gridpackTest.sh | 2 +-
.../test/test_10_mc_aMC_ttbar_gridpackTest.sh | 2 +-
.../test/test_11_mc_aMC_ttbar_gridpackClusterTest.sh | 2 +-
.../test/test_12_mc_MGPy8EG_ttbar_MCOREtest.sh | 2 +-
.../test/test_13_mc_MG_ttbar_ReweightTest.sh | 2 +-
.../test/test_14_mc_aMC_ttbar_ReweightTest.sh | 2 +-
.../test/test_15_mc_aMCPy8EG_A14NNPDF23_ttbar_Incl.sh | 2 +-
.../test/test_16_mc_MGPy8EG_A14NNPDF23_ttbar_Incl.sh | 2 +-
.../test_17_mc_MGPy8EG_A14NNPDF23_ttbar_Merge_Np01.sh | 2 +-
.../test/test_18_mc_aMCPy8EG_A14NNPDF23_ttbar_Incl.sh | 2 +-
.../test/test_19_mc_SUSY_gridpackTest.sh | 2 +-
.../MadGraphControl/test/test_20_mc_SUSY_OTF_test.sh | 2 +-
.../test_21_mc_SUSY_EVNT_from_LHE_with_MadSpin_test.sh | 2 +-
Generators/PowhegControl/test/test_00_bb.sh | 2 +-
Generators/PowhegControl/test/test_01_ZZ.sh | 2 +-
.../PowhegControl/test/test_02_single_top_s_channel.sh | 2 +-
Generators/PowhegControl/test/test_03_W.sh | 2 +-
Generators/PowhegControl/test/test_04_Z.sh | 2 +-
Generators/PowhegControl/test/test_05_tt.sh | 2 +-
Generators/PowhegControl/test/test_06_WW.sh | 2 +-
Generators/Pythia8_i/test/test_00_Zprime_1000_tt.sh | 2 +-
Generators/Pythia8_i/test/test_01_Z_tautau.sh | 2 +-
Generators/Pythia8_i/test/test_02_minbias.sh | 2 +-
Generators/Sherpa_i/test/test_00_sherpa_tttautau.sh | 2 +-
Generators/Sherpa_i/test/test_01_DY.sh | 2 +-
.../test/test_data15_13TeV_1000evt.sh | 2 +-
.../test/test_data16_13TeV_1000evt.sh | 2 +-
.../test/test_data17_13TeV_1000evt.sh | 2 +-
.../test/test_data18_13TeV_1000evt.sh | 2 +-
.../InDetPhysValMonitoring/test/test_ele10GeV_reco.sh | 2 +-
.../InDetPhysValMonitoring/test/test_ele5GeV_reco.sh | 2 +-
.../InDetPhysValMonitoring/test/test_mu100GeV_reco.sh | 2 +-
.../test/test_mu100GeV_simreco.sh | 2 +-
.../InDetPhysValMonitoring/test/test_mu10GeV_reco.sh | 2 +-
.../InDetPhysValMonitoring/test/test_mu1GeV_reco.sh | 2 +-
.../InDetPhysValMonitoring/test/test_mu1GeV_simreco.sh | 2 +-
.../InDetPhysValMonitoring/test/test_mu20GeV_reco.sh | 2 +-
.../test/test_mu20GeV_simreco.sh | 2 +-
.../InDetPhysValMonitoring/test/test_mu5GeV_simreco.sh | 2 +-
.../test/test_piplus1GeV_reco.sh | 2 +-
.../test/test_piplus1GeV_simreco.sh | 2 +-
.../test/test_piplus5GeV_reco.sh | 2 +-
.../test/test_piplus5GeV_simreco.sh | 2 +-
.../test/test_run4_acts_ckf_mu100GeV.sh | 2 +-
.../test/test_run4_acts_ttbar_PU200.sh | 2 +-
.../InDetPhysValMonitoring/test/test_run4_el10.sh | 2 +-
.../InDetPhysValMonitoring/test/test_run4_mu100_FTF.sh | 2 +-
.../test/test_run4_mu100_reco.sh | 2 +-
.../InDetPhysValMonitoring/test/test_run4_pi10_reco.sh | 2 +-
.../InDetPhysValMonitoring/test/test_run4_ttbar_PU0.sh | 2 +-
.../test/test_run4_ttbar_PU200.sh | 2 +-
.../test/test_run4_ttbar_PU200_FTF.sh | 2 +-
.../InDetPhysValMonitoring/test/test_ttbarPU40_reco.sh | 2 +-
.../LArCalibProcessing/test/test_LArElecCalibChainI.sh | 2 +-
.../MuonGeomRTT/test/test_amdc_mgm-misaligned_geom.sh | 2 +-
.../MuonGeomRTT/test/test_amdc_mgm-test_layout.sh | 2 +-
.../MuonGeomRTT/test/test_checkgeo_agdd.sh | 2 +-
.../MuonGeomRTT/test/test_checkgeo_amdc.sh | 2 +-
.../MuonGeomRTT/test/test_checkgeo_nswd.sh | 2 +-
.../MuonGeomRTT/test/test_gengeo_agdd.sh | 2 +-
.../MuonGeomRTT/test/test_gengeo_agdd_viaAmdb.sh | 2 +-
.../MuonGeomRTT/test/test_gengeo_amdc.sh | 2 +-
.../MuonGeomRTT/test/test_gengeo_nswd.sh | 2 +-
.../MuonGeomRTT/test/test_geoFromLocal_R_08_01.sh | 2 +-
.../MuonGeomRTT/test/test_geoFromLocal_R_08_02_AGDD.sh | 2 +-
.../MuonGeomRTT/test/test_geoFromLocal_R_08_02_Amdb.sh | 2 +-
.../test/test_geoFromLocal_R_09_02_NSWAGDD.sh | 2 +-
.../MuonGeomRTT/test/test_muon_geantino_sim.sh | 2 +-
.../MuonGeomRTT/test/test_muon_gm_check.sh | 2 +-
.../MuonGeomRTT/test/test_muon_gm_check_reference.sh | 2 +-
.../MuonGeomRTT/test/test_muon_hit_relocation.sh | 2 +-
.../test/test_singlemuon-mc12-pt100gev.sh | 2 +-
.../test/test_singlemuon-mc12-pt10gev.sh | 2 +-
.../MooPerformance/test/test_singlemuon-mc12-pt1tev.sh | 2 +-
.../test/test_singlemuon-mc12-pt200gev.sh | 2 +-
.../test/test_singlemuon-mc12-pt20gev.sh | 2 +-
.../MooPerformance/test/test_singlemuon-mc12-pt2tev.sh | 2 +-
.../MooPerformance/test/test_singlemuon-mc12-pt3gev.sh | 2 +-
.../MooPerformance/test/test_singlemuon-mc12-pt3tev.sh | 2 +-
.../test/test_singlemuon-mc12-pt500gev.sh | 2 +-
.../test/test_singlemuon-mc12-pt50gev.sh | 2 +-
.../MooPerformance/test/test_singlemuon-mc12-pt5gev.sh | 2 +-
.../MuonRecRTT/test/test_Run3_asymmetric_fullChain.sh | 2 +-
.../MuonRecRTT/test/test_Run3_symmetric_fullChain.sh | 2 +-
.../MuonRecRTT/test/test_Run4_muon_fullChain.sh | 2 +-
.../MuonRecRTT/test/test_digi_phase2.sh | 2 +-
.../MuonRecRTT/test/test_muonrec_Run3_asymmetric.sh | 2 +-
.../MuonRecRTT/test/test_muonrec_Run3_symmetric.sh | 2 +-
.../MuonRecRTT/test/test_muonrec_phase2.sh | 2 +-
.../MuonRecRTT/test/test_muonrecrtt_cosmic.sh | 2 +-
.../MuonRecRTT/test/test_q442_RAWtoESD_MT.sh | 2 +-
.../MuonRecRTT/test/test_q443_RAWtoESD_MT.sh | 2 +-
.../test/test_data18BPHY1.sh | 2 +-
.../test/test_data18BPHY10.sh | 2 +-
.../test/test_data18BPHY15.sh | 2 +-
.../test/test_data18BPHY16.sh | 2 +-
.../test/test_data18BPHY18.sh | 2 +-
.../test/test_data18BPHY2.sh | 2 +-
.../test/test_data18BPHY21.sh | 2 +-
.../test/test_data18BPHY22.sh | 2 +-
.../test/test_data18BPHY23.sh | 2 +-
.../test/test_data18BPHY24.sh | 2 +-
.../test/test_data18BPHY3.sh | 2 +-
.../test/test_data18BPHY4.sh | 2 +-
.../test/test_data18BPHY5.sh | 2 +-
.../test/test_data18BPHY6.sh | 2 +-
.../test/test_data22BPHY1.sh | 2 +-
.../test/test_data22BPHY10.sh | 2 +-
.../test/test_data22BPHY15.sh | 2 +-
.../test/test_data22BPHY16.sh | 2 +-
.../test/test_data22BPHY18.sh | 2 +-
.../test/test_data22BPHY2.sh | 2 +-
.../test/test_data22BPHY21.sh | 2 +-
.../test/test_data22BPHY22.sh | 2 +-
.../test/test_data22BPHY23.sh | 2 +-
.../test/test_data22BPHY24.sh | 2 +-
.../test/test_data22BPHY3.sh | 2 +-
.../test/test_data22BPHY4.sh | 2 +-
.../test/test_data22BPHY5.sh | 2 +-
.../test/test_data22BPHY6.sh | 2 +-
.../DerivationFrameworkBPhysART/test/test_mc20BPHY1.sh | 2 +-
.../test/test_mc20BPHY10.sh | 2 +-
.../test/test_mc20BPHY15.sh | 2 +-
.../test/test_mc20BPHY16.sh | 2 +-
.../test/test_mc20BPHY18.sh | 2 +-
.../DerivationFrameworkBPhysART/test/test_mc20BPHY2.sh | 2 +-
.../test/test_mc20BPHY21.sh | 2 +-
.../test/test_mc20BPHY22.sh | 2 +-
.../test/test_mc20BPHY23.sh | 2 +-
.../test/test_mc20BPHY24.sh | 2 +-
.../DerivationFrameworkBPhysART/test/test_mc20BPHY3.sh | 2 +-
.../DerivationFrameworkBPhysART/test/test_mc20BPHY4.sh | 2 +-
.../DerivationFrameworkBPhysART/test/test_mc20BPHY5.sh | 2 +-
.../DerivationFrameworkBPhysART/test/test_mc20BPHY6.sh | 2 +-
.../DerivationFrameworkBPhysART/test/test_mc21BPHY1.sh | 2 +-
.../test/test_mc21BPHY10.sh | 2 +-
.../test/test_mc21BPHY15.sh | 2 +-
.../test/test_mc21BPHY16.sh | 2 +-
.../test/test_mc21BPHY18.sh | 2 +-
.../DerivationFrameworkBPhysART/test/test_mc21BPHY2.sh | 2 +-
.../test/test_mc21BPHY21.sh | 2 +-
.../test/test_mc21BPHY22.sh | 2 +-
.../test/test_mc21BPHY23.sh | 2 +-
.../test/test_mc21BPHY24.sh | 2 +-
.../DerivationFrameworkBPhysART/test/test_mc21BPHY3.sh | 2 +-
.../DerivationFrameworkBPhysART/test/test_mc21BPHY4.sh | 2 +-
.../DerivationFrameworkBPhysART/test/test_mc21BPHY5.sh | 2 +-
.../DerivationFrameworkBPhysART/test/test_mc21BPHY6.sh | 2 +-
.../test/test_data18EGAM1.sh | 2 +-
.../test/test_data18EGAM10.sh | 2 +-
.../test/test_data18EGAM2.sh | 2 +-
.../test/test_data18EGAM3.sh | 2 +-
.../test/test_data18EGAM4.sh | 2 +-
.../test/test_data18EGAM5.sh | 2 +-
.../test/test_data18EGAM7.sh | 2 +-
.../test/test_data18EGAM8.sh | 2 +-
.../test/test_data18EGAM9.sh | 2 +-
.../test/test_data22EGAM1.sh | 2 +-
.../test/test_data22EGAM10.sh | 2 +-
.../test/test_data22EGAM2.sh | 2 +-
.../test/test_data22EGAM3.sh | 2 +-
.../test/test_data22EGAM4.sh | 2 +-
.../test/test_data22EGAM5.sh | 2 +-
.../test/test_data22EGAM7.sh | 2 +-
.../test/test_data22EGAM8.sh | 2 +-
.../test/test_data22EGAM9.sh | 2 +-
.../test/test_mc20EGAM1.sh | 2 +-
.../test/test_mc20EGAM10.sh | 2 +-
.../test/test_mc20EGAM2.sh | 2 +-
.../test/test_mc20EGAM3.sh | 2 +-
.../test/test_mc20EGAM4.sh | 2 +-
.../test/test_mc20EGAM5.sh | 2 +-
.../test/test_mc20EGAM7.sh | 2 +-
.../test/test_mc20EGAM8.sh | 2 +-
.../test/test_mc20EGAM9.sh | 2 +-
.../test/test_mc21EGAM1.sh | 2 +-
.../test/test_mc21EGAM10.sh | 2 +-
.../test/test_mc21EGAM2.sh | 2 +-
.../test/test_mc21EGAM3.sh | 2 +-
.../test/test_mc21EGAM4.sh | 2 +-
.../test/test_mc21EGAM5.sh | 2 +-
.../test/test_mc21EGAM7.sh | 2 +-
.../test/test_mc21EGAM8.sh | 2 +-
.../test/test_mc21EGAM9.sh | 2 +-
.../test/test_data18FTAG1.sh | 2 +-
.../test/test_data18FTAG2.sh | 2 +-
.../test/test_data18FTAG3.sh | 2 +-
.../test/test_data22FTAG1.sh | 2 +-
.../test/test_data22FTAG2.sh | 2 +-
.../test/test_data22FTAG3.sh | 2 +-
.../test/test_mc20FTAG1.sh | 2 +-
.../test/test_mc20FTAG2.sh | 2 +-
.../test/test_mc20FTAG3.sh | 2 +-
.../test/test_mc21FTAG1.sh | 2 +-
.../test/test_mc21FTAG2.sh | 2 +-
.../test/test_mc21FTAG3.sh | 2 +-
.../test/test_data18HIGG1D1.sh | 2 +-
.../test/test_data22HIGG1D1.sh | 2 +-
.../test/test_mc20HIGG1D1.sh | 2 +-
.../test/test_mc21HIGG1D1.sh | 2 +-
.../test/test_data18IDTR2.sh | 2 +-
.../test/test_data22IDTR2.sh | 2 +-
.../DerivationFrameworkInDetART/test/test_mc20IDTR2.sh | 2 +-
.../DerivationFrameworkInDetART/test/test_mc21IDTR2.sh | 2 +-
.../test/test_data18JETM1.sh | 2 +-
.../test/test_data18JETM10.sh | 2 +-
.../test/test_data18JETM11.sh | 2 +-
.../test/test_data18JETM12.sh | 2 +-
.../test/test_data18JETM14.sh | 2 +-
.../test/test_data18JETM2.sh | 2 +-
.../test/test_data18JETM3.sh | 2 +-
.../test/test_data18JETM4.sh | 2 +-
.../test/test_data18JETM5.sh | 2 +-
.../test/test_data18JETM6.sh | 2 +-
.../test/test_data22JETM1.sh | 2 +-
.../test/test_data22JETM10.sh | 2 +-
.../test/test_data22JETM11.sh | 2 +-
.../test/test_data22JETM12.sh | 2 +-
.../test/test_data22JETM14.sh | 2 +-
.../test/test_data22JETM2.sh | 2 +-
.../test/test_data22JETM3.sh | 2 +-
.../test/test_data22JETM4.sh | 2 +-
.../test/test_data22JETM5.sh | 2 +-
.../test/test_data22JETM6.sh | 2 +-
.../test/test_mc20JETM1.sh | 2 +-
.../test/test_mc20JETM10.sh | 2 +-
.../test/test_mc20JETM11.sh | 2 +-
.../test/test_mc20JETM12.sh | 2 +-
.../test/test_mc20JETM14.sh | 2 +-
.../test/test_mc20JETM2.sh | 2 +-
.../test/test_mc20JETM3.sh | 2 +-
.../test/test_mc20JETM4.sh | 2 +-
.../test/test_mc20JETM5.sh | 2 +-
.../test/test_mc20JETM6.sh | 2 +-
.../test/test_mc21JETM1.sh | 2 +-
.../test/test_mc21JETM10.sh | 2 +-
.../test/test_mc21JETM11.sh | 2 +-
.../test/test_mc21JETM12.sh | 2 +-
.../test/test_mc21JETM14.sh | 2 +-
.../test/test_mc21JETM2.sh | 2 +-
.../test/test_mc21JETM3.sh | 2 +-
.../test/test_mc21JETM4.sh | 2 +-
.../test/test_mc21JETM5.sh | 2 +-
.../test/test_mc21JETM6.sh | 2 +-
.../DerivationFrameworkLLPART/test/test_data18LLP1.sh | 2 +-
.../DerivationFrameworkLLPART/test/test_data22LLP1.sh | 2 +-
.../DerivationFrameworkLLPART/test/test_mc20LLP1.sh | 2 +-
.../DerivationFrameworkLLPART/test/test_mc21LLP1.sh | 2 +-
.../test/test_mc21TRUTH0.sh | 2 +-
.../test/test_mc21TRUTH1.sh | 2 +-
.../test/test_mc21TRUTH3.sh | 2 +-
.../DerivationFrameworkPHYS/test/test_data18PHYS.sh | 2 +-
.../test/test_data18PHYSLITE.sh | 2 +-
.../DerivationFrameworkPHYS/test/test_data22PHYS.sh | 2 +-
.../test/test_data22PHYSLITE.sh | 2 +-
.../DerivationFrameworkPHYS/test/test_mc20PHYS.sh | 2 +-
.../DerivationFrameworkPHYS/test/test_mc20PHYSLITE.sh | 2 +-
.../DerivationFrameworkPHYS/test/test_mc21PHYS.sh | 2 +-
.../DerivationFrameworkPHYS/test/test_mc21PHYSLITE.sh | 2 +-
.../test/test_data18PHYSVAL.sh | 2 +-
.../test/test_data22PHYSVAL.sh | 2 +-
.../test/test_mc20PHYSVAL.sh | 2 +-
.../test/test_mc21PHYSVAL.sh | 2 +-
.../test/test_mc21PHYSVAL_DAOD_NTUP_HIST.sh | 2 +-
.../DerivationFrameworkSMART/test/test_data18STDM7.sh | 2 +-
.../DerivationFrameworkSMART/test/test_data22STDM7.sh | 2 +-
.../DerivationFrameworkSMART/test/test_mc20STDM7.sh | 2 +-
.../DerivationFrameworkSMART/test/test_mc21STDM7.sh | 2 +-
.../test/test_data18CPandPAformats.sh | 2 +-
.../test/test_data18EGAM1_EGAM2_EGAM5_EGAM10.sh | 2 +-
.../test/test_data18EGAM3_EGAM4_JETM4.sh | 2 +-
.../test/test_data18EGAM7_JETM3.sh | 2 +-
.../test/test_data18EGAM8_EGAM9_JETM1_LLP1.sh | 2 +-
.../test/test_data18JETM6_FTAG2.sh | 2 +-
.../test/test_data18PHYS_PHYSLITE_mp_sharedwriter.sh | 2 +-
.../test_data18PHYS_PHYSLITE_mp_sharedwriter_fafe.sh | 2 +-
...ta18PHYS_PHYSLITE_mp_sharedwriter_noparallelcomp.sh | 2 +-
...HYS_PHYSLITE_mp_sharedwriter_noparallelcomp_fafe.sh | 2 +-
.../test/test_data22CPandPAformats.sh | 2 +-
.../test/test_data22EGAM1_EGAM2_EGAM5_EGAM10.sh | 2 +-
.../test/test_data22EGAM3_EGAM4_JETM4.sh | 2 +-
.../test/test_data22EGAM7_JETM3.sh | 2 +-
.../test/test_data22EGAM8_EGAM9_JETM1_LLP1.sh | 2 +-
.../test/test_data22JETM6_FTAG2.sh | 2 +-
.../test/test_mc20CPandPAformats.sh | 2 +-
.../test/test_mc20EGAM1_EGAM2_EGAM5_EGAM10.sh | 2 +-
.../test/test_mc20EGAM3_EGAM4_JETM4.sh | 2 +-
.../test/test_mc20EGAM7_JETM3.sh | 2 +-
.../test/test_mc20EGAM8_EGAM9_JETM1_LLP1.sh | 2 +-
.../test/test_mc20JETM6_FTAG2.sh | 2 +-
.../test/test_mc20PHYS_PHYSLITE_mp_sharedwriter.sh | 2 +-
.../test_mc20PHYS_PHYSLITE_mp_sharedwriter_fafe.sh | 2 +-
...mc20PHYS_PHYSLITE_mp_sharedwriter_noparallelcomp.sh | 2 +-
...HYS_PHYSLITE_mp_sharedwriter_noparallelcomp_fafe.sh | 2 +-
.../test/test_mc21CPandPAformats.sh | 2 +-
.../test/test_mc21EGAM1_EGAM2_EGAM5_EGAM10.sh | 2 +-
.../test/test_mc21EGAM3_EGAM4_JETM4.sh | 2 +-
.../test/test_mc21EGAM7_JETM3.sh | 2 +-
.../test/test_mc21EGAM8_EGAM9_JETM1_LLP1.sh | 2 +-
.../test/test_mc21JETM6_FTAG2.sh | 2 +-
.../test/test_data22TRIG8.sh | 2 +-
.../DerivationFrameworkART/makeARTScripts.py | 4 ++--
.../test/test_TruthDerivationTest.sh | 2 +-
.../test_trigAna_FTAG_PhysicsVariablePlots_AOD_grid.py | 2 +-
.../test/test_SUSYTools_ART_MC20e-AnaBase-grid.sh | 2 +-
.../test/test_SUSYTools_ART_MC20e-LITE-AnaBase-grid.sh | 2 +-
.../test/test_SUSYTools_ART_MC21a-AnaBase-grid.sh | 2 +-
.../test/test_SUSYTools_ART_MC21a-LITE-AnaBase-grid.sh | 2 +-
.../test/test_SUSYTools_ART_data18-AnaBase-grid.sh | 2 +-
.../test_SUSYTools_ART_data18-LITE-AnaBase-grid.sh | 2 +-
.../test/test_SUSYTools_ART_data22-AnaBase-grid.sh | 2 +-
.../test_SUSYTools_ART_data22-LITE-AnaBase-grid.sh | 2 +-
Reconstruction/Jet/JetValidation/test/test_jet.sh | 2 +-
.../Jet/JetValidation/test/test_jet_noPtCut.sh | 2 +-
Reconstruction/Jet/JetValidation/test/test_met.sh | 2 +-
.../test/test_pflowReco_decorateCalHits_fromESD.sh | 2 +-
.../test/test_pflow_EOverP_fromESD_noLinking.sh | 2 +-
.../test/test_pflow_decorateCalHits_fromESD.sh | 2 +-
.../PFlowTests/test/test_pflow_fromESD_withLinking.sh | 2 +-
.../test/test_pflow_fromESD_withLinking_withJets.sh | 2 +-
.../test/test_pflow_fromESD_withLinking_withJetsMET.sh | 2 +-
.../test/test_RecExReco_Art_BTagging_fromESDMC21.sh | 2 +-
.../test_RecExReco_Art_CaloTopoCluster_fromESDMC21.sh | 2 +-
.../test/test_RecExReco_Art_Calo_fromRawData22.sh | 2 +-
.../test/test_RecExReco_Art_EGamma_fromRawData22.sh | 2 +-
.../test/test_RecExReco_Art_Jets_fromAODMC21.sh | 2 +-
.../test/test_RecExReco_Art_Muon_fromRawData22.sh | 2 +-
.../test/test_RecExReco_Art_PFlow_fromESDMC21.sh | 2 +-
.../test/test_RecExReco_Art_Taus_fromESDMC21.sh | 2 +-
.../test/test_RecExReco_Art_Tracking_fromESDMC21.sh | 2 +-
.../test/test_RecExReco_Art_Tracking_fromRawData22.sh | 2 +-
.../test/test_recexreco_art_met_fromesd.sh | 2 +-
.../RecJobTransformTests/test/test_data11_7tev.sh | 2 +-
.../RecJobTransformTests/test/test_data11_heavy_ion.sh | 2 +-
.../RecJobTransformTests/test/test_data12_8tev.sh | 2 +-
.../RecJobTransformTests/test/test_data15_13tev.sh | 2 +-
.../RecJobTransformTests/test/test_data15_heavy_ion.sh | 2 +-
.../RecJobTransformTests/test/test_data16_13tev.sh | 2 +-
.../RecJobTransformTests/test/test_data17_13tev.sh | 2 +-
.../RecJobTransformTests/test/test_data18_13TeV.sh | 2 +-
.../test/test_data18_heavy_ion_notrigger.sh | 2 +-
.../test/test_data22AFP_13p6tev.sh | 2 +-
.../RecJobTransformTests/test/test_data22_13p6TeV.sh | 2 +-
.../test/test_data22_13p6TeV_FPE.sh | 2 +-
.../test/test_data22_13p6TeV_serial.sh | 2 +-
.../test/test_data22_900GV_splash.sh | 2 +-
.../test/test_data22_CosmicCalo.sh | 2 +-
.../RecJobTransformTests/test/test_data22_IDCosmic.sh | 2 +-
.../RecJobTransformTests/test/test_data22_hi.sh | 2 +-
.../RecJobTransformTests/test/test_data22_hip.sh | 2 +-
.../test/test_mc18_heavy_ion_notrigger.sh | 2 +-
.../test/test_mc20e_AFP_nopileup_13TeV.sh | 2 +-
.../RecJobTransformTests/test/test_mc21_13p6TeV.sh | 2 +-
.../test/test_mc21_13p6TeV_hi_withtrigger.sh | 2 +-
..._recexreco_art_data22_13p6TeV_compare1Vs8Threads.sh | 2 +-
...xreco_art_data22_13p6TeV_compare1Vs8Threads_Long.sh | 2 +-
...exreco_art_data22_13p6TeV_compareMultipleThreads.sh | 2 +-
...o_art_data22_13p6TeV_compareMultipleThreads_Long.sh | 2 +-
.../egamma/egammaValidation/test/test_electron.sh | 2 +-
.../egamma/egammaValidation/test/test_electron_Run4.sh | 2 +-
.../egammaValidation/test/test_electron_pileup.sh | 2 +-
.../egammaValidation/test/test_electron_pileup_Run4.sh | 2 +-
.../egamma/egammaValidation/test/test_gamma.sh | 2 +-
.../egamma/egammaValidation/test/test_gamma_pileup.sh | 2 +-
.../tauRec/test/test_tau_q221_multithread.sh | 2 +-
Reconstruction/tauRec/test/test_tau_q431_serial.sh | 2 +-
.../test/test_tau_standalone_LCTopo_multithread.sh | 2 +-
.../tauRec/test/test_tau_standalone_LCTopo_serial.sh | 2 +-
Simulation/Digitization/test/test_Digitization.sh | 2 +-
Simulation/Digitization/test/test_PileUp.sh | 2 +-
...test_MC20a_ATLFAST3F_G4MS_MCOverlay_ttbar_CAvsCG.sh | 2 +-
.../test_MC20a_ATLFAST3F_G4MS_pileup_ttbar_CAvsCG.sh | 2 +-
...test_MC21a_ATLFAST3F_G4MS_MCOverlay_ttbar_CAvsCG.sh | 2 +-
.../test_MC21a_ATLFAST3F_G4MS_TrackOverlay_ttbar_CA.sh | 2 +-
.../test_MC21a_ATLFAST3F_G4MS_pileup_ttbar_CAvsCG.sh | 2 +-
.../test_MC21a_ATLFAST3MT_MCOverlay_ttbar_CAvsCG.sh | 2 +-
.../test/test_MC21a_TrackOverlay_ttbar_CA.sh | 2 +-
Simulation/G4Atlas/G4AtlasApps/test/test_G4Atlas.sh | 2 +-
.../G4Atlas/G4AtlasApps/test/test_G4AtlasReadEvgen.sh | 4 ++--
Simulation/G4Atlas/G4AtlasApps/test/test_G4Cosmic.sh | 2 +-
Simulation/SimuJobTransforms/test/test_G4param.sh | 4 ++--
Simulation/SimuJobTransforms/test/test_diffmerged.sh | 2 +-
Simulation/SimuJobTransforms/test/test_filterHIT.sh | 2 +-
Simulation/SimuJobTransforms/test/test_pileup.sh | 2 +-
.../test/test_Digi_tf_RUN4_neutrinos_mu200.sh | 2 +-
.../test/test_Digi_tf_RUN4_presampling_mu1.sh | 2 +-
.../test/test_Digi_tf_RUN4_presampling_mu140.sh | 2 +-
.../test/test_Digi_tf_RUN4_presampling_mu200.sh | 2 +-
.../test/test_Digi_tf_RUN4_presampling_mu60.sh | 2 +-
.../test/test_Digi_tf_RUN4_presampling_muMC21a.sh | 2 +-
.../test/test_Digi_tf_RUN4_single_muon_no_pileup.sh | 2 +-
.../test/test_Digi_tf_RUN4_ttbar_mu140.sh | 2 +-
.../test/test_Digi_tf_RUN4_ttbar_mu1_inTimeTruth.sh | 2 +-
.../test/test_Digi_tf_RUN4_ttbar_mu200.sh | 2 +-
.../test/test_Digi_tf_RUN4_ttbar_mu60.sh | 2 +-
.../test/test_Digi_tf_RUN4_ttbar_muMC21a.sh | 2 +-
.../test/test_Digi_tf_RUN4_ttbar_no_pileup.sh | 2 +-
.../test/test_Digi_tf_mc15_2010_ttbar_no_pileup.sh | 2 +-
.../test/test_Digi_tf_mc15_2011_ttbar_no_pileup.sh | 2 +-
.../test/test_Digi_tf_mc15_2012_ttbar_no_pileup.sh | 2 +-
.../test/test_Digi_tf_mc15_2015_cosmics.sh | 2 +-
.../test/test_Digi_tf_mc15_2015_heavy_ion.sh | 2 +-
...test_Digi_tf_mc15_2015_ttbar_25ns_pileup_noNoise.sh | 2 +-
.../test/test_Digi_tf_mc20a_CA_vs_CG.sh | 2 +-
.../test/test_Digi_tf_mc20a_CA_vs_CG_no_minbias.sh | 2 +-
.../test/test_Digi_tf_mc20a_presampling.sh | 2 +-
.../test/test_Digi_tf_mc20a_qballs.sh | 2 +-
.../test/test_Digi_tf_mc20d_CA_vs_CG.sh | 2 +-
.../test/test_Digi_tf_mc20d_presampling.sh | 2 +-
.../test/test_Digi_tf_mc20e_CA_vs_CG.sh | 2 +-
.../test/test_Digi_tf_mc20e_CA_vs_CG_no_minbias.sh | 2 +-
.../test_Digi_tf_mc20e_CA_vs_CG_presampling_custom.sh | 2 +-
.../test/test_Digi_tf_mc20e_presampling.sh | 2 +-
.../test_Digi_tf_mc20e_ttbar_beamspotsizereweight.sh | 2 +-
.../test/test_Digi_tf_mc21a_presampling.sh | 2 +-
.../test/test_Digi_tf_mc21a_presampling_variable.sh | 2 +-
...est_Digi_tf_mc21a_presampling_variable_TruthOnly.sh | 2 +-
.../DigitizationTests/test/test_Digi_tf_mc21a_ttbar.sh | 2 +-
.../test/test_Digi_tf_mc21a_ttbar_lowmu.sh | 2 +-
.../test/test_Digi_tf_mc21a_ttbar_no_pileup.sh | 2 +-
...test_Digi_tf_RUN4_MP_presampling_reproducibility.sh | 2 +-
.../test/test_Digi_tf_RUN4_MP_ttbar_reproducibility.sh | 2 +-
.../test/test_Digi_tf_RUN4_MT_presampling.sh | 2 +-
.../test/test_Digi_tf_RUN4_MT_presampling_ITkPixel.sh | 2 +-
.../test/test_Digi_tf_mc20_ttbar_no_pileup_MT.sh | 2 +-
.../test_Digi_tf_mc20_ttbar_no_pileup_MT_1thread.sh | 2 +-
...e_MP_SharedWriter_NoParallelComp_reproducibility.sh | 2 +-
...st_Digi_tf_mc20e_MP_SharedWriter_reproducibility.sh | 2 +-
...est_Digi_tf_mc20e_MP_presampling_reproducibility.sh | 2 +-
.../test/test_Digi_tf_mc20e_MP_reproducibility.sh | 2 +-
...est_Digi_tf_mc21a_MP_presampling_reproducibility.sh | 2 +-
.../ISF_Validation/test/test_ATLFASTIIF_ttbar_2evts.sh | 2 +-
.../ISF_Validation/test/test_ATLFASTII_ttbar_2evts.sh | 2 +-
.../test/test_AtlasG4_FullG4_comparison.sh | 4 ++--
.../test/test_FatrasGammaCones_FastCalo_2evts.sh | 2 +-
.../test/test_G4BHadronsOnly_FastCalo_2evts.sh | 2 +-
.../ISF_Validation/test/test_G4GammaCones_2evts.sh | 2 +-
.../test/test_G4GammaCones_FastCalo_2evts.sh | 2 +-
.../test/test_MC16_ATLFAST3F_G4MS_ttbar.sh | 2 +-
.../ISF_Validation/test/test_MC16_ATLFAST3_QS_ttbar.sh | 2 +-
.../ISF_Validation/test/test_MC16_ATLFAST3_ttbar.sh | 2 +-
.../test/test_MC16_ATLFASTIIF_Acts_ttbar.sh | 2 +-
.../test/test_MC16_ATLFASTIIF_G4MS_ttbar.sh | 2 +-
.../ISF_Validation/test/test_MC16_ATLFASTIIF_ttbar.sh | 2 +-
.../ISF_Validation/test/test_MC16_ATLFASTII_ttbar.sh | 2 +-
.../ISF_Validation/test/test_MC16_FullG4_ttbar.sh | 2 +-
.../test/test_MC16_FullG4_ttbar_2evts.sh | 4 ++--
.../test/test_MC21_FullG4MT_QS_SQLiteGeoM_ttbar.sh | 2 +-
.../ISF_Validation/test/test_MC21_FullG4MT_QS_ttbar.sh | 2 +-
.../test_RUN2_FullG4MT_QS_CalibrationHits_pions.sh | 2 +-
.../ISF_Validation/test/test_RUN2_FullG4MT_QS_ttbar.sh | 4 ++--
.../ISF_Validation/test/test_RUN2_FullG4MT_ttbar.sh | 4 ++--
.../test/test_RUN3_2023_FullG4MT_QS_ttbar.sh | 2 +-
.../test/test_RUN3_AF3InputParamFiles.sh | 2 +-
.../test/test_RUN3_ATLFAST3F_G4MS_ttbar.sh | 4 ++--
.../test/test_RUN3_ATLFAST3MT_QS_ttbar.sh | 2 +-
.../ISF_Validation/test/test_RUN3_ATLFAST3MT_ttbar.sh | 2 +-
.../test/test_RUN3_ATLFASTIIF_G4MS_ttbar.sh | 2 +-
.../ISF_Validation/test/test_RUN3_ATLFASTIIMT_ttbar.sh | 2 +-
.../test_RUN3_FullG4MT_QS_CalibrationHits_pions.sh | 2 +-
.../test/test_RUN3_FullG4_QS_ZPrime_2evts.sh | 4 ++--
.../ISF_Validation/test/test_RUN3_FullG4_QS_ttbar.sh | 2 +-
.../test/test_RUN3_FullG4_ReproducibilityTest.sh | 4 ++--
.../ISF_Validation/test/test_RUN3_FullG4_minbias.sh | 2 +-
.../test/test_RUN3_FullG4_ttbar_2evts.sh | 4 ++--
.../test_RUN4_FullG4MT_QS_CalibrationHits_pions.sh | 2 +-
.../ISF_Validation/test/test_RUN4_FullG4_minbias.sh | 2 +-
.../test/test_RUN4_FullG4_single_muon.sh | 2 +-
.../test/test_RUN4_FullG4_single_neutrino.sh | 2 +-
.../ISF_Validation/test/test_RUN4_FullG4_ttbar.sh | 2 +-
.../Tests/ISF_Validation/test/test_ReSimulation.sh | 2 +-
.../ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh | 2 +-
.../ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh | 2 +-
.../test_MC20_ReSimulation_FullG4MT_QS_ttbar_MT.sh | 2 +-
.../test_MC21_ReSimulation_FullG4MT_QS_ttbar_MT.sh | 2 +-
.../test/test_RUN2_ATLFAST3MT_QS_ttbar_MP.sh | 2 +-
.../test/test_RUN2_ATLFAST3MT_QS_ttbar_MT.sh | 2 +-
.../test/test_RUN2_FullG4MT_QS_ttbar_MP.sh | 4 ++--
.../test/test_RUN2_FullG4MT_QS_ttbar_MT.sh | 4 ++--
.../test/test_RUN3_2023_FullG4MT_QS_ttbar_MT.sh | 4 ++--
.../test/test_RUN3_ATLFAST3F_G4MS_ttbar_MP.sh | 2 +-
.../test/test_RUN3_ATLFAST3MT_QS_ttbar_MP.sh | 2 +-
.../test/test_RUN3_ATLFAST3MT_QS_ttbar_MT.sh | 2 +-
.../test/test_RUN3_ATLFAST3MT_ttbar_MP.sh | 2 +-
.../test/test_RUN3_ATLFAST3MT_ttbar_MT.sh | 2 +-
.../test/test_RUN3_ATLFASTIIF_G4MS_ttbar_MP.sh | 2 +-
.../test_RUN3_FullG4MT_QS_CalibrationHits_pions_MT.sh | 4 ++--
.../test/test_RUN3_FullG4MT_QS_Monopoles_MT.sh | 4 ++--
.../test/test_RUN3_FullG4MT_QS_Smuons_MT.sh | 4 ++--
.../test/test_RUN3_FullG4MT_QS_ZPrime_MT.sh | 4 ++--
.../test/test_RUN3_FullG4MT_QS_minbias_MT.sh | 2 +-
.../test/test_RUN3_FullG4MT_QS_ttbar_MP.sh | 4 ++--
.../test/test_RUN3_FullG4MT_QS_ttbar_MPvsST.sh | 4 ++--
.../test/test_RUN3_FullG4MT_QS_ttbar_MT.sh | 4 ++--
.../test/test_RUN3_FullG4MT_QS_ttbar_MTvsST.sh | 4 ++--
.../test/test_RUN3_FullG4MT_ttbar_MP.sh | 4 ++--
.../test/test_RUN3_FullG4MT_ttbar_MT.sh | 4 ++--
Simulation/Tests/OverlayTests/test/test_BSFilter.sh | 2 +-
.../test/test_DataOverlay_ConfigTest_Zmumu.sh | 2 +-
.../test/test_DataOverlay_ConfigTest_Zmumu_BCM.sh | 2 +-
.../test/test_DataOverlay_ConfigTest_Zmumu_LAr.sh | 2 +-
.../test/test_DataOverlay_ConfigTest_Zmumu_Muon.sh | 2 +-
.../test/test_DataOverlay_ConfigTest_Zmumu_Pixel.sh | 2 +-
.../test/test_DataOverlay_ConfigTest_Zmumu_SCT.sh | 2 +-
.../test/test_DataOverlay_ConfigTest_Zmumu_TRT.sh | 2 +-
.../test/test_DataOverlay_ConfigTest_Zmumu_Tile.sh | 2 +-
.../test/test_DataOverlay_ConfigTest_Zmumu_Truth.sh | 2 +-
.../test_DataOverlay_ConfigTest_Zmumu_sequential.sh | 2 +-
.../OverlayTests/test/test_DataOverlay_MC16_Zmumu.sh | 2 +-
.../test/test_MCOverlay_ConfigTest_ttbar_BCM.sh | 2 +-
.../test/test_MCOverlay_ConfigTest_ttbar_LAr.sh | 2 +-
.../test/test_MCOverlay_ConfigTest_ttbar_Muon.sh | 2 +-
.../test/test_MCOverlay_ConfigTest_ttbar_Muon_NSW.sh | 2 +-
.../test/test_MCOverlay_ConfigTest_ttbar_Pixel_Run2.sh | 2 +-
.../test/test_MCOverlay_ConfigTest_ttbar_Pixel_Run3.sh | 2 +-
.../test/test_MCOverlay_ConfigTest_ttbar_Run2.sh | 2 +-
.../test/test_MCOverlay_ConfigTest_ttbar_Run3.sh | 2 +-
.../test/test_MCOverlay_ConfigTest_ttbar_SCT.sh | 2 +-
.../test/test_MCOverlay_ConfigTest_ttbar_SuperCells.sh | 2 +-
.../test/test_MCOverlay_ConfigTest_ttbar_TRT.sh | 2 +-
.../test/test_MCOverlay_ConfigTest_ttbar_Tile.sh | 2 +-
.../test/test_MCOverlay_ConfigTest_ttbar_Truth.sh | 2 +-
.../test_MCOverlay_ConfigTest_ttbar_sequential_Run2.sh | 2 +-
.../test_MCOverlay_ConfigTest_ttbar_sequential_Run3.sh | 2 +-
.../OverlayTests/test/test_MCOverlay_MC20a_ttbar.sh | 2 +-
.../test/test_MCOverlay_MC20a_ttbar_fullchain.sh | 2 +-
.../OverlayTests/test/test_MCOverlay_MC20d_ttbar.sh | 2 +-
.../test/test_MCOverlay_MC20d_ttbar_fullchain.sh | 2 +-
.../OverlayTests/test/test_MCOverlay_MC20e_ttbar.sh | 2 +-
.../test/test_MCOverlay_MC20e_ttbar_fullchain.sh | 2 +-
.../OverlayTests/test/test_MCOverlay_MC21a_ttbar.sh | 2 +-
.../test/test_MCOverlay_RUN4_neutrinos_mu200.sh | 2 +-
.../test/test_MCOverlay_RUN4_ttbar_mu200.sh | 2 +-
.../test/test_MCOverlay_RUN4_ttbar_mu60.sh | 2 +-
.../test_DataOverlay_MT_Zmumu_8threads_NewConfig.sh | 2 +-
.../test/test_DataOverlay_Zmumu_ST_vs_MT.sh | 2 +-
.../test/test_MCOverlay_MT_ttbar_1thread.sh | 2 +-
.../test/test_MCOverlay_MT_ttbar_4threads.sh | 2 +-
.../test/test_MCOverlay_MT_ttbar_8threads_NewConfig.sh | 2 +-
.../test/test_MCOverlay_MT_ttbar_Run3_1thread.sh | 2 +-
.../test/test_MCOverlay_MT_ttbar_Run3_4threads.sh | 2 +-
.../test_MCOverlay_MT_ttbar_Run3_8threads_NewConfig.sh | 2 +-
.../test/test_MCOverlay_ttbar_Run3_ST_vs_MT.sh | 2 +-
.../test/test_MCOverlay_ttbar_ST_vs_MT.sh | 2 +-
.../test/test_MCOverlay_ttbar_ST_vs_MT_1thread.sh | 2 +-
.../test/test_MCOverlay_ttbar_ST_vs_MT_LAr.sh | 2 +-
.../test/test_MCOverlay_ttbar_ST_vs_MT_Muon.sh | 2 +-
.../test/test_MCOverlay_ttbar_ST_vs_MT_Muon_NSW.sh | 2 +-
.../test/test_MCOverlay_ttbar_ST_vs_MT_SCT.sh | 2 +-
.../test/test_MCOverlay_ttbar_ST_vs_MT_TRT.sh | 2 +-
.../test/test_MCOverlay_ttbar_ST_vs_MT_Tile.sh | 2 +-
.../test/test_MCOverlay_ttbar_ST_vs_MT_pixel.sh | 2 +-
.../test/test_MCOverlay_ttbar_ST_vs_MT_truth.sh | 2 +-
.../Tests/SimCoreTests/test/test_AtlasG4_AFPSimTest.sh | 2 +-
.../SimCoreTests/test/test_AtlasG4_ALFASimTest.sh | 2 +-
.../SimCoreTests/test/test_AtlasG4_CavernBg_EVNT2TR.sh | 2 +-
.../Tests/SimCoreTests/test/test_AtlasG4_CosmicSim.sh | 2 +-
.../SimCoreTests/test/test_AtlasG4_CosmicSimTR.sh | 2 +-
.../SimCoreTests/test/test_AtlasG4_FastCaloSim.sh | 2 +-
.../SimCoreTests/test/test_AtlasG4_HeavyIonSim.sh | 2 +-
.../SimCoreTests/test/test_AtlasG4_LucidSimTest.sh | 2 +-
.../SimCoreTests/test/test_AtlasG4_NeutronCutTest.sh | 2 +-
.../test/test_AtlasG4_ReproducibilityTest.sh | 4 ++--
.../SimCoreTests/test/test_AtlasG4_SkipEventsTest.sh | 4 ++--
.../Tests/SimCoreTests/test/test_AtlasG4_ZDCSimTest.sh | 2 +-
.../Tests/SimCoreTests/test/test_AtlasG4_electrons.sh | 2 +-
.../Tests/SimCoreTests/test/test_AtlasG4_minbias.sh | 2 +-
.../Tests/SimCoreTests/test/test_AtlasG4_muons.sh | 2 +-
.../Tests/SimCoreTests/test/test_AtlasG4_pions.sh | 2 +-
.../SimCoreTests/test/test_RUN1_2010_AtlasG4_mu.sh | 4 ++--
.../SimCoreTests/test/test_RUN1_2011_AtlasG4_mu.sh | 4 ++--
.../SimCoreTests/test/test_RUN1_2012_AtlasG4_mu.sh | 4 ++--
.../test/test_RUN2_2015_AtlasG4_QGSP_BIC.sh | 4 ++--
.../SimCoreTests/test/test_RUN2_AtlasG4_FTFP_BERT.sh | 4 ++--
.../Tests/SimCoreTests/test/test_RUN2_AtlasG4_ttbar.sh | 4 ++--
.../test/test_RUN3_AtlasG4_CalibrationHits_pions.sh | 2 +-
.../Tests/SimCoreTests/test/test_RUN3_AtlasG4_ttbar.sh | 4 ++--
.../Tests/SimCoreTests/test/test_Sim_Comparison.sh | 2 +-
Simulation/Tests/SimCoreTests/test/test_TestBeamSim.sh | 2 +-
.../SimCoreTests/test/test_athena_G4AtlasCosmic.sh | 2 +-
.../SimCoreTests/test/test_athena_G4AtlasGeoTest.sh | 2 +-
.../test/test_AtlasG4_CalibationHits_pions_MT.sh | 2 +-
.../test/test_AtlasG4_FastCaloSim_MTvsST.sh | 2 +-
.../SimCoreTestsMT/test/test_AtlasG4_TTbarSim_MT.sh | 2 +-
.../test/test_AtlasG4_TTbarSim_MTvsST.sh | 2 +-
.../test/test_RUN3_AtlasG4_QS_ttbar_MT.sh | 4 ++--
.../test/test_FullG4_DecayingCharginos.sh | 4 ++--
.../test/test_FullG4_DecayingCharginos_busy.sh | 4 ++--
.../test/test_FullG4_DecayingLightSleptons.sh | 4 ++--
.../test/test_FullG4_DecayingNeutralinos.sh | 4 ++--
.../SimExoticsTests/test/test_FullG4_DecayingStaus.sh | 4 ++--
.../test/test_FullG4_SemiVisibleJets.sh | 4 ++--
.../test/test_FullG4_StableCharginos.sh | 4 ++--
.../SimExoticsTests/test/test_FullG4_StableSleptons.sh | 4 ++--
.../test/test_MC20_FullG4_LongLived_SemiVisibleJets.sh | 4 ++--
.../TileExample/TileSimEx/test/test_TileTB_Sim.sh | 4 ++--
.../test/test_digi_reco_ttbar_mu1_inTimeTruth.sh | 2 +-
Tools/CampaignsARTTests/test/test_full_chain_quick.sh | 2 +-
.../test/test_full_chain_ttbar_mu0.sh | 2 +-
Tools/DirectIOART/generateARTtests.py | 10 +++++-----
.../test_directioart_athena_recotf_with_rdo_davs.sh | 2 +-
.../test_directioart_athena_recotf_with_rdo_https.sh | 2 +-
.../test_directioart_athena_recotf_with_rdo_root.sh | 2 +-
.../test_directioart_athenamp_recotf_with_aod_davs.sh | 2 +-
.../test_directioart_athenamp_recotf_with_aod_https.sh | 2 +-
.../test_directioart_athenamp_recotf_with_aod_root.sh | 2 +-
Tools/DirectIOART/test/test_directioart_tfileopen.py | 2 +-
.../test/test_directioart_tfileopen_rucioredirector.py | 2 +-
.../Tier0ChainTests/test/test_bulkProcessing_calib.sh | 2 +-
.../test/test_bulkProcessing_calib_legacy.sh | 2 +-
.../Tier0ChainTests/test/test_bulkProcessing_cosmic.sh | 2 +-
.../test/test_bulkProcessing_cosmic_legacy.sh | 2 +-
.../Tier0ChainTests/test/test_bulkProcessing_data22.sh | 2 +-
.../test/test_bulkProcessing_data22_900GeV.sh | 2 +-
.../test/test_bulkProcessing_data22_900GeV_legacy.sh | 2 +-
.../Tier0ChainTests/test/test_bulkProcessing_data23.sh | 2 +-
.../test/test_bulkProcessing_pilotBeam_local.sh | 2 +-
.../test_bulkProcessing_pilot_collisions_legacy.sh | 2 +-
.../test/test_bulkProcessing_pilot_legacy.sh | 2 +-
.../test/test_bulkProcessing_splashes.sh | 2 +-
.../test/test_bulkProcessing_splashes_legacy.sh | 2 +-
Tools/Tier0ChainTests/test/test_data18PHYS_mp.sh | 2 +-
Tools/Tier0ChainTests/test/test_data18PHYS_mt.sh | 2 +-
Tools/Tier0ChainTests/test/test_data18PHYS_serial.sh | 2 +-
.../test/test_expressProcessing_beamSplashes.sh | 2 +-
.../test/test_expressProcessing_calib.sh | 2 +-
.../test/test_expressProcessing_cosmic.sh | 2 +-
.../test/test_expressProcessing_data22.sh | 2 +-
.../test/test_expressProcessing_data22_legacy.sh | 2 +-
Tools/Tier0ChainTests/test/test_mc20PHYSVAL_mp.sh | 2 +-
Tools/Tier0ChainTests/test/test_mc20PHYSVAL_serial.sh | 2 +-
Tools/Tier0ChainTests/test/test_mc20PHYS_mp.sh | 2 +-
Tools/Tier0ChainTests/test/test_mc20PHYS_mt.sh | 2 +-
Tools/Tier0ChainTests/test/test_mc20PHYS_serial.sh | 2 +-
Tools/Tier0ChainTests/test/test_poolMerging_data23.sh | 2 +-
Tools/Tier0ChainTests/test/test_q220.sh | 2 +-
Tools/Tier0ChainTests/test/test_q220_mp.sh | 2 +-
Tools/Tier0ChainTests/test/test_q223.sh | 2 +-
Tools/Tier0ChainTests/test/test_q223_mp.sh | 2 +-
Tools/Tier0ChainTests/test/test_q442.sh | 2 +-
Tools/Tier0ChainTests/test/test_q442_mp.sh | 2 +-
Tools/Tier0ChainTests/test/test_q443.sh | 2 +-
Tools/Tier0ChainTests/test/test_q443_serial.sh | 2 +-
Tools/Tier0ChainTests/test/test_q444.sh | 2 +-
Tools/Tier0ChainTests/test/test_q444_serial.sh | 2 +-
Tools/Tier0ChainTests/test/test_q445.sh | 2 +-
Tools/Tier0ChainTests/test/test_q445_legacy.sh | 2 +-
Tools/Tier0ChainTests/test/test_q445_serial.sh | 2 +-
.../test/test_reco_with_derived_outputs.sh | 2 +-
.../test/test_reco_with_derived_outputs_2.sh | 2 +-
.../test/test_reprocessing_with_derived_outputs.sh | 2 +-
.../test/test_trf_RUN4_r2a_ca_mt_mp_mu200.sh | 2 +-
.../test/test_trf_RUN4_r2a_ca_mt_mu200_overlay.sh | 2 +-
.../test/test_trf_RUN4_r2a_ca_mt_no_pileup.sh | 2 +-
Tools/TrfTestsART/test/test_trf_aodmerge_mt.sh | 2 +-
Tools/TrfTestsART/test/test_trf_aodmerge_mt_ca.sh | 2 +-
Tools/TrfTestsART/test/test_trf_aodmerge_serial.sh | 2 +-
.../test/test_trf_aodmerge_serial_std_vs_ca.sh | 2 +-
Tools/TrfTestsART/test/test_trf_data15_mt.sh | 2 +-
Tools/TrfTestsART/test/test_trf_data16_mt.sh | 2 +-
Tools/TrfTestsART/test/test_trf_data17_mt.sh | 2 +-
Tools/TrfTestsART/test/test_trf_data18_hybrid.sh | 2 +-
Tools/TrfTestsART/test/test_trf_data18_mp.sh | 2 +-
Tools/TrfTestsART/test/test_trf_data18_mt.sh | 2 +-
Tools/TrfTestsART/test/test_trf_data18_rucio_mt.sh | 2 +-
.../test/test_trf_data18_rucio_weekly_mt.sh | 2 +-
Tools/TrfTestsART/test/test_trf_data22_hybrid_ca.sh | 2 +-
Tools/TrfTestsART/test/test_trf_data22_mt.sh | 2 +-
Tools/TrfTestsART/test/test_trf_data22_mt_ca.sh | 2 +-
Tools/TrfTestsART/test/test_trf_data23_mt_ca.sh | 2 +-
Tools/TrfTestsART/test/test_trf_esdmerge_mt.sh | 2 +-
Tools/TrfTestsART/test/test_trf_esdmerge_serial.sh | 2 +-
.../test/test_trf_mcoverlay_mc20e_fullchain_mt.sh | 4 ++--
Tools/TrfTestsART/test/test_trf_merge_mp_ca_sw.sh | 2 +-
Tools/TrfTestsART/test/test_trf_q442_r2a_ca_mt.sh | 2 +-
.../test/test_trf_q442_r2a_ca_mt_compare.sh | 2 +-
Tools/TrfTestsART/test/test_trf_q442_r2a_mt.sh | 2 +-
.../test/test_trf_q443_r2a_ca_mt_compare.sh | 2 +-
Tools/TrfTestsART/test/test_trf_q443_r2a_mt.sh | 2 +-
Tools/TrfTestsART/test/test_trf_q445_aodmerge.sh | 2 +-
.../test/test_trf_q445_r2a_ca_mt_compare.sh | 2 +-
.../test/test_trf_q445_r2a_ca_mt_compare_both_rdo.sh | 2 +-
.../test/test_trf_q445_r2a_ca_mt_compare_ca_rdo.sh | 2 +-
.../test/test_trf_q445_r2a_ca_mt_compare_cg_rdo.sh | 2 +-
.../test/test_trf_q449_r2a_ca_mt_compare.sh | 2 +-
.../test/test_trf_mc20_phys_physlite_ca.sh | 2 +-
.../test/test_trf_mc21_phys_physlite_ca.sh | 2 +-
.../test/test_trf_q442_phys_physlite_ca.sh | 2 +-
.../test/test_trf_q443_phys_physlite_ca.sh | 2 +-
.../test/test_trf_q445_phys_physlite_ca.sh | 2 +-
.../test/test_trf_q449_phys_physlite_ca.sh | 2 +-
...DISABLED_test_trigAna_BStoBStoESDAOD_v1Dev_build.py | 2 +-
.../test/test_trigAna_AODtoDAOD_run2_build.py | 2 +-
.../test/test_trigAna_BStoESDAOD_run1_build.py | 2 +-
.../test/test_trigAna_HITtoAOD_v1Dev_build.py | 2 +-
.../test/test_trigAna_HITtoDAOD_trigRel21_build.py | 2 +-
.../test_trigAna_HITtoDAOD_trigRel21_mc16a_build.py | 2 +-
.../test_trigAna_HITtoDAOD_trigRel21_mc16d_build.py | 2 +-
.../test/test_trigAna_HITtoRDOTrig_v1Dev_build.py | 2 +-
.../test/test_trigAna_HITtoRDOTrig_v1Dev_grid.py | 2 +-
.../test/test_trigAna_RDOtoAOD_v1Dev_build.py | 2 +-
.../test/test_trigAna_RDOtoAOD_v1Dev_grid.py | 2 +-
.../test/test_trigAna_RDOtoAOD_v1MC_build.py | 2 +-
.../test/test_trigAna_RDOtoAOD_v1MC_grid.py | 2 +-
.../test/test_trigAna_RDOtoDAOD_v1Dev_grid.py | 2 +-
.../test/test_trigAna_RDOtoRDOTrig_v1DevHI_build.py | 2 +-
.../test/test_trigAna_RDOtoRDOTrig_v1Dev_build.py | 2 +-
.../test/test_trigAna_RDOtoRDOTrig_v1Dev_grid.py | 2 +-
.../test/test_trigAna_RDOtoRun3DQ_v1Dev_build.py | 2 +-
.../test/test_trigAna_RDOtoRun3DQ_v1Dev_grid.py | 2 +-
.../test/test_trigID_all_ttbar_nopileup.py | 2 +-
.../test/test_trigID_all_ttbar_pu55.py | 2 +-
.../test/test_trigID_all_ttbar_pu80.py | 2 +-
.../test/test_trigID_all_ttbar_tier0_pu40.py | 2 +-
.../TrigInDetValidation/test/test_trigID_bjet.py | 2 +-
.../TrigInDetValidation/test/test_trigID_bjet_pu55.py | 2 +-
.../test/test_trigID_bjet_redundancy_pu55.py | 2 +-
.../TrigInDetValidation/test/test_trigID_bphys.py | 2 +-
.../TrigInDetValidation/test/test_trigID_cosmic.py | 2 +-
.../test/test_trigID_cosmic_data.py | 2 +-
.../test/test_trigID_el_jpsiee_pu40.py | 2 +-
.../test/test_trigID_el_singlee_7-80.py | 2 +-
.../test/test_trigID_el_singlee_7-80_larged0.py | 2 +-
.../test/test_trigID_el_singlee_7-80_larged0_pu.py | 2 +-
.../test/test_trigID_el_singlee_7-80_pu40.py | 2 +-
.../test/test_trigID_el_zee_clones_pu40.py | 2 +-
.../test/test_trigID_el_zee_cloneschi2_pu40.py | 2 +-
.../test/test_trigID_el_zee_pu40.py | 2 +-
.../test/test_trigID_el_zee_pu40_elreco.py | 2 +-
.../test/test_trigID_ellrt_staustau.py | 2 +-
.../TrigInDetValidation/test/test_trigID_fsjet_pu55.py | 2 +-
.../test/test_trigID_fsjet_redundancy_pu55.py | 2 +-
.../test/test_trigID_fsjet_vtx_pu55.py | 2 +-
.../test/test_trigID_fsjet_vtx_pu55_MC16.py | 2 +-
.../test/test_trigID_fslrt_rhadron.py | 2 +-
.../TrigInDetValidation/test/test_trigID_minbias.py | 2 +-
.../TrigInDetValidation/test/test_trigID_mu_bphys.py | 2 +-
.../test/test_trigID_mu_singlemu_larged0.py | 2 +-
.../test/test_trigID_mu_singlemu_larged0_pu.py | 2 +-
.../test/test_trigID_mu_zmumu_pu40.py | 2 +-
.../test/test_trigID_mulrt_staustau.py | 2 +-
.../test/test_trigID_tauLRT_staustau.py | 2 +-
.../test/test_trigID_tau_ztautau_lowpt_pu46.py | 2 +-
.../test/test_trigID_tau_ztautau_pu46.py | 2 +-
.../TrigP1Test/test/test_trigP1_BeamSpot_build.py | 2 +-
.../TrigP1Test/test/test_trigP1_CalibPeb_build.py | 2 +-
.../test/test_trigP1_CalibPeb_concurrent_build.py | 2 +-
.../test/test_trigP1_CalibPeb_concurrent_grid.py | 2 +-
.../test/test_trigP1_CalibPeb_highForkAndMT_build.py | 2 +-
.../test/test_trigP1_HelloWorld_OHMonitoring_build.py | 2 +-
.../TrigP1Test/test/test_trigP1_HelloWorld_build.py | 2 +-
.../test/test_trigP1_HelloWorld_forkAndMT_build.py | 2 +-
.../test/test_trigP1_HelloWorld_runStopRun_build.py | 2 +-
.../TrigP1Test/test/test_trigP1_PEB_DS_build.py | 2 +-
.../TrigP1Test/test/test_trigP1_condStopStart_build.py | 2 +-
.../test_trigP1_detectStreamerInfoChanges_build.py | 2 +-
.../test/test_trigP1_magFieldToggle_build.py | 2 +-
.../TrigP1Test/test/test_trigP1_timeout_build.py | 2 +-
.../test/test_trigP1_v1Cosmic_T0Mon_build.py | 2 +-
.../TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_grid.py | 2 +-
.../TrigP1Test/test/test_trigP1_v1Cosmic_build.py | 2 +-
.../test/test_trigP1_v1Cosmic_noL1Sim_build.py | 2 +-
.../TrigP1Test/test/test_trigP1_v1Dev_build.py | 2 +-
.../test/test_trigP1_v1Dev_configConsistency_build.py | 2 +-
.../test/test_trigP1_v1Dev_decodeBS_build.py | 2 +-
.../TrigP1Test/test/test_trigP1_v1Dev_decodeBS_grid.py | 2 +-
.../test/test_trigP1_v1Dev_dumpConfig_build.py | 2 +-
.../test/test_trigP1_v1Dev_dumpConfig_run2_build.py | 2 +-
.../test/test_trigP1_v1Dev_forkAndMT_build.py | 2 +-
.../TrigP1Test/test/test_trigP1_v1Dev_fork_build.py | 2 +-
.../TrigP1Test/test/test_trigP1_v1Dev_grid.py | 2 +-
.../TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_build.py | 2 +-
.../test/test_trigP1_v1Dev_noL1Sim_dumpConfig_build.py | 2 +-
.../TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_grid.py | 2 +-
.../test_trigP1_v1Dev_noL1Sim_missingROBs_build.py | 2 +-
.../test_trigP1_v1Dev_noL1Sim_noHLTChains_MT_build.py | 2 +-
.../test_trigP1_v1Dev_noL1Sim_noHLTChains_build.py | 2 +-
.../test/test_trigP1_v1Dev_noL1Sim_noMon_build.py | 2 +-
.../test/test_trigP1_v1Dev_noL1Sim_preload_build.py | 2 +-
.../TrigP1Test/test/test_trigP1_v1Dev_noPS_grid.py | 2 +-
.../test/test_trigP1_v1Dev_reverseViews_build.py | 2 +-
.../TrigP1Test/test/test_trigP1_v1PhysP1_ALFA_build.py | 2 +-
.../test/test_trigP1_v1PhysP1_ALFA_forkAndMT_build.py | 2 +-
.../test/test_trigP1_v1PhysP1_T0MonTrf_build.py | 2 +-
.../test/test_trigP1_v1PhysP1_T0MonTrf_run2_build.py | 2 +-
.../test/test_trigP1_v1PhysP1_T0Mon_build.py | 2 +-
.../TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py | 2 +-
.../TrigP1Test/test/test_trigP1_v1PhysP1_build.py | 2 +-
.../test/test_trigP1_v1PhysP1_dumpConfig_run2_build.py | 2 +-
.../TrigP1Test/test/test_trigP1_v1PhysP1_grid.py | 2 +-
.../test_trigP1_v1PhysP1_inputIndependence_build.py | 2 +-
.../test/test_trigP1_v1PhysP1_noL1Sim_build.py | 2 +-
.../test_trigP1_v1PhysP1_noL1Sim_dumpConfig_build.py | 2 +-
.../test/test_trigP1_v1PhysP1_noL1Sim_grid.py | 2 +-
.../test/test_trigP1_v1PhysP1_noL1Sim_preload_build.py | 2 +-
.../test_trigP1_v1PhysP1_noL1Sim_runStopRun_build.py | 2 +-
.../test/test_trigP1_v1PhysP1_runRuleBook_build.py | 2 +-
.../test/test_trigP1_v1PhysP1_trfDbgStream_build.py | 2 +-
.../test/test_trigP1_v1Phys_ROSRate_build.py | 2 +-
.../TriggerTest/test/test_trig_data_newJO_build.py | 2 +-
.../test/test_trig_data_newJO_writeBS_build.py | 2 +-
.../TriggerTest/test/test_trig_data_v1Cosmic_build.py | 2 +-
.../TriggerTest/test/test_trig_data_v1Cosmic_grid.py | 2 +-
.../test/test_trig_data_v1Dev_L1SimOnly_build.py | 2 +-
.../TriggerTest/test/test_trig_data_v1Dev_build.py | 2 +-
.../TriggerTest/test/test_trig_data_v1Dev_grid.py | 2 +-
.../test/test_trig_data_v1Dev_noL1Sim_build.py | 2 +-
.../test/test_trig_data_v1Dev_noL1Sim_grid.py | 2 +-
.../test_trig_data_v1Dev_noL1Sim_noHLTChains_build.py | 2 +-
.../TriggerTest/test/test_trig_data_v1Dev_noPS_grid.py | 2 +-
.../test/test_trig_data_v1Dev_slice_bjet_build.py | 2 +-
.../test/test_trig_data_v1Dev_slice_bphysics_build.py | 2 +-
.../test/test_trig_data_v1Dev_slice_egamma_build.py | 2 +-
.../test/test_trig_data_v1Dev_slice_jet_build.py | 2 +-
.../test/test_trig_data_v1Dev_slice_met_build.py | 2 +-
.../test/test_trig_data_v1Dev_slice_muon_build.py | 2 +-
.../test/test_trig_data_v1Dev_slice_tau_build.py | 2 +-
.../test/test_trig_data_v1Dev_writeBS_build.py | 2 +-
.../test/test_trig_data_v1Dev_writeBS_grid.py | 2 +-
.../TriggerTest/test/test_trig_data_v1MC_build.py | 2 +-
.../TriggerTest/test/test_trig_data_v1MC_grid.py | 2 +-
.../TriggerTest/test/test_trig_data_v1lowMu_build.py | 2 +-
.../TriggerTest/test/test_trig_mc_newJO_build.py | 2 +-
.../test/test_trig_mc_newJO_v1DevHI_build.py | 2 +-
.../test/test_trig_mc_newJO_v1lowMu_build.py | 2 +-
.../TriggerTest/test/test_trig_mc_v1Cosmic_build.py | 2 +-
.../TriggerTest/test/test_trig_mc_v1Cosmic_grid.py | 2 +-
.../TriggerTest/test/test_trig_mc_v1DevHI_build.py | 2 +-
.../TriggerTest/test/test_trig_mc_v1DevHI_grid.py | 2 +-
.../test/test_trig_mc_v1Dev_L1SimOnly_build.py | 2 +-
.../TriggerTest/test/test_trig_mc_v1Dev_LLP_grid.py | 2 +-
.../TriggerTest/test/test_trig_mc_v1Dev_MT_build.py | 2 +-
.../TriggerTest/test/test_trig_mc_v1Dev_build.py | 2 +-
.../TriggerTest/test/test_trig_mc_v1Dev_grid.py | 2 +-
.../TriggerTest/test/test_trig_mc_v1Dev_noPS_grid.py | 2 +-
.../TriggerTest/test/test_trig_mc_v1Dev_pu80_build.py | 2 +-
.../TriggerTest/test/test_trig_mc_v1Dev_pu80_grid.py | 2 +-
.../test/test_trig_mc_v1Dev_slice_bjet_build.py | 2 +-
.../test/test_trig_mc_v1Dev_slice_bjet_grid.py | 2 +-
.../test/test_trig_mc_v1Dev_slice_bphysics_build.py | 2 +-
.../test/test_trig_mc_v1Dev_slice_bphysics_grid.py | 2 +-
.../test/test_trig_mc_v1Dev_slice_bphysicsee_build.py | 2 +-
.../test/test_trig_mc_v1Dev_slice_bphysicsee_grid.py | 2 +-
.../test/test_trig_mc_v1Dev_slice_bphysicsexo_build.py | 2 +-
.../test/test_trig_mc_v1Dev_slice_bphysicsexo_grid.py | 2 +-
.../test/test_trig_mc_v1Dev_slice_egamma_build.py | 2 +-
.../test/test_trig_mc_v1Dev_slice_egamma_grid.py | 2 +-
.../test/test_trig_mc_v1Dev_slice_jet_build.py | 2 +-
.../test/test_trig_mc_v1Dev_slice_jet_grid.py | 2 +-
.../test/test_trig_mc_v1Dev_slice_met_build.py | 2 +-
.../test/test_trig_mc_v1Dev_slice_met_grid.py | 2 +-
.../test/test_trig_mc_v1Dev_slice_muon_build.py | 2 +-
.../test/test_trig_mc_v1Dev_slice_muon_grid.py | 2 +-
.../test_trig_mc_v1Dev_slice_reprodWithFlags_grid.py | 2 +-
.../test_trig_mc_v1Dev_slice_reprodWithPS_build.py | 2 +-
.../test/test_trig_mc_v1Dev_slice_reprodWithPS_grid.py | 2 +-
.../test/test_trig_mc_v1Dev_slice_tau_build.py | 2 +-
.../test/test_trig_mc_v1Dev_slice_tau_grid.py | 2 +-
.../test/test_trig_mc_v1Dev_writeBS_build.py | 2 +-
.../test/test_trig_mc_v1Dev_writeBS_grid.py | 2 +-
.../TriggerTest/test/test_trig_mc_v1MC_build.py | 2 +-
.../TriggerTest/test/test_trig_mc_v1MC_grid.py | 2 +-
.../TriggerTest/test/test_trig_mc_v1PhysP1_build.py | 2 +-
.../TriggerTest/test/test_trig_mc_v1PhysP1_grid.py | 2 +-
.../TriggerTest/test/test_trig_mc_v1Phys_build.py | 2 +-
.../TriggerTest/test/test_trig_mc_v1Phys_grid.py | 2 +-
.../TriggerTest/test/test_trig_mc_v1lowMu_build.py | 2 +-
.../TriggerTest/test/test_trig_mc_v1lowMu_grid.py | 2 +-
936 files changed, 1032 insertions(+), 1032 deletions(-)
diff --git a/Control/AthenaMonitoring/test/test_run3dq_q442_aod.sh b/Control/AthenaMonitoring/test/test_run3dq_q442_aod.sh
index 65f1a8b335ab..431bb6738af2 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_q442_aod.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_q442_aod.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: AOD->HIST, R22 Run 2 data AOD
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: ExampleMonitorOutput.root
# art-output: log*
diff --git a/Control/AthenaMonitoring/test/test_run3dq_q442_esd.sh b/Control/AthenaMonitoring/test/test_run3dq_q442_esd.sh
index 42acdca05e43..4a48ea70f0b0 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_q442_esd.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_q442_esd.sh
@@ -2,7 +2,7 @@
# art-description: ESD->HIST, R22 Run 2 data ESD
# art-type: grid
# art-memory: 4096
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: ExampleMonitorOutput.root
# art-output: log*
diff --git a/Control/AthenaMonitoring/test/test_run3dq_q442_esd_cosmics.sh b/Control/AthenaMonitoring/test/test_run3dq_q442_esd_cosmics.sh
index 7cf635a653ac..3ee835b863ca 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_q442_esd_cosmics.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_q442_esd_cosmics.sh
@@ -2,7 +2,7 @@
# art-description: ESD->HIST, R22 Run 2 cosmics data ESD
# art-type: grid
# art-memory: 3072
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: ExampleMonitorOutput.root
# art-output: log*
diff --git a/Control/AthenaMonitoring/test/test_run3dq_q445_aod_trigger.sh b/Control/AthenaMonitoring/test/test_run3dq_q445_aod_trigger.sh
index 2463753913f8..3cb49d07d67d 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_q445_aod_trigger.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_q445_aod_trigger.sh
@@ -2,7 +2,7 @@
# art-description: AOD->HIST, R22 MC, Trigger Only
# art-type: grid
# art-memory: 4096
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: ExampleMonitorOutput.root
# art-output: log*
diff --git a/Control/AthenaMonitoring/test/test_run3dq_recotf_q442_rawtoall.sh b/Control/AthenaMonitoring/test/test_run3dq_recotf_q442_rawtoall.sh
index 407a6ec64ed9..4858912900b7 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_recotf_q442_rawtoall.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_recotf_q442_rawtoall.sh
@@ -2,7 +2,7 @@
# art-description: new DQ in Reco_tf, RAWtoALL, Run 2 data q431
# art-type: grid
# art-memory: 6144
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: myHIST.root
# art-output: log*
diff --git a/Control/AthenaMonitoring/test/test_run3dq_recotf_q449_rawtoall.sh b/Control/AthenaMonitoring/test/test_run3dq_recotf_q449_rawtoall.sh
index 0a4378ad7882..c15063282d2b 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_recotf_q449_rawtoall.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_recotf_q449_rawtoall.sh
@@ -2,7 +2,7 @@
# art-description: new DQ in Reco_tf, RAWtoALL, Run 2 data q431
# art-type: grid
# art-memory: 6144
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: myHIST.root
# art-output: log*
diff --git a/Control/AthenaMonitoring/test/test_run3dq_recotf_q449_rawtoall_mt_t2.sh b/Control/AthenaMonitoring/test/test_run3dq_recotf_q449_rawtoall_mt_t2.sh
index 552dae92ca0c..31d0d91dd55b 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_recotf_q449_rawtoall_mt_t2.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_recotf_q449_rawtoall_mt_t2.sh
@@ -2,7 +2,7 @@
# art-description: new DQ in Reco_tf, RAWtoALL, Run 2 data q431
# art-type: grid
# art-memory: 6144
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: myHIST.root
# art-output: log*
diff --git a/Control/AthenaMonitoring/test/test_run3dq_recotf_q449_twostep.sh b/Control/AthenaMonitoring/test/test_run3dq_recotf_q449_twostep.sh
index 1b2cc7491044..da66e9334d47 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_recotf_q449_twostep.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_recotf_q449_twostep.sh
@@ -2,7 +2,7 @@
# art-description: new DQ in Reco_tf, two-step, Run 2 data q431
# art-type: grid
# art-memory: 6144
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: myHIST.root
# art-output: log*
diff --git a/Event/ByteStreamCnvSvcBase/test/test_ROBDataProviderSvcMT.sh b/Event/ByteStreamCnvSvcBase/test/test_ROBDataProviderSvcMT.sh
index 051d1a9c6297..c25b7f415b0d 100755
--- a/Event/ByteStreamCnvSvcBase/test/test_ROBDataProviderSvcMT.sh
+++ b/Event/ByteStreamCnvSvcBase/test/test_ROBDataProviderSvcMT.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-ci: master
athena --threads=10 --concurrent-events=2 ByteStreamCnvSvcBase/testROBDataProviderSvcMT.py
diff --git a/Generators/EvgenJobTransforms/test/deactiv_test_gen_qgsjet.sh b/Generators/EvgenJobTransforms/test/deactiv_test_gen_qgsjet.sh
index ebb86e20ec1f..ece010fab475 100755
--- a/Generators/EvgenJobTransforms/test/deactiv_test_gen_qgsjet.sh
+++ b/Generators/EvgenJobTransforms/test/deactiv_test_gen_qgsjet.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# art-description: Generation test QGSjet
# art-type: build
-# art-include: master/AthGeneration
-# art-include: master--HepMC3/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-output: *.root
# art-output: log.generate
diff --git a/Generators/EvgenJobTransforms/test/test_full_chain_min_bias.sh b/Generators/EvgenJobTransforms/test/test_full_chain_min_bias.sh
index e5bc782e9549..d21c7b8f83a4 100644
--- a/Generators/EvgenJobTransforms/test/test_full_chain_min_bias.sh
+++ b/Generators/EvgenJobTransforms/test/test_full_chain_min_bias.sh
@@ -1,7 +1,7 @@
#!/bin/sh
-# art-include: master--HepMC2/Athena
-# art-include: master/Athena
+# art-include: main--HepMC2/Athena
+# art-include: main/Athena
# art-description: Pythia event generation -- min_bias
# art-type: grid
diff --git a/Generators/EvgenJobTransforms/test/test_gen_E2ESh_LepxTauQCDJetFilter.sh b/Generators/EvgenJobTransforms/test/test_gen_E2ESh_LepxTauQCDJetFilter.sh
index 648091cf961c..5e08d139c128 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_E2ESh_LepxTauQCDJetFilter.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_E2ESh_LepxTauQCDJetFilter.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# art-description: EVNT2EVNT filtering - Sherpa files - Lepton+xAODTau+QCDTruthJetFilters
# art-type: build
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-output: *.root
# art-output: log.generate
diff --git a/Generators/EvgenJobTransforms/test/test_gen_bphys.sh b/Generators/EvgenJobTransforms/test/test_gen_bphys.sh
index db4aebf46f7c..cd14f00a3088 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_bphys.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_bphys.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Generation test Pythia8B Jpsimumu Zmumu
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-type: build
# art-output: *.root
diff --git a/Generators/EvgenJobTransforms/test/test_gen_epos.sh b/Generators/EvgenJobTransforms/test/test_gen_epos.sh
index 50d971a15e26..f0151d60dbfc 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_epos.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_epos.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Generation test Epos min_bias
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-type: build
# art-output: *.root
diff --git a/Generators/EvgenJobTransforms/test/test_gen_hepmcToEVNT.sh b/Generators/EvgenJobTransforms/test/test_gen_hepmcToEVNT.sh
index 9090569cd8c7..de80482c7564 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_hepmcToEVNT.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_hepmcToEVNT.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Test of converting HepMC file into EVNT one
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-type: build
# art-output: *.root
diff --git a/Generators/EvgenJobTransforms/test/test_gen_herwig7_dijet.sh b/Generators/EvgenJobTransforms/test/test_gen_herwig7_dijet.sh
index ab6ac23a22da..39d123411299 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_herwig7_dijet.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_herwig7_dijet.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Generation test H7 dijets
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-type: build
# art-output: *.root
diff --git a/Generators/EvgenJobTransforms/test/test_gen_herwig7_minbias.sh b/Generators/EvgenJobTransforms/test/test_gen_herwig7_minbias.sh
index c92fc897d17d..afcb66891abb 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_herwig7_minbias.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_herwig7_minbias.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Generation test H7 min_bias
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-type: build
# art-output: *.root
diff --git a/Generators/EvgenJobTransforms/test/test_gen_herwig7_wjets.sh b/Generators/EvgenJobTransforms/test/test_gen_herwig7_wjets.sh
index b49213746b78..1bd1e799ac27 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_herwig7_wjets.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_herwig7_wjets.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Generation test H7 Wjets
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-type: build
# art-output: *.root
diff --git a/Generators/EvgenJobTransforms/test/test_gen_herwig7_zjets.sh b/Generators/EvgenJobTransforms/test/test_gen_herwig7_zjets.sh
index f9f28d1cd332..36a59bd21f47 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_herwig7_zjets.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_herwig7_zjets.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Generation test H7 Zjets
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-type: build
# art-output: *.root
diff --git a/Generators/EvgenJobTransforms/test/test_gen_hijing_pp.sh b/Generators/EvgenJobTransforms/test/test_gen_hijing_pp.sh
index 0342c428641e..8ac261d5cc12 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_hijing_pp.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_hijing_pp.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Generation test Hijing pp at 5020 GeV, nch>40
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-type: build
# art-output: *.root
diff --git a/Generators/EvgenJobTransforms/test/test_gen_mg_LHEonly_Zee.sh b/Generators/EvgenJobTransforms/test/test_gen_mg_LHEonly_Zee.sh
index b5c6a75ccde1..353f19a3fece 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_mg_LHEonly_Zee.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_mg_LHEonly_Zee.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# art-description: Generation test MadGraph LHE-only for Z->ee
# art-type: build
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-output: *.root
# art-output: log.generate
diff --git a/Generators/EvgenJobTransforms/test/test_gen_mgh7_VBF_HH.sh b/Generators/EvgenJobTransforms/test/test_gen_mgh7_VBF_HH.sh
index 6f901407534d..cb71be8db4f7 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_mgh7_VBF_HH.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_mgh7_VBF_HH.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Generation test MG+Py8 VBF-only HH-> bb ZZ (ZZ-> 2l 2q)
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-type: build
# art-output: *.root
diff --git a/Generators/EvgenJobTransforms/test/test_gen_mgpy8_TT_METorLepFilt.sh b/Generators/EvgenJobTransforms/test/test_gen_mgpy8_TT_METorLepFilt.sh
index 39a19a68cedd..cc4f6ca56ded 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_mgpy8_TT_METorLepFilt.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_mgpy8_TT_METorLepFilt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Generation test MG+Py8 TT MET or Lepton Filter
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-type: build
# art-output: *.root
diff --git a/Generators/EvgenJobTransforms/test/test_gen_mgpy8eg_tWgamma_madspin.sh b/Generators/EvgenJobTransforms/test/test_gen_mgpy8eg_tWgamma_madspin.sh
index 9c33468a63ce..d593279b2fe3 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_mgpy8eg_tWgamma_madspin.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_mgpy8eg_tWgamma_madspin.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# art-description: Generation test MG+Py8+EG pp->ttbar+W+a with MadSpin
# art-type: build
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-output: *.root
# art-output: log.generate
diff --git a/Generators/EvgenJobTransforms/test/test_gen_mgpythia8_Zmumu.sh b/Generators/EvgenJobTransforms/test/test_gen_mgpythia8_Zmumu.sh
index f095a12627bc..0b3f68816b14 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_mgpythia8_Zmumu.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_mgpythia8_Zmumu.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# art-description: Generation test MG+Py8 Z->mumu
# art-type: build
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-output: *.root
# art-output: log.generate
diff --git a/Generators/EvgenJobTransforms/test/test_gen_mgpythia8_ttW.sh b/Generators/EvgenJobTransforms/test/test_gen_mgpythia8_ttW.sh
index 9949df4c9d0b..24c04a4c9618 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_mgpythia8_ttW.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_mgpythia8_ttW.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Generation test MG+Py8 ttW
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-type: build
# art-output: *.root
diff --git a/Generators/EvgenJobTransforms/test/test_gen_mgpythia8_tt_NLO.sh b/Generators/EvgenJobTransforms/test/test_gen_mgpythia8_tt_NLO.sh
index 6ccf729abab6..dc260c7cd6c3 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_mgpythia8_tt_NLO.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_mgpythia8_tt_NLO.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Generation test MG+Py8 tt NLO
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-type: build
# art-output: *.root
diff --git a/Generators/EvgenJobTransforms/test/test_gen_phh7_WWlvlv.sh b/Generators/EvgenJobTransforms/test/test_gen_phh7_WWlvlv.sh
index 4b0d9d865a5b..10482a702e96 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_phh7_WWlvlv.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_phh7_WWlvlv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Generation test Powheg+H7 WW->lvlv
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-type: build
# art-output: *.root
diff --git a/Generators/EvgenJobTransforms/test/test_gen_phh7_Zmumu_gridpack.sh b/Generators/EvgenJobTransforms/test/test_gen_phh7_Zmumu_gridpack.sh
index ab73d930bead..1a6a928d9bf6 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_phh7_Zmumu_gridpack.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_phh7_Zmumu_gridpack.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Generation test Powheg+H7_EG Z->mumu with gridpack
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-type: build
# art-output: *.root
diff --git a/Generators/EvgenJobTransforms/test/test_gen_phpy8_VBFNLO_Wev.sh b/Generators/EvgenJobTransforms/test/test_gen_phpy8_VBFNLO_Wev.sh
index 3479e00c4a0c..1dc5d7ba0760 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_phpy8_VBFNLO_Wev.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_phpy8_VBFNLO_Wev.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Generation test Powheg+Py8 VBFNLO W+->e+v
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-type: build
# art-output: *.root
diff --git a/Generators/EvgenJobTransforms/test/test_gen_phpy8_Wt_DR.sh b/Generators/EvgenJobTransforms/test/test_gen_phpy8_Wt_DR.sh
index 8721b1f9a9a3..a4787239267d 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_phpy8_Wt_DR.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_phpy8_Wt_DR.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Generation test Powheg+Pythia8 Wt_DR
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-type: build
# art-output: *.root
diff --git a/Generators/EvgenJobTransforms/test/test_gen_phpy8eg_13p6TeV_ttbar.sh b/Generators/EvgenJobTransforms/test/test_gen_phpy8eg_13p6TeV_ttbar.sh
index 885aa3e288f2..4672cf747159 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_phpy8eg_13p6TeV_ttbar.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_phpy8eg_13p6TeV_ttbar.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Generation test Ph+Py8 ttbar incl. with ECM=13.6TeV
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-type: build
# art-output: *.root
diff --git a/Generators/EvgenJobTransforms/test/test_gen_powhegLHEonly_ZZ.sh b/Generators/EvgenJobTransforms/test/test_gen_powhegLHEonly_ZZ.sh
index 3107b913116e..3a2e6c7d8dbb 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_powhegLHEonly_ZZ.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_powhegLHEonly_ZZ.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# art-description: Generation test Powheg LHE-only ZZ
# art-type: build
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-output: *.root
# art-output: log.generate
diff --git a/Generators/EvgenJobTransforms/test/test_gen_powhegLHEonly_singleTop.sh b/Generators/EvgenJobTransforms/test/test_gen_powhegLHEonly_singleTop.sh
index d81c48e7b588..3ffc8778147d 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_powhegLHEonly_singleTop.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_powhegLHEonly_singleTop.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# art-description: Generation test Powheg LHE-only single top s-channel
# art-type: build
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-output: *.root
# art-output: log.generate
diff --git a/Generators/EvgenJobTransforms/test/test_gen_powheg_ttbar.sh b/Generators/EvgenJobTransforms/test/test_gen_powheg_ttbar.sh
index cf0c8f289266..a40a15639e5b 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_powheg_ttbar.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_powheg_ttbar.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Generation test Ph+Py8 ttbar using PDGParams and removing old rwt comments
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-type: build
# art-output: *.root
diff --git a/Generators/EvgenJobTransforms/test/test_gen_powheg_wenu.sh b/Generators/EvgenJobTransforms/test/test_gen_powheg_wenu.sh
index 46ebb354a8d2..17d12d7e4681 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_powheg_wenu.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_powheg_wenu.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Generation test Powheg+Pythia8 W->enu
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-type: build
# art-output: *.root
diff --git a/Generators/EvgenJobTransforms/test/test_gen_py8_JZ2MultiBJetFilt.sh b/Generators/EvgenJobTransforms/test/test_gen_py8_JZ2MultiBJetFilt.sh
index 5ac1ba360ddc..c1400eabf108 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_py8_JZ2MultiBJetFilt.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_py8_JZ2MultiBJetFilt.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# art-description: Generation test Pythia8 with two jet filters QCDTruthJetJZ2 with R=0.6 and MultiBJetFilter with R=0.4
# art-type: build
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-output: *.root
# art-output: log.generate
diff --git a/Generators/EvgenJobTransforms/test/test_gen_py8tauola_DYto2tau.sh b/Generators/EvgenJobTransforms/test/test_gen_py8tauola_DYto2tau.sh
index d9b099dd121b..ba6c45f28b9e 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_py8tauola_DYto2tau.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_py8tauola_DYto2tau.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Generation test Pythia8Tauolapp Z->tautau
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-type: build
# art-output: *.root
diff --git a/Generators/EvgenJobTransforms/test/test_gen_pythia8_jets.sh b/Generators/EvgenJobTransforms/test/test_gen_pythia8_jets.sh
index ae5b54122f3c..af20a3674c96 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_pythia8_jets.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_pythia8_jets.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Generation test Pythia8 dijets
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-type: build
# art-output: *.root
diff --git a/Generators/EvgenJobTransforms/test/test_gen_pythia8_minbias.sh b/Generators/EvgenJobTransforms/test/test_gen_pythia8_minbias.sh
index e12ccdefc0a2..a1a121bd2d49 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_pythia8_minbias.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_pythia8_minbias.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Generation test Pythia8 min_bias
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-type: build
# art-output: *.root
diff --git a/Generators/EvgenJobTransforms/test/test_gen_pythia8_minbias_high.sh b/Generators/EvgenJobTransforms/test/test_gen_pythia8_minbias_high.sh
index 73ed1448653a..c88266df5c9b 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_pythia8_minbias_high.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_pythia8_minbias_high.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# art-description: Generation test Pythia8 min_bias inelastic high
# art-type: build
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-output: *.root
# art-output: log.generate
diff --git a/Generators/EvgenJobTransforms/test/test_gen_pythia8_ztautau.sh b/Generators/EvgenJobTransforms/test/test_gen_pythia8_ztautau.sh
index 6af253ebf276..e1db291189ce 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_pythia8_ztautau.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_pythia8_ztautau.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# art-description: Generation test Pythia8 Z->tautau
# art-type: build
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-output: *.root
# art-output: log.generate
diff --git a/Generators/EvgenJobTransforms/test/test_gen_rivet_athena.sh b/Generators/EvgenJobTransforms/test/test_gen_rivet_athena.sh
index fa77f6e87a58..fe7b4629ea68 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_rivet_athena.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_rivet_athena.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# art-description: Athena-based Rivet run test
# art-type: build
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-output: *.yoda.gz
# art-output: log.generate
diff --git a/Generators/EvgenJobTransforms/test/test_gen_rivet_standalone.sh b/Generators/EvgenJobTransforms/test/test_gen_rivet_standalone.sh
index 12e6779168f1..93bd2af99555 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_rivet_standalone.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_rivet_standalone.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# art-description: Standalone Rivet run test
# art-type: build
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-output: *.yoda.gz
# art-output: log.generate
diff --git a/Generators/EvgenJobTransforms/test/test_gen_sherpa_Z0.sh b/Generators/EvgenJobTransforms/test/test_gen_sherpa_Z0.sh
index d4da0ce477eb..71a5764c1ee3 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_sherpa_Z0.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_sherpa_Z0.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# art-description: Generation test Sherpa Z0
# art-type: build
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-output: *.root
# art-output: log.generate
diff --git a/Generators/EvgenJobTransforms/test/test_gen_sherpa_dy.sh b/Generators/EvgenJobTransforms/test/test_gen_sherpa_dy.sh
index 7babc52af08d..fe57e127c522 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_sherpa_dy.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_sherpa_dy.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# art-description: Generation test Sherpa DY without inputs
# art-type: build
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-output: *.root
# art-output: log.generate
diff --git a/Generators/EvgenJobTransforms/test/test_gen_sherpa_tttautau.sh b/Generators/EvgenJobTransforms/test/test_gen_sherpa_tttautau.sh
index ca87313ca83d..7a2da8b17888 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_sherpa_tttautau.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_sherpa_tttautau.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# art-description: Generation test Sherpa ttll without inputs
# art-type: build
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-output: *.root
# art-output: log.generate
diff --git a/Generators/EvgenJobTransforms/test/test_gen_single.sh b/Generators/EvgenJobTransforms/test/test_gen_single.sh
index 844761b2735f..d4f451749a66 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_single.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_single.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# art-description: MC Generators test Particel Gun single particle production
# art-type: build
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-output: *.root
# art-output: log.generate
diff --git a/Generators/EvgenJobTransforms/test/test_gen_starlight.sh b/Generators/EvgenJobTransforms/test/test_gen_starlight.sh
index 1abb86f1e462..d65d028e53a1 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_starlight.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_starlight.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# art-description: Generation test Starlight
# art-type: build
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-output: *.root
# art-output: log.generate
diff --git a/Generators/EvgenJobTransforms/test/test_gen_starlight_lhe.sh b/Generators/EvgenJobTransforms/test/test_gen_starlight_lhe.sh
index 5bdfb540e0a3..79d8596d6d61 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_starlight_lhe.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_starlight_lhe.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# art-description: Generation test StarlightPy8Tauola, gamma-gamma-> tau tau
# art-type: build
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-output: *.root
# art-output: log.generate
diff --git a/Generators/EvgenJobTransforms/test/test_gen_superchicPy8_gamgam_2sleptons.sh b/Generators/EvgenJobTransforms/test/test_gen_superchicPy8_gamgam_2sleptons.sh
index 8733cc6172a2..1ec99a012d87 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_superchicPy8_gamgam_2sleptons.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_superchicPy8_gamgam_2sleptons.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Generation test SuperChic4+Py8 gamma+gamma to 2 sleptons
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-type: build
# art-output: *.root
diff --git a/Generators/EvgenJobTransforms/test/test_gen_superchic_ALP2.sh b/Generators/EvgenJobTransforms/test/test_gen_superchic_ALP2.sh
index 5c014785b957..3a24931213eb 100755
--- a/Generators/EvgenJobTransforms/test/test_gen_superchic_ALP2.sh
+++ b/Generators/EvgenJobTransforms/test/test_gen_superchic_ALP2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Generation test SuperChic ALP2
-# art-include: master/AthGeneration
-# art-include: master--HepMC2/Athena
+# art-include: main/AthGeneration
+# art-include: main--HepMC2/Athena
# art-include: 22.0/Athena
# art-type: build
# art-output: *.root
diff --git a/Generators/EvgenJobTransforms/test/test_rel21_sim_reco.sh b/Generators/EvgenJobTransforms/test/test_rel21_sim_reco.sh
index bf182ed4bf6d..f05565c07659 100755
--- a/Generators/EvgenJobTransforms/test/test_rel21_sim_reco.sh
+++ b/Generators/EvgenJobTransforms/test/test_rel21_sim_reco.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: Pythia event generation -- Zprime to tautau
# art-architecture: '#x86_64-intel'
# art-type: grid
diff --git a/Generators/Herwig7_i/test/test_00_dijet.sh b/Generators/Herwig7_i/test/test_00_dijet.sh
index ffb8608f55e7..f030c4be78a9 100755
--- a/Generators/Herwig7_i/test/test_00_dijet.sh
+++ b/Generators/Herwig7_i/test/test_00_dijet.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: Herwig7 ART test dijet
# art-type: grid
# art-output: EVNT.root
diff --git a/Generators/Herwig7_i/test/test_01_dijet_dipole.sh b/Generators/Herwig7_i/test/test_01_dijet_dipole.sh
index d809ad37a0b2..5451d528a367 100755
--- a/Generators/Herwig7_i/test/test_01_dijet_dipole.sh
+++ b/Generators/Herwig7_i/test/test_01_dijet_dipole.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: Herwig7 ART test dijet dipole
# art-type: grid
# art-output: EVNT.root
diff --git a/Generators/Herwig7_i/test/test_02_Wjet.sh b/Generators/Herwig7_i/test/test_02_Wjet.sh
index 2ab9341c2262..a3773cf1503c 100755
--- a/Generators/Herwig7_i/test/test_02_Wjet.sh
+++ b/Generators/Herwig7_i/test/test_02_Wjet.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: Herwig7 ART test Wjet
# art-type: grid
# art-output: EVNT.root
diff --git a/Generators/Herwig7_i/test/test_03_Zjet.sh b/Generators/Herwig7_i/test/test_03_Zjet.sh
index 4af43b91478c..d9cb77bbe0a5 100755
--- a/Generators/Herwig7_i/test/test_03_Zjet.sh
+++ b/Generators/Herwig7_i/test/test_03_Zjet.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: Herwig7 ART test Zjet
# art-type: grid
# art-output: EVNT.root
diff --git a/Generators/Herwig7_i/test/test_04_WWlvlv_PH.sh b/Generators/Herwig7_i/test/test_04_WWlvlv_PH.sh
index 664665e07dbb..0a78ed1d99da 100755
--- a/Generators/Herwig7_i/test/test_04_WWlvlv_PH.sh
+++ b/Generators/Herwig7_i/test/test_04_WWlvlv_PH.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: Herwig7 ART test Zmumu
# art-type: grid
# art-output: EVNT.root
diff --git a/Generators/Herwig7_i/test/test_05_Zmumu_ph.sh b/Generators/Herwig7_i/test/test_05_Zmumu_ph.sh
index 8911864835de..81685794f21e 100755
--- a/Generators/Herwig7_i/test/test_05_Zmumu_ph.sh
+++ b/Generators/Herwig7_i/test/test_05_Zmumu_ph.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: Herwig ART test Zmumu
# art-type: grid
# art-output: MyOutput.yoda.gz
diff --git a/Generators/MadGraphControl/test/test_00_mc_MG_ttbar_LHEtest.sh b/Generators/MadGraphControl/test/test_00_mc_MG_ttbar_LHEtest.sh
index 9477964d4a79..5791fd020213 100755
--- a/Generators/MadGraphControl/test/test_00_mc_MG_ttbar_LHEtest.sh
+++ b/Generators/MadGraphControl/test/test_00_mc_MG_ttbar_LHEtest.sh
@@ -1,8 +1,8 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/Athena
-# art-include: master/AthGeneration
+# art-include: main/Athena
+# art-include: main/AthGeneration
# art-description: MadGraph Event Generation Test - LO LHE generation
# art-type: grid
# art-output: test_lhe_events.tar.gz
diff --git a/Generators/MadGraphControl/test/test_01_mc_aMC_ttbar_LHEtest.sh b/Generators/MadGraphControl/test/test_01_mc_aMC_ttbar_LHEtest.sh
index 1da1ca1f68d1..22f086d93208 100755
--- a/Generators/MadGraphControl/test/test_01_mc_aMC_ttbar_LHEtest.sh
+++ b/Generators/MadGraphControl/test/test_01_mc_aMC_ttbar_LHEtest.sh
@@ -1,8 +1,8 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/Athena
-# art-include: master/AthGeneration
+# art-include: main/Athena
+# art-include: main/AthGeneration
# art-description: MadGraph Event Generation Test - NLO LHE generation
# art-type: grid
# art-output: test_lhe_events.tar.gz
diff --git a/Generators/MadGraphControl/test/test_02_mc_MG_ttbar_LHAPDFTest.sh b/Generators/MadGraphControl/test/test_02_mc_MG_ttbar_LHAPDFTest.sh
index 1405eba01c97..29d9f99a699b 100755
--- a/Generators/MadGraphControl/test/test_02_mc_MG_ttbar_LHAPDFTest.sh
+++ b/Generators/MadGraphControl/test/test_02_mc_MG_ttbar_LHAPDFTest.sh
@@ -1,8 +1,8 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/Athena
-# art-include: master/AthGeneration
+# art-include: main/Athena
+# art-include: main/AthGeneration
# art-description: MadGraph Event Generation Test - LHE generation with LHAPDF
# art-type: grid
# art-output: test_lhe_events.tar.gz
diff --git a/Generators/MadGraphControl/test/test_03_mc_MG_ttbar_BaseFragmentTest.sh b/Generators/MadGraphControl/test/test_03_mc_MG_ttbar_BaseFragmentTest.sh
index 013783d64f61..653f4c60bb75 100755
--- a/Generators/MadGraphControl/test/test_03_mc_MG_ttbar_BaseFragmentTest.sh
+++ b/Generators/MadGraphControl/test/test_03_mc_MG_ttbar_BaseFragmentTest.sh
@@ -1,8 +1,8 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/Athena
-# art-include: master/AthGeneration
+# art-include: main/Athena
+# art-include: main/AthGeneration
# art-description: MadGraph Event Generation Test - ttbar base fragment LHE generation
# art-type: grid
# art-output: test_lhe_events.tar.gz
diff --git a/Generators/MadGraphControl/test/test_04_mc_aMC_ttbar_BaseFragmentGridpackTest.sh b/Generators/MadGraphControl/test/test_04_mc_aMC_ttbar_BaseFragmentGridpackTest.sh
index c39295a0b4a5..9b326adc4f0c 100755
--- a/Generators/MadGraphControl/test/test_04_mc_aMC_ttbar_BaseFragmentGridpackTest.sh
+++ b/Generators/MadGraphControl/test/test_04_mc_aMC_ttbar_BaseFragmentGridpackTest.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: MadGraph Event Generation Test - NLO gridpack
# art-type: grid
# art-output: test_lhe_events.tar.gz
diff --git a/Generators/MadGraphControl/test/test_05_mc_MG_ttbar_SystTest.sh b/Generators/MadGraphControl/test/test_05_mc_MG_ttbar_SystTest.sh
index 36f3a3b637a0..44fc2970d8aa 100755
--- a/Generators/MadGraphControl/test/test_05_mc_MG_ttbar_SystTest.sh
+++ b/Generators/MadGraphControl/test/test_05_mc_MG_ttbar_SystTest.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: MadGraph Event Generation Test - LO systematics
# art-type: grid
# art-output: test_lhe_events.tar.gz
diff --git a/Generators/MadGraphControl/test/test_06_mc_aMC_ttbar_SystTest.sh b/Generators/MadGraphControl/test/test_06_mc_aMC_ttbar_SystTest.sh
index e3d43e276100..184ba6395cd5 100755
--- a/Generators/MadGraphControl/test/test_06_mc_aMC_ttbar_SystTest.sh
+++ b/Generators/MadGraphControl/test/test_06_mc_aMC_ttbar_SystTest.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: MadGraph Event Generation Test - NLO systematics
# art-type: grid
# art-output: test_lhe_events.tar.gz
diff --git a/Generators/MadGraphControl/test/test_07_mc_MG_ttbar_MadSpinTest.sh b/Generators/MadGraphControl/test/test_07_mc_MG_ttbar_MadSpinTest.sh
index 33388ed28da7..127c478ff43f 100755
--- a/Generators/MadGraphControl/test/test_07_mc_MG_ttbar_MadSpinTest.sh
+++ b/Generators/MadGraphControl/test/test_07_mc_MG_ttbar_MadSpinTest.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: MadGraph Event Generation Test - LO MadSpin
# art-type: grid
# art-output: test_lhe_events.tar.gz
diff --git a/Generators/MadGraphControl/test/test_08_mc_aMC_ttbar_MadSpinTest.sh b/Generators/MadGraphControl/test/test_08_mc_aMC_ttbar_MadSpinTest.sh
index 80f1b419cd0a..dcde27079c0d 100755
--- a/Generators/MadGraphControl/test/test_08_mc_aMC_ttbar_MadSpinTest.sh
+++ b/Generators/MadGraphControl/test/test_08_mc_aMC_ttbar_MadSpinTest.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: MadGraph Event Generation Test - NLO MadSpin
# art-type: grid
# art-output: test_lhe_events.tar.gz
diff --git a/Generators/MadGraphControl/test/test_09_mc_MG_ttbar_gridpackTest.sh b/Generators/MadGraphControl/test/test_09_mc_MG_ttbar_gridpackTest.sh
index f26ccd427bcc..634f27cab4b6 100755
--- a/Generators/MadGraphControl/test/test_09_mc_MG_ttbar_gridpackTest.sh
+++ b/Generators/MadGraphControl/test/test_09_mc_MG_ttbar_gridpackTest.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: MadGraph Event Generation Test - LO Gridpack
# art-type: grid
# art-output: test_lhe_events.tar.gz
diff --git a/Generators/MadGraphControl/test/test_10_mc_aMC_ttbar_gridpackTest.sh b/Generators/MadGraphControl/test/test_10_mc_aMC_ttbar_gridpackTest.sh
index 99af4a36a1fc..ee664d6eb6f6 100755
--- a/Generators/MadGraphControl/test/test_10_mc_aMC_ttbar_gridpackTest.sh
+++ b/Generators/MadGraphControl/test/test_10_mc_aMC_ttbar_gridpackTest.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: MadGraph Event Generation Test - NLO Gridpack
# art-type: grid
# art-output: test_lhe_events.tar.gz
diff --git a/Generators/MadGraphControl/test/test_11_mc_aMC_ttbar_gridpackClusterTest.sh b/Generators/MadGraphControl/test/test_11_mc_aMC_ttbar_gridpackClusterTest.sh
index 6b07b1fb3868..f135ba719c93 100755
--- a/Generators/MadGraphControl/test/test_11_mc_aMC_ttbar_gridpackClusterTest.sh
+++ b/Generators/MadGraphControl/test/test_11_mc_aMC_ttbar_gridpackClusterTest.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: MadGraph Event Generation Test - Cluster grid pack
# art-type: grid
diff --git a/Generators/MadGraphControl/test/test_12_mc_MGPy8EG_ttbar_MCOREtest.sh b/Generators/MadGraphControl/test/test_12_mc_MGPy8EG_ttbar_MCOREtest.sh
index ae4c07461d99..be20340ca023 100755
--- a/Generators/MadGraphControl/test/test_12_mc_MGPy8EG_ttbar_MCOREtest.sh
+++ b/Generators/MadGraphControl/test/test_12_mc_MGPy8EG_ttbar_MCOREtest.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: MadGraph Event Generation Test - Multicore LO
# art-type: grid
# art-athena-mt: 8
diff --git a/Generators/MadGraphControl/test/test_13_mc_MG_ttbar_ReweightTest.sh b/Generators/MadGraphControl/test/test_13_mc_MG_ttbar_ReweightTest.sh
index e6e61c029270..ed6402a0ce9a 100755
--- a/Generators/MadGraphControl/test/test_13_mc_MG_ttbar_ReweightTest.sh
+++ b/Generators/MadGraphControl/test/test_13_mc_MG_ttbar_ReweightTest.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: MadGraph Event Generation Test - LO with reweighting module
# art-type: grid
# art-output: test_lhe_events.tar.gz
diff --git a/Generators/MadGraphControl/test/test_14_mc_aMC_ttbar_ReweightTest.sh b/Generators/MadGraphControl/test/test_14_mc_aMC_ttbar_ReweightTest.sh
index eaae8138c215..7af97ead13e4 100755
--- a/Generators/MadGraphControl/test/test_14_mc_aMC_ttbar_ReweightTest.sh
+++ b/Generators/MadGraphControl/test/test_14_mc_aMC_ttbar_ReweightTest.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: MadGraph Event Generation Test - NLO with reweighting module
# art-type: grid
# art-output: test_lhe_events.tar.gz
diff --git a/Generators/MadGraphControl/test/test_15_mc_aMCPy8EG_A14NNPDF23_ttbar_Incl.sh b/Generators/MadGraphControl/test/test_15_mc_aMCPy8EG_A14NNPDF23_ttbar_Incl.sh
index dabecf1ff527..fdfb294ffeb7 100755
--- a/Generators/MadGraphControl/test/test_15_mc_aMCPy8EG_A14NNPDF23_ttbar_Incl.sh
+++ b/Generators/MadGraphControl/test/test_15_mc_aMCPy8EG_A14NNPDF23_ttbar_Incl.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: MadGraph Event Generation Test - NLO inclusive ttbar
# art-type: grid
# art-output: EVNT.root
diff --git a/Generators/MadGraphControl/test/test_16_mc_MGPy8EG_A14NNPDF23_ttbar_Incl.sh b/Generators/MadGraphControl/test/test_16_mc_MGPy8EG_A14NNPDF23_ttbar_Incl.sh
index ee41cb4fd85b..8c6e85534f7c 100755
--- a/Generators/MadGraphControl/test/test_16_mc_MGPy8EG_A14NNPDF23_ttbar_Incl.sh
+++ b/Generators/MadGraphControl/test/test_16_mc_MGPy8EG_A14NNPDF23_ttbar_Incl.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: MadGraph Event Generation Test - LO inclusive ttbar
# art-type: grid
# art-output: EVNT.root
diff --git a/Generators/MadGraphControl/test/test_17_mc_MGPy8EG_A14NNPDF23_ttbar_Merge_Np01.sh b/Generators/MadGraphControl/test/test_17_mc_MGPy8EG_A14NNPDF23_ttbar_Merge_Np01.sh
index 0db6742c8fc4..a2347a93d7ce 100755
--- a/Generators/MadGraphControl/test/test_17_mc_MGPy8EG_A14NNPDF23_ttbar_Merge_Np01.sh
+++ b/Generators/MadGraphControl/test/test_17_mc_MGPy8EG_A14NNPDF23_ttbar_Merge_Np01.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: MadGraph Event Generation Test - LO merging test
# art-type: grid
# art-output: EVNT.root
diff --git a/Generators/MadGraphControl/test/test_18_mc_aMCPy8EG_A14NNPDF23_ttbar_Incl.sh b/Generators/MadGraphControl/test/test_18_mc_aMCPy8EG_A14NNPDF23_ttbar_Incl.sh
index 6c86c1054aec..69321774102d 100755
--- a/Generators/MadGraphControl/test/test_18_mc_aMCPy8EG_A14NNPDF23_ttbar_Incl.sh
+++ b/Generators/MadGraphControl/test/test_18_mc_aMCPy8EG_A14NNPDF23_ttbar_Incl.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: MadGraph Event Generation Test - NLO inclusive ttbar
# art-type: grid
# art-output: EVNT.root
diff --git a/Generators/MadGraphControl/test/test_19_mc_SUSY_gridpackTest.sh b/Generators/MadGraphControl/test/test_19_mc_SUSY_gridpackTest.sh
index a30b642b63ec..bb96f85b7d8e 100755
--- a/Generators/MadGraphControl/test/test_19_mc_SUSY_gridpackTest.sh
+++ b/Generators/MadGraphControl/test/test_19_mc_SUSY_gridpackTest.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: MadGraph Event Generation Test - SUSY LO gridpack
# art-type: grid
# art-output: test_lhe_events.tar.gz
diff --git a/Generators/MadGraphControl/test/test_20_mc_SUSY_OTF_test.sh b/Generators/MadGraphControl/test/test_20_mc_SUSY_OTF_test.sh
index 09729d2b2735..9d6dffa3d908 100755
--- a/Generators/MadGraphControl/test/test_20_mc_SUSY_OTF_test.sh
+++ b/Generators/MadGraphControl/test/test_20_mc_SUSY_OTF_test.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: MadGraph Event Generation Test - SUSY OTF EVNT+TXT
# art-type: grid
# art-output: test_lhe_events.tar.gz
diff --git a/Generators/MadGraphControl/test/test_21_mc_SUSY_EVNT_from_LHE_with_MadSpin_test.sh b/Generators/MadGraphControl/test/test_21_mc_SUSY_EVNT_from_LHE_with_MadSpin_test.sh
index b537955c4b42..82db38c94bf1 100755
--- a/Generators/MadGraphControl/test/test_21_mc_SUSY_EVNT_from_LHE_with_MadSpin_test.sh
+++ b/Generators/MadGraphControl/test/test_21_mc_SUSY_EVNT_from_LHE_with_MadSpin_test.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: MadGraph Event Generation Test - SUSY gen from LHE with MadSpin
# art-type: grid
# art-output: test_lhe_events.tar.gz
diff --git a/Generators/PowhegControl/test/test_00_bb.sh b/Generators/PowhegControl/test/test_00_bb.sh
index 76f1dcfbfde7..a77cba42276c 100755
--- a/Generators/PowhegControl/test/test_00_bb.sh
+++ b/Generators/PowhegControl/test/test_00_bb.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: Powheg Control ART test bb
# art-type: grid
# art-output: test_powheg_bb.TXT.tar.gz
diff --git a/Generators/PowhegControl/test/test_01_ZZ.sh b/Generators/PowhegControl/test/test_01_ZZ.sh
index a92e57a3c947..acd38f0b211c 100755
--- a/Generators/PowhegControl/test/test_01_ZZ.sh
+++ b/Generators/PowhegControl/test/test_01_ZZ.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: Powheg Control ART test ZZ
# art-type: grid
# art-output: test_powheg_ZZ.TXT.tar.gz
diff --git a/Generators/PowhegControl/test/test_02_single_top_s_channel.sh b/Generators/PowhegControl/test/test_02_single_top_s_channel.sh
index 3d380287c410..1a73d40427e3 100755
--- a/Generators/PowhegControl/test/test_02_single_top_s_channel.sh
+++ b/Generators/PowhegControl/test/test_02_single_top_s_channel.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: Powheg Control ART test single top s-channel
# art-type: grid
# art-output: test_powheg_ZZ.TXT.tar.gz
diff --git a/Generators/PowhegControl/test/test_03_W.sh b/Generators/PowhegControl/test/test_03_W.sh
index 091b971e54fa..c47dd67306e3 100755
--- a/Generators/PowhegControl/test/test_03_W.sh
+++ b/Generators/PowhegControl/test/test_03_W.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: Powheg Control ART test W
# art-type: grid
# art-output: test_powheg_W.TXT.tar.gz
diff --git a/Generators/PowhegControl/test/test_04_Z.sh b/Generators/PowhegControl/test/test_04_Z.sh
index 87e922e5bc2a..c5bb902b4f6a 100755
--- a/Generators/PowhegControl/test/test_04_Z.sh
+++ b/Generators/PowhegControl/test/test_04_Z.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: Powheg Control ART test Z
# art-type: grid
# art-output: test_powheg_Z.TXT.tar.gz
diff --git a/Generators/PowhegControl/test/test_05_tt.sh b/Generators/PowhegControl/test/test_05_tt.sh
index aab29a67a501..fa948d79a0ea 100755
--- a/Generators/PowhegControl/test/test_05_tt.sh
+++ b/Generators/PowhegControl/test/test_05_tt.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: Powheg Control ART test tt
# art-type: grid
# art-output: test_powheg_W.TXT.tar.gz
diff --git a/Generators/PowhegControl/test/test_06_WW.sh b/Generators/PowhegControl/test/test_06_WW.sh
index 1875fc23cf66..86ad8ac649fb 100755
--- a/Generators/PowhegControl/test/test_06_WW.sh
+++ b/Generators/PowhegControl/test/test_06_WW.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: Powheg Control ART test WW
# art-type: grid
# art-output: test_powheg_WW.TXT.tar.gz
diff --git a/Generators/Pythia8_i/test/test_00_Zprime_1000_tt.sh b/Generators/Pythia8_i/test/test_00_Zprime_1000_tt.sh
index caa40c766794..2c0abaeb0477 100755
--- a/Generators/Pythia8_i/test/test_00_Zprime_1000_tt.sh
+++ b/Generators/Pythia8_i/test/test_00_Zprime_1000_tt.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: Pythia event generation -- Zprime to tautau
# art-type: grid
# art-output: EVNT.root
diff --git a/Generators/Pythia8_i/test/test_01_Z_tautau.sh b/Generators/Pythia8_i/test/test_01_Z_tautau.sh
index 5eb6d742a7d1..e6405f60ffa7 100755
--- a/Generators/Pythia8_i/test/test_01_Z_tautau.sh
+++ b/Generators/Pythia8_i/test/test_01_Z_tautau.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: Pythia event generation -- Z to tautau
# art-type: grid
# art-output: EVNT.root
diff --git a/Generators/Pythia8_i/test/test_02_minbias.sh b/Generators/Pythia8_i/test/test_02_minbias.sh
index 691144839eed..5d67dd5f8209 100755
--- a/Generators/Pythia8_i/test/test_02_minbias.sh
+++ b/Generators/Pythia8_i/test/test_02_minbias.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: Pythia event generation -- minbias
# art-type: grid
# art-output: EVNT.root
diff --git a/Generators/Sherpa_i/test/test_00_sherpa_tttautau.sh b/Generators/Sherpa_i/test/test_00_sherpa_tttautau.sh
index ab2bc2e9e779..4226105f1cbd 100755
--- a/Generators/Sherpa_i/test/test_00_sherpa_tttautau.sh
+++ b/Generators/Sherpa_i/test/test_00_sherpa_tttautau.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: Sherpa tttautau
# art-type: grid
# art-output: EVNT.root
diff --git a/Generators/Sherpa_i/test/test_01_DY.sh b/Generators/Sherpa_i/test/test_01_DY.sh
index f9aec44af2dc..af9f04ea2a43 100755
--- a/Generators/Sherpa_i/test/test_01_DY.sh
+++ b/Generators/Sherpa_i/test/test_01_DY.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# art-include: 21.6/AthGeneration
-# art-include: master/AthGeneration
+# art-include: main/AthGeneration
# art-description: Sherpa DY test
# art-type: grid
# art-output: EVNT.root
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data15_13TeV_1000evt.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data15_13TeV_1000evt.sh
index efac7449b1c4..c72d7d80b41e 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data15_13TeV_1000evt.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data15_13TeV_1000evt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Standard test for 2015 data
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 23.0/Athena
# art-output: physval*.root
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data16_13TeV_1000evt.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data16_13TeV_1000evt.sh
index 6622a00909d8..2e92186de37b 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data16_13TeV_1000evt.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data16_13TeV_1000evt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Standard test for 2016 data
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 23.0/Athena
# art-output: physval*.root
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data17_13TeV_1000evt.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data17_13TeV_1000evt.sh
index e2970c24834d..2ae2025be9b6 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data17_13TeV_1000evt.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data17_13TeV_1000evt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Standard test for 2017 data
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 23.0/Athena
# art-output: physval*.root
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data18_13TeV_1000evt.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data18_13TeV_1000evt.sh
index cf8254177901..5e850f4d847e 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data18_13TeV_1000evt.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data18_13TeV_1000evt.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Standard test for 2018 data
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 23.0/Athena
# art-output: physval*.root
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele10GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele10GeV_reco.sh
index 83e88bb970aa..fff2f4217b48 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele10GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele10GeV_reco.sh
@@ -5,7 +5,7 @@
# art-input-nfiles: 10
# art-cores: 4
# art-memory: 4096
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 23.0/Athena
# art-output: physval*.root
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele5GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele5GeV_reco.sh
index de0590bfb570..efe06075e982 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele5GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele5GeV_reco.sh
@@ -5,7 +5,7 @@
# art-input-nfiles: 10
# art-cores: 4
# art-memory: 4096
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 23.0/Athena
# art-output: physval*.root
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_reco.sh
index 854bf7f9a194..cc9aa7a1db26 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_reco.sh
@@ -5,7 +5,7 @@
# art-input-nfiles: 10
# art-cores: 4
# art-memory: 4096
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 23.0/Athena
# art-output: physval*.root
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_simreco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_simreco.sh
index a01e5be02be4..76e3f4d5f6b6 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_simreco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_simreco.sh
@@ -3,7 +3,7 @@
# art-type: grid
# art-input: user.keli:user.keli.mc16_13TeV.422036.ParticleGun_single_mu_Pt100.merge.EVNT.e7967_e5984_tid20254953_00
# art-input-nfiles: 1
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 23.0/Athena
# art-output: physval*.root
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu10GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu10GeV_reco.sh
index caaadb8d0bf5..594cc74d3a45 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu10GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu10GeV_reco.sh
@@ -5,7 +5,7 @@
# art-input-nfiles: 10
# art-cores: 4
# art-memory: 4096
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 23.0/Athena
# art-output: physval*.root
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_reco.sh
index 32af0766ac9b..13a4a897f3e0 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_reco.sh
@@ -5,7 +5,7 @@
# art-input-nfiles: 10
# art-cores: 4
# art-memory: 4096
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 23.0/Athena
# art-output: physval*.root
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_simreco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_simreco.sh
index 64da035806b3..c5e34d93b618 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_simreco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_simreco.sh
@@ -3,7 +3,7 @@
# art-type: grid
# art-input: user.keli:user.keli.mc16_13TeV.422032.ParticleGun_single_mu_Pt1.merge.EVNT.e7967_e5984_tid20254902_00
# art-input-nfiles: 1
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 23.0/Athena
# art-output: physval*.root
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_reco.sh
index 409be46535d6..1c6d6e48d2ea 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_reco.sh
@@ -5,7 +5,7 @@
# art-input-nfiles: 10
# art-cores: 4
# art-memory: 4096
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 23.0/Athena
# art-output: physval*.root
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_simreco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_simreco.sh
index 91ab1eb77dbd..0cde9470f809 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_simreco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_simreco.sh
@@ -3,7 +3,7 @@
# art-type: grid
# art-input: user.keli:user.keli.mc16_13TeV.422035.ParticleGun_single_mu_Pt20.merge.EVNT.e7967_e5984_tid20255021_00
# art-input-nfiles: 1
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 23.0/Athena
# art-output: physval*.root
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu5GeV_simreco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu5GeV_simreco.sh
index 2bb06caae2b5..7de351bf8819 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu5GeV_simreco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu5GeV_simreco.sh
@@ -3,7 +3,7 @@
# art-type: grid
# art-input: user.keli:user.keli.mc16_13TeV.422033.ParticleGun_single_mu_Pt5.merge.EVNT.e7967_e5984_tid20254920_00
# art-input-nfiles: 1
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 23.0/Athena
# art-output: physval*.root
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_reco.sh
index a4dcc066e4a6..7e8b78fb178b 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_reco.sh
@@ -5,7 +5,7 @@
# art-input-nfiles: 10
# art-cores: 4
# art-memory: 4096
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 23.0/Athena
# art-output: physval*.root
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_simreco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_simreco.sh
index e8c1353b5f3b..9069c510efd9 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_simreco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_simreco.sh
@@ -3,7 +3,7 @@
# art-type: grid
# art-input: user.keli:user.keli.mc16_13TeV.422047.ParticleGun_single_piplus_Pt1.merge.EVNT.e7967_e5984_tid20255138_00
# art-input-nfiles: 1
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 23.0/Athena
# art-output: physval*.root
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_reco.sh
index bcdd8d122eef..373c852a7d27 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_reco.sh
@@ -5,7 +5,7 @@
# art-input-nfiles: 10
# art-cores: 4
# art-memory: 4096
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 23.0/Athena
# art-output: physval*.root
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_simreco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_simreco.sh
index 9944f59a519d..9964868322b1 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_simreco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_simreco.sh
@@ -3,7 +3,7 @@
# art-type: grid
# art-input: user.keli:user.keli.mc16_13TeV.422048.ParticleGun_single_piplus_Pt5.merge.EVNT.e7967_e5984_tid20255154_00
# art-input-nfiles: 1
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 23.0/Athena
# art-output: physval*.root
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_acts_ckf_mu100GeV.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_acts_ckf_mu100GeV.sh
index 77f5bf88970f..7f027a1604fc 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_acts_ckf_mu100GeV.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_acts_ckf_mu100GeV.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Run 4 configuration, ITK only recontruction, Single muon 100GeV, acts activated
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: *.xml
# art-output: dcube*
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_acts_ttbar_PU200.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_acts_ttbar_PU200.sh
index 1882173b0402..795166928531 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_acts_ttbar_PU200.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_acts_ttbar_PU200.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Run 4 configuration, ITK only recontruction, all-hadronic ttbar, full pileup, acts activated
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: *.xml
# art-output: dcube*
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_el10.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_el10.sh
index 77f22078e115..68c7147ded3d 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_el10.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_el10.sh
@@ -3,7 +3,7 @@
# art-input: mc15_14TeV:mc15_14TeV.900035.PG_singleel_Pt10_etaFlatnp0_43.evgen.EVNT.e8185
# art-input-nfiles: 1
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: *.xml
# art-output: dcube*
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_mu100_FTF.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_mu100_FTF.sh
index fb0facfae67e..884b1160ceb7 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_mu100_FTF.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_mu100_FTF.sh
@@ -3,7 +3,7 @@
# art-input: mc15_14TeV:mc15_14TeV.900040.PG_singlemu_Pt100_etaFlatnp0_43.evgen.EVNT.e8185
# art-input-nfiles: 1
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: *.xml
# art-output: dcube*
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_mu100_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_mu100_reco.sh
index 096a21895382..82d116b46a7e 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_mu100_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_mu100_reco.sh
@@ -3,7 +3,7 @@
# art-input: mc15_14TeV:mc15_14TeV.900040.PG_singlemu_Pt100_etaFlatnp0_43.evgen.EVNT.e8185
# art-input-nfiles: 1
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: *.xml
# art-output: dcube*
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_pi10_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_pi10_reco.sh
index 7034938aab2e..365c3d88c0f7 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_pi10_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_pi10_reco.sh
@@ -3,7 +3,7 @@
# art-input: mc15_14TeV:mc15_14TeV.900038.PG_singlepiplus_Pt10_etaFlatnp0_43.evgen.EVNT.e8185
# art-input-nfiles: 1
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: *.xml
# art-output: dcube*
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_ttbar_PU0.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_ttbar_PU0.sh
index 93469c78bb81..da62cfc7e435 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_ttbar_PU0.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_ttbar_PU0.sh
@@ -3,7 +3,7 @@
# art-input: mc15_14TeV:mc15_14TeV.601237.PhPy8EG_A14_ttbar_hdamp258p75_allhad.evgen.EVNT.e8357
# art-input-nfiles: 1
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: *.xml
# art-output: dcube*
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_ttbar_PU200.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_ttbar_PU200.sh
index ac251f6fe099..802b9f7e266a 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_ttbar_PU200.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_ttbar_PU200.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Run 4 configuration, ITK only recontruction, all-hadronic ttbar, full pileup
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: *.xml
# art-output: dcube*
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_ttbar_PU200_FTF.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_ttbar_PU200_FTF.sh
index 1ee68c15fe8d..fc74c4584598 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_ttbar_PU200_FTF.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_ttbar_PU200_FTF.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Run 4 configuration, ITK only recontruction, all-hadronic ttbar, full pileup, TrigFastTrackFinder as an offline algorithm
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: *.xml
# art-output: dcube*
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU40_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU40_reco.sh
index 32b50369e95c..18c0f1008015 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU40_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU40_reco.sh
@@ -3,7 +3,7 @@
# art-input: user.keli:user.keli.mc16_13TeV.410471.PhPy8EG_A14_ttbar_hdamp258p75_allhad.e6337_e5984_Rel22073
# art-input-nfiles: 10
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 23.0/Athena
# art-output: physval*.root
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/test/test_LArElecCalibChainI.sh b/LArCalorimeter/LArExample/LArCalibProcessing/test/test_LArElecCalibChainI.sh
index 49255dfb16e8..c08d6c6168b5 100755
--- a/LArCalorimeter/LArExample/LArCalibProcessing/test/test_LArElecCalibChainI.sh
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/test/test_LArElecCalibChainI.sh
@@ -3,7 +3,7 @@
# art-description: Testing LAr ElecCalib Chain I
# art-type: build
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
athena --CA LArCalibProcessing/LArCalib_PedestalAutoCorrConfig.py
echo "art-result: $? pedestal"
diff --git a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_amdc_mgm-misaligned_geom.sh b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_amdc_mgm-misaligned_geom.sh
index a6890031c12d..d3f2544fe66f 100755
--- a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_amdc_mgm-misaligned_geom.sh
+++ b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_amdc_mgm-misaligned_geom.sh
@@ -4,7 +4,7 @@
# # Purpose: Compare MuonGeoModel and AMDB detector element positions
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 21.0/Athena
# art-include: 21.3/Athena
#
diff --git a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_amdc_mgm-test_layout.sh b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_amdc_mgm-test_layout.sh
index 5c69d798dca4..4280d313babe 100755
--- a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_amdc_mgm-test_layout.sh
+++ b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_amdc_mgm-test_layout.sh
@@ -4,7 +4,7 @@
# # Purpose: Compare MuonGeoModel and AMDB detector element positions
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 21.0/Athena
# art-include: 21.3/Athena
#
diff --git a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_checkgeo_agdd.sh b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_checkgeo_agdd.sh
index 464f45658c59..720bfa4940c1 100755
--- a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_checkgeo_agdd.sh
+++ b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_checkgeo_agdd.sh
@@ -3,7 +3,7 @@
# art-description: Check SQL files of muon spectrometer description, just AGDD part from amdc_simrec (only passive materials)
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
#
# art-output: *.txt
# art-output: *.data
diff --git a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_checkgeo_amdc.sh b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_checkgeo_amdc.sh
index 223188239186..3def391bb34f 100755
--- a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_checkgeo_amdc.sh
+++ b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_checkgeo_amdc.sh
@@ -3,7 +3,7 @@
# art-description: Check SQL files of muon spectrometer description, just AMDB part from amdb_simrec
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
#
# art-output: *.txt
# art-output: *.data
diff --git a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_checkgeo_nswd.sh b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_checkgeo_nswd.sh
index e1d1112ca873..392d674c3199 100755
--- a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_checkgeo_nswd.sh
+++ b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_checkgeo_nswd.sh
@@ -3,7 +3,7 @@
# art-description: Check SQL files of muon spectrometer (NSW) description, just AGDD part from NSW .xml
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
#
# art-output: *.txt
# art-output: *.data
diff --git a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_gengeo_agdd.sh b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_gengeo_agdd.sh
index ba8a40eeaa4b..b632fdfa1c7a 100755
--- a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_gengeo_agdd.sh
+++ b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_gengeo_agdd.sh
@@ -3,7 +3,7 @@
# art-description: Generate SQL files for muon spectrometer description, just AGDD part from .xml
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
#
# art-output: *.data
diff --git a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_gengeo_agdd_viaAmdb.sh b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_gengeo_agdd_viaAmdb.sh
index 2bec28ded4b9..d59c118063de 100755
--- a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_gengeo_agdd_viaAmdb.sh
+++ b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_gengeo_agdd_viaAmdb.sh
@@ -3,7 +3,7 @@
# art-description: Generate SQL files for muon spectrometer description, just AGDD part from amdb_simrec file
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
#
# art-output: *.data
diff --git a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_gengeo_amdc.sh b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_gengeo_amdc.sh
index 85e5f06256c2..8e88372d807a 100755
--- a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_gengeo_amdc.sh
+++ b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_gengeo_amdc.sh
@@ -3,7 +3,7 @@
# art-description: Generate SQL files for muon spectrometer description, just AMDB part from amdb_simrec
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
#
# art-output: *.data
diff --git a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_gengeo_nswd.sh b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_gengeo_nswd.sh
index d99ed810ef6d..ea74ee6945d5 100755
--- a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_gengeo_nswd.sh
+++ b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_gengeo_nswd.sh
@@ -3,7 +3,7 @@
# art-description: Generate SQL files for muon spectrometer description, just NSW AGDD .xml part
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
#
# art-output: *.data
diff --git a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_geoFromLocal_R_08_01.sh b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_geoFromLocal_R_08_01.sh
index f593905a8f67..0651459a8faa 100755
--- a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_geoFromLocal_R_08_01.sh
+++ b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_geoFromLocal_R_08_01.sh
@@ -3,7 +3,7 @@
# art-description: Run simulation from existing layout of geometry database and from local amdb file (for muon geometry MuonSpectrometer-R.08.01)
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
#
# art-output: log.EVNTtoHITS_fromLocal
# art-output: log.EVNTtoHITS
diff --git a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_geoFromLocal_R_08_02_AGDD.sh b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_geoFromLocal_R_08_02_AGDD.sh
index b05ba7baf792..69d7b980ff6e 100755
--- a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_geoFromLocal_R_08_02_AGDD.sh
+++ b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_geoFromLocal_R_08_02_AGDD.sh
@@ -3,7 +3,7 @@
# art-description: Run simulation from existing layout of geometry database and from local AGDD file (for muon geometry MuonSpectrometer-R.08.02)
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
#
# art-output: log.EVNTtoHITS_fromLocal
# art-output: log.EVNTtoHITS
diff --git a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_geoFromLocal_R_08_02_Amdb.sh b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_geoFromLocal_R_08_02_Amdb.sh
index 9eb13c326a66..5f2ccd9324f8 100755
--- a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_geoFromLocal_R_08_02_Amdb.sh
+++ b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_geoFromLocal_R_08_02_Amdb.sh
@@ -3,7 +3,7 @@
# art-description: Run simulation from existing layout of geometry database and from local amdb file (for muon geometry MuonSpectrometer-R.08.02)
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
#
# art-output: log.EVNTtoHITS_fromLocal
# art-output: log.EVNTtoHITS
diff --git a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_geoFromLocal_R_09_02_NSWAGDD.sh b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_geoFromLocal_R_09_02_NSWAGDD.sh
index f668331d2bc5..45cd2fb7b3ef 100755
--- a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_geoFromLocal_R_09_02_NSWAGDD.sh
+++ b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_geoFromLocal_R_09_02_NSWAGDD.sh
@@ -3,7 +3,7 @@
# art-description: Run simulation from existing layout of geometry database and from local NSW AGDD file (for muon geometry MuonSpectrometer-R.09.02.Asym)
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
#
# art-output: log.EVNTtoHITS_fromLocal
# art-output: log.EVNTtoHITS
diff --git a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_muon_geantino_sim.sh b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_muon_geantino_sim.sh
index 69aa8a770570..7cc5b2015eff 100755
--- a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_muon_geantino_sim.sh
+++ b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_muon_geantino_sim.sh
@@ -4,7 +4,7 @@
# # Purpose: Check internal consistency of raw geometry (fed to G4 simulation)
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 21.0/Athena
# art-include: 21.3/Athena
#
diff --git a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_muon_gm_check.sh b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_muon_gm_check.sh
index b407a3917c61..7c34ae9a950d 100755
--- a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_muon_gm_check.sh
+++ b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_muon_gm_check.sh
@@ -4,7 +4,7 @@
# # Purpose: Compare MuonGeoModel raw and readout geometry relative to a reference
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 21.0/Athena
# art-include: 21.3/Athena
#
diff --git a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_muon_gm_check_reference.sh b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_muon_gm_check_reference.sh
index 095e09dcdfa5..80ee68adc25b 100755
--- a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_muon_gm_check_reference.sh
+++ b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_muon_gm_check_reference.sh
@@ -4,7 +4,7 @@
# # Purpose: Compare MuonGeoModel raw and readout geometry relative to a reference
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 21.0/Athena
# art-include: 21.3/Athena
#
diff --git a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_muon_hit_relocation.sh b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_muon_hit_relocation.sh
index 53306c20a3a6..3ddea0edbbd5 100755
--- a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_muon_hit_relocation.sh
+++ b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_muon_hit_relocation.sh
@@ -4,7 +4,7 @@
# # Purpose: Check internal consistency of readout geometry (used by reconstruction)
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 21.0/Athena
# art-include: 21.3/Athena
#
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt100gev.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt100gev.sh
index c19c66686323..bf92a654dc16 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt100gev.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt100gev.sh
@@ -3,7 +3,7 @@
# art-description: Art test job for MooPerformance package, migrated from RTT job: SingleMuons-mc12-Pt100GeV
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-memory: 4096
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt10gev.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt10gev.sh
index 46cd354a7612..a898d4653f8d 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt10gev.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt10gev.sh
@@ -3,7 +3,7 @@
# art-description: Art test job for MooPerformance package, migrated from RTT job: SingleMuons-mc12-Pt10GeV
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-memory: 4096
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt1tev.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt1tev.sh
index 9275ae445cc0..ed202e294c2e 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt1tev.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt1tev.sh
@@ -3,7 +3,7 @@
# art-description: Art test job for MooPerformance package, migrated from RTT job: SingleMuons-mc12-Pt1TeV
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-memory: 4096
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt200gev.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt200gev.sh
index c62e7cbd50f0..ec821dea310b 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt200gev.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt200gev.sh
@@ -3,7 +3,7 @@
# art-description: Art test job for MooPerformance package, migrated from RTT job: SingleMuons-mc12-Pt200GeV
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-memory: 4096
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt20gev.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt20gev.sh
index bc15c8a062f9..d24791348046 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt20gev.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt20gev.sh
@@ -3,7 +3,7 @@
# art-description: Art test job for MooPerformance package, migrated from RTT job: SingleMuons-mc12-Pt20GeV
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-memory: 4096
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt2tev.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt2tev.sh
index 630089822eba..c9835cee76cf 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt2tev.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt2tev.sh
@@ -3,7 +3,7 @@
# art-description: Art test job for MooPerformance package, migrated from RTT job: SingleMuons-mc12-Pt2TeV
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-memory: 4096
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt3gev.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt3gev.sh
index e5476d4ca2e4..e9505dd15b9a 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt3gev.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt3gev.sh
@@ -3,7 +3,7 @@
# art-description: Art test job for MooPerformance package, migrated from RTT job: SingleMuons-mc12-Pt3GeV
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-memory: 4096
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt3tev.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt3tev.sh
index 159bdbb47722..e312937765a3 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt3tev.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt3tev.sh
@@ -3,7 +3,7 @@
# art-description: Art test job for MooPerformance package, migrated from RTT job: SingleMuons-mc12-Pt3TeV
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-memory: 4096
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt500gev.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt500gev.sh
index 3d309b4e5aab..94e89f19ea26 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt500gev.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt500gev.sh
@@ -3,7 +3,7 @@
# art-description: Art test job for MooPerformance package, migrated from RTT job: SingleMuons-mc12-Pt500GeV
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-memory: 4096
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt50gev.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt50gev.sh
index 50f347ca3193..70d4d827c237 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt50gev.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt50gev.sh
@@ -3,7 +3,7 @@
# art-description: Art test job for MooPerformance package, migrated from RTT job: SingleMuons-mc12-Pt50GeV
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-memory: 4096
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt5gev.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt5gev.sh
index 7d92fdc9910d..d2ff764e2283 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt5gev.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt5gev.sh
@@ -3,7 +3,7 @@
# art-description: Art test job for MooPerformance package, migrated from RTT job: SingleMuons-mc12-Pt5GeV
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-memory: 4096
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run3_asymmetric_fullChain.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run3_asymmetric_fullChain.sh
index 4d30d09311e1..c4a5914ebcee 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run3_asymmetric_fullChain.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run3_asymmetric_fullChain.sh
@@ -3,7 +3,7 @@
# art-description: Test the asymmetric Run3 layout in simulation/digitisation/reconstruction
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-athena-mt: 5
# art-output: OUT_HITS.root
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run3_symmetric_fullChain.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run3_symmetric_fullChain.sh
index 24b3191e73c9..14ad669d859e 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run3_symmetric_fullChain.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run3_symmetric_fullChain.sh
@@ -3,7 +3,7 @@
# art-description: Test the symmetric Run3 layout in simulation/digitisation/reconstruction
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-athena-mt: 5
# art-output: OUT_HITS.root
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run4_muon_fullChain.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run4_muon_fullChain.sh
index b25789e5f709..bc17cfc2948c 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run4_muon_fullChain.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run4_muon_fullChain.sh
@@ -3,7 +3,7 @@
# art-description: Test the Run4 muon layout in simulation/digitisation/reconstruction
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-output: OUT_HITS.root
# art-output: OUT_RDO.root
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_digi_phase2.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_digi_phase2.sh
index c2ecd90d55ea..d4bce3905e6a 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_digi_phase2.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_digi_phase2.sh
@@ -3,7 +3,7 @@
# art-description: Test muon digitisation on best knowledge Run4 muon layout
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 21.9/Athena
# art-output: log.HITtoRDO
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrec_Run3_asymmetric.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrec_Run3_asymmetric.sh
index a3505c75c08a..c85dd97f86db 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrec_Run3_asymmetric.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrec_Run3_asymmetric.sh
@@ -3,7 +3,7 @@
# art-description: Test muon reconstruction on best knowledge asymmetric Run3 layout
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 21.9/Athena
# art-output: trkPerformance_MuonSpectrometerTracks.txt
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrec_Run3_symmetric.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrec_Run3_symmetric.sh
index 234255f95d85..7052b54c0f2e 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrec_Run3_symmetric.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrec_Run3_symmetric.sh
@@ -3,7 +3,7 @@
# art-description: Test muon reconstruction on best knowledge symmetric Run3 layout
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 21.9/Athena
# art-output: trkPerformance_MuonSpectrometerTracks.txt
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrec_phase2.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrec_phase2.sh
index ff047f95ad68..79a2f420ec6c 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrec_phase2.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrec_phase2.sh
@@ -3,7 +3,7 @@
# art-description: Test muon reconstruction on best knowledge Run4 muon layout
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 21.9/Athena
# art-output: trkPerformance_MuonSpectrometerTracks.txt
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_cosmic.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_cosmic.sh
index b863b4cd8f6d..8937261168bb 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_cosmic.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_muonrecrtt_cosmic.sh
@@ -3,7 +3,7 @@
# art-description: Test the reconstruction of muon cosmic samples.
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 21.0/Athena
# art-input: user.zhidong.data17_cos.00342172.physics_CosmicMuons.merge.RAW_subset01
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q442_RAWtoESD_MT.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q442_RAWtoESD_MT.sh
index 8f45892dcc39..0cc76e98e75e 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q442_RAWtoESD_MT.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q442_RAWtoESD_MT.sh
@@ -3,7 +3,7 @@
# art-description: run the RAWtoESD transform of plain q442 with different number of threads and compare the outputs
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-athena-mt: 8
# art-output: OUT_ESD.root
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q443_RAWtoESD_MT.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q443_RAWtoESD_MT.sh
index 84b86efb11a9..81818126bbf7 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q443_RAWtoESD_MT.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q443_RAWtoESD_MT.sh
@@ -3,7 +3,7 @@
# art-description: run the RAWtoESD transform of plain q443 with different number of threads and compare the outputs
#
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-athena-mt: 8
# art-output: OUT_ESD.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY1.sh
index b0e992bc64ee..c1873aa14cfd 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY1 data18
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY10.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY10.sh
index fde1cf4cb02e..6bc8d05355ec 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY10.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY10.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY10 data18
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY15.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY15.sh
index 2f5f42efb137..00ce6a1c344a 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY15.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY15.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY15 data18
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY16.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY16.sh
index a5cec2b2f2fb..8955afd5cb5a 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY16.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY16.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY16 data18
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY18.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY18.sh
index 901dfc879ec2..a2004f225b3b 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY18.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY18.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY18 data18
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY2.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY2.sh
index 4cf2be6510b4..11ad51e7b690 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY2.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY2.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY2 data18
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY21.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY21.sh
index 06427d7a9286..3865b93f160a 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY21.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY21.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY21 data18
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY22.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY22.sh
index 15a10074b65c..c2bfdf712c8e 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY22.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY22.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY22 data18
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY23.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY23.sh
index 4293526ccf5a..a972e85c2a32 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY23.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY23.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY23 data18
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY24.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY24.sh
index fd7fa1620232..904c74db1bf3 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY24.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY24.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY24 data18
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY3.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY3.sh
index 52731484bf72..dd66b2f4da58 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY3.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY3.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY3 data18
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY4.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY4.sh
index aaa17fa1ac2e..98c3f4191848 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY4.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY4.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY4 data18
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY5.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY5.sh
index 23cac001bc65..4d0896b6fb0b 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY5.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY5.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY5 data18
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY6.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY6.sh
index 214099f49a09..b00b6c5a6532 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY6.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data18BPHY6.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY6 data18
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY1.sh
index aa57a55264a3..57f19b8b7659 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY1 data22
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY10.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY10.sh
index 0e53733e4e0f..f65543ae274f 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY10.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY10.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY10 data22
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY15.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY15.sh
index 58dde9d90c2c..99c0b2bd9c84 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY15.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY15.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY15 data22
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY16.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY16.sh
index 841934132a82..ef88960fe2fc 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY16.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY16.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY16 data22
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY18.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY18.sh
index 929f3d758560..4f2b09ae2420 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY18.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY18.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY18 data22
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY2.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY2.sh
index 307fc00bc462..5c0c6b78ecf1 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY2.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY2.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY2 data22
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY21.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY21.sh
index c4840f79da47..3a47b587808b 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY21.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY21.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY21 data22
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY22.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY22.sh
index a3e5eec28e24..e32e147d139e 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY22.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY22.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY22 data22
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY23.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY23.sh
index fff044b320ca..78a6328effc4 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY23.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY23.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY23 data22
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY24.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY24.sh
index aa114abaccc1..db9868fa3b45 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY24.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY24.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY24 data22
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY3.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY3.sh
index 117a19a09c83..3a7be41a8721 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY3.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY3.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY3 data22
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY4.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY4.sh
index 3e4f2fba18e2..096c944c9fd5 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY4.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY4.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY4 data22
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY5.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY5.sh
index d01ddd04b30c..bab7a684e06a 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY5.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY5.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY5 data22
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY6.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY6.sh
index d0962e43531e..52f383a13b0c 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY6.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_data22BPHY6.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY6 data22
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY1.sh
index 0d1c46a63fb2..482309b8f65f 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY1 mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY10.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY10.sh
index 1e7485bed214..7b4e67591d9d 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY10.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY10.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY10 mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY15.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY15.sh
index f8c1f8a48ea1..99b09647a2f7 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY15.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY15.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY15 mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY16.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY16.sh
index 433c92bb00b4..95da5cd5a3ea 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY16.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY16.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY16 mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY18.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY18.sh
index b3a41da497e1..a280729a0a5c 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY18.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY18.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY18 mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY2.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY2.sh
index 00bea20ca291..3653c50ddd93 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY2.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY2.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY2 mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY21.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY21.sh
index f255d630080f..9b1d41554c18 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY21.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY21.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY21 mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY22.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY22.sh
index 0506973539c3..78d23d2ab953 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY22.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY22.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY22 mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY23.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY23.sh
index 707b5c8893e6..de8573ac28c6 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY23.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY23.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY23 mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY24.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY24.sh
index b3b83c3d3708..67f55a84ef42 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY24.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY24.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY24 mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY3.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY3.sh
index 96d4f56a5bc9..886aabda9830 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY3.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY3.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY3 mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY4.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY4.sh
index 79cd109636da..c2c372b2c785 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY4.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY4.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY4 mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY5.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY5.sh
index 5a5dfceb25df..3410e19d4b49 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY5.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY5.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY5 mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY6.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY6.sh
index 4d878ab14b1a..31587a61bf49 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY6.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc20BPHY6.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY6 mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY1.sh
index b4b6d140041a..9eaf3fb1fd24 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY1 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY10.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY10.sh
index 765fb6814dee..5b24339149bd 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY10.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY10.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY10 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY15.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY15.sh
index 94f243e76950..fe9f525ae763 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY15.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY15.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY15 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY16.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY16.sh
index 4472ac780428..460c81626c0a 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY16.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY16.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY16 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY18.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY18.sh
index 135383179f6e..1b07562206ba 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY18.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY18.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY18 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY2.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY2.sh
index 09e52ee4fa05..dd3bd5e27c8a 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY2.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY2.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY2 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY21.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY21.sh
index 79d6e056d748..e1b32d1f1a9e 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY21.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY21.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY21 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY22.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY22.sh
index 34406808cc1d..9d4b37ddb85e 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY22.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY22.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY22 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY23.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY23.sh
index 7cd4fbb70431..db611408c4ae 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY23.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY23.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY23 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY24.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY24.sh
index f910456ac8ec..2c346b8d6c0e 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY24.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY24.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY24 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY3.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY3.sh
index 494cae8c9dd1..aa048ae74762 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY3.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY3.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY3 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY4.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY4.sh
index bd8c6de64b73..1209bee02b20 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY4.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY4.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY4 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY5.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY5.sh
index 41bf66e5295f..10bfa201f208 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY5.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY5.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY5 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY6.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY6.sh
index 72e3dc0e143c..b38379344a2a 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY6.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkBPhysART/test/test_mc21BPHY6.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building BPHY6 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM1.sh
index 6c6991c6e0b2..b1ec08074161 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM1 data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM10.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM10.sh
index f711762ea083..e7deadcb32ec 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM10.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM10.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM10 data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM2.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM2.sh
index 25cf5831768a..e971eb048820 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM2.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM2.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM2 data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM3.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM3.sh
index 28bcc2e83dcd..13e65c873ae3 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM3.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM3.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM3 data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM4.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM4.sh
index 1182fbac519e..b3615f74e746 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM4.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM4.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM4 data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM5.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM5.sh
index 3e667dc33632..67b314df7487 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM5.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM5.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM5 data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM7.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM7.sh
index 69301807591f..73c7a210df06 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM7.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM7.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM7 data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM8.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM8.sh
index 151fbf00ffe0..ea911bde2617 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM8.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM8.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM8 data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM9.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM9.sh
index febf88f5b5fc..412e5f102a8c 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM9.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data18EGAM9.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM9 data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM1.sh
index 010f4670030c..a70968e1925d 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM1 data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM10.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM10.sh
index 24f92cac3bee..8f9b471cbcf8 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM10.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM10.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM10 data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM2.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM2.sh
index 7a35e9d899dd..36bdb66c1453 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM2.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM2.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM2 data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM3.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM3.sh
index cf14a3558287..14fff2ff59de 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM3.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM3.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM3 data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM4.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM4.sh
index 7a578f5287de..df6bce14c1c6 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM4.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM4.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM4 data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM5.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM5.sh
index 04c1307fcb1c..e9aee9699c93 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM5.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM5.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM5 data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM7.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM7.sh
index fa641470f559..b427a207435d 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM7.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM7.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM7 data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM8.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM8.sh
index cf775511f116..a7020b6269b5 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM8.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM8.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM8 data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM9.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM9.sh
index e7b35046d09a..f3c233287937 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM9.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_data22EGAM9.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM9 data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM1.sh
index d55a908a9bc4..e9df59653253 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM1 mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM10.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM10.sh
index 91781ec227a1..2cb281f27258 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM10.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM10.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM10 mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM2.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM2.sh
index 40b0e1f762c1..20f0ed94477f 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM2.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM2.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM2 mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM3.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM3.sh
index 989a2deb7171..5ed31a5a2afe 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM3.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM3.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM3 mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM4.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM4.sh
index b37a5959f199..5c982486234f 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM4.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM4.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM4 mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM5.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM5.sh
index ce7421566c22..73acd2dc0305 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM5.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM5.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM5 mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM7.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM7.sh
index 8b547a110205..bb2f273e1aee 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM7.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM7.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM7 mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM8.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM8.sh
index 06f68d26e58d..4aac0c56e931 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM8.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM8.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM8 mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM9.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM9.sh
index 77306136500c..662177e3ef45 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM9.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc20EGAM9.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM9 mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM1.sh
index f4bb28d02b22..8bdfcec1d982 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM1 mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM10.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM10.sh
index 92bea14c7624..b5b45bc900bb 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM10.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM10.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM10 mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM2.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM2.sh
index 13a8b8c4fd2d..03fafbd9d97d 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM2.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM2.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM2 mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM3.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM3.sh
index e2898dc8c326..3f567047741b 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM3.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM3.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM3 mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM4.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM4.sh
index f35546cf1e39..13225f338aed 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM4.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM4.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM4 mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM5.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM5.sh
index 84fe82ff5a7a..b0c90f4aaaf5 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM5.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM5.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM5 mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM7.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM7.sh
index 3ce33be45f0a..a73669ae706b 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM7.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM7.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM7 mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM8.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM8.sh
index fe2066dbadd6..0ff273f28b25 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM8.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM8.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM8 mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM9.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM9.sh
index 1a805feaf86a..45e956a112df 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM9.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkEgammaART/test/test_mc21EGAM9.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building EGAM9 mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_data18FTAG1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_data18FTAG1.sh
index f9ec299a79af..bf47f3ca9e43 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_data18FTAG1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_data18FTAG1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building FTAG1 data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_data18FTAG2.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_data18FTAG2.sh
index 56d32a567441..90403350045d 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_data18FTAG2.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_data18FTAG2.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building FTAG2 data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_data18FTAG3.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_data18FTAG3.sh
index 1083e73411ac..1f99ab726b3a 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_data18FTAG3.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_data18FTAG3.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building FTAG3 data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_data22FTAG1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_data22FTAG1.sh
index a260378ec5e6..28979874393e 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_data22FTAG1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_data22FTAG1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building FTAG1 data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_data22FTAG2.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_data22FTAG2.sh
index 6c3840205cb6..fd6ffa516893 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_data22FTAG2.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_data22FTAG2.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building FTAG2 data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_data22FTAG3.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_data22FTAG3.sh
index 452026696fcf..9c12993181b7 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_data22FTAG3.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_data22FTAG3.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building FTAG3 data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_mc20FTAG1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_mc20FTAG1.sh
index 8dbcf03d67c5..f3fe94b6d257 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_mc20FTAG1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_mc20FTAG1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building FTAG1 mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_mc20FTAG2.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_mc20FTAG2.sh
index af0713a60b9e..8e6e4a1b2c33 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_mc20FTAG2.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_mc20FTAG2.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building FTAG2 mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_mc20FTAG3.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_mc20FTAG3.sh
index bb8fe470df12..55d93bb75573 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_mc20FTAG3.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_mc20FTAG3.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building FTAG3 mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_mc21FTAG1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_mc21FTAG1.sh
index b7fb3e147ec4..bb2d219f2182 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_mc21FTAG1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_mc21FTAG1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building FTAG1 mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_mc21FTAG2.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_mc21FTAG2.sh
index 331a341b2578..04b891f2ef92 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_mc21FTAG2.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_mc21FTAG2.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building FTAG2 mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_mc21FTAG3.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_mc21FTAG3.sh
index d88915279cec..c6687876e9b3 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_mc21FTAG3.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkFlavourTagART/test/test_mc21FTAG3.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building FTAG3 mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkHiggsART/test/test_data18HIGG1D1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkHiggsART/test/test_data18HIGG1D1.sh
index 9ca7014070bc..c9324e601db4 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkHiggsART/test/test_data18HIGG1D1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkHiggsART/test/test_data18HIGG1D1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building HIGG1D1 data18
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkHiggsART/test/test_data22HIGG1D1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkHiggsART/test/test_data22HIGG1D1.sh
index 308482830b27..9a84b891c14d 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkHiggsART/test/test_data22HIGG1D1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkHiggsART/test/test_data22HIGG1D1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building HIGG1D1 data22
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkHiggsART/test/test_mc20HIGG1D1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkHiggsART/test/test_mc20HIGG1D1.sh
index 3b42e4abb2e6..3cd60b19c10b 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkHiggsART/test/test_mc20HIGG1D1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkHiggsART/test/test_mc20HIGG1D1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building HIGG1D1 mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkHiggsART/test/test_mc21HIGG1D1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkHiggsART/test/test_mc21HIGG1D1.sh
index 7d766646628d..7e189c479ca0 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkHiggsART/test/test_mc21HIGG1D1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkHiggsART/test/test_mc21HIGG1D1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building HIGG1D1 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkInDetART/test/test_data18IDTR2.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkInDetART/test/test_data18IDTR2.sh
index 60b44159ac54..94b08b630834 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkInDetART/test/test_data18IDTR2.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkInDetART/test/test_data18IDTR2.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building IDTR2 data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkInDetART/test/test_data22IDTR2.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkInDetART/test/test_data22IDTR2.sh
index dcd52f09caab..73713563424d 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkInDetART/test/test_data22IDTR2.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkInDetART/test/test_data22IDTR2.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building IDTR2 data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkInDetART/test/test_mc20IDTR2.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkInDetART/test/test_mc20IDTR2.sh
index 15cd15590d55..663fa2995d7a 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkInDetART/test/test_mc20IDTR2.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkInDetART/test/test_mc20IDTR2.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building IDTR2 mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkInDetART/test/test_mc21IDTR2.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkInDetART/test/test_mc21IDTR2.sh
index 65513236e3f2..cb92250ac233 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkInDetART/test/test_mc21IDTR2.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkInDetART/test/test_mc21IDTR2.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building IDTR2 mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM1.sh
index 280b7f98c03c..b8a04966dd8f 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM1 data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM10.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM10.sh
index fd02531d7f49..4e86c914320a 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM10.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM10.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM10 data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM11.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM11.sh
index ecd9e228f050..25ef57c3ffbb 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM11.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM11.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM11 data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM12.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM12.sh
index b42df498fcf3..b1960b4bc81a 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM12.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM12.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM12 data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM14.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM14.sh
index 431f544d356d..f1c8adab59dd 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM14.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM14.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM14 data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM2.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM2.sh
index bf942487c116..0c4b124b44d8 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM2.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM2.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM2 data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM3.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM3.sh
index 600c0af24465..04917e61792f 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM3.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM3.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM3 data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM4.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM4.sh
index a1f178bed8b3..d254a4b5dd3f 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM4.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM4.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM4 data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM5.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM5.sh
index d6d2dcd41446..9719fdb24286 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM5.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM5.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM5 data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM6.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM6.sh
index b3842d20072d..876bbe38f87f 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM6.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data18JETM6.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM6 data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM1.sh
index 1e7ec5940201..3296fbafe59c 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM1 data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM10.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM10.sh
index 05a2c12c1377..158010db02fc 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM10.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM10.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM10 data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM11.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM11.sh
index 0941f17c153f..95850ab3a4fc 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM11.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM11.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM11 data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM12.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM12.sh
index 765c4778b13f..61424c9b86d8 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM12.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM12.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM12 data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM14.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM14.sh
index 117d56292f93..7c125b47df71 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM14.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM14.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM14 data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM2.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM2.sh
index bea993403eb6..e4b8a3850f2c 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM2.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM2.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM2 data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM3.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM3.sh
index 732f7355c24f..3b697fb272db 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM3.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM3.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM3 data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM4.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM4.sh
index 9246cf1c0bb0..0ff5be5f1728 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM4.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM4.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM4 data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM5.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM5.sh
index 8f0e77959059..e0b2e71ac5df 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM5.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM5.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM5 data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM6.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM6.sh
index 91f56bd45e05..6e303fbea669 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM6.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_data22JETM6.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM6 data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM1.sh
index 665c93225246..ee0519500264 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM1 mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM10.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM10.sh
index bb1c3ff2e048..8aafbcba5dc0 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM10.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM10.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM10 mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM11.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM11.sh
index c2deb02c5227..e8760dc65de7 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM11.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM11.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM11 mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM12.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM12.sh
index cd72d40d9165..4cefbc1620de 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM12.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM12.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM12 mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM14.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM14.sh
index ba68fa49c751..7cb5fbdd01f9 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM14.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM14.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM14 mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM2.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM2.sh
index d4502970a612..7c02f64440e8 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM2.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM2.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM2 mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM3.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM3.sh
index e0deb78ce90d..1d32adf3decc 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM3.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM3.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM3 mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM4.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM4.sh
index 1cc71a097345..42f40bcff242 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM4.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM4.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM4 mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM5.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM5.sh
index 827a805adf0e..0b937e2c0f5b 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM5.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM5.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM5 mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM6.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM6.sh
index a3858988f916..8bf33c9f5a67 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM6.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc20JETM6.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM6 mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM1.sh
index f350b4d7650e..8d637179510d 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM1 mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM10.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM10.sh
index f9226b5a5379..cb29577fac7a 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM10.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM10.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM10 mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM11.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM11.sh
index e5208a52cbbb..fa18375246d8 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM11.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM11.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM11 mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM12.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM12.sh
index 75732d9d300c..b0037b722b5d 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM12.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM12.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM12 mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM14.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM14.sh
index 5e67fba629b3..47748c779009 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM14.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM14.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM14 mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM2.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM2.sh
index 651ab4d39397..4074c96c5524 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM2.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM2.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM2 mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM3.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM3.sh
index 5304dff3125f..d46b4f1a9fa5 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM3.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM3.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM3 mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM4.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM4.sh
index 3284d1f0e5ab..de5d59216fd8 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM4.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM4.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM4 mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM5.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM5.sh
index 8eab8e4cd3a0..a04bf841cead 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM5.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM5.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM5 mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM6.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM6.sh
index ce01af3c57e6..ec13d409cc35 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM6.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkJetEtMissART/test/test_mc21JETM6.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building JETM6 mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkLLPART/test/test_data18LLP1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkLLPART/test/test_data18LLP1.sh
index 91eb26f53a74..d47954c8e988 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkLLPART/test/test_data18LLP1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkLLPART/test/test_data18LLP1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building LLP1 data18
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkLLPART/test/test_data22LLP1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkLLPART/test/test_data22LLP1.sh
index b84100782e3d..b913276f64ea 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkLLPART/test/test_data22LLP1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkLLPART/test/test_data22LLP1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building LLP1 data22
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkLLPART/test/test_mc20LLP1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkLLPART/test/test_mc20LLP1.sh
index 9aec0833d6f5..3b97f90d56ef 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkLLPART/test/test_mc20LLP1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkLLPART/test/test_mc20LLP1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building LLP1 mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkLLPART/test/test_mc21LLP1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkLLPART/test/test_mc21LLP1.sh
index e23d2e401379..8c1bc2334e24 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkLLPART/test/test_mc21LLP1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkLLPART/test/test_mc21LLP1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building LLP1 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkMCTruthART/test/test_mc21TRUTH0.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkMCTruthART/test/test_mc21TRUTH0.sh
index 7e938e851854..124e65d3bb95 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkMCTruthART/test/test_mc21TRUTH0.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkMCTruthART/test/test_mc21TRUTH0.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building TRUTH0 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkMCTruthART/test/test_mc21TRUTH1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkMCTruthART/test/test_mc21TRUTH1.sh
index f7cbdf5f7749..c1a7e2372acd 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkMCTruthART/test/test_mc21TRUTH1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkMCTruthART/test/test_mc21TRUTH1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building TRUTH1 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkMCTruthART/test/test_mc21TRUTH3.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkMCTruthART/test/test_mc21TRUTH3.sh
index dcf722f6add5..e8a7fef79368 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkMCTruthART/test/test_mc21TRUTH3.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkMCTruthART/test/test_mc21TRUTH3.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building TRUTH3 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_data18PHYS.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_data18PHYS.sh
index 3ed169a1d719..97ecbd579e37 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_data18PHYS.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_data18PHYS.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building PHYS data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_data18PHYSLITE.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_data18PHYSLITE.sh
index 5d27367db403..8e797b41934b 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_data18PHYSLITE.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_data18PHYSLITE.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building PHYSLITE data18
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_data22PHYS.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_data22PHYS.sh
index d73e52f55fa6..90d3bc54c943 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_data22PHYS.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_data22PHYS.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building PHYS data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_data22PHYSLITE.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_data22PHYSLITE.sh
index 284ecf055d1a..e190f95c5dbe 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_data22PHYSLITE.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_data22PHYSLITE.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building PHYSLITE data22
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_mc20PHYS.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_mc20PHYS.sh
index bd72d26bf426..3ed4b7e635ed 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_mc20PHYS.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_mc20PHYS.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building PHYS mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_mc20PHYSLITE.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_mc20PHYSLITE.sh
index f51a0652c0cf..bf9c183be2df 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_mc20PHYSLITE.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_mc20PHYSLITE.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building PHYSLITE mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_mc21PHYS.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_mc21PHYS.sh
index 5557314948fc..ba88a176145e 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_mc21PHYS.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_mc21PHYS.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building PHYS mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_mc21PHYSLITE.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_mc21PHYSLITE.sh
index 580724135fe2..09c9fc07bcfb 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_mc21PHYSLITE.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPHYS/test/test_mc21PHYSLITE.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building PHYSLITE mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPhysicsValidationART/test/test_data18PHYSVAL.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPhysicsValidationART/test/test_data18PHYSVAL.sh
index e88ddd24c6ee..bb0d540e8b24 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPhysicsValidationART/test/test_data18PHYSVAL.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPhysicsValidationART/test/test_data18PHYSVAL.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building PHYSVAL data18
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPhysicsValidationART/test/test_data22PHYSVAL.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPhysicsValidationART/test/test_data22PHYSVAL.sh
index 1ca6af56168d..b7f460427fa2 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPhysicsValidationART/test/test_data22PHYSVAL.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPhysicsValidationART/test/test_data22PHYSVAL.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building PHYSVAL data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPhysicsValidationART/test/test_mc20PHYSVAL.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPhysicsValidationART/test/test_mc20PHYSVAL.sh
index 71b8e64ba227..fa62b877650e 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPhysicsValidationART/test/test_mc20PHYSVAL.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPhysicsValidationART/test/test_mc20PHYSVAL.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building PHYSVAL mc20
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPhysicsValidationART/test/test_mc21PHYSVAL.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPhysicsValidationART/test/test_mc21PHYSVAL.sh
index 6912ddb89149..9fa9b97a5d38 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPhysicsValidationART/test/test_mc21PHYSVAL.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPhysicsValidationART/test/test_mc21PHYSVAL.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building PHYSVAL mc21
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPhysicsValidationART/test/test_mc21PHYSVAL_DAOD_NTUP_HIST.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPhysicsValidationART/test/test_mc21PHYSVAL_DAOD_NTUP_HIST.sh
index 77c9f12f25bd..deb4374d4960 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPhysicsValidationART/test/test_mc21PHYSVAL_DAOD_NTUP_HIST.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkPhysicsValidationART/test/test_mc21PHYSVAL_DAOD_NTUP_HIST.sh
@@ -3,7 +3,7 @@
# art-description: AOD to DAOD_PHYSVAL to NTUP_PHYSVAL and WEB display
# art-type: grid
# art-input: mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.recon.AOD.e8453_s3873_r13829
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input-nfiles: 1
# art-output: DAOD_PHYSVAL.OUT.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkSMART/test/test_data18STDM7.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkSMART/test/test_data18STDM7.sh
index cb12f81b5bde..8557aef54f9e 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkSMART/test/test_data18STDM7.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkSMART/test/test_data18STDM7.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building STDM7 data18
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkSMART/test/test_data22STDM7.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkSMART/test/test_data22STDM7.sh
index 16a50adda672..56dd2cc33ebe 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkSMART/test/test_data22STDM7.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkSMART/test/test_data22STDM7.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building STDM7 data22
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkSMART/test/test_mc20STDM7.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkSMART/test/test_mc20STDM7.sh
index f5e685e2d091..197e4f3c04b0 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkSMART/test/test_mc20STDM7.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkSMART/test/test_mc20STDM7.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building STDM7 mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkSMART/test/test_mc21STDM7.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkSMART/test/test_mc21STDM7.sh
index 88e241cd71dd..562ed67ee7bd 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkSMART/test/test_mc21STDM7.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkSMART/test/test_mc21STDM7.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building STDM7 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18CPandPAformats.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18CPandPAformats.sh
index 5a2ab0c1a542..b7115d975ae5 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18CPandPAformats.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18CPandPAformats.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building EGAM1 EGAM2 EGAM3 EGAM4 EGAM5 EGAM7 EGAM8 EGAM9 EGAM10 JETM1 JETM3 JETM4 JETM6 FTAG1 FTAG2 FTAG3 IDTR2 TRIG8 LLP1 STDM7 HIGG1D1 data18
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18EGAM1_EGAM2_EGAM5_EGAM10.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18EGAM1_EGAM2_EGAM5_EGAM10.sh
index d8e5299a7d1a..c9f7cc6f7e38 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18EGAM1_EGAM2_EGAM5_EGAM10.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18EGAM1_EGAM2_EGAM5_EGAM10.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building EGAM1 EGAM2 EGAM5 EGAM10 data18
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18EGAM3_EGAM4_JETM4.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18EGAM3_EGAM4_JETM4.sh
index 2abad133efce..1afa31e4c704 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18EGAM3_EGAM4_JETM4.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18EGAM3_EGAM4_JETM4.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building EGAM3 EGAM4 JETM4 data18
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18EGAM7_JETM3.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18EGAM7_JETM3.sh
index f846758082e4..fbc5f1cac609 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18EGAM7_JETM3.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18EGAM7_JETM3.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building EGAM7 JETM3 data18
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18EGAM8_EGAM9_JETM1_LLP1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18EGAM8_EGAM9_JETM1_LLP1.sh
index fb02c77eddb1..3db337509b5a 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18EGAM8_EGAM9_JETM1_LLP1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18EGAM8_EGAM9_JETM1_LLP1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building EGAM8 EGAM9 JETM1 LLP1 data18
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18JETM6_FTAG2.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18JETM6_FTAG2.sh
index 097ff62c7cf4..39a7b764d322 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18JETM6_FTAG2.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18JETM6_FTAG2.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building JETM6 FTAG2 data18
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18PHYS_PHYSLITE_mp_sharedwriter.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18PHYS_PHYSLITE_mp_sharedwriter.sh
index 12270b315688..ae20411564e3 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18PHYS_PHYSLITE_mp_sharedwriter.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18PHYS_PHYSLITE_mp_sharedwriter.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building PHYS and PHYSLITE data18 MP w/ SharedWriter
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18PHYS_PHYSLITE_mp_sharedwriter_fafe.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18PHYS_PHYSLITE_mp_sharedwriter_fafe.sh
index 8dcca408b7ff..c97bbb4e0061 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18PHYS_PHYSLITE_mp_sharedwriter_fafe.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18PHYS_PHYSLITE_mp_sharedwriter_fafe.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building PHYS and PHYSLITE data18 MP w/ SharedWriter and FAFE
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18PHYS_PHYSLITE_mp_sharedwriter_noparallelcomp.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18PHYS_PHYSLITE_mp_sharedwriter_noparallelcomp.sh
index b248410d5a7d..96540746b31a 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18PHYS_PHYSLITE_mp_sharedwriter_noparallelcomp.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18PHYS_PHYSLITE_mp_sharedwriter_noparallelcomp.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building PHYS and PHYSLITE data18 MP w/ SharedWriter w/o parallel compression
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18PHYS_PHYSLITE_mp_sharedwriter_noparallelcomp_fafe.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18PHYS_PHYSLITE_mp_sharedwriter_noparallelcomp_fafe.sh
index b1844e75dc70..767b94db4e77 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18PHYS_PHYSLITE_mp_sharedwriter_noparallelcomp_fafe.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data18PHYS_PHYSLITE_mp_sharedwriter_noparallelcomp_fafe.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building PHYS and PHYSLITE data18 MP w/ SharedWriter w/o parallel compression and FAFE
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data22CPandPAformats.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data22CPandPAformats.sh
index 25621dfb7cf7..a247bf8cd074 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data22CPandPAformats.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data22CPandPAformats.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building EGAM1 EGAM2 EGAM3 EGAM4 EGAM5 EGAM7 EGAM8 EGAM9 EGAM10 JETM1 JETM3 JETM4 JETM6 FTAG1 FTAG2 FTAG3 IDTR2 TRIG8 LLP1 STDM7 HIGG1D1 data22
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data22EGAM1_EGAM2_EGAM5_EGAM10.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data22EGAM1_EGAM2_EGAM5_EGAM10.sh
index a1373720de44..71e3f51a5af8 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data22EGAM1_EGAM2_EGAM5_EGAM10.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data22EGAM1_EGAM2_EGAM5_EGAM10.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building EGAM1 EGAM2 EGAM5 EGAM10 data22
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data22EGAM3_EGAM4_JETM4.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data22EGAM3_EGAM4_JETM4.sh
index 28ed83b75164..19f70899e79b 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data22EGAM3_EGAM4_JETM4.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data22EGAM3_EGAM4_JETM4.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building EGAM3 EGAM4 JETM4 data22
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data22EGAM7_JETM3.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data22EGAM7_JETM3.sh
index 0a73b3e8bf5c..18f9fe711c5a 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data22EGAM7_JETM3.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data22EGAM7_JETM3.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building EGAM7 JETM3 data22
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data22EGAM8_EGAM9_JETM1_LLP1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data22EGAM8_EGAM9_JETM1_LLP1.sh
index 82275fbd3bdd..8b98995b2cf2 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data22EGAM8_EGAM9_JETM1_LLP1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data22EGAM8_EGAM9_JETM1_LLP1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building EGAM8 EGAM9 JETM1 LLP1 data22
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data22JETM6_FTAG2.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data22JETM6_FTAG2.sh
index 2c2c0cba5549..b14e050bbef6 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data22JETM6_FTAG2.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_data22JETM6_FTAG2.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building JETM6 FTAG2 data22
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20CPandPAformats.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20CPandPAformats.sh
index f6459be7c79f..c5f6afc38bc1 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20CPandPAformats.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20CPandPAformats.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building EGAM1 EGAM2 EGAM3 EGAM4 EGAM5 EGAM7 EGAM8 EGAM9 EGAM10 JETM1 JETM3 JETM4 JETM6 FTAG1 FTAG2 FTAG3 IDTR2 TRIG8 LLP1 STDM7 HIGG1D1 mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20EGAM1_EGAM2_EGAM5_EGAM10.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20EGAM1_EGAM2_EGAM5_EGAM10.sh
index 3240195b1714..b15443c3e797 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20EGAM1_EGAM2_EGAM5_EGAM10.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20EGAM1_EGAM2_EGAM5_EGAM10.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building EGAM1 EGAM2 EGAM5 EGAM10 mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20EGAM3_EGAM4_JETM4.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20EGAM3_EGAM4_JETM4.sh
index 88fcedea8e2c..0b632941bfa4 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20EGAM3_EGAM4_JETM4.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20EGAM3_EGAM4_JETM4.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building EGAM3 EGAM4 JETM4 mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20EGAM7_JETM3.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20EGAM7_JETM3.sh
index 1a63b7656b4b..74b1ff46c8fb 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20EGAM7_JETM3.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20EGAM7_JETM3.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building EGAM7 JETM3 mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20EGAM8_EGAM9_JETM1_LLP1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20EGAM8_EGAM9_JETM1_LLP1.sh
index 425e454992b9..012b887a960c 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20EGAM8_EGAM9_JETM1_LLP1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20EGAM8_EGAM9_JETM1_LLP1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building EGAM8 EGAM9 JETM1 LLP1 mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20JETM6_FTAG2.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20JETM6_FTAG2.sh
index 923f037a9d3e..fd3113b9bcf2 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20JETM6_FTAG2.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20JETM6_FTAG2.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building JETM6 FTAG2 mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20PHYS_PHYSLITE_mp_sharedwriter.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20PHYS_PHYSLITE_mp_sharedwriter.sh
index f020a90153fa..e55b92c342f5 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20PHYS_PHYSLITE_mp_sharedwriter.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20PHYS_PHYSLITE_mp_sharedwriter.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building PHYS and PHYSLITE mc20 MP w/ SharedWriter
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20PHYS_PHYSLITE_mp_sharedwriter_fafe.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20PHYS_PHYSLITE_mp_sharedwriter_fafe.sh
index de3eac5a646e..b3274ceb2a76 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20PHYS_PHYSLITE_mp_sharedwriter_fafe.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20PHYS_PHYSLITE_mp_sharedwriter_fafe.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building PHYS and PHYSLITE mc20 MP w/ SharedWriter and FAFE
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20PHYS_PHYSLITE_mp_sharedwriter_noparallelcomp.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20PHYS_PHYSLITE_mp_sharedwriter_noparallelcomp.sh
index 4d602da175d0..4a6d876830be 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20PHYS_PHYSLITE_mp_sharedwriter_noparallelcomp.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20PHYS_PHYSLITE_mp_sharedwriter_noparallelcomp.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building PHYS and PHYSLITE mc20 MP w/ SharedWriter w/o parallel compression
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20PHYS_PHYSLITE_mp_sharedwriter_noparallelcomp_fafe.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20PHYS_PHYSLITE_mp_sharedwriter_noparallelcomp_fafe.sh
index bea7160bfb24..e82ab1edde0f 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20PHYS_PHYSLITE_mp_sharedwriter_noparallelcomp_fafe.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc20PHYS_PHYSLITE_mp_sharedwriter_noparallelcomp_fafe.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building PHYS and PHYSLITE mc20 MP w/ SharedWriter w/o parallel compression and FAFE
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc21CPandPAformats.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc21CPandPAformats.sh
index bdf5431465dc..65743bdc99f5 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc21CPandPAformats.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc21CPandPAformats.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building EGAM1 EGAM2 EGAM3 EGAM4 EGAM5 EGAM7 EGAM8 EGAM9 EGAM10 JETM1 JETM3 JETM4 JETM6 FTAG1 FTAG2 FTAG3 IDTR2 TRIG8 LLP1 STDM7 HIGG1D1 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc21EGAM1_EGAM2_EGAM5_EGAM10.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc21EGAM1_EGAM2_EGAM5_EGAM10.sh
index 75069048557d..90f8c9fb9344 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc21EGAM1_EGAM2_EGAM5_EGAM10.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc21EGAM1_EGAM2_EGAM5_EGAM10.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building EGAM1 EGAM2 EGAM5 EGAM10 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc21EGAM3_EGAM4_JETM4.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc21EGAM3_EGAM4_JETM4.sh
index bbc930b24a21..95c7f27eb8de 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc21EGAM3_EGAM4_JETM4.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc21EGAM3_EGAM4_JETM4.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building EGAM3 EGAM4 JETM4 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc21EGAM7_JETM3.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc21EGAM7_JETM3.sh
index dff8834e8a34..16e61c3fdd22 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc21EGAM7_JETM3.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc21EGAM7_JETM3.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building EGAM7 JETM3 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc21EGAM8_EGAM9_JETM1_LLP1.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc21EGAM8_EGAM9_JETM1_LLP1.sh
index 4277e3442baf..27b0b38083ca 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc21EGAM8_EGAM9_JETM1_LLP1.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc21EGAM8_EGAM9_JETM1_LLP1.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building EGAM8 EGAM9 JETM1 LLP1 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc21JETM6_FTAG2.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc21JETM6_FTAG2.sh
index 3badb68614a4..c18f58d15ada 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc21JETM6_FTAG2.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTrainsART/test/test_mc21JETM6_FTAG2.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building JETM6 FTAG2 mc21
# art-type: grid
# art-output: *.pool.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTriggerART/test/test_data22TRIG8.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTriggerART/test/test_data22TRIG8.sh
index 43bd2cf09903..31305bafc10d 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTriggerART/test/test_data22TRIG8.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/DerivationFrameworkTriggerART/test/test_data22TRIG8.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building TRIG8 data22
# art-type: grid
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/makeARTScripts.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/makeARTScripts.py
index bfba8ad27cae..86e488fbb336 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/makeARTScripts.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkART/makeARTScripts.py
@@ -46,7 +46,7 @@ def generateText(formatName,label,inputFile,isTruth,isMC,nEvents,useLegacy):
outputFile = open(outputFileName,"w")
outputFile.write("#!/bin/sh"+"\n")
outputFile.write("\n")
- outputFile.write("# art-include: master/Athena"+"\n")
+ outputFile.write("# art-include: main/Athena"+"\n")
if (formatName.find("EGAM")!=-1 or formatName.find("JETM")!=-1 or formatName.find("FTAG")!=-1 or formatName.find("IDTR")!=-1 or formatName.find("TRIG")!=-1 or (formatName.find("PHYS")!=-1 and formatName.find("PHYSLITE")==-1)):
outputFile.write("# art-include: 23.0/Athena"+"\n")
outputFile.write("# art-description: DAOD building "+formatName+" "+label+"\n")
@@ -109,7 +109,7 @@ def generateTrains(formatList,label,inputFile,isMC,nEvents,useLegacy):
outputFile = open(outputFileName,"w")
outputFile.write("#!/bin/sh"+"\n")
outputFile.write("\n")
- outputFile.write("# art-include: master/Athena"+"\n")
+ outputFile.write("# art-include: main/Athena"+"\n")
outputFile.write("# art-description: DAOD building "+" ".join(formatList)+" "+label+"\n")
outputFile.write("# art-type: grid"+"\n")
outputFile.write("# art-output: *.pool.root"+"\n")
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkAnalysisTests/test/test_TruthDerivationTest.sh b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkAnalysisTests/test/test_TruthDerivationTest.sh
index bc67875140eb..a94201e31b07 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkAnalysisTests/test/test_TruthDerivationTest.sh
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkAnalysisTests/test/test_TruthDerivationTest.sh
@@ -3,7 +3,7 @@
# art-description: Truth derivation validation
#
# art-type: grid
-# art-include: master
+# art-include: main
# art-output: test_histograms.root
# art-output: dcube
# art-html: dcube
diff --git a/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_trigAna_FTAG_PhysicsVariablePlots_AOD_grid.py b/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_trigAna_FTAG_PhysicsVariablePlots_AOD_grid.py
index 41e977ed9fd4..0dbeb3bc589e 100755
--- a/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_trigAna_FTAG_PhysicsVariablePlots_AOD_grid.py
+++ b/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_trigAna_FTAG_PhysicsVariablePlots_AOD_grid.py
@@ -3,7 +3,7 @@
#
# art-description: FTAG Validation plots run on mc16 AOD file
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 4
# art-memory: 7000
# art-output: *.root
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_MC20e-AnaBase-grid.sh b/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_MC20e-AnaBase-grid.sh
index bb4307a905a9..d59330272e4f 100755
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_MC20e-AnaBase-grid.sh
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_MC20e-AnaBase-grid.sh
@@ -2,7 +2,7 @@
# art-description: SUSYTools ART test - TestSUSYToolsAlg.py
# art-type: grid
-# art-include: master/AnalysisBase
+# art-include: main/AnalysisBase
# art-output: hist-MC20e_DAOD_PHYS.root
# art-output: dcube
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_MC20e-LITE-AnaBase-grid.sh b/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_MC20e-LITE-AnaBase-grid.sh
index 66cf3f7ccd41..079c5ae9b6bc 100755
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_MC20e-LITE-AnaBase-grid.sh
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_MC20e-LITE-AnaBase-grid.sh
@@ -2,7 +2,7 @@
# art-description: SUSYTools ART test - TestSUSYToolsAlg.py
# art-type: grid
-# art-include: master/AnalysisBase
+# art-include: main/AnalysisBase
# art-output: hist-MC20e_DAOD_PHYSLITE.root
# art-output: dcube
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_MC21a-AnaBase-grid.sh b/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_MC21a-AnaBase-grid.sh
index 96017896df81..506ca8c8be3d 100755
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_MC21a-AnaBase-grid.sh
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_MC21a-AnaBase-grid.sh
@@ -2,7 +2,7 @@
# art-description: SUSYTools ART test - TestSUSYToolsAlg.py
# art-type: grid
-# art-include: master/AnalysisBase
+# art-include: main/AnalysisBase
# art-output: hist-MC21a_DAOD_PHYS.root
# art-output: dcube
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_MC21a-LITE-AnaBase-grid.sh b/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_MC21a-LITE-AnaBase-grid.sh
index 9609549e9c54..7a94ff58d026 100755
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_MC21a-LITE-AnaBase-grid.sh
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_MC21a-LITE-AnaBase-grid.sh
@@ -2,7 +2,7 @@
# art-description: SUSYTools ART test - TestSUSYToolsAlg.py
# art-type: grid
-# art-include: master/AnalysisBase
+# art-include: main/AnalysisBase
# art-output: hist-MC21a_DAOD_PHYSLITE.root
# art-output: dcube
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_data18-AnaBase-grid.sh b/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_data18-AnaBase-grid.sh
index 8105c80861fb..6196d5baf201 100755
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_data18-AnaBase-grid.sh
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_data18-AnaBase-grid.sh
@@ -2,7 +2,7 @@
# art-description: SUSYTools ART test - TestSUSYToolsAlg.py
# art-type: grid
-# art-include: master/AnalysisBase
+# art-include: main/AnalysisBase
# art-output: hist-data18_DAOD_PHYS.root
# art-output: dcube
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_data18-LITE-AnaBase-grid.sh b/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_data18-LITE-AnaBase-grid.sh
index 98e87f80ef42..a10e77f9d1fa 100755
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_data18-LITE-AnaBase-grid.sh
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_data18-LITE-AnaBase-grid.sh
@@ -2,7 +2,7 @@
# art-description: SUSYTools ART test - TestSUSYToolsAlg.py
# art-type: grid
-# art-include: master/AnalysisBase
+# art-include: main/AnalysisBase
# art-output: hist-data18_DAOD_PHYSLITE.root
# art-output: dcube
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_data22-AnaBase-grid.sh b/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_data22-AnaBase-grid.sh
index b3c93682f751..94c4a9a0df0b 100755
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_data22-AnaBase-grid.sh
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_data22-AnaBase-grid.sh
@@ -2,7 +2,7 @@
# art-description: SUSYTools ART test - TestSUSYToolsAlg.py
# art-type: grid
-# art-include: master/AnalysisBase
+# art-include: main/AnalysisBase
# art-output: hist-data22_DAOD_PHYS.root
# art-output: dcube
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_data22-LITE-AnaBase-grid.sh b/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_data22-LITE-AnaBase-grid.sh
index aae36e879fa9..cbfdedd83cfd 100755
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_data22-LITE-AnaBase-grid.sh
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/test/test_SUSYTools_ART_data22-LITE-AnaBase-grid.sh
@@ -2,7 +2,7 @@
# art-description: SUSYTools ART test - TestSUSYToolsAlg.py
# art-type: grid
-# art-include: master/AnalysisBase
+# art-include: main/AnalysisBase
# art-output: hist-data22_DAOD_PHYSLITE.root
# art-output: dcube
diff --git a/Reconstruction/Jet/JetValidation/test/test_jet.sh b/Reconstruction/Jet/JetValidation/test/test_jet.sh
index fb5db47dbb23..942a00fec9f3 100755
--- a/Reconstruction/Jet/JetValidation/test/test_jet.sh
+++ b/Reconstruction/Jet/JetValidation/test/test_jet.sh
@@ -2,7 +2,7 @@
#
# art-description: RAWtoALL (q443 test), PHYSVAL production and NTUP_PHYSVAL for jets
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 8
# art-output: *.root
# art-output: dcube
diff --git a/Reconstruction/Jet/JetValidation/test/test_jet_noPtCut.sh b/Reconstruction/Jet/JetValidation/test/test_jet_noPtCut.sh
index 8c39af5a5492..657385aecef7 100755
--- a/Reconstruction/Jet/JetValidation/test/test_jet_noPtCut.sh
+++ b/Reconstruction/Jet/JetValidation/test/test_jet_noPtCut.sh
@@ -2,7 +2,7 @@
#
# art-description: RAWtoALL (q443 test), PHYSVAL production and NTUP_PHYSVAL for jets with no pT threshold
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 8
# art-output: *.root
# art-output: dcube
diff --git a/Reconstruction/Jet/JetValidation/test/test_met.sh b/Reconstruction/Jet/JetValidation/test/test_met.sh
index c9f7db9d3e72..825e62e3a6f1 100755
--- a/Reconstruction/Jet/JetValidation/test/test_met.sh
+++ b/Reconstruction/Jet/JetValidation/test/test_met.sh
@@ -2,7 +2,7 @@
#
# art-description: RAWtoALL (q443 test), PHYSVAL production and NTUP_PHYSVAL for ptmiss
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 8
# art-output: *.root
# art-output: dcube
diff --git a/Reconstruction/PFlow/PFlowTests/test/test_pflowReco_decorateCalHits_fromESD.sh b/Reconstruction/PFlow/PFlowTests/test/test_pflowReco_decorateCalHits_fromESD.sh
index 633468b8330d..8ce497a3ba00 100755
--- a/Reconstruction/PFlow/PFlowTests/test/test_pflowReco_decorateCalHits_fromESD.sh
+++ b/Reconstruction/PFlow/PFlowTests/test/test_pflowReco_decorateCalHits_fromESD.sh
@@ -3,7 +3,7 @@
# art-description: Athena runs pflow calibration hit decoration reconstruction, after pflow and
# topocluster reco
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
# art-output: AOD.pool.root
diff --git a/Reconstruction/PFlow/PFlowTests/test/test_pflow_EOverP_fromESD_noLinking.sh b/Reconstruction/PFlow/PFlowTests/test/test_pflow_EOverP_fromESD_noLinking.sh
index f01f294e75c1..e83c7f180f77 100755
--- a/Reconstruction/PFlow/PFlowTests/test/test_pflow_EOverP_fromESD_noLinking.sh
+++ b/Reconstruction/PFlow/PFlowTests/test/test_pflow_EOverP_fromESD_noLinking.sh
@@ -2,7 +2,7 @@
#
# art-description: Athena runs EOverP ESD pflow reconstruction, PFO linking off, thinning off.
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
# art-output: AOD.pool.root
diff --git a/Reconstruction/PFlow/PFlowTests/test/test_pflow_decorateCalHits_fromESD.sh b/Reconstruction/PFlow/PFlowTests/test/test_pflow_decorateCalHits_fromESD.sh
index 32086a2f6a44..64b7dbc76276 100755
--- a/Reconstruction/PFlow/PFlowTests/test/test_pflow_decorateCalHits_fromESD.sh
+++ b/Reconstruction/PFlow/PFlowTests/test/test_pflow_decorateCalHits_fromESD.sh
@@ -2,7 +2,7 @@
#
# art-description: Athena runs pflow calibration hit decoration reconstruction
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
# art-output: AOD.pool.root
diff --git a/Reconstruction/PFlow/PFlowTests/test/test_pflow_fromESD_withLinking.sh b/Reconstruction/PFlow/PFlowTests/test/test_pflow_fromESD_withLinking.sh
index d30aba5dfef3..54f58cbdc29d 100755
--- a/Reconstruction/PFlow/PFlowTests/test/test_pflow_fromESD_withLinking.sh
+++ b/Reconstruction/PFlow/PFlowTests/test/test_pflow_fromESD_withLinking.sh
@@ -2,7 +2,7 @@
#
# art-description: Athena runs Standard ESD pflow reconstruction, PFO linking off, thinning off.
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
# art-output: AOD.pool.root
diff --git a/Reconstruction/PFlow/PFlowTests/test/test_pflow_fromESD_withLinking_withJets.sh b/Reconstruction/PFlow/PFlowTests/test/test_pflow_fromESD_withLinking_withJets.sh
index c312800cf4a6..5e7c05eb16ef 100755
--- a/Reconstruction/PFlow/PFlowTests/test/test_pflow_fromESD_withLinking_withJets.sh
+++ b/Reconstruction/PFlow/PFlowTests/test/test_pflow_fromESD_withLinking_withJets.sh
@@ -2,7 +2,7 @@
#
# art-description: Athena runs Standard ESD pflow reconstruction, PFO linking off, thinning off.
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
# art-output: AOD.pool.root
diff --git a/Reconstruction/PFlow/PFlowTests/test/test_pflow_fromESD_withLinking_withJetsMET.sh b/Reconstruction/PFlow/PFlowTests/test/test_pflow_fromESD_withLinking_withJetsMET.sh
index b0d8cf4f5e06..11b8f466eb35 100755
--- a/Reconstruction/PFlow/PFlowTests/test/test_pflow_fromESD_withLinking_withJetsMET.sh
+++ b/Reconstruction/PFlow/PFlowTests/test/test_pflow_fromESD_withLinking_withJetsMET.sh
@@ -2,7 +2,7 @@
#
# art-description: Athena runs Standard ESD pflow reconstruction, PFO linking off, thinning off.
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
# art-output: AOD.pool.root
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_BTagging_fromESDMC21.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_BTagging_fromESDMC21.sh
index 11afb8a09a9e..d0e1b8dc0d70 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_BTagging_fromESDMC21.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_BTagging_fromESDMC21.sh
@@ -3,7 +3,7 @@
# art-description: Athena (serial mode only) runs flavor taggingreconstruction, using the new Run 3 job configuration, from an ESD file
# art-type: grid
# art-athena-mt: 8
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: *.log
python $Athena_DIR/python/BTagging/BTagESD.py | tee temp.log
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_CaloTopoCluster_fromESDMC21.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_CaloTopoCluster_fromESDMC21.sh
index b2ebad6548b8..3268afecf796 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_CaloTopoCluster_fromESDMC21.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_CaloTopoCluster_fromESDMC21.sh
@@ -3,7 +3,7 @@
# art-description: Athena runs calo reconstruction from a mc20e ESD file
# art-type: grid
# art-athena-mt: 8
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: *.log
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Calo_fromRawData22.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Calo_fromRawData22.sh
index 92e7646e711b..2c428bb60354 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Calo_fromRawData22.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Calo_fromRawData22.sh
@@ -3,7 +3,7 @@
# art-description: Athena runs calo reconstruction from a RAW data22 file
# art-type: grid
# art-athena-mt: 8
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: *.log
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_EGamma_fromRawData22.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_EGamma_fromRawData22.sh
index a9ec0dfd4230..f0b7260b8a4b 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_EGamma_fromRawData22.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_EGamma_fromRawData22.sh
@@ -3,7 +3,7 @@
# art-description: Athena runs egamma (+ calo + ID) reconstruction from a RAW data22 file
# art-type: grid
# art-athena-mt: 8
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: *.log
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Jets_fromAODMC21.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Jets_fromAODMC21.sh
index c4bb3b457221..7f0fba725b30 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Jets_fromAODMC21.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Jets_fromAODMC21.sh
@@ -3,7 +3,7 @@
# art-description: Athena runs jet reconstruction, using the new job configuration for Run 3, from an ESD file
# art-type: grid
# art-athena-mt: 8
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: *.log
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Muon_fromRawData22.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Muon_fromRawData22.sh
index b010c848ba55..529e796b1028 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Muon_fromRawData22.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Muon_fromRawData22.sh
@@ -3,7 +3,7 @@
# art-description: Athena runs muon reconstruction from a RAW data18 file
# art-type: grid
# art-athena-mt: 8
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: *.log
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_PFlow_fromESDMC21.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_PFlow_fromESDMC21.sh
index cb39ae97654f..c6dbcb8ebd88 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_PFlow_fromESDMC21.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_PFlow_fromESDMC21.sh
@@ -3,7 +3,7 @@
# art-description: Athena (serial mode only) runs particle flow reconstruction, using the new Run 3 job configuration, from an ESD file
# art-type: grid
# art-athena-mt: 8
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: *.log
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Taus_fromESDMC21.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Taus_fromESDMC21.sh
index 2dc7b74ee292..a29abeab5d45 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Taus_fromESDMC21.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Taus_fromESDMC21.sh
@@ -3,7 +3,7 @@
# art-description: Athena runs tau reconstruction, using the new job configuration for Run 3, from an ESD file
# art-type: grid
# art-athena-mt: 8
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: *.log
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Tracking_fromESDMC21.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Tracking_fromESDMC21.sh
index 799c477c9fe4..491c99e3cd63 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Tracking_fromESDMC21.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Tracking_fromESDMC21.sh
@@ -3,7 +3,7 @@
# art-description: Athena runs combined muon reconstruction, using the new job configuration for Run 3, from an ESD file
# art-type: grid
# art-athena-mt: 8
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: *.log
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Tracking_fromRawData22.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Tracking_fromRawData22.sh
index e3483c7714e7..be108e167af9 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Tracking_fromRawData22.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Tracking_fromRawData22.sh
@@ -3,7 +3,7 @@
# art-description: Athena runs tracking reconstruction from a RAW data22 file
# art-type: grid
# art-athena-mt: 8
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: *.log
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_met_fromesd.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_met_fromesd.sh
index 252ef7602b14..41aafee75baa 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_met_fromesd.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_met_fromesd.sh
@@ -2,7 +2,7 @@
#
# art-description: Athena runs met reconstruction from an ESD file
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
# art-output: *.log
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_7tev.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_7tev.sh
index 581c94aae1ae..f3d0e5903e78 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_7tev.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_7tev.sh
@@ -3,7 +3,7 @@
# art-description: Reco_tf runs on 7TeV collision data with all streams 2011
# art-athena-mt: 8
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
export ATHENA_CORE_NUMBER=8
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion.sh
index a8e92203509f..0c09a9d67ddd 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion.sh
@@ -3,7 +3,7 @@
# art-description: heavy ion reconstruction test from Andrzej Olszewski and Iwona Grabowska-Bold
# art-athena-mt: 4
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
Reco_tf.py --athenaopts="--threads=8" --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data11_hi.00193321.physics_HardProbes.merge.RAW._lb0050._SFO-9._0002.1 --outputESDFile ESD.pool.root --outputAODFile AOD.pool.root --conditionsTag COMCOND-BLKPA-RUN1-06 --geometryVersion ATLAS-R1-2011-02-00-00 --autoConfiguration=everything --maxEvents='25' --preExec 'all:rec.doHeavyIon.set_Value_and_Lock(True);rec.doZdc.set_Value_and_Lock(False);rec.doTrigger.set_Value_and_Lock(False);' --postExec 'all:from IOVDbSvc.CondDB import conddb;conddb.addOverride("/TRT/Calib/PID_NN", "TRTCalibPID_NN_v1");conddb.addOverride("/TRT/Onl/Calib/PID_NN", "TRTCalibPID_NN_v1");'
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data12_8tev.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data12_8tev.sh
index a56a883f7072..9aae9c1156fb 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data12_8tev.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data12_8tev.sh
@@ -3,7 +3,7 @@
# art-description: Reco_tf runs on 8TeV collision data with all streams 2012
# art-athena-mt: 8
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
export ATHENA_CORE_NUMBER=8
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_13tev.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_13tev.sh
index f1bce503d0d6..581091328eb8 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_13tev.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_13tev.sh
@@ -3,7 +3,7 @@
# art-description: Reco_tf runs on 13TeV collision data with all streams 2015
# art-athena-mt: 8
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
export ATHENA_CORE_NUMBER=8
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion.sh
index 097c9a6d38d9..be5847e96486 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion.sh
@@ -3,7 +3,7 @@
# art-description: heavy ion reconstruction test from Andrzej Olszewski and Iwona Grabowska-Bold
# art-athena-mt: 4
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
Reco_tf.py --athenaopts="--threads=8" --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_hi.00286711.physics_MinBiasOverlay.daq.RAW._lb0217._SFO-2._0001.data --outputESDFile=ESD.root --outputAODFile=AOD.root --maxEvents=25 --conditionsTag 'default:CONDBR2-BLKPA-RUN2-11' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --autoConfiguration 'everything' --preExec 'all:rec.doHeavyIon.set_Value_and_Lock(True);rec.doZdc.set_Value_and_Lock(False);rec.doTrigger.set_Value_and_Lock(False);'
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data16_13tev.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data16_13tev.sh
index 86ed3f79d0a3..d51302e7276c 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data16_13tev.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data16_13tev.sh
@@ -3,7 +3,7 @@
# art-description: Reco_tf runs on 13TeV collision data with all streams 2016
# art-athena-mt: 8
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
export ATHENA_CORE_NUMBER=8
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data17_13tev.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data17_13tev.sh
index 5033cec11039..7a06ae619e14 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data17_13tev.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data17_13tev.sh
@@ -3,7 +3,7 @@
# art-description: Reco_tf runs on 13TeV collision data 2017, early data, A3
# art-athena-mt: 8
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
export ATHENA_CORE_NUMBER=8
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_13TeV.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_13TeV.sh
index 2fdb3dd65f7f..4ef403ff1725 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_13TeV.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_13TeV.sh
@@ -3,7 +3,7 @@
# art-description: Reco_tf runs on 13TeV collision data 2018
# art-athena-mt: 8
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
export ATHENA_CORE_NUMBER=8
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger.sh
index e1ab32d92665..631f714001a5 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger.sh
@@ -3,7 +3,7 @@
# art-description: heavy ion reconstruction test from Sebastian Tapia
# art-athena-mt: 8
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
export ATHENA_CORE_NUMBER=8
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22AFP_13p6tev.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22AFP_13p6tev.sh
index 047210e58d8c..0b4850da63c1 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22AFP_13p6tev.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22AFP_13p6tev.sh
@@ -3,7 +3,7 @@
# art-description: Reco_tf runs on 13p6TeV collision data 2022, run 435229 has AFP detector included. Details at https://twiki.cern.ch/twiki/bin/view/AtlasProtected/SpecialRunsIn2022#done_47_SM_HI_combined_LHCf_ZDC
# art-athena-mt: 8
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
export ATHENA_CORE_NUMBER=8
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_13p6TeV.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_13p6TeV.sh
index 25a36fd567e0..c445f9408c88 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_13p6TeV.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_13p6TeV.sh
@@ -3,7 +3,7 @@
# art-description: Reco_tf runs on 13.6TeV collision data 2022
# art-athena-mt: 8
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
export ATHENA_CORE_NUMBER=8
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_13p6TeV_FPE.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_13p6TeV_FPE.sh
index 8c33215dddcc..dc13436a9568 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_13p6TeV_FPE.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_13p6TeV_FPE.sh
@@ -3,7 +3,7 @@
# art-description: Reco_tf runs on 13.6TeV collision data 2022 with FPE crashes enabled.
# art-athena-mt: 8
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
export ATHENA_CORE_NUMBER=8
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_13p6TeV_serial.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_13p6TeV_serial.sh
index 4a5f1ba1c85a..85803c30946a 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_13p6TeV_serial.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_13p6TeV_serial.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf runs on 13.6TeV collision data 2022 in serial mode
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-memory: 6500
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_900GV_splash.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_900GV_splash.sh
index 6dbf74995812..351833b11c2b 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_900GV_splash.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_900GV_splash.sh
@@ -3,7 +3,7 @@
# art-description: Reco_tf runs on splash events with all streams
# art-athena-mt: 8
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
export ATHENA_CORE_NUMBER=8
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_CosmicCalo.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_CosmicCalo.sh
index 01e159eb677d..819e4b47495e 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_CosmicCalo.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_CosmicCalo.sh
@@ -3,7 +3,7 @@
# art-description: Reco_tf runs on 2022 CosmicCalo stream
# art-athena-mt: 8
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
export ATHENA_CORE_NUMBER=8
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_IDCosmic.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_IDCosmic.sh
index 4e02ef916828..7ba0372e29a9 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_IDCosmic.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_IDCosmic.sh
@@ -3,7 +3,7 @@
# art-description: Reco_tf runs on 2020 IDCosmic stream, without trigger.
# art-athena-mt: 8
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
export ATHENA_CORE_NUMBER=8
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_hi.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_hi.sh
index ffb6575c25d6..d84363e8da95 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_hi.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_hi.sh
@@ -3,7 +3,7 @@
# art-description: heavy ion reconstruction on data22
# art-athena-mt: 8
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
export ATHENA_CORE_NUMBER=8
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_hip.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_hip.sh
index 9c5abefd7399..1b768849073f 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_hip.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_hip.sh
@@ -3,7 +3,7 @@
# art-description: heavy ion reconstruction on data22
# art-athena-mt: 8
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
export ATHENA_CORE_NUMBER=8
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger.sh
index 07ed22ff3d86..cb7a5c9d4e28 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger.sh
@@ -3,7 +3,7 @@
# art-description: heavy ion reconstruction test from Sebastian Tapia
# art-athena-mt: 8
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
export ATHENA_CORE_NUMBER=8
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc20e_AFP_nopileup_13TeV.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc20e_AFP_nopileup_13TeV.sh
index f3c935ad28eb..b30109152e06 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc20e_AFP_nopileup_13TeV.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc20e_AFP_nopileup_13TeV.sh
@@ -4,7 +4,7 @@
# art-output: log.*
# art-type: grid
# art-athena-mt: 8
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
export ATHENA_CORE_NUMBER=8
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV.sh
index 04e87ca3b760..8b8b58124a77 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV.sh
@@ -4,7 +4,7 @@
# art-output: log.*
# art-athena-mt: 8
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
export ATHENA_CORE_NUMBER=8
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV_hi_withtrigger.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV_hi_withtrigger.sh
index e34cffb4b55f..0a52fad8c529 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV_hi_withtrigger.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV_hi_withtrigger.sh
@@ -3,7 +3,7 @@
# art-description: heavy ion reconstruction on mc21 using ttbar
# art-athena-mt: 8
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
export ATHENA_CORE_NUMBER=8
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compare1Vs8Threads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compare1Vs8Threads.sh
index e53a4648a1a2..0dba7b9339bf 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compare1Vs8Threads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compare1Vs8Threads.sh
@@ -2,7 +2,7 @@
#
# art-description: Athena runs data22 with 1 and 8 threads twice, and then does diff-root.
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
# art-output: runOne
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compare1Vs8Threads_Long.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compare1Vs8Threads_Long.sh
index 2ef097c15a8f..fe43be94f401 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compare1Vs8Threads_Long.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compare1Vs8Threads_Long.sh
@@ -2,7 +2,7 @@
#
# art-description: Athena runs data22 with 1 and 8 threads twice, and then does diff-root.
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
# art-output: runOne
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compareMultipleThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compareMultipleThreads.sh
index e910f587f076..aa4258231416 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compareMultipleThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compareMultipleThreads.sh
@@ -2,7 +2,7 @@
#
# art-description: Athena runs data22 with 8 threads twice, and then does diff-root.
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
# art-output: runOne
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compareMultipleThreads_Long.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compareMultipleThreads_Long.sh
index a41d6302353b..a1c8282f47c7 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compareMultipleThreads_Long.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compareMultipleThreads_Long.sh
@@ -2,7 +2,7 @@
#
# art-description: Athena runs data22 with 8 threads twice, and then does diff-root.
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
# art-output: runOne
diff --git a/Reconstruction/egamma/egammaValidation/test/test_electron.sh b/Reconstruction/egamma/egammaValidation/test/test_electron.sh
index 715a30be11ed..a69e02a805c7 100755
--- a/Reconstruction/egamma/egammaValidation/test/test_electron.sh
+++ b/Reconstruction/egamma/egammaValidation/test/test_electron.sh
@@ -6,7 +6,7 @@
# art-input: mc16_13TeV.423000.ParticleGun_single_electron_egammaET.recon.RDO.e3566_e5984_s3112_r12663
# art-input-nfiles: 30
# art-cores: 4
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: *.hist.root
# art-output: *.txt
diff --git a/Reconstruction/egamma/egammaValidation/test/test_electron_Run4.sh b/Reconstruction/egamma/egammaValidation/test/test_electron_Run4.sh
index f9f8550752cc..24b76b16c329 100755
--- a/Reconstruction/egamma/egammaValidation/test/test_electron_Run4.sh
+++ b/Reconstruction/egamma/egammaValidation/test/test_electron_Run4.sh
@@ -6,7 +6,7 @@
# art-input: mc21_14TeV.900494.PG_single_epm_Pt10_etaFlatnp0_43.recon.RDO.e8481_s4038_r14362
# art-input-nfiles: 10
# art-cores: 4
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.hist.root
# art-output: *.txt
# art-output: *.png
diff --git a/Reconstruction/egamma/egammaValidation/test/test_electron_pileup.sh b/Reconstruction/egamma/egammaValidation/test/test_electron_pileup.sh
index 526b943e27eb..91e8a06c0a79 100755
--- a/Reconstruction/egamma/egammaValidation/test/test_electron_pileup.sh
+++ b/Reconstruction/egamma/egammaValidation/test/test_electron_pileup.sh
@@ -6,7 +6,7 @@
# art-input: mc16_13TeV.423000.ParticleGun_single_electron_egammaET.recon.RDO.e3566_e5984_s3112_r12662
# art-input-nfiles: 8
# art-cores: 4
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: *.hist.root
# art-output: *.txt
diff --git a/Reconstruction/egamma/egammaValidation/test/test_electron_pileup_Run4.sh b/Reconstruction/egamma/egammaValidation/test/test_electron_pileup_Run4.sh
index 354d15147953..ca701f3c2f26 100755
--- a/Reconstruction/egamma/egammaValidation/test/test_electron_pileup_Run4.sh
+++ b/Reconstruction/egamma/egammaValidation/test/test_electron_pileup_Run4.sh
@@ -6,7 +6,7 @@
# art-input: mc21_14TeV.900494.PG_single_epm_Pt10_etaFlatnp0_43.recon.RDO.e8481_s4038_r14365
# art-input-nfiles: 45
# art-cores: 4
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.hist.root
# art-output: *.txt
# art-output: *.png
diff --git a/Reconstruction/egamma/egammaValidation/test/test_gamma.sh b/Reconstruction/egamma/egammaValidation/test/test_gamma.sh
index 138a1075a133..28f7c86b2bcd 100755
--- a/Reconstruction/egamma/egammaValidation/test/test_gamma.sh
+++ b/Reconstruction/egamma/egammaValidation/test/test_gamma.sh
@@ -6,7 +6,7 @@
# art-input: mc16_13TeV.423001.ParticleGun_single_photon_egammaET.recon.RDO.e3566_s3112_r12663
# art-input-nfiles: 30
# art-cores: 4
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: *.hist.root
# art-output: *.txt
diff --git a/Reconstruction/egamma/egammaValidation/test/test_gamma_pileup.sh b/Reconstruction/egamma/egammaValidation/test/test_gamma_pileup.sh
index d1b7ffc7badd..91a1ec2a8e56 100755
--- a/Reconstruction/egamma/egammaValidation/test/test_gamma_pileup.sh
+++ b/Reconstruction/egamma/egammaValidation/test/test_gamma_pileup.sh
@@ -6,7 +6,7 @@
# art-input: mc16_13TeV.423001.ParticleGun_single_photon_egammaET.recon.RDO.e3566_s3112_r12662
# art-input-nfiles: 8
# art-cores: 4
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: *.hist.root
# art-output: *.txt
diff --git a/Reconstruction/tauRec/test/test_tau_q221_multithread.sh b/Reconstruction/tauRec/test/test_tau_q221_multithread.sh
index 70d4e6c523be..7a1578528636 100755
--- a/Reconstruction/tauRec/test/test_tau_q221_multithread.sh
+++ b/Reconstruction/tauRec/test/test_tau_q221_multithread.sh
@@ -3,7 +3,7 @@
# art-description: q221 reconstruction ART on MC in multithread mode
# art-type: grid
# art-athena-mt: 4
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: myAOD.pool.root
# art-output: NTUP_PHYSVAL.root
# art-output: rootcomp.root
diff --git a/Reconstruction/tauRec/test/test_tau_q431_serial.sh b/Reconstruction/tauRec/test/test_tau_q431_serial.sh
index f9a882eb2dc1..cc04d631719d 100755
--- a/Reconstruction/tauRec/test/test_tau_q431_serial.sh
+++ b/Reconstruction/tauRec/test/test_tau_q431_serial.sh
@@ -2,7 +2,7 @@
#
# art-description: q431 reconstruction ART on data in serail mode
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: myAOD.pool.root
# art-output: NTUP_PHYSVAL.root
# art-output: rootcomp.root
diff --git a/Reconstruction/tauRec/test/test_tau_standalone_LCTopo_multithread.sh b/Reconstruction/tauRec/test/test_tau_standalone_LCTopo_multithread.sh
index a860b0ff3adc..969dece5620b 100755
--- a/Reconstruction/tauRec/test/test_tau_standalone_LCTopo_multithread.sh
+++ b/Reconstruction/tauRec/test/test_tau_standalone_LCTopo_multithread.sh
@@ -3,7 +3,7 @@
# art-description: standalone tau reconstruction ART on MC in multithread mode
# art-type: grid
# art-athena-mt: 8
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: *.log
# art-output: *.ps
diff --git a/Reconstruction/tauRec/test/test_tau_standalone_LCTopo_serial.sh b/Reconstruction/tauRec/test/test_tau_standalone_LCTopo_serial.sh
index bce38338e009..de083458ee51 100755
--- a/Reconstruction/tauRec/test/test_tau_standalone_LCTopo_serial.sh
+++ b/Reconstruction/tauRec/test/test_tau_standalone_LCTopo_serial.sh
@@ -2,7 +2,7 @@
#
# art-description: standalone tau reconstruction on MC in serial mode
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: *.log
# art-output: *.ps
diff --git a/Simulation/Digitization/test/test_Digitization.sh b/Simulation/Digitization/test/test_Digitization.sh
index 6fd284cff804..f46027c71917 100755
--- a/Simulation/Digitization/test/test_Digitization.sh
+++ b/Simulation/Digitization/test/test_Digitization.sh
@@ -3,7 +3,7 @@
# art-description: Run digitization of an MC16a ttbar sample with 2016a geometry and conditions, without pile-up
# art-type: build
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
Digi_tf.py \
--CA \
diff --git a/Simulation/Digitization/test/test_PileUp.sh b/Simulation/Digitization/test/test_PileUp.sh
index f840cb2b92ad..f93cf053bc33 100755
--- a/Simulation/Digitization/test/test_PileUp.sh
+++ b/Simulation/Digitization/test/test_PileUp.sh
@@ -5,7 +5,7 @@
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
+# art-include: main/Athena
athena Digitization/NightlyPileUp.py
diff --git a/Simulation/FastSimulation/FastChainPileup/test/test_MC20a_ATLFAST3F_G4MS_MCOverlay_ttbar_CAvsCG.sh b/Simulation/FastSimulation/FastChainPileup/test/test_MC20a_ATLFAST3F_G4MS_MCOverlay_ttbar_CAvsCG.sh
index 9c844171d386..612027cf0bd3 100755
--- a/Simulation/FastSimulation/FastChainPileup/test/test_MC20a_ATLFAST3F_G4MS_MCOverlay_ttbar_CAvsCG.sh
+++ b/Simulation/FastSimulation/FastChainPileup/test/test_MC20a_ATLFAST3F_G4MS_MCOverlay_ttbar_CAvsCG.sh
@@ -2,7 +2,7 @@
#
# art-description: CA vs Legacy code diff (ATLFAST3F_G4MS with MC-overlay) for MC20a ttbar
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: run_*
# art-output: log.*
diff --git a/Simulation/FastSimulation/FastChainPileup/test/test_MC20a_ATLFAST3F_G4MS_pileup_ttbar_CAvsCG.sh b/Simulation/FastSimulation/FastChainPileup/test/test_MC20a_ATLFAST3F_G4MS_pileup_ttbar_CAvsCG.sh
index b3b5485eb3de..6bcb9f5f0e78 100755
--- a/Simulation/FastSimulation/FastChainPileup/test/test_MC20a_ATLFAST3F_G4MS_pileup_ttbar_CAvsCG.sh
+++ b/Simulation/FastSimulation/FastChainPileup/test/test_MC20a_ATLFAST3F_G4MS_pileup_ttbar_CAvsCG.sh
@@ -2,7 +2,7 @@
#
# art-description: CA vs Legacy code diff (ATLFAST3F_G4MS with pileup profile) for MC20a ttbar
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: run_*
# art-output: log.*
diff --git a/Simulation/FastSimulation/FastChainPileup/test/test_MC21a_ATLFAST3F_G4MS_MCOverlay_ttbar_CAvsCG.sh b/Simulation/FastSimulation/FastChainPileup/test/test_MC21a_ATLFAST3F_G4MS_MCOverlay_ttbar_CAvsCG.sh
index cd74eb7d005f..e202186e0c8c 100755
--- a/Simulation/FastSimulation/FastChainPileup/test/test_MC21a_ATLFAST3F_G4MS_MCOverlay_ttbar_CAvsCG.sh
+++ b/Simulation/FastSimulation/FastChainPileup/test/test_MC21a_ATLFAST3F_G4MS_MCOverlay_ttbar_CAvsCG.sh
@@ -2,7 +2,7 @@
#
# art-description: CA vs Legacy code diff (ATLFAST3F_G4MS with MC-overlay) for MC21a ttbar
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: run_*
# art-output: log.*
diff --git a/Simulation/FastSimulation/FastChainPileup/test/test_MC21a_ATLFAST3F_G4MS_TrackOverlay_ttbar_CA.sh b/Simulation/FastSimulation/FastChainPileup/test/test_MC21a_ATLFAST3F_G4MS_TrackOverlay_ttbar_CA.sh
index 6f5311610dda..3e60b8bcf940 100755
--- a/Simulation/FastSimulation/FastChainPileup/test/test_MC21a_ATLFAST3F_G4MS_TrackOverlay_ttbar_CA.sh
+++ b/Simulation/FastSimulation/FastChainPileup/test/test_MC21a_ATLFAST3F_G4MS_TrackOverlay_ttbar_CA.sh
@@ -2,7 +2,7 @@
#
# art-description: CA-based config ATLFAST3F_G4MS with Track-overlay for MC21a ttbar
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: run_*
# art-output: log.*
diff --git a/Simulation/FastSimulation/FastChainPileup/test/test_MC21a_ATLFAST3F_G4MS_pileup_ttbar_CAvsCG.sh b/Simulation/FastSimulation/FastChainPileup/test/test_MC21a_ATLFAST3F_G4MS_pileup_ttbar_CAvsCG.sh
index 9c93825c7d12..f19576c68ae6 100755
--- a/Simulation/FastSimulation/FastChainPileup/test/test_MC21a_ATLFAST3F_G4MS_pileup_ttbar_CAvsCG.sh
+++ b/Simulation/FastSimulation/FastChainPileup/test/test_MC21a_ATLFAST3F_G4MS_pileup_ttbar_CAvsCG.sh
@@ -2,7 +2,7 @@
#
# art-description: CA vs Legacy code diff (ATLFAST3F_G4MS with pileup profile) for MC21a ttbar
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: run_*
# art-output: log.*
diff --git a/Simulation/FastSimulation/FastChainPileup/test/test_MC21a_ATLFAST3MT_MCOverlay_ttbar_CAvsCG.sh b/Simulation/FastSimulation/FastChainPileup/test/test_MC21a_ATLFAST3MT_MCOverlay_ttbar_CAvsCG.sh
index 0f87cef39b9b..ce4e76a3994d 100755
--- a/Simulation/FastSimulation/FastChainPileup/test/test_MC21a_ATLFAST3MT_MCOverlay_ttbar_CAvsCG.sh
+++ b/Simulation/FastSimulation/FastChainPileup/test/test_MC21a_ATLFAST3MT_MCOverlay_ttbar_CAvsCG.sh
@@ -2,7 +2,7 @@
#
# art-description: CA vs Legacy code diff (ATLFAST3MT with MC-overlay) for MC21a ttbar
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: run_*
# art-output: log.*
diff --git a/Simulation/FastSimulation/FastChainPileup/test/test_MC21a_TrackOverlay_ttbar_CA.sh b/Simulation/FastSimulation/FastChainPileup/test/test_MC21a_TrackOverlay_ttbar_CA.sh
index 1b19bcff2644..18a63bdfa7f7 100755
--- a/Simulation/FastSimulation/FastChainPileup/test/test_MC21a_TrackOverlay_ttbar_CA.sh
+++ b/Simulation/FastSimulation/FastChainPileup/test/test_MC21a_TrackOverlay_ttbar_CA.sh
@@ -2,7 +2,7 @@
#
# art-description: CA-based config Track-overlay for MC21a ttbar
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: run_*
# art-output: log.*
diff --git a/Simulation/G4Atlas/G4AtlasApps/test/test_G4Atlas.sh b/Simulation/G4Atlas/G4AtlasApps/test/test_G4Atlas.sh
index be1397ef0679..b7fd6d8b2a7d 100755
--- a/Simulation/G4Atlas/G4AtlasApps/test/test_G4Atlas.sh
+++ b/Simulation/G4Atlas/G4AtlasApps/test/test_G4Atlas.sh
@@ -3,7 +3,7 @@
# art-description: G4Atlas ParticleGun example
# art-type: build
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
athena G4AtlasApps/jobOptions.G4Atlas.py
diff --git a/Simulation/G4Atlas/G4AtlasApps/test/test_G4AtlasReadEvgen.sh b/Simulation/G4Atlas/G4AtlasApps/test/test_G4AtlasReadEvgen.sh
index 2869eadb5a35..87953e262c8a 100755
--- a/Simulation/G4Atlas/G4AtlasApps/test/test_G4AtlasReadEvgen.sh
+++ b/Simulation/G4Atlas/G4AtlasApps/test/test_G4AtlasReadEvgen.sh
@@ -4,8 +4,8 @@
# art-type: build
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
athena G4AtlasApps/jobOptions.G4Atlas_ReadEvgen.py
diff --git a/Simulation/G4Atlas/G4AtlasApps/test/test_G4Cosmic.sh b/Simulation/G4Atlas/G4AtlasApps/test/test_G4Cosmic.sh
index 93a187ac60b9..de304973f0ba 100755
--- a/Simulation/G4Atlas/G4AtlasApps/test/test_G4Cosmic.sh
+++ b/Simulation/G4Atlas/G4AtlasApps/test/test_G4Cosmic.sh
@@ -3,7 +3,7 @@
# art-description: G4Cosmic example
# art-type: build
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
athena G4AtlasApps/jobOptions.G4Cosmic.py
diff --git a/Simulation/SimuJobTransforms/test/test_G4param.sh b/Simulation/SimuJobTransforms/test/test_G4param.sh
index 6ba9bbea2555..f07acf64e7be 100755
--- a/Simulation/SimuJobTransforms/test/test_G4param.sh
+++ b/Simulation/SimuJobTransforms/test/test_G4param.sh
@@ -6,8 +6,8 @@
# art-include: 21.0/AthSimulation
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# MC15 setup
# ATLAS-R2-2015-03-01-00 and OFLCOND-RUN12-SDR-30
diff --git a/Simulation/SimuJobTransforms/test/test_diffmerged.sh b/Simulation/SimuJobTransforms/test/test_diffmerged.sh
index 75258166c467..f89ed5403796 100755
--- a/Simulation/SimuJobTransforms/test/test_diffmerged.sh
+++ b/Simulation/SimuJobTransforms/test/test_diffmerged.sh
@@ -3,7 +3,7 @@
# art-description: MC23-style simulation, then merge two copies of the HITS file
# art-type: build
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# MC23 setup
# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC23-SDR-RUN3-01
diff --git a/Simulation/SimuJobTransforms/test/test_filterHIT.sh b/Simulation/SimuJobTransforms/test/test_filterHIT.sh
index 0931021e8ece..ae0c453bbb6a 100755
--- a/Simulation/SimuJobTransforms/test/test_filterHIT.sh
+++ b/Simulation/SimuJobTransforms/test/test_filterHIT.sh
@@ -5,7 +5,7 @@
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# MC15 setup
# ATLAS-R2-2015-03-01-00 and OFLCOND-RUN12-SDR-30
diff --git a/Simulation/SimuJobTransforms/test/test_pileup.sh b/Simulation/SimuJobTransforms/test/test_pileup.sh
index 384b53187781..a9747fa2a536 100755
--- a/Simulation/SimuJobTransforms/test/test_pileup.sh
+++ b/Simulation/SimuJobTransforms/test/test_pileup.sh
@@ -3,7 +3,7 @@
# art-description: Modified/Simplified MC20e digitization job
# art-type: build
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
Events=10
HSHitsFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayTests/mc16_13TeV.900149.PG_single_nu_Pt50.simul.HITS.e8307_s3482/HITS.24078104._234467.pool.root.1"
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_neutrinos_mu200.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_neutrinos_mu200.sh
index 60fd66487b69..00f9b78ef00a 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_neutrinos_mu200.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_neutrinos_mu200.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: RUN4_neutrinos.mu200.RDO.pool.root
# art-output: RDOAnalysis.root
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_mu1.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_mu1.sh
index 61239c976aa3..eb88635b77a1 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_mu1.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_mu1.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: RUN4_presampling.mu1.RDO.pool.root
# art-output: RDOAnalysis.root
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_mu140.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_mu140.sh
index 410018c4105b..e0e472ab5982 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_mu140.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_mu140.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: RUN4_presampling.mu140.RDO.pool.root
# art-output: RDOAnalysis.root
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_mu200.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_mu200.sh
index 9c926087fff0..5eab6f2169bf 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_mu200.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_mu200.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: RUN4_presampling.mu200.RDO.pool.root
# art-output: RDOAnalysis.root
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_mu60.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_mu60.sh
index 6ee17132e18f..a056b152fc05 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_mu60.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_mu60.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: RUN4_presampling.mu60.RDO.pool.root
# art-output: RDOAnalysis.root
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_muMC21a.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_muMC21a.sh
index 4d46033dee7f..22285dac839b 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_muMC21a.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_presampling_muMC21a.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: RUN4_presampling.muMC21a.RDO.pool.root
# art-output: RDOAnalysis.root
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_single_muon_no_pileup.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_single_muon_no_pileup.sh
index efe051eba529..a78e1b5d326f 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_single_muon_no_pileup.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_single_muon_no_pileup.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: RUN4_muons.RDO.pool.root
# art-output: RDOAnalysis.root
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_mu140.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_mu140.sh
index 7854b6f710ad..43b4fc5b3e2b 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_mu140.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_mu140.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: RUN4_ttbar.mu140.RDO.pool.root
# art-output: RDOAnalysis.root
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_mu1_inTimeTruth.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_mu1_inTimeTruth.sh
index 0e3b5018d9b2..6717ea08eb76 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_mu1_inTimeTruth.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_mu1_inTimeTruth.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: RUN4_ttbar.puTruth.RDO.pool.root
# art-output: RDOAnalysis.root
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_mu200.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_mu200.sh
index bc47e6fa1e93..f0954bccda52 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_mu200.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_mu200.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: RUN4_ttbar.mu200.RDO.pool.root
# art-output: RDOAnalysis.root
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_mu60.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_mu60.sh
index e64cfb05c812..b4843fa37d10 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_mu60.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_mu60.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: RUN4_ttbar.mu60.RDO.pool.root
# art-output: RDOAnalysis.root
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_muMC21a.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_muMC21a.sh
index d9e451d4b3a1..09895fba861f 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_muMC21a.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_muMC21a.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: RUN4_ttbar.muMC21a.RDO.pool.root
# art-output: RDOAnalysis.root
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_no_pileup.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_no_pileup.sh
index 800b5a532b48..7a3ce95f7c00 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_no_pileup.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_RUN4_ttbar_no_pileup.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: RUN4_ttbar.RDO.pool.root
# art-output: RDOAnalysis.root
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2010_ttbar_no_pileup.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2010_ttbar_no_pileup.sh
index eef4c51daede..5c8716fa35b4 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2010_ttbar_no_pileup.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2010_ttbar_no_pileup.sh
@@ -4,7 +4,7 @@
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: mc15_2010_ttbar_no_pileup.RDO.pool.root
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2011_ttbar_no_pileup.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2011_ttbar_no_pileup.sh
index 913d54ae04b6..2e5423e6ce82 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2011_ttbar_no_pileup.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2011_ttbar_no_pileup.sh
@@ -4,7 +4,7 @@
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: mc15_2011_ttbar_no_pileup.RDO.pool.root
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2012_ttbar_no_pileup.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2012_ttbar_no_pileup.sh
index 6dce74ad71d5..fdcafe217a54 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2012_ttbar_no_pileup.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2012_ttbar_no_pileup.sh
@@ -4,7 +4,7 @@
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: mc15_2012_ttbar_no_pileup.RDO.pool.root
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_cosmics.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_cosmics.sh
index 982fdf16a8f6..c083d2ba65d6 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_cosmics.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_cosmics.sh
@@ -4,7 +4,7 @@
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: mc15_2015_cosmics.RDO.pool.root
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_heavy_ion.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_heavy_ion.sh
index 8b1e7c01ec81..88aeb1272e78 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_heavy_ion.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_heavy_ion.sh
@@ -4,7 +4,7 @@
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: mc15_2015_heavyIon.RDO.pool.root
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_25ns_pileup_noNoise.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_25ns_pileup_noNoise.sh
index 1d0934afdc7c..48dfef260467 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_25ns_pileup_noNoise.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_25ns_pileup_noNoise.sh
@@ -4,7 +4,7 @@
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: mc15_2015_ttbar_25ns_pileup_noNoise.RDO.pool.root
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_CA_vs_CG.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_CA_vs_CG.sh
index c5061c78dd0d..424b30b3f81a 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_CA_vs_CG.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_CA_vs_CG.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mc20a_ttbar.CG.RDO.pool.root
# art-output: mc20a_ttbar.CA.RDO.pool.root
# art-output: log.*
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_CA_vs_CG_no_minbias.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_CA_vs_CG_no_minbias.sh
index d741de659b7b..a9a4642af5fe 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_CA_vs_CG_no_minbias.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_CA_vs_CG_no_minbias.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mc20a_ttbar.CG.RDO.pool.root
# art-output: mc20a_ttbar.CA.RDO.pool.root
# art-output: log.*
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_presampling.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_presampling.sh
index a9bf44b79005..9c8f795ae79a 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_presampling.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_presampling.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-include: 22.0-mc20/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mc20a_presampling.RDO.pool.root
# art-output: log.*
# art-output: legacy.*
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_qballs.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_qballs.sh
index 1693a26b17c3..2b45b2900d90 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_qballs.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20a_qballs.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mc20a_qball.*.RDO.pool.root
# art-output: log.*
# art-output: legacy.*
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20d_CA_vs_CG.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20d_CA_vs_CG.sh
index 8ec6513020f2..4746e67e6d85 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20d_CA_vs_CG.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20d_CA_vs_CG.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mc20d_ttbar.CG.RDO.pool.root
# art-output: mc20d_ttbar.CA.RDO.pool.root
# art-output: log.*
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20d_presampling.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20d_presampling.sh
index 59d9ad118749..8dca9391a48a 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20d_presampling.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20d_presampling.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-include: 22.0-mc20/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mc20d_presampling.RDO.pool.root
# art-output: log.*
# art-output: legacy.*
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG.sh
index ad6e41eca31d..4c0dff598b11 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mc20e_ttbar.CG.RDO.pool.root
# art-output: mc20e_ttbar.CA.RDO.pool.root
# art-output: log.*
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG_no_minbias.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG_no_minbias.sh
index aa5c74540a85..596cad56301d 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG_no_minbias.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG_no_minbias.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mc20e_ttbar.CG.RDO.pool.root
# art-output: mc20e_ttbar.CA.RDO.pool.root
# art-output: log.*
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG_presampling_custom.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG_presampling_custom.sh
index ee431a6be201..fce83263d543 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG_presampling_custom.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_CA_vs_CG_presampling_custom.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mc20e_presampling.CG.RDO.pool.root
# art-output: mc20e_presampling.CA.RDO.pool.root
# art-output: log.*
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_presampling.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_presampling.sh
index 88d57f30d286..c987874cbeee 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_presampling.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_presampling.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-include: 22.0-mc20/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mc20e_presampling.RDO.pool.root
# art-output: log.*
# art-output: legacy.*
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_ttbar_beamspotsizereweight.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_ttbar_beamspotsizereweight.sh
index 66d183d5931d..0c1878e5df38 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_ttbar_beamspotsizereweight.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc20e_ttbar_beamspotsizereweight.sh
@@ -6,7 +6,7 @@
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mc16e_ttbar_beamspotsizereweight.*.RDO.pool.root
DigiOutFileNameCG="mc16e_ttbar_beamspotsizereweight.CG.RDO.pool.root"
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc21a_presampling.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc21a_presampling.sh
index 2d4a0a0d7686..d814554feabe 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc21a_presampling.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc21a_presampling.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-include: 22.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mc21a_presampling.CG.RDO.pool.root
# art-output: mc21a_presampling.CA.RDO.pool.root
# art-output: log.*
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc21a_presampling_variable.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc21a_presampling_variable.sh
index fb9a59caa1ed..8d8533bd7c68 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc21a_presampling_variable.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc21a_presampling_variable.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-include: 22.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mc21a_presampling.VarBS.CG.RDO.pool.root
# art-output: mc21a_presampling.VarBS.CA.RDO.pool.root
# art-output: log.*
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc21a_presampling_variable_TruthOnly.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc21a_presampling_variable_TruthOnly.sh
index 61f351bdcc6b..1177c0a697c2 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc21a_presampling_variable_TruthOnly.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc21a_presampling_variable_TruthOnly.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-include: 22.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mc21a_presampling.VarBSTruth.CG.RDO.pool.root
# art-output: mc21a_presampling.VarBSTruth.CA.RDO.pool.root
# art-output: log.*
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc21a_ttbar.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc21a_ttbar.sh
index 95c34cae9510..f7b6e1948a86 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc21a_ttbar.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc21a_ttbar.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-include: 22.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mc21a_ttbar.CG.RDO.pool.root
# art-output: mc21a_ttbar.CA.RDO.pool.root
# art-output: log.*
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc21a_ttbar_lowmu.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc21a_ttbar_lowmu.sh
index 26da574cc565..ef2f97f98063 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc21a_ttbar_lowmu.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc21a_ttbar_lowmu.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-include: 22.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mc21a_ttbar_lowmu.CG.RDO.pool.root
# art-output: mc21a_ttbar_lowmu.CA.RDO.pool.root
# art-output: log.*
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc21a_ttbar_no_pileup.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc21a_ttbar_no_pileup.sh
index af2bee5646bb..17da1cc81dd5 100755
--- a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc21a_ttbar_no_pileup.sh
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc21a_ttbar_no_pileup.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-include: 22.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mc21a.ttbar.nopileup.CG.RDO.pool.root
# art-output: mc21a.ttbar.nopileup.CA.RDO.pool.root
# art-output: log.*
diff --git a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_RUN4_MP_presampling_reproducibility.sh b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_RUN4_MP_presampling_reproducibility.sh
index 88a96d1388ea..e7d5c7f01f82 100755
--- a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_RUN4_MP_presampling_reproducibility.sh
+++ b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_RUN4_MP_presampling_reproducibility.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-athena-mt: 8
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: RUN4_presampling_SP.RDO.pool.root
# art-output: RUN4_presampling_MP_fork_evt0.RDO.pool.root
# art-output: RUN4_presampling_MP_fork_evt1.RDO.pool.root
diff --git a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_RUN4_MP_ttbar_reproducibility.sh b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_RUN4_MP_ttbar_reproducibility.sh
index 999881f5b71a..e1f99348ef97 100755
--- a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_RUN4_MP_ttbar_reproducibility.sh
+++ b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_RUN4_MP_ttbar_reproducibility.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-athena-mt: 8
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: RUN4_ttbar_SP.RDO.pool.root
# art-output: RUN4_ttbar_MP_fork_evt0.RDO.pool.root
# art-output: RUN4_ttbar_MP_fork_evt1.RDO.pool.root
diff --git a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_RUN4_MT_presampling.sh b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_RUN4_MT_presampling.sh
index 25e4c788960b..bc5c4ff2654b 100755
--- a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_RUN4_MT_presampling.sh
+++ b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_RUN4_MT_presampling.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-athena-mt: 8
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: RUN4_presampling_MT.RDO.pool.root
export ATHENA_CORE_NUMBER=4
diff --git a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_RUN4_MT_presampling_ITkPixel.sh b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_RUN4_MT_presampling_ITkPixel.sh
index 8566fdabd32b..15f28404091f 100755
--- a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_RUN4_MT_presampling_ITkPixel.sh
+++ b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_RUN4_MT_presampling_ITkPixel.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-athena-mt: 8
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: RUN4_presampling_MT.RDO.pool.root
export ATHENA_CORE_NUMBER=8
diff --git a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20_ttbar_no_pileup_MT.sh b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20_ttbar_no_pileup_MT.sh
index 22ab94e188f3..1e2c3ed40af3 100755
--- a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20_ttbar_no_pileup_MT.sh
+++ b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20_ttbar_no_pileup_MT.sh
@@ -6,7 +6,7 @@
# art-athena-mt: 8
# art-include: 22.0-mc20/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# the name below is needed because of the environment variable (marks storing in tar file).
# art-output: mc20_nopileup_ttbar.MT.RDO.pool.root
# art-output: mc20_nopileup_ttbar.ST.RDO.pool.root
diff --git a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20_ttbar_no_pileup_MT_1thread.sh b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20_ttbar_no_pileup_MT_1thread.sh
index 7d641f53eccc..ce2f026c751e 100755
--- a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20_ttbar_no_pileup_MT_1thread.sh
+++ b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20_ttbar_no_pileup_MT_1thread.sh
@@ -6,7 +6,7 @@
# art-athena-mt: 8
# art-include: 22.0-mc20/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# the name below is needed because of the environment variable (marks storing in tar file).
# art-output: mc20_nopileup_ttbar.MT.RDO.pool.root
# art-output: mc20_nopileup_ttbar.ST.RDO.pool.root
diff --git a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20e_MP_SharedWriter_NoParallelComp_reproducibility.sh b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20e_MP_SharedWriter_NoParallelComp_reproducibility.sh
index 03771cdf31b7..99c073617b5f 100755
--- a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20e_MP_SharedWriter_NoParallelComp_reproducibility.sh
+++ b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20e_MP_SharedWriter_NoParallelComp_reproducibility.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-athena-mt: 8
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mc20e_SP.RDO.pool.root
# art-output: mc20e_MP_fork_evt0.RDO.pool.root
# art-output: mc20e_MP_fork_evt1.RDO.pool.root
diff --git a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20e_MP_SharedWriter_reproducibility.sh b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20e_MP_SharedWriter_reproducibility.sh
index d9d3bfdb7dc1..6c78396f0cf1 100755
--- a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20e_MP_SharedWriter_reproducibility.sh
+++ b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20e_MP_SharedWriter_reproducibility.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-athena-mt: 8
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mc20e_SP.RDO.pool.root
# art-output: mc20e_MP_fork_evt0.RDO.pool.root
# art-output: mc20e_MP_fork_evt1.RDO.pool.root
diff --git a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20e_MP_presampling_reproducibility.sh b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20e_MP_presampling_reproducibility.sh
index c72e01f022a5..2da8c236fb11 100755
--- a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20e_MP_presampling_reproducibility.sh
+++ b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20e_MP_presampling_reproducibility.sh
@@ -6,7 +6,7 @@
# art-athena-mt: 8
# art-include: 22.0-mc20/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mc20e_presampling_SP.RDO.pool.root
# art-output: mc20e_presampling_MP_fork_evt0.RDO.pool.root
# art-output: mc20e_presampling_MP_fork_evt1.RDO.pool.root
diff --git a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20e_MP_reproducibility.sh b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20e_MP_reproducibility.sh
index 506b0292ff8d..dfd7a2df92c6 100755
--- a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20e_MP_reproducibility.sh
+++ b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc20e_MP_reproducibility.sh
@@ -6,7 +6,7 @@
# art-athena-mt: 8
# art-include: 22.0-mc20/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mc20e_SP.RDO.pool.root
# art-output: mc20e_MP_fork_evt0.RDO.pool.root
# art-output: mc20e_MP_fork_evt1.RDO.pool.root
diff --git a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc21a_MP_presampling_reproducibility.sh b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc21a_MP_presampling_reproducibility.sh
index b524f69f66fb..7e89591484e5 100755
--- a/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc21a_MP_presampling_reproducibility.sh
+++ b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc21a_MP_presampling_reproducibility.sh
@@ -6,7 +6,7 @@
# art-athena-mt: 8
# art-include: 22.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mc21a_presampling_SP.RDO.pool.root
# art-output: mc21a_presampling_MP_fork_evt0.RDO.pool.root
# art-output: mc21a_presampling_MP_fork_evt1.RDO.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_ATLFASTIIF_ttbar_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_ATLFASTIIF_ttbar_2evts.sh
index 920d82f848eb..818022597d4b 100755
--- a/Simulation/Tests/ISF_Validation/test/test_ATLFASTIIF_ttbar_2evts.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_ATLFASTIIF_ttbar_2evts.sh
@@ -5,7 +5,7 @@
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# MC15 setup
# ATLAS-R2-2015-03-01-00 and OFLCOND-RUN12-SDR-19
diff --git a/Simulation/Tests/ISF_Validation/test/test_ATLFASTII_ttbar_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_ATLFASTII_ttbar_2evts.sh
index 05ebfcb2b3a6..691473b6b81b 100755
--- a/Simulation/Tests/ISF_Validation/test/test_ATLFASTII_ttbar_2evts.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_ATLFASTII_ttbar_2evts.sh
@@ -5,7 +5,7 @@
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# MC15 setup
# ATLAS-R2-2015-03-01-00 and OFLCOND-RUN12-SDR-19
diff --git a/Simulation/Tests/ISF_Validation/test/test_AtlasG4_FullG4_comparison.sh b/Simulation/Tests/ISF_Validation/test/test_AtlasG4_FullG4_comparison.sh
index 3aa5873e83c5..efb34dc83151 100755
--- a/Simulation/Tests/ISF_Validation/test/test_AtlasG4_FullG4_comparison.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_AtlasG4_FullG4_comparison.sh
@@ -6,8 +6,8 @@
# art-include: 21.0/AthSimulation
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# MC16 setup
# ATLAS-R2-2016-01-00-01 and OFLCOND-MC16-SDR-14
diff --git a/Simulation/Tests/ISF_Validation/test/test_FatrasGammaCones_FastCalo_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_FatrasGammaCones_FastCalo_2evts.sh
index 13166f7b4054..fcd8f0e839d4 100755
--- a/Simulation/Tests/ISF_Validation/test/test_FatrasGammaCones_FastCalo_2evts.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_FatrasGammaCones_FastCalo_2evts.sh
@@ -5,7 +5,7 @@
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# MC15 setup
# ATLAS-R2-2015-03-01-00 and OFLCOND-RUN12-SDR-19
diff --git a/Simulation/Tests/ISF_Validation/test/test_G4BHadronsOnly_FastCalo_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_G4BHadronsOnly_FastCalo_2evts.sh
index d9f82778fa86..ebd77e8c134c 100755
--- a/Simulation/Tests/ISF_Validation/test/test_G4BHadronsOnly_FastCalo_2evts.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_G4BHadronsOnly_FastCalo_2evts.sh
@@ -5,7 +5,7 @@
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# MC15 setup
# ATLAS-R2-2015-03-01-00 and OFLCOND-RUN12-SDR-19
diff --git a/Simulation/Tests/ISF_Validation/test/test_G4GammaCones_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_G4GammaCones_2evts.sh
index b35b5abd27c3..ced0ef24a23c 100755
--- a/Simulation/Tests/ISF_Validation/test/test_G4GammaCones_2evts.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_G4GammaCones_2evts.sh
@@ -5,7 +5,7 @@
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# MC15 setup
# ATLAS-R2-2015-03-01-00 and OFLCOND-RUN12-SDR-19
diff --git a/Simulation/Tests/ISF_Validation/test/test_G4GammaCones_FastCalo_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_G4GammaCones_FastCalo_2evts.sh
index 8d2dc79378e7..da4057cc7c2e 100755
--- a/Simulation/Tests/ISF_Validation/test/test_G4GammaCones_FastCalo_2evts.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_G4GammaCones_FastCalo_2evts.sh
@@ -5,7 +5,7 @@
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# MC15 setup
# ATLAS-R2-2015-03-01-00 and OFLCOND-RUN12-SDR-19
diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3F_G4MS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3F_G4MS_ttbar.sh
index f5d4d128019b..7d6cc0ac6210 100755
--- a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3F_G4MS_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3F_G4MS_ttbar.sh
@@ -3,7 +3,7 @@
# art-description: MC16-style simulation using ATLFAST3F
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test.HITS.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_QS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_QS_ttbar.sh
index d3a0fd6ad9c6..00767499a24a 100755
--- a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_QS_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_QS_ttbar.sh
@@ -4,7 +4,7 @@
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-athena-mt: 4
diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_ttbar.sh
index 88472e632430..4d9066b2c068 100755
--- a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_ttbar.sh
@@ -4,7 +4,7 @@
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-athena-mt: 4
diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_Acts_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_Acts_ttbar.sh
index d7522b610946..8425790d8d71 100755
--- a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_Acts_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_Acts_ttbar.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
# art-description: MC16-style simulation using ATLFASTIIF
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test.HITS.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_G4MS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_G4MS_ttbar.sh
index c6afb560829c..b6899e16773c 100755
--- a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_G4MS_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_G4MS_ttbar.sh
@@ -3,7 +3,7 @@
# art-description: MC16-style simulation using ATLFASTIIF
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test.HITS.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_ttbar.sh
index 7f9200e68ca6..86a431e53c6a 100755
--- a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_ttbar.sh
@@ -3,7 +3,7 @@
# art-description: MC16-style simulation using ATLFASTIIF
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test.HITS.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTII_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTII_ttbar.sh
index cf4f2fa95f6a..9984bceabfc0 100755
--- a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTII_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTII_ttbar.sh
@@ -4,7 +4,7 @@
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test.HITS.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar.sh
index 13f3697a1187..0f60609d34d2 100755
--- a/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar.sh
@@ -4,7 +4,7 @@
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test.HITS.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar_2evts.sh
index 355a6b4a4373..cf1238cbb2c7 100755
--- a/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar_2evts.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar_2evts.sh
@@ -6,8 +6,8 @@
# art-include: 21.0/AthSimulation
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# MC16 setup
# ATLAS-R2-2016-01-00-01 and OFLCOND-MC16-SDR-14
diff --git a/Simulation/Tests/ISF_Validation/test/test_MC21_FullG4MT_QS_SQLiteGeoM_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC21_FullG4MT_QS_SQLiteGeoM_ttbar.sh
index 06f5421e7580..40e6a813f655 100755
--- a/Simulation/Tests/ISF_Validation/test/test_MC21_FullG4MT_QS_SQLiteGeoM_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_MC21_FullG4MT_QS_SQLiteGeoM_ttbar.sh
@@ -2,7 +2,7 @@
#
# art-description: Run simulation using ISF with the FullG4MT_QS simulator, reading ttbar events, building ATLAS-R3S-2021-03-00-00 geometry from SQLite database
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: *.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_MC21_FullG4MT_QS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC21_FullG4MT_QS_ttbar.sh
index 2e6cb9234e38..bc90b29e42d3 100755
--- a/Simulation/Tests/ISF_Validation/test/test_MC21_FullG4MT_QS_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_MC21_FullG4MT_QS_ttbar.sh
@@ -2,7 +2,7 @@
#
# art-description: Run simulation using ISF with the FullG4MT_QS simulator, reading 13 TeV ttbar events, writing HITS, using 2021 geometry and MC21 conditions
# art-include: 22.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: *.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_QS_CalibrationHits_pions.sh b/Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_QS_CalibrationHits_pions.sh
index 8b8ad044eb40..045cc92a72b5 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_QS_CalibrationHits_pions.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_QS_CalibrationHits_pions.sh
@@ -2,7 +2,7 @@
#
# art-description: Run simulation using ISF with the FullG4MT_QS simulator, reading single pion events, writing HITS including full CaloCalibrationHit information, using RUN2 geometry and conditions
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_QS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_QS_ttbar.sh
index 4853217d5f1d..dee51717b881 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_QS_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_QS_ttbar.sh
@@ -3,8 +3,8 @@
# art-description: MC23-style RUN2 simulation using FullG4MT_QS simulator in serial Athena
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: *.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_ttbar.sh
index 1be4f6cd81d5..d19180f1bcfd 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_ttbar.sh
@@ -3,8 +3,8 @@
# art-description: MC23-style RUN2 simulation using FullG4MT in serial Athena
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test.CG.HITS.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_2023_FullG4MT_QS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_2023_FullG4MT_QS_ttbar.sh
index 82671e94a120..a92dba7f07ab 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_2023_FullG4MT_QS_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN3_2023_FullG4MT_QS_ttbar.sh
@@ -2,7 +2,7 @@
#
# art-description: Run simulation using ISF with the FullG4MT_QS simulator, reading 13.6 TeV ttbar events, writing HITS, using the best knowledge RUN3 geometry and MC23 conditions
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: *.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_AF3InputParamFiles.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_AF3InputParamFiles.sh
index 0a6c526a3cce..cadbb8b4c1c2 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_AF3InputParamFiles.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN3_AF3InputParamFiles.sh
@@ -4,7 +4,7 @@
# art-type: build
# art-include: 22.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# Full chain with special flags
# ATLAS-R3S-2021-03-01-00 and OFLCOND-MC21-SDR-RUN3-07
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFAST3F_G4MS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFAST3F_G4MS_ttbar.sh
index 0a72b082e68a..526d3ea4b242 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFAST3F_G4MS_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFAST3F_G4MS_ttbar.sh
@@ -1,8 +1,8 @@
#!/bin/sh
#
# art-description: MC23-style RUN3 simulation using ATLFAST3F_G4MS in serial Athena
-# art-include: master/23.0
-# art-include: master/Athena
+# art-include: 23.0/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test.*.HITS.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFAST3MT_QS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFAST3MT_QS_ttbar.sh
index 4db733f595b8..ef2352a17151 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFAST3MT_QS_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFAST3MT_QS_ttbar.sh
@@ -2,7 +2,7 @@
#
# art-description: MC23-style RUN3 simulation using ATLFAST3MT_QS in serial Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test.*.HITS.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFAST3MT_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFAST3MT_ttbar.sh
index 333fc2d457ac..e9575f3f1057 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFAST3MT_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFAST3MT_ttbar.sh
@@ -2,7 +2,7 @@
#
# art-description: MC23-style RUN3 simulation using ATLFAST3MT in serial Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test.*.HITS.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFASTIIF_G4MS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFASTIIF_G4MS_ttbar.sh
index 3bc44945d171..ef77d6f9bab1 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFASTIIF_G4MS_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFASTIIF_G4MS_ttbar.sh
@@ -3,7 +3,7 @@
# art-description: MC23-style RUN3 simulation using ATLFASTIIF_G4MS in serial Athena
# art-type: grid
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-architecture: '#x86_64-intel'
# art-output: test.*.HITS.pool.root
# art-output: log.*
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFASTIIMT_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFASTIIMT_ttbar.sh
index 4ff525947bbe..71001e7b0358 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFASTIIMT_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFASTIIMT_ttbar.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
# art-description: MC23-style RUN3 simulation using ATLFASTIIMT in serial Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test.*.HITS.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4MT_QS_CalibrationHits_pions.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4MT_QS_CalibrationHits_pions.sh
index b43e8d006037..7eb532bd1bcc 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4MT_QS_CalibrationHits_pions.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4MT_QS_CalibrationHits_pions.sh
@@ -2,7 +2,7 @@
#
# art-description: Run simulation using ISF with the FullG4MT_QS simulator, reading single pion events, writing HITS including full CaloCalibrationHit information, using RUN3 geometry and conditions
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_QS_ZPrime_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_QS_ZPrime_2evts.sh
index 2ce4c92cbf2c..5594a8490308 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_QS_ZPrime_2evts.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_QS_ZPrime_2evts.sh
@@ -6,8 +6,8 @@
# art-include: 22.0/AthSimulation
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# RUN3 setup - Frozen Showers currently off by default
# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC21-SDR-RUN3-07
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_QS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_QS_ttbar.sh
index 11e8965c9086..cce95a59136f 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_QS_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_QS_ttbar.sh
@@ -3,7 +3,7 @@
# art-description: MC21-style simulation using FullG4MT_QS (13 TeV ttbar input - needs updating)
# art-include: 22.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: *.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_ReproducibilityTest.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_ReproducibilityTest.sh
index 0b9e97e030bb..80c6e1c73e24 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_ReproducibilityTest.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_ReproducibilityTest.sh
@@ -5,8 +5,8 @@
# art-include: 22.0/AthSimulation
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: hitsFull.ttbar.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_minbias.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_minbias.sh
index 7fd02eb07a2a..b2ac632d0c3e 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_minbias.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_minbias.sh
@@ -3,7 +3,7 @@
# art-description: MC21-style simulation using FullG4 (7 TeV minbias input - needs updating)
# art-include: 22.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test.HITS.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_ttbar_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_ttbar_2evts.sh
index d6790a49061c..ee5aaab227fb 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_ttbar_2evts.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_ttbar_2evts.sh
@@ -6,8 +6,8 @@
# art-include: 22.0/AthSimulation
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# RUN3 setup - Frozen Showers currently off by default
# ATLAS-R3S-2021-03-01-00 and OFLCOND-MC21-SDR-RUN3-03
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4MT_QS_CalibrationHits_pions.sh b/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4MT_QS_CalibrationHits_pions.sh
index 9ce0b0fa7b86..7e3fed64cb15 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4MT_QS_CalibrationHits_pions.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4MT_QS_CalibrationHits_pions.sh
@@ -2,7 +2,7 @@
#
# art-description: Run simulation using ISF with the FullG4MT_QS simulator, reading single pion events, writing HITS including full CaloCalibrationHit information, using RUN4 geometry and conditions
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_minbias.sh b/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_minbias.sh
index 511d4cc87202..05294579e8a4 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_minbias.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_minbias.sh
@@ -2,7 +2,7 @@
#
# art-description: MC21-style simulation using FullG4 and RUN4 geometry, minimum bias
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test_minbias.HITS.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_single_muon.sh b/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_single_muon.sh
index 8ff7cc80ea13..62055effeeb1 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_single_muon.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_single_muon.sh
@@ -2,7 +2,7 @@
#
# art-description: MC21-style simulation using FullG4 and RUN4 geometry, single muon
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test_muons.HITS.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_single_neutrino.sh b/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_single_neutrino.sh
index 23beb5dc2258..a02f5cb1e235 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_single_neutrino.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_single_neutrino.sh
@@ -2,7 +2,7 @@
#
# art-description: MC21-style simulation using FullG4 and RUN4 geometry, single neutrino
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test_neutrino.HITS.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_ttbar.sh
index e2318be648e7..37651609d60d 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_ttbar.sh
@@ -2,7 +2,7 @@
#
# art-description: MC21-style simulation using FullG4 and RUN4 geometry, ttbar
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test.HITS.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_ReSimulation.sh b/Simulation/Tests/ISF_Validation/test/test_ReSimulation.sh
index e85e3f67b385..2179f38ac3a9 100755
--- a/Simulation/Tests/ISF_Validation/test/test_ReSimulation.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_ReSimulation.sh
@@ -2,7 +2,7 @@
#
# art-description: ReSimulation Workflow running with MC16 conditions/geometry
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: log.*
diff --git a/Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh b/Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh
index bd69a8dfb14a..10818573ad28 100755
--- a/Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh
@@ -3,7 +3,7 @@
# art-description: Run cosmics simulation using ISF with the FullG4 simulator, generating events on-the-fly, using 2015 geometry and conditions
# art-include: 21.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test.HITS.pool.root
diff --git a/Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh b/Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh
index 56134ff4b194..e85e5e101007 100755
--- a/Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh
@@ -3,7 +3,7 @@
# art-description: Run cosmics simulation using ISF with the FullG4 simulator, using TrackRecords as input, using 2015 geometry and conditions
# art-include: 21.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test.HITS.pool.root
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_MC20_ReSimulation_FullG4MT_QS_ttbar_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_MC20_ReSimulation_FullG4MT_QS_ttbar_MT.sh
index a65f60a5468f..c7724c01906d 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_MC20_ReSimulation_FullG4MT_QS_ttbar_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_MC20_ReSimulation_FullG4MT_QS_ttbar_MT.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
# art-description: ReSimulation Workflow running with MC16 conditions/geometry
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: log.*
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_MC21_ReSimulation_FullG4MT_QS_ttbar_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_MC21_ReSimulation_FullG4MT_QS_ttbar_MT.sh
index f3428e260dd5..905334b6d75c 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_MC21_ReSimulation_FullG4MT_QS_ttbar_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_MC21_ReSimulation_FullG4MT_QS_ttbar_MT.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
# art-description: ReSimulation Workflow running with MC21 conditions/geometry and variable beamspot
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: log.*
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_ATLFAST3MT_QS_ttbar_MP.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_ATLFAST3MT_QS_ttbar_MP.sh
index 6a73002c9993..7624fc520432 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_ATLFAST3MT_QS_ttbar_MP.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_ATLFAST3MT_QS_ttbar_MP.sh
@@ -2,7 +2,7 @@
#
# art-description: MC23-style RUN2 simulation using ATLFAST3MT_QS in AthenaMP
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-athena-mt: 8
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_ATLFAST3MT_QS_ttbar_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_ATLFAST3MT_QS_ttbar_MT.sh
index da8cf035cd8d..50cced94ddfe 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_ATLFAST3MT_QS_ttbar_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_ATLFAST3MT_QS_ttbar_MT.sh
@@ -2,7 +2,7 @@
#
# art-description: MC23-style RUN2 simulation using ATLFAST3MT_QS in AthenaMT
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-athena-mt: 8
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_FullG4MT_QS_ttbar_MP.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_FullG4MT_QS_ttbar_MP.sh
index 07330ccda390..eeba418f44c3 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_FullG4MT_QS_ttbar_MP.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_FullG4MT_QS_ttbar_MP.sh
@@ -3,8 +3,8 @@
# art-description: MC23-style RUN2 simulation using FullG4MT_QS in AthenaMP
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-athena-mt: 8
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_FullG4MT_QS_ttbar_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_FullG4MT_QS_ttbar_MT.sh
index 03b1cbd93f12..79083b0f28c3 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_FullG4MT_QS_ttbar_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_FullG4MT_QS_ttbar_MT.sh
@@ -3,8 +3,8 @@
# art-description: MC23-style RUN2 simulation using FullG4MT_QS in AthenaMT
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-athena-mt: 8
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_2023_FullG4MT_QS_ttbar_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_2023_FullG4MT_QS_ttbar_MT.sh
index 7cf812c002e7..872df3c39770 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_2023_FullG4MT_QS_ttbar_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_2023_FullG4MT_QS_ttbar_MT.sh
@@ -3,8 +3,8 @@
# art-description: Run simulation using ISF with the FullG4MT_QS simulator, reading 13.6 TeV ttbar events, writing HITS, using the best knowledge RUN3 geometry and MC23 conditions
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-athena-mt: 8
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3F_G4MS_ttbar_MP.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3F_G4MS_ttbar_MP.sh
index 2eeda6ab1403..b937b9c2f66d 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3F_G4MS_ttbar_MP.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3F_G4MS_ttbar_MP.sh
@@ -3,7 +3,7 @@
# art-description: MC23-style Run3 simulation using ATLFAST3F_G4MS in AthenaMP
# art-type: grid
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 8
# art-architecture: '#x86_64-intel'
# art-output: test.*.HITS.pool.root
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_QS_ttbar_MP.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_QS_ttbar_MP.sh
index 070791753202..5e8b8945599e 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_QS_ttbar_MP.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_QS_ttbar_MP.sh
@@ -2,7 +2,7 @@
#
# art-description: MC23-style RUN3 simulation using ATLFAST3MT_QS in AthenaMP
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-athena-mt: 8
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_QS_ttbar_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_QS_ttbar_MT.sh
index 7d2bef93dc81..bb4e0003c179 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_QS_ttbar_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_QS_ttbar_MT.sh
@@ -2,7 +2,7 @@
#
# art-description: MC23-style RUN3 simulation using ATLFAST3MT_QS in AthenaMT
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-athena-mt: 8
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_ttbar_MP.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_ttbar_MP.sh
index 16a5a8b42aac..cd5df6a7194f 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_ttbar_MP.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_ttbar_MP.sh
@@ -2,7 +2,7 @@
#
# art-description: MC23-style RUN3 simulation using ATLFAST3MT in AthenaMP
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-athena-mt: 8
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_ttbar_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_ttbar_MT.sh
index 9c854b222397..19755f9dff80 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_ttbar_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_ttbar_MT.sh
@@ -2,7 +2,7 @@
#
# art-description: MC23-style RUN3 simulation using ATLFAST3MT in AthenaMT
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-athena-mt: 8
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFASTIIF_G4MS_ttbar_MP.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFASTIIF_G4MS_ttbar_MP.sh
index e21d5e724401..fff6c37077da 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFASTIIF_G4MS_ttbar_MP.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFASTIIF_G4MS_ttbar_MP.sh
@@ -3,7 +3,7 @@
# art-description: MC23-style Run3 simulation using ATLFASTIIF_G4MS in AthenaMP
# art-type: grid
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 8
# art-architecture: '#x86_64-intel'
# art-output: test.*.HITS.pool.root
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_CalibrationHits_pions_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_CalibrationHits_pions_MT.sh
index 880d83d7fc2d..e6fa2c984cd4 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_CalibrationHits_pions_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_CalibrationHits_pions_MT.sh
@@ -3,8 +3,8 @@
# art-description: MC23-style RUN3 simulation using FullG4MT_QS in AthenaMT, reading single pion events, writing HITS including full CaloCalibrationHit information
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-athena-mt: 8
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_Monopoles_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_Monopoles_MT.sh
index 45e377cc0442..08c39acbdc0a 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_Monopoles_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_Monopoles_MT.sh
@@ -3,8 +3,8 @@
# art-description: MC23-style RUN3 simulation of monopole samples using FullG4MT_QS
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-athena-mt: 8
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_Smuons_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_Smuons_MT.sh
index df3d1627b654..1c838415b9b5 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_Smuons_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_Smuons_MT.sh
@@ -3,8 +3,8 @@
# art-description: MC23-style RUN3 simulation of smuon samples using FullG4MT_QS in AthenaMT - input needs to be updated to an official sample when available.
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-athena-mt: 8
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ZPrime_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ZPrime_MT.sh
index ff9d7a239435..fb660819c2e2 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ZPrime_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ZPrime_MT.sh
@@ -3,8 +3,8 @@
# art-description: MC23-style Run3 simulation using FullG4MT_QS (13.6 TeV Zprime input) in AthenaMT
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-athena-mt: 8
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_minbias_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_minbias_MT.sh
index d3c8b05cc4f5..deb06a164fce 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_minbias_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_minbias_MT.sh
@@ -2,7 +2,7 @@
#
# art-description: MC23-style RUN3 simulation using FullG4MT_QS in AthenaMT
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-athena-mt: 8
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MP.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MP.sh
index 55f03b1970e1..4dd942642c57 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MP.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MP.sh
@@ -3,8 +3,8 @@
# art-description: MC23-style RUN3 simulation using FullG4MT_QS in AthenaMP
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-athena-mt: 8
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MPvsST.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MPvsST.sh
index cf8aa76bb9a3..fb428071abe1 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MPvsST.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MPvsST.sh
@@ -3,8 +3,8 @@
# art-description: Run MP and ST simulation, reading ttbar events, writing HITS, using MC23a geometry and conditions
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-athena-mt: 8
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MT.sh
index 4a3e2858f80e..e652f0f5a31a 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MT.sh
@@ -3,8 +3,8 @@
# art-description: MC23-style RUN3 simulation using FullG4MT_QS in AthenaMT
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-athena-mt: 8
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MTvsST.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MTvsST.sh
index 1d6519598e32..f623a1342072 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MTvsST.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MTvsST.sh
@@ -3,8 +3,8 @@
# art-description: Run MT and ST simulation, reading ttbar events, writing HITS, using MC23a geometry and conditions
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-athena-mt: 8
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_ttbar_MP.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_ttbar_MP.sh
index 475babffd1bf..25c3a150842c 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_ttbar_MP.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_ttbar_MP.sh
@@ -3,8 +3,8 @@
# art-description: MC23-style RUN3 simulation using FullG4MT in AthenaMP
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-athena-mt: 8
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_ttbar_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_ttbar_MT.sh
index e9fc95ec1992..97b7d0e73b66 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_ttbar_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_ttbar_MT.sh
@@ -3,8 +3,8 @@
# art-description: MC23-style RUN3 simulation using FullG4MT in AthenaMT
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-athena-mt: 8
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/OverlayTests/test/test_BSFilter.sh b/Simulation/Tests/OverlayTests/test/test_BSFilter.sh
index 22bc8a34db20..24e838432b0b 100755
--- a/Simulation/Tests/OverlayTests/test/test_BSFilter.sh
+++ b/Simulation/Tests/OverlayTests/test/test_BSFilter.sh
@@ -3,7 +3,7 @@
# art-description: BSOverlayFilter_tf legacy test
# art-type: grid
# art-architecture: '#x86_64-intel'
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: trigs_tar.txt
# art-output: log.*
diff --git a/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu.sh b/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu.sh
index 2a91d6a0f5eb..77e09745e65d 100755
--- a/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu.sh
+++ b/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu.sh
@@ -3,7 +3,7 @@
# art-description: MC+data Overlay with MT support, config test
# art-type: grid
# art-architecture: '#x86_64-intel'
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: legacyDataOverlayRDO.pool.root
# art-output: dataOverlayRDO.pool.root
diff --git a/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_BCM.sh b/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_BCM.sh
index 090813a271bc..89857a4b1b4b 100755
--- a/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_BCM.sh
+++ b/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_BCM.sh
@@ -3,7 +3,7 @@
# art-description: MC+data Overlay with MT support, config test
# art-type: grid
# art-architecture: '#x86_64-intel'
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: legacyDataOverlayRDO.pool.root
# art-output: dataOverlayRDO.pool.root
diff --git a/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_LAr.sh b/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_LAr.sh
index d4d61691ccd6..236e2e4f88f7 100755
--- a/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_LAr.sh
+++ b/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_LAr.sh
@@ -3,7 +3,7 @@
# art-description: MC+data Overlay with MT support, config test
# art-type: grid
# art-architecture: '#x86_64-intel'
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: legacyDataOverlayRDO.pool.root
# art-output: dataOverlayRDO.pool.root
diff --git a/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_Muon.sh b/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_Muon.sh
index 496d86f94118..cece28ec60a4 100755
--- a/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_Muon.sh
+++ b/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_Muon.sh
@@ -3,7 +3,7 @@
# art-description: MC+data Overlay with MT support, config test
# art-type: grid
# art-architecture: '#x86_64-intel'
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: legacyDataOverlayRDO.pool.root
# art-output: dataOverlayRDO.pool.root
diff --git a/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_Pixel.sh b/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_Pixel.sh
index a7c2e22c9d73..f8efeaec4288 100755
--- a/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_Pixel.sh
+++ b/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_Pixel.sh
@@ -3,7 +3,7 @@
# art-description: MC+data Overlay with MT support, config test
# art-type: grid
# art-architecture: '#x86_64-intel'
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: legacyDataOverlayRDO.pool.root
# art-output: dataOverlayRDO.pool.root
diff --git a/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_SCT.sh b/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_SCT.sh
index 1f43c16413e1..4efd1a8e2aa0 100755
--- a/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_SCT.sh
+++ b/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_SCT.sh
@@ -3,7 +3,7 @@
# art-description: MC+data Overlay with MT support, config test
# art-type: grid
# art-architecture: '#x86_64-intel'
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: legacyDataOverlayRDO.pool.root
# art-output: dataOverlayRDO.pool.root
diff --git a/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_TRT.sh b/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_TRT.sh
index f72e3d77813a..58dff50dcd21 100755
--- a/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_TRT.sh
+++ b/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_TRT.sh
@@ -3,7 +3,7 @@
# art-description: MC+data Overlay with MT support, config test
# art-type: grid
# art-architecture: '#x86_64-intel'
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: legacyDataOverlayRDO.pool.root
# art-output: dataOverlayRDO.pool.root
diff --git a/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_Tile.sh b/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_Tile.sh
index 07c456687107..7936a04f267b 100755
--- a/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_Tile.sh
+++ b/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_Tile.sh
@@ -3,7 +3,7 @@
# art-description: MC+data Overlay with MT support, config test
# art-type: grid
# art-architecture: '#x86_64-intel'
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: legacyDataOverlayRDO.pool.root
# art-output: dataOverlayRDO.pool.root
diff --git a/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_Truth.sh b/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_Truth.sh
index a6fac5c60a92..eb05e810c443 100755
--- a/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_Truth.sh
+++ b/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_Truth.sh
@@ -3,7 +3,7 @@
# art-description: MC+data Overlay with MT support, config test
# art-type: grid
# art-architecture: '#x86_64-intel'
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: legacyDataOverlayRDO.pool.root
# art-output: dataOverlayRDO.pool.root
diff --git a/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_sequential.sh b/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_sequential.sh
index c9b0f3854c2f..888554d6ecd2 100755
--- a/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_sequential.sh
+++ b/Simulation/Tests/OverlayTests/test/test_DataOverlay_ConfigTest_Zmumu_sequential.sh
@@ -3,7 +3,7 @@
# art-description: MC+data Overlay with MT support, running sequentially, new config
# art-type: grid
# art-architecture: '#x86_64-intel'
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: dataOverlayRDO.pool.root
# art-output: log.*
diff --git a/Simulation/Tests/OverlayTests/test/test_DataOverlay_MC16_Zmumu.sh b/Simulation/Tests/OverlayTests/test/test_DataOverlay_MC16_Zmumu.sh
index 276c6b4d995a..71016c29f32d 100755
--- a/Simulation/Tests/OverlayTests/test/test_DataOverlay_MC16_Zmumu.sh
+++ b/Simulation/Tests/OverlayTests/test/test_DataOverlay_MC16_Zmumu.sh
@@ -3,7 +3,7 @@
# art-description: OverlayChain+Reco test for data16.
# art-type: grid
# art-architecture: '#x86_64-intel'
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: log.*
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_BCM.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_BCM.sh
index 8c2d81a70c1e..d70689c71d54 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_BCM.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_BCM.sh
@@ -3,7 +3,7 @@
# art-description: MC+MC Overlay with MT support, config test
# art-type: grid
# art-architecture: '#x86_64-intel'
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: legacyMcOverlayRDO.pool.root
# art-output: mcOverlayRDO.pool.root
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_LAr.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_LAr.sh
index e00d66feec90..d4111bfb37c0 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_LAr.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_LAr.sh
@@ -3,7 +3,7 @@
# art-description: MC+MC Overlay with MT support, config test
# art-type: grid
# art-architecture: '#x86_64-intel'
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: legacyMcOverlayRDO.pool.root
# art-output: mcOverlayRDO.pool.root
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Muon.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Muon.sh
index 1d0e1b80f90f..8f3046a9f880 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Muon.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Muon.sh
@@ -3,7 +3,7 @@
# art-description: MC+MC Overlay with MT support, config test
# art-type: grid
# art-architecture: '#x86_64-intel'
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: legacyMcOverlayRDO.pool.root
# art-output: mcOverlayRDO.pool.root
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Muon_NSW.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Muon_NSW.sh
index b737c248bcdb..0209f04a7f0f 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Muon_NSW.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Muon_NSW.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 22.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: legacyMcOverlayRDO.pool.root
# art-output: mcOverlayRDO.pool.root
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Pixel_Run2.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Pixel_Run2.sh
index ae955784a90c..83cd412e1f9a 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Pixel_Run2.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Pixel_Run2.sh
@@ -3,7 +3,7 @@
# art-description: MC+MC Overlay with MT support, config test
# art-type: grid
# art-architecture: '#x86_64-intel'
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: legacyMcOverlayRDO.pool.root
# art-output: mcOverlayRDO.pool.root
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Pixel_Run3.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Pixel_Run3.sh
index 90eb6afb7e26..1d52a2a69aad 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Pixel_Run3.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Pixel_Run3.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 22.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: legacyMcOverlayRDO.pool.root
# art-output: mcOverlayRDO.pool.root
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Run2.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Run2.sh
index efb33e962435..458266419ecc 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Run2.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Run2.sh
@@ -3,7 +3,7 @@
# art-description: MC+MC Overlay with MT support, config test
# art-type: grid
# art-architecture: '#x86_64-intel'
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: legacyMcOverlayRDO.pool.root
# art-output: mcOverlayRDO.pool.root
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Run3.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Run3.sh
index 85a7f33619de..233135e01014 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Run3.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Run3.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 22.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: legacyMcOverlayRDO.pool.root
# art-output: mcOverlayRDO.pool.root
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_SCT.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_SCT.sh
index aa2204710b80..131840f5ca94 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_SCT.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_SCT.sh
@@ -3,7 +3,7 @@
# art-description: MC+MC Overlay with MT support, config test
# art-type: grid
# art-architecture: '#x86_64-intel'
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: legacyMcOverlayRDO.pool.root
# art-output: mcOverlayRDO.pool.root
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_SuperCells.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_SuperCells.sh
index 4dd3e6faf658..d0e766863d98 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_SuperCells.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_SuperCells.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 22.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: legacyMcOverlayRDO.pool.root
# art-output: mcOverlayRDO.pool.root
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_TRT.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_TRT.sh
index 20cba89f34d7..d952916cad6f 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_TRT.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_TRT.sh
@@ -3,7 +3,7 @@
# art-description: MC+MC Overlay with MT support, config test
# art-type: grid
# art-architecture: '#x86_64-intel'
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: legacyMcOverlayRDO.pool.root
# art-output: mcOverlayRDO.pool.root
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Tile.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Tile.sh
index 6bc749a11c80..39c737d8d0ed 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Tile.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Tile.sh
@@ -3,7 +3,7 @@
# art-description: MC+MC Overlay with MT support, config test
# art-type: grid
# art-architecture: '#x86_64-intel'
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: legacyMcOverlayRDO.pool.root
# art-output: mcOverlayRDO.pool.root
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Truth.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Truth.sh
index c821c49b2176..f6d5704e7601 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Truth.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_Truth.sh
@@ -3,7 +3,7 @@
# art-description: MC+MC Overlay with MT support, config test
# art-type: grid
# art-architecture: '#x86_64-intel'
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: legacyMcOverlayRDO.pool.root
# art-output: mcOverlayRDO.pool.root
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_sequential_Run2.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_sequential_Run2.sh
index 8aec8d45dd27..be4e0214e087 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_sequential_Run2.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_sequential_Run2.sh
@@ -3,7 +3,7 @@
# art-description: MC+MC Overlay with MT support, running sequentially, new config
# art-type: grid
# art-architecture: '#x86_64-intel'
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mcOverlayRDO.pool.root
# art-output: log.*
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_sequential_Run3.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_sequential_Run3.sh
index 9ebf5a929001..6e87e210345f 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_sequential_Run3.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_ConfigTest_ttbar_sequential_Run3.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 22.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mcOverlayRDO.pool.root
# art-output: log.*
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20a_ttbar.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20a_ttbar.sh
index 90f3329e79ba..acdf70f0f3de 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20a_ttbar.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20a_ttbar.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-include: 22.0-mc20/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: log.*
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20a_ttbar_fullchain.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20a_ttbar_fullchain.sh
index 3c07334864be..50a123a9e7de 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20a_ttbar_fullchain.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20a_ttbar_fullchain.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-include: 22.0-mc20/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: log.*
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20d_ttbar.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20d_ttbar.sh
index 4e0b99ba158c..f6af9d2e0fe4 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20d_ttbar.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20d_ttbar.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-include: 22.0-mc20/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: log.*
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20d_ttbar_fullchain.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20d_ttbar_fullchain.sh
index a07f6c7f69e8..6f6b0dcd6583 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20d_ttbar_fullchain.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20d_ttbar_fullchain.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-include: 22.0-mc20/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: log.*
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20e_ttbar.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20e_ttbar.sh
index b5acea51fd76..76a7caea7d27 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20e_ttbar.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20e_ttbar.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-include: 22.0-mc20/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: log.*
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20e_ttbar_fullchain.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20e_ttbar_fullchain.sh
index d0eda125b045..b6f2c950dc96 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20e_ttbar_fullchain.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20e_ttbar_fullchain.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-include: 22.0-mc20/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: log.*
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC21a_ttbar.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC21a_ttbar.sh
index e2c833c29038..f764c44bc23a 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC21a_ttbar.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC21a_ttbar.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-include: 22.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: log.*
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_RUN4_neutrinos_mu200.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_RUN4_neutrinos_mu200.sh
index 8dee7b86ee5e..b4c795f5e999 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_RUN4_neutrinos_mu200.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_RUN4_neutrinos_mu200.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: log.*
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_RUN4_ttbar_mu200.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_RUN4_ttbar_mu200.sh
index ec3c652ae531..e6b1674c35ff 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_RUN4_ttbar_mu200.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_RUN4_ttbar_mu200.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: log.*
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_RUN4_ttbar_mu60.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_RUN4_ttbar_mu60.sh
index 1d337cebe3fa..e8bb330c6bab 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_RUN4_ttbar_mu60.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_RUN4_ttbar_mu60.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: log.*
diff --git a/Simulation/Tests/OverlayTestsMT/test/test_DataOverlay_MT_Zmumu_8threads_NewConfig.sh b/Simulation/Tests/OverlayTestsMT/test/test_DataOverlay_MT_Zmumu_8threads_NewConfig.sh
index d15ad32fb61d..cf117ab9c089 100755
--- a/Simulation/Tests/OverlayTestsMT/test/test_DataOverlay_MT_Zmumu_8threads_NewConfig.sh
+++ b/Simulation/Tests/OverlayTestsMT/test/test_DataOverlay_MT_Zmumu_8threads_NewConfig.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-athena-mt: 8
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: dataOverlayRDO.pool.root
# art-output: log.*
diff --git a/Simulation/Tests/OverlayTestsMT/test/test_DataOverlay_Zmumu_ST_vs_MT.sh b/Simulation/Tests/OverlayTestsMT/test/test_DataOverlay_Zmumu_ST_vs_MT.sh
index cd8d253e7c23..0480eeed1d6a 100755
--- a/Simulation/Tests/OverlayTestsMT/test/test_DataOverlay_Zmumu_ST_vs_MT.sh
+++ b/Simulation/Tests/OverlayTestsMT/test/test_DataOverlay_Zmumu_ST_vs_MT.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-athena-mt: 8
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: MC_plus_data.MT.RDO.pool.root
# art-output: MC_plus_data.ST.RDO.pool.root
diff --git a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_1thread.sh b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_1thread.sh
index b69a74b79c8f..39c6adcfe478 100755
--- a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_1thread.sh
+++ b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_1thread.sh
@@ -6,7 +6,7 @@
# art-athena-mt: 8
# art-include: 22.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: log.*
diff --git a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_4threads.sh b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_4threads.sh
index e60afcfaca20..b5838e44420a 100755
--- a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_4threads.sh
+++ b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_4threads.sh
@@ -6,7 +6,7 @@
# art-athena-mt: 8
# art-include: 22.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: MC_plus_MC.RDO.pool.root
# art-output: log.*
diff --git a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_8threads_NewConfig.sh b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_8threads_NewConfig.sh
index a0c8500e4382..23419e5057de 100755
--- a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_8threads_NewConfig.sh
+++ b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_8threads_NewConfig.sh
@@ -6,7 +6,7 @@
# art-athena-mt: 8
# art-include: 22.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mcOverlayRDO.pool.root
# art-output: log.*
diff --git a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_Run3_1thread.sh b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_Run3_1thread.sh
index 2d0fcd5d6439..3571c2bcf78e 100755
--- a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_Run3_1thread.sh
+++ b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_Run3_1thread.sh
@@ -6,7 +6,7 @@
# art-athena-mt: 8
# art-include: 22.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: log.*
diff --git a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_Run3_4threads.sh b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_Run3_4threads.sh
index 8b31042cf154..55e7cd706b5d 100755
--- a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_Run3_4threads.sh
+++ b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_Run3_4threads.sh
@@ -6,7 +6,7 @@
# art-athena-mt: 8
# art-include: 22.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: MC_plus_MC.RDO.pool.root
# art-output: log.*
diff --git a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_Run3_8threads_NewConfig.sh b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_Run3_8threads_NewConfig.sh
index 4f6cca525397..80107c22b83a 100755
--- a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_Run3_8threads_NewConfig.sh
+++ b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_Run3_8threads_NewConfig.sh
@@ -6,7 +6,7 @@
# art-athena-mt: 8
# art-include: 22.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: mcOverlayRDO.pool.root
# art-output: log.*
diff --git a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_Run3_ST_vs_MT.sh b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_Run3_ST_vs_MT.sh
index b71fe2ce6380..05d3d12a7989 100755
--- a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_Run3_ST_vs_MT.sh
+++ b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_Run3_ST_vs_MT.sh
@@ -6,7 +6,7 @@
# art-athena-mt: 8
# art-include: 22.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: MC_plus_MC.MT.RDO.pool.root
# art-output: MC_plus_MC.ST.RDO.pool.root
diff --git a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT.sh b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT.sh
index 7efb33f7c9f4..fb059d537f3a 100755
--- a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT.sh
+++ b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-athena-mt: 8
# art-include: 22.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: MC_plus_MC.MT.RDO.pool.root
# art-output: MC_plus_MC.ST.RDO.pool.root
diff --git a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_1thread.sh b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_1thread.sh
index 3316284ccf83..9d0a2e9d3dbc 100755
--- a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_1thread.sh
+++ b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_1thread.sh
@@ -6,7 +6,7 @@
# art-athena-mt: 8
# art-include: 22.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: MC_plus_MC.MT.RDO.pool.root
# art-output: MC_plus_MC.ST.RDO.pool.root
diff --git a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_LAr.sh b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_LAr.sh
index 13689de1551c..ad99fcd1b26f 100755
--- a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_LAr.sh
+++ b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_LAr.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-athena-mt: 8
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: MC_plus_MC.MT.RDO.pool.root
# art-output: MC_plus_MC.ST.RDO.pool.root
diff --git a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_Muon.sh b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_Muon.sh
index 132c12bd5ec7..d8e73f36175b 100755
--- a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_Muon.sh
+++ b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_Muon.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-athena-mt: 8
# art-include: 22.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: MC_plus_MC.MT.RDO.pool.root
# art-output: MC_plus_MC.ST.RDO.pool.root
diff --git a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_Muon_NSW.sh b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_Muon_NSW.sh
index 79b43b097174..c5b4744e994f 100755
--- a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_Muon_NSW.sh
+++ b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_Muon_NSW.sh
@@ -5,7 +5,7 @@
# art-architecture: '#x86_64-intel'
# art-athena-mt: 8
# art-include: 22.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: MC_plus_MC.MT.RDO.pool.root
# art-output: MC_plus_MC.ST.RDO.pool.root
diff --git a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_SCT.sh b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_SCT.sh
index 3309493433bf..e70a8f4b8ee1 100755
--- a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_SCT.sh
+++ b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_SCT.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-athena-mt: 8
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: MC_plus_MC.MT.RDO.pool.root
# art-output: MC_plus_MC.ST.RDO.pool.root
diff --git a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_TRT.sh b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_TRT.sh
index 77ba2011042e..0a82af9d1adc 100755
--- a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_TRT.sh
+++ b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_TRT.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-athena-mt: 8
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: MC_plus_MC.MT.RDO.pool.root
# art-output: MC_plus_MC.ST.RDO.pool.root
diff --git a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_Tile.sh b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_Tile.sh
index 0e706d6af187..8444ae3b0873 100755
--- a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_Tile.sh
+++ b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_Tile.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-athena-mt: 8
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: MC_plus_MC.MT.RDO.pool.root
# art-output: MC_plus_MC.ST.RDO.pool.root
diff --git a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_pixel.sh b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_pixel.sh
index 4ecd430198e8..f41ba01f79cb 100755
--- a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_pixel.sh
+++ b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_pixel.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-athena-mt: 8
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: MC_plus_MC.MT.RDO.pool.root
# art-output: MC_plus_MC.ST.RDO.pool.root
diff --git a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_truth.sh b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_truth.sh
index bae23e28490c..08f5489d4345 100755
--- a/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_truth.sh
+++ b/Simulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_truth.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-athena-mt: 8
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: MC_plus_MC.MT.RDO.pool.root
# art-output: MC_plus_MC.ST.RDO.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_AFPSimTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_AFPSimTest.sh
index dac50f09f234..3894bae08247 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_AFPSimTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_AFPSimTest.sh
@@ -2,7 +2,7 @@
#
# art-description: Tests ATLAS + AFP simulation, generating events on-the-fly
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ALFASimTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ALFASimTest.sh
index b865067d0475..0bd422110fa0 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ALFASimTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ALFASimTest.sh
@@ -2,7 +2,7 @@
#
# art-description: Tests ATLAS + ALFA simulation, generating events on-the-fly
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_EVNT2TR.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_EVNT2TR.sh
index f4620c3c4618..ecf56b744285 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_EVNT2TR.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_EVNT2TR.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.EVNT_TR.pool.root
# art-output: log.*
# art-output: Config*.pkl
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSim.sh
index fc48603684bd..c78fb064f63d 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSim.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSim.sh
@@ -2,7 +2,7 @@
#
# art-description: Run cosmics simulation outside ISF, generating events on-the-fly, using 2015 geometry and conditions
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR.sh
index 920c73e4a336..eeae5a7e6e14 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.HITS.pool.root
# art-output: log.*
# art-output: Config*.pkl
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FastCaloSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FastCaloSim.sh
index b6ea5b7120db..d1d006414872 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FastCaloSim.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FastCaloSim.sh
@@ -2,7 +2,7 @@
#
# art-description: Tests implementation of FastCaloSimV2 as a Geant4 fast simulation engine with Run 3 geometry and conditions
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_HeavyIonSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_HeavyIonSim.sh
index 470af89695c8..f8858923fe16 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_HeavyIonSim.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_HeavyIonSim.sh
@@ -2,7 +2,7 @@
#
# art-description: Run simulation outside ISF, reading lead ions peripheral simulation (low multiplicity) events, writing HITS, using 2015 geometry and conditions
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_LucidSimTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_LucidSimTest.sh
index 410eb9b5bacd..c0cd5c3ed586 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_LucidSimTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_LucidSimTest.sh
@@ -3,7 +3,7 @@
# art-description: Tests ATLAS + Lucid simulation, reading in events from a file, using 2015 geometry and conditions
# art-include: 21.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NeutronCutTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NeutronCutTest.sh
index f730013375b8..347d2aefcdd0 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NeutronCutTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NeutronCutTest.sh
@@ -2,7 +2,7 @@
#
# art-description: Run simulation outside ISF, reading Z->tau tau events, modifying the Neutron timing cut, writing HITS, using 2015 geometry and conditions
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ReproducibilityTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ReproducibilityTest.sh
index dea25dcc4b3d..f6af1097ae98 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ReproducibilityTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ReproducibilityTest.sh
@@ -5,8 +5,8 @@
# art-include: 21.0/AthSimulation
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: hitsFull.ttbar.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_SkipEventsTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_SkipEventsTest.sh
index df17430da46c..e1632fca8244 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_SkipEventsTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_SkipEventsTest.sh
@@ -5,8 +5,8 @@
# art-include: 21.0/AthSimulation
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ZDCSimTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ZDCSimTest.sh
index e1ca40fd3a0d..ba66a793a0d5 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ZDCSimTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ZDCSimTest.sh
@@ -2,7 +2,7 @@
#
# art-description: Tests ATLAS + ZDC simulation, generating events on-the-fly
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_electrons.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_electrons.sh
index 92fea25cb0c5..9468768ad1b0 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_electrons.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_electrons.sh
@@ -2,7 +2,7 @@
#
# art-description: Tests detector response to single electrons, generated on-the-fly, using 2015 geometry and conditions
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_minbias.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_minbias.sh
index 737f2c4524ad..5ef47dd0f8ad 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_minbias.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_minbias.sh
@@ -3,7 +3,7 @@
# art-description: Tests inner detector response to minbias events, using 2015 geometry and conditions
# art-include: 21.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_muons.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_muons.sh
index c90097523ec9..20f31713e5c2 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_muons.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_muons.sh
@@ -2,7 +2,7 @@
#
# art-description: Tests detector response to single muons, generated on-the-fly, using 2015 geometry and conditions
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_pions.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_pions.sh
index e60432d33df7..3f4d206236e2 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_pions.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_pions.sh
@@ -2,7 +2,7 @@
#
# art-description: Tests detector response to single pions, generated on-the-fly, using 2015 geometry and conditions
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_RUN1_2010_AtlasG4_mu.sh b/Simulation/Tests/SimCoreTests/test/test_RUN1_2010_AtlasG4_mu.sh
index 72e06e30337f..3144c7b12fc1 100755
--- a/Simulation/Tests/SimCoreTests/test/test_RUN1_2010_AtlasG4_mu.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_RUN1_2010_AtlasG4_mu.sh
@@ -3,8 +3,8 @@
# art-description: Run simulation outside ISF, using 2010 geometry and conditions, reading single muon events, writing HITS
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_RUN1_2011_AtlasG4_mu.sh b/Simulation/Tests/SimCoreTests/test/test_RUN1_2011_AtlasG4_mu.sh
index cbdb177b425f..ef9c5e7142e1 100755
--- a/Simulation/Tests/SimCoreTests/test/test_RUN1_2011_AtlasG4_mu.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_RUN1_2011_AtlasG4_mu.sh
@@ -3,8 +3,8 @@
# art-description: Run simulation outside ISF, using 2011 geometry and conditions, reading single muon events, writing HITS
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_RUN1_2012_AtlasG4_mu.sh b/Simulation/Tests/SimCoreTests/test/test_RUN1_2012_AtlasG4_mu.sh
index ef47ef9afa1d..5b25c36b6bdc 100755
--- a/Simulation/Tests/SimCoreTests/test/test_RUN1_2012_AtlasG4_mu.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_RUN1_2012_AtlasG4_mu.sh
@@ -3,8 +3,8 @@
# art-description: Run simulation outside ISF, using 2012 geometry and conditions, reading single muon events, writing HITS
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_RUN2_2015_AtlasG4_QGSP_BIC.sh b/Simulation/Tests/SimCoreTests/test/test_RUN2_2015_AtlasG4_QGSP_BIC.sh
index 1f31e066220f..ae23a00bcb9d 100755
--- a/Simulation/Tests/SimCoreTests/test/test_RUN2_2015_AtlasG4_QGSP_BIC.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_RUN2_2015_AtlasG4_QGSP_BIC.sh
@@ -3,8 +3,8 @@
# art-description: Run simulation outside ISF, with alternative QGSP_BIC physics list, reading in SU3 SUSY events, using 2015 geometry and conditions
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_RUN2_AtlasG4_FTFP_BERT.sh b/Simulation/Tests/SimCoreTests/test/test_RUN2_AtlasG4_FTFP_BERT.sh
index fd39d2b447ba..088ef53d5535 100755
--- a/Simulation/Tests/SimCoreTests/test/test_RUN2_AtlasG4_FTFP_BERT.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_RUN2_AtlasG4_FTFP_BERT.sh
@@ -3,8 +3,8 @@
# art-description: Run simulation outside ISF, reading di-jet events, using FTFP_BERT physics list, writing HITS, using RUN2 geometry and conditions
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_RUN2_AtlasG4_ttbar.sh b/Simulation/Tests/SimCoreTests/test/test_RUN2_AtlasG4_ttbar.sh
index 5d17dc700dd1..396241f9cdef 100755
--- a/Simulation/Tests/SimCoreTests/test/test_RUN2_AtlasG4_ttbar.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_RUN2_AtlasG4_ttbar.sh
@@ -3,8 +3,8 @@
# art-description: Run G4AtlasAlg simulation, reading ttbar events, writing HITS, using RUN2 geometry and conditions
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: log.*
diff --git a/Simulation/Tests/SimCoreTests/test/test_RUN3_AtlasG4_CalibrationHits_pions.sh b/Simulation/Tests/SimCoreTests/test/test_RUN3_AtlasG4_CalibrationHits_pions.sh
index 49d62dcef111..0f8de50832b4 100755
--- a/Simulation/Tests/SimCoreTests/test/test_RUN3_AtlasG4_CalibrationHits_pions.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_RUN3_AtlasG4_CalibrationHits_pions.sh
@@ -2,7 +2,7 @@
#
# art-description: Reading in single particle gen events, writing out full CaloCalibrationHit information, using RUN3 geometry and conditions
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_RUN3_AtlasG4_ttbar.sh b/Simulation/Tests/SimCoreTests/test/test_RUN3_AtlasG4_ttbar.sh
index 3e6738dccb83..f0ecd2146e59 100755
--- a/Simulation/Tests/SimCoreTests/test/test_RUN3_AtlasG4_ttbar.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_RUN3_AtlasG4_ttbar.sh
@@ -3,8 +3,8 @@
# art-description: Run G4AtlasAlg simulation, reading ttbar events, writing HITS, using RUN2 geometry and conditions
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: log.*
diff --git a/Simulation/Tests/SimCoreTests/test/test_Sim_Comparison.sh b/Simulation/Tests/SimCoreTests/test/test_Sim_Comparison.sh
index 6853938530a5..95e634cebe18 100755
--- a/Simulation/Tests/SimCoreTests/test/test_Sim_Comparison.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_Sim_Comparison.sh
@@ -2,7 +2,7 @@
#
# art-description: Simulation example to test agreement between ConfGetter and ComponentAccumulator configurations.
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_TestBeamSim.sh b/Simulation/Tests/SimCoreTests/test/test_TestBeamSim.sh
index edc7bc43c198..22bf7e714233 100755
--- a/Simulation/Tests/SimCoreTests/test/test_TestBeamSim.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_TestBeamSim.sh
@@ -2,7 +2,7 @@
#
# art-description: Run test-beam simulation outside ISF, generating events on-the-fly, writing HITS
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test*HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_athena_G4AtlasCosmic.sh b/Simulation/Tests/SimCoreTests/test/test_athena_G4AtlasCosmic.sh
index 670c462ca400..6bb90e93dc94 100755
--- a/Simulation/Tests/SimCoreTests/test/test_athena_G4AtlasCosmic.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_athena_G4AtlasCosmic.sh
@@ -3,7 +3,7 @@
# art-description: Run cosmics simulation outside ISF from the athena command-line, generating events on-the-fly
# art-include: 21.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_athena_G4AtlasGeoTest.sh b/Simulation/Tests/SimCoreTests/test/test_athena_G4AtlasGeoTest.sh
index 73d976e9ebf6..552364e105ac 100755
--- a/Simulation/Tests/SimCoreTests/test/test_athena_G4AtlasGeoTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_athena_G4AtlasGeoTest.sh
@@ -3,7 +3,7 @@
# art-description: Recursive geometry test on ATLAS-R2-2015-03-01-00 (MC15 default). Done only on G4 and GeoModel envelopes
# art-include: 21.0/Athena
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_CalibationHits_pions_MT.sh b/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_CalibationHits_pions_MT.sh
index 4c74df74af06..3630a9555737 100755
--- a/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_CalibationHits_pions_MT.sh
+++ b/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_CalibationHits_pions_MT.sh
@@ -2,7 +2,7 @@
#
# art-description: Run MT simulation outside ISF, reading single pion events, writing HITS including CaloCalibrationHits, using MC16 geometry and conditions
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_FastCaloSim_MTvsST.sh b/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_FastCaloSim_MTvsST.sh
index a9184cb8ca96..da9def9a7887 100755
--- a/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_FastCaloSim_MTvsST.sh
+++ b/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_FastCaloSim_MTvsST.sh
@@ -2,7 +2,7 @@
#
# art-description: Run MT and ST simulation outside ISF, reading ttbar events, writing HITS, using MC16 geometry and conditions
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_TTbarSim_MT.sh b/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_TTbarSim_MT.sh
index f9d68e7f1fa2..e7dbf9f8a705 100755
--- a/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_TTbarSim_MT.sh
+++ b/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_TTbarSim_MT.sh
@@ -2,7 +2,7 @@
#
# art-description: Run MT simulation outside ISF, reading ttbar events, writing HITS, using MC16 geometry and conditions
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_TTbarSim_MTvsST.sh b/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_TTbarSim_MTvsST.sh
index da215a066190..11dbac8f6f76 100755
--- a/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_TTbarSim_MTvsST.sh
+++ b/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_TTbarSim_MTvsST.sh
@@ -2,7 +2,7 @@
#
# art-description: Run MT and ST simulation outside ISF, reading ttbar events, writing HITS, using MC16 geometry and conditions
# art-include: 23.0/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/SimCoreTestsMT/test/test_RUN3_AtlasG4_QS_ttbar_MT.sh b/Simulation/Tests/SimCoreTestsMT/test/test_RUN3_AtlasG4_QS_ttbar_MT.sh
index 18a020edc3c5..23c8e99b1455 100755
--- a/Simulation/Tests/SimCoreTestsMT/test/test_RUN3_AtlasG4_QS_ttbar_MT.sh
+++ b/Simulation/Tests/SimCoreTestsMT/test/test_RUN3_AtlasG4_QS_ttbar_MT.sh
@@ -3,8 +3,8 @@
# art-description: Run G4AtlasAlg simulation, reading ttbar events, writing HITS, using RUN3 geometry and conditions and quasi-stable particle simulation
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-athena-mt: 8
diff --git a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos.sh b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos.sh
index 57a94f3eac9f..03807bf6990e 100755
--- a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos.sh
+++ b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos.sh
@@ -5,8 +5,8 @@
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-output: *.root
# art-output: PDGTABLE.MeV.*
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos_busy.sh b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos_busy.sh
index b659d964c2f6..53eb892330f2 100755
--- a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos_busy.sh
+++ b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos_busy.sh
@@ -5,8 +5,8 @@
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-output: *.root
# art-output: PDGTABLE.MeV.*
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingLightSleptons.sh b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingLightSleptons.sh
index 9af32f25a42a..99002d45e739 100755
--- a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingLightSleptons.sh
+++ b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingLightSleptons.sh
@@ -5,8 +5,8 @@
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-output: *.root
# art-output: PDGTABLE.MeV.*
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingNeutralinos.sh b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingNeutralinos.sh
index 5d66fff6afc0..cf4ac8e0d0d3 100755
--- a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingNeutralinos.sh
+++ b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingNeutralinos.sh
@@ -5,8 +5,8 @@
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-output: *.root
# art-output: PDGTABLE.MeV.*
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingStaus.sh b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingStaus.sh
index ec8c156cc8ec..5f114d798ea2 100755
--- a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingStaus.sh
+++ b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingStaus.sh
@@ -5,8 +5,8 @@
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-output: *.root
# art-output: PDGTABLE.MeV.*
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/SimExoticsTests/test/test_FullG4_SemiVisibleJets.sh b/Simulation/Tests/SimExoticsTests/test/test_FullG4_SemiVisibleJets.sh
index 57a9afb2f3d2..2b990f114a7b 100755
--- a/Simulation/Tests/SimExoticsTests/test/test_FullG4_SemiVisibleJets.sh
+++ b/Simulation/Tests/SimExoticsTests/test/test_FullG4_SemiVisibleJets.sh
@@ -5,8 +5,8 @@
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-output: *.root
# art-output: PDGTABLE.MeV.*
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/SimExoticsTests/test/test_FullG4_StableCharginos.sh b/Simulation/Tests/SimExoticsTests/test/test_FullG4_StableCharginos.sh
index 98a1ad31a936..a6e052442c97 100755
--- a/Simulation/Tests/SimExoticsTests/test/test_FullG4_StableCharginos.sh
+++ b/Simulation/Tests/SimExoticsTests/test/test_FullG4_StableCharginos.sh
@@ -5,8 +5,8 @@
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-output: *.root
# art-output: PDGTABLE.MeV.*
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/SimExoticsTests/test/test_FullG4_StableSleptons.sh b/Simulation/Tests/SimExoticsTests/test/test_FullG4_StableSleptons.sh
index 50ad19fbcfce..0b1342f6bf89 100755
--- a/Simulation/Tests/SimExoticsTests/test/test_FullG4_StableSleptons.sh
+++ b/Simulation/Tests/SimExoticsTests/test/test_FullG4_StableSleptons.sh
@@ -5,8 +5,8 @@
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-output: *.root
# art-output: PDGTABLE.MeV.*
# art-output: *.HITS.pool.root
diff --git a/Simulation/Tests/SimExoticsTests/test/test_MC20_FullG4_LongLived_SemiVisibleJets.sh b/Simulation/Tests/SimExoticsTests/test/test_MC20_FullG4_LongLived_SemiVisibleJets.sh
index f9a67f2bb90e..06806a9aaf3f 100755
--- a/Simulation/Tests/SimExoticsTests/test/test_MC20_FullG4_LongLived_SemiVisibleJets.sh
+++ b/Simulation/Tests/SimExoticsTests/test/test_MC20_FullG4_LongLived_SemiVisibleJets.sh
@@ -5,8 +5,8 @@
# art-architecture: '#x86_64-intel'
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
# art-output: *.root
# art-output: PDGTABLE.MeV.*
# art-output: *.HITS.pool.root
diff --git a/TileCalorimeter/TileExample/TileSimEx/test/test_TileTB_Sim.sh b/TileCalorimeter/TileExample/TileSimEx/test/test_TileTB_Sim.sh
index 48c5c3f010b4..6e301f999fb8 100755
--- a/TileCalorimeter/TileExample/TileSimEx/test/test_TileTB_Sim.sh
+++ b/TileCalorimeter/TileExample/TileSimEx/test/test_TileTB_Sim.sh
@@ -6,8 +6,8 @@
# art-include: 21.0/AthSimulation
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-# art-include: master/Athena
-# art-include: master/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
athena TileSimEx/jobOptions_TileTB_Sim.py
diff --git a/Tools/CampaignsARTTests/test/test_digi_reco_ttbar_mu1_inTimeTruth.sh b/Tools/CampaignsARTTests/test/test_digi_reco_ttbar_mu1_inTimeTruth.sh
index d5845415e10a..d1abf9d2f08b 100755
--- a/Tools/CampaignsARTTests/test/test_digi_reco_ttbar_mu1_inTimeTruth.sh
+++ b/Tools/CampaignsARTTests/test/test_digi_reco_ttbar_mu1_inTimeTruth.sh
@@ -2,7 +2,7 @@
# art-description: Run-4 Sim to DAOD_PHYSVAL and output plots via dcube, on non-all-had ttbar with no pile-up
# art-input-nfiles: 1
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: *.xml
# art-output: dcube*
diff --git a/Tools/CampaignsARTTests/test/test_full_chain_quick.sh b/Tools/CampaignsARTTests/test/test_full_chain_quick.sh
index c051989b4424..9d4cea279eb9 100755
--- a/Tools/CampaignsARTTests/test/test_full_chain_quick.sh
+++ b/Tools/CampaignsARTTests/test/test_full_chain_quick.sh
@@ -3,7 +3,7 @@
# art-input: mc21_14TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8481
# art-input-nfiles: 1
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-athena-mt: 4
diff --git a/Tools/CampaignsARTTests/test/test_full_chain_ttbar_mu0.sh b/Tools/CampaignsARTTests/test/test_full_chain_ttbar_mu0.sh
index 83ac1dcd3b96..bcf071ce53d0 100755
--- a/Tools/CampaignsARTTests/test/test_full_chain_ttbar_mu0.sh
+++ b/Tools/CampaignsARTTests/test/test_full_chain_ttbar_mu0.sh
@@ -3,7 +3,7 @@
# art-input: mc21_14TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8481
# art-input-nfiles: 1
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-output: *.root
# art-output: *.xml
# art-output: dcube*
diff --git a/Tools/DirectIOART/generateARTtests.py b/Tools/DirectIOART/generateARTtests.py
index 24be7f0c87c4..0c8295647863 100755
--- a/Tools/DirectIOART/generateARTtests.py
+++ b/Tools/DirectIOART/generateARTtests.py
@@ -80,7 +80,7 @@ def write_RecoTF(opts):
# art-type: grid
# art-output: *.pool.root
# art-include: 21.0/Athena
-# art-include: master/Athena\n
+# art-include: main/Athena\n
set -e\n
Reco_tf.py --AMI q221 --inputRDOFile {turl} --outputRDO_TRIGFile art.pool.root\n
echo \"art-result: $? DirectIOART_Athena_RecoTF_inputRDO_protocol_{protocol}\"""".format(turl=item.values()[0], protocol=item.keys()[0])
@@ -98,7 +98,7 @@ echo \"art-result: $? DirectIOART_Athena_RecoTF_inputRDO_protocol_{protocol}\"""
# art-type: grid
# art-output: *.pool.root
# art-include: 21.0/Athena
-# art-include: master/Athena\n
+# art-include: main/Athena\n
set -e\n
export ATHENA_CORE_NUMBER=2
Reco_tf.py --AMI q221 --multiprocess --inputRDOFile {turl} --outputRDO_TRIGFile art.pool.root\n
@@ -118,7 +118,7 @@ echo \"art-result: $? DirectIOART_AthenaMP_RecoTF_inputRDO_protocol_{protocol}\"
# art-type: grid
# art-output: *.pool.root
# art-include: 21.0/Athena
-# art-include: master/Athena\n
+# art-include: main/Athena\n
set -e\n
Reco_tf.py --AMI q431 --inputBSFile {turl} --outputESDFile art.pool.root\n
echo \"art-result: $? DirectIOART_Athena_RecoTF_inputBS_protocol_{protocol}\"""".format(turl=item.values()[0], protocol=item.keys()[0])
@@ -136,7 +136,7 @@ echo \"art-result: $? DirectIOART_Athena_RecoTF_inputBS_protocol_{protocol}\""""
# art-type: grid
# art-output: *.pool.root
# art-include: 21.0/Athena
-# art-include: master/Athena\n
+# art-include: main/Athena\n
set -e\n
export ATHENA_CORE_NUMBER=2
Reco_tf.py --AMI q431 --multiprocess --inputBSFile {turl} --outputESDFile art.pool.root\n
@@ -223,7 +223,7 @@ def writeTFileOpen():
outstring = """#!/usr/bin/env python\n
# art-description: DirectIOART TFile::Open
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: master/AthSimulation
# art-include: 21.0/Athena
# art-include: 21.0/AthSimulation
diff --git a/Tools/DirectIOART/test/test_directioart_athena_recotf_with_rdo_davs.sh b/Tools/DirectIOART/test/test_directioart_athena_recotf_with_rdo_davs.sh
index a011a1fbdf29..c0f1293e6574 100755
--- a/Tools/DirectIOART/test/test_directioart_athena_recotf_with_rdo_davs.sh
+++ b/Tools/DirectIOART/test/test_directioart_athena_recotf_with_rdo_davs.sh
@@ -3,7 +3,7 @@
# art-description: DirectIOART Athena Reco_tf.py inputFile:RDO protocol=DAVS
# art-type: grid
# art-output: *.pool.root
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 8
set -e
diff --git a/Tools/DirectIOART/test/test_directioart_athena_recotf_with_rdo_https.sh b/Tools/DirectIOART/test/test_directioart_athena_recotf_with_rdo_https.sh
index 6e20f5018536..3816573ec8d1 100755
--- a/Tools/DirectIOART/test/test_directioart_athena_recotf_with_rdo_https.sh
+++ b/Tools/DirectIOART/test/test_directioart_athena_recotf_with_rdo_https.sh
@@ -3,7 +3,7 @@
# art-description: DirectIOART Athena Reco_tf.py inputFile:RDO protocol=HTTPS
# art-type: grid
# art-output: *.pool.root
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 8
set -e
diff --git a/Tools/DirectIOART/test/test_directioart_athena_recotf_with_rdo_root.sh b/Tools/DirectIOART/test/test_directioart_athena_recotf_with_rdo_root.sh
index 5efe26ef9953..39f97bcf5b60 100755
--- a/Tools/DirectIOART/test/test_directioart_athena_recotf_with_rdo_root.sh
+++ b/Tools/DirectIOART/test/test_directioart_athena_recotf_with_rdo_root.sh
@@ -3,7 +3,7 @@
# art-description: DirectIOART Athena Reco_tf.py inputFile:RDO protocol=ROOT
# art-type: grid
# art-output: *.pool.root
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 8
set -e
diff --git a/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_aod_davs.sh b/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_aod_davs.sh
index 9ba76b06faa3..e83c99a89510 100755
--- a/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_aod_davs.sh
+++ b/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_aod_davs.sh
@@ -3,7 +3,7 @@
# art-description: DirectIOART AthenaMP Reco_tf.py inputFile:AOD protocol=DAVS
# art-type: grid
# art-output: *.pool.root
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 2
set -e
diff --git a/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_aod_https.sh b/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_aod_https.sh
index 9d5623a380ab..636ff9060d88 100755
--- a/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_aod_https.sh
+++ b/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_aod_https.sh
@@ -3,7 +3,7 @@
# art-description: DirectIOART AthenaMP Reco_tf.py inputFile:AOD protocol=HTTPS
# art-type: grid
# art-output: *.pool.root
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 2
set -e
diff --git a/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_aod_root.sh b/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_aod_root.sh
index 8142083d0955..4dfa0ad9d1e7 100755
--- a/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_aod_root.sh
+++ b/Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_aod_root.sh
@@ -3,7 +3,7 @@
# art-description: DirectIOART AthenaMP Reco_tf.py inputFile:AOD protocol=ROOT
# art-type: grid
# art-output: *.pool.root
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 2
set -e
diff --git a/Tools/DirectIOART/test/test_directioart_tfileopen.py b/Tools/DirectIOART/test/test_directioart_tfileopen.py
index 20cca8c8b1c8..6c26236a1374 100755
--- a/Tools/DirectIOART/test/test_directioart_tfileopen.py
+++ b/Tools/DirectIOART/test/test_directioart_tfileopen.py
@@ -2,7 +2,7 @@
# art-description: DirectIOART TFile::Open
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: master/AthSimulation
# art-include: 21.0/Athena
# art-include: 21.0/AthSimulation
diff --git a/Tools/DirectIOART/test/test_directioart_tfileopen_rucioredirector.py b/Tools/DirectIOART/test/test_directioart_tfileopen_rucioredirector.py
index ffa2277af06b..5f50dc779d00 100755
--- a/Tools/DirectIOART/test/test_directioart_tfileopen_rucioredirector.py
+++ b/Tools/DirectIOART/test/test_directioart_tfileopen_rucioredirector.py
@@ -2,7 +2,7 @@
# art-description: DirectIOART TFile::Open RucioRedirector
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 21.2/AthAnalysis
# art-include: 21.2/AnalysisBase
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh
index eb1f5d1fe6b4..04935e1a4b11 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh
@@ -2,7 +2,7 @@
#
# art-description: Express processing at Tier0
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_calib_legacy.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_calib_legacy.sh
index 1a81e4b6503d..63055c4482cb 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_calib_legacy.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_calib_legacy.sh
@@ -2,7 +2,7 @@
#
# art-description: Express processing at Tier0
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh
index bafa4fd3a3e5..418bbdaceefc 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh
@@ -2,7 +2,7 @@
#
# art-description: Express processing at Tier0
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic_legacy.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic_legacy.sh
index b3a2eb524a8c..54a79c2e236a 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic_legacy.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic_legacy.sh
@@ -2,7 +2,7 @@
#
# art-description: Express processing at Tier0
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_data22.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_data22.sh
index 8e6a8c1927c2..726e3f8d077d 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_data22.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_data22.sh
@@ -2,7 +2,7 @@
#
# art-description: RecoTrf
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_data22_900GeV.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_data22_900GeV.sh
index d37dc2f9eac6..b0bc1f4ce085 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_data22_900GeV.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_data22_900GeV.sh
@@ -2,7 +2,7 @@
#
# art-description: RecoTrf
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_data22_900GeV_legacy.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_data22_900GeV_legacy.sh
index b6272b3083c7..c70fa72b643a 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_data22_900GeV_legacy.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_data22_900GeV_legacy.sh
@@ -2,7 +2,7 @@
#
# art-description: RecoTrf
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_data23.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_data23.sh
index 0552b65ff9b2..f36273fd9093 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_data23.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_data23.sh
@@ -2,7 +2,7 @@
#
# art-description: RecoTrf
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_local.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_local.sh
index a4f1fa53cbec..5b44a5784b4d 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_local.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_local.sh
@@ -2,7 +2,7 @@
#
# art-description: Test for bulk processing at Tier0
# art-type: local
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# There was a database connection problem reported in ATR-24782. Rodney Walker's solution is to use the following export to fix the problem:
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_pilot_collisions_legacy.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_pilot_collisions_legacy.sh
index 97ea6e57b97c..63de5b077c56 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_pilot_collisions_legacy.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_pilot_collisions_legacy.sh
@@ -2,7 +2,7 @@
#
# art-description: RecoTrf
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_pilot_legacy.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_pilot_legacy.sh
index a87377529250..efe26367bdc1 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_pilot_legacy.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_pilot_legacy.sh
@@ -2,7 +2,7 @@
#
# art-description: RecoTrf
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_splashes.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_splashes.sh
index 63d9101bcba6..502901f26e2a 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_splashes.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_splashes.sh
@@ -2,7 +2,7 @@
#
# art-description: Express processing at Tier0
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_splashes_legacy.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_splashes_legacy.sh
index 18a070fa9e37..7205e696db5a 100755
--- a/Tools/Tier0ChainTests/test/test_bulkProcessing_splashes_legacy.sh
+++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_splashes_legacy.sh
@@ -2,7 +2,7 @@
#
# art-description: Express processing at Tier0
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/Tier0ChainTests/test/test_data18PHYS_mp.sh b/Tools/Tier0ChainTests/test/test_data18PHYS_mp.sh
index 62aff4408cf2..7f266bb85b80 100755
--- a/Tools/Tier0ChainTests/test/test_data18PHYS_mp.sh
+++ b/Tools/Tier0ChainTests/test/test_data18PHYS_mp.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building PHYS data18 MP
# art-type: grid
# art-output: *.pool.root
diff --git a/Tools/Tier0ChainTests/test/test_data18PHYS_mt.sh b/Tools/Tier0ChainTests/test/test_data18PHYS_mt.sh
index d0ad90f26f2c..fe167ef1ff98 100755
--- a/Tools/Tier0ChainTests/test/test_data18PHYS_mt.sh
+++ b/Tools/Tier0ChainTests/test/test_data18PHYS_mt.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building PHYS data18 MT
# art-type: grid
# art-output: *.pool.root
diff --git a/Tools/Tier0ChainTests/test/test_data18PHYS_serial.sh b/Tools/Tier0ChainTests/test/test_data18PHYS_serial.sh
index c7a83d79beb5..7492aedb191c 100755
--- a/Tools/Tier0ChainTests/test/test_data18PHYS_serial.sh
+++ b/Tools/Tier0ChainTests/test/test_data18PHYS_serial.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building PHYS data18
# art-type: grid
# art-output: *.pool.root
diff --git a/Tools/Tier0ChainTests/test/test_expressProcessing_beamSplashes.sh b/Tools/Tier0ChainTests/test/test_expressProcessing_beamSplashes.sh
index cb71deaee95f..04d00ebd2256 100755
--- a/Tools/Tier0ChainTests/test/test_expressProcessing_beamSplashes.sh
+++ b/Tools/Tier0ChainTests/test/test_expressProcessing_beamSplashes.sh
@@ -2,7 +2,7 @@
#
# art-description: Express processing at Tier0
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/Tier0ChainTests/test/test_expressProcessing_calib.sh b/Tools/Tier0ChainTests/test/test_expressProcessing_calib.sh
index ea95ba034eca..c4deb2029708 100755
--- a/Tools/Tier0ChainTests/test/test_expressProcessing_calib.sh
+++ b/Tools/Tier0ChainTests/test/test_expressProcessing_calib.sh
@@ -2,7 +2,7 @@
#
# art-description: Express processing at Tier0
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/Tier0ChainTests/test/test_expressProcessing_cosmic.sh b/Tools/Tier0ChainTests/test/test_expressProcessing_cosmic.sh
index df26a904f05b..fa6b3e19a9bb 100755
--- a/Tools/Tier0ChainTests/test/test_expressProcessing_cosmic.sh
+++ b/Tools/Tier0ChainTests/test/test_expressProcessing_cosmic.sh
@@ -2,7 +2,7 @@
#
# art-description: Express processing at Tier0
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/Tier0ChainTests/test/test_expressProcessing_data22.sh b/Tools/Tier0ChainTests/test/test_expressProcessing_data22.sh
index 4e354958b353..e18c35fda4b4 100755
--- a/Tools/Tier0ChainTests/test/test_expressProcessing_data22.sh
+++ b/Tools/Tier0ChainTests/test/test_expressProcessing_data22.sh
@@ -2,7 +2,7 @@
#
# art-description: Express processing at Tier0
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/Tier0ChainTests/test/test_expressProcessing_data22_legacy.sh b/Tools/Tier0ChainTests/test/test_expressProcessing_data22_legacy.sh
index ad03794d9ec2..3ddd5edb2b6d 100755
--- a/Tools/Tier0ChainTests/test/test_expressProcessing_data22_legacy.sh
+++ b/Tools/Tier0ChainTests/test/test_expressProcessing_data22_legacy.sh
@@ -2,7 +2,7 @@
#
# art-description: Express processing at Tier0
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/Tier0ChainTests/test/test_mc20PHYSVAL_mp.sh b/Tools/Tier0ChainTests/test/test_mc20PHYSVAL_mp.sh
index 18394daf284e..6762e41eafb5 100755
--- a/Tools/Tier0ChainTests/test/test_mc20PHYSVAL_mp.sh
+++ b/Tools/Tier0ChainTests/test/test_mc20PHYSVAL_mp.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building PHYSVAL mc20 MP
# art-type: grid
diff --git a/Tools/Tier0ChainTests/test/test_mc20PHYSVAL_serial.sh b/Tools/Tier0ChainTests/test/test_mc20PHYSVAL_serial.sh
index 53b07b2d96b9..948fc34b82b8 100755
--- a/Tools/Tier0ChainTests/test/test_mc20PHYSVAL_serial.sh
+++ b/Tools/Tier0ChainTests/test/test_mc20PHYSVAL_serial.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-description: DAOD building PHYSVAL mc20
# art-type: grid
diff --git a/Tools/Tier0ChainTests/test/test_mc20PHYS_mp.sh b/Tools/Tier0ChainTests/test/test_mc20PHYS_mp.sh
index 103188f2fcb4..b2d6744028f1 100755
--- a/Tools/Tier0ChainTests/test/test_mc20PHYS_mp.sh
+++ b/Tools/Tier0ChainTests/test/test_mc20PHYS_mp.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building PHYS mc20 MP
# art-type: grid
# art-output: *.pool.root
diff --git a/Tools/Tier0ChainTests/test/test_mc20PHYS_mt.sh b/Tools/Tier0ChainTests/test/test_mc20PHYS_mt.sh
index 2184935d1cb8..d12e6c395947 100755
--- a/Tools/Tier0ChainTests/test/test_mc20PHYS_mt.sh
+++ b/Tools/Tier0ChainTests/test/test_mc20PHYS_mt.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building PHYS mc20 MT
# art-type: grid
# art-output: *.pool.root
diff --git a/Tools/Tier0ChainTests/test/test_mc20PHYS_serial.sh b/Tools/Tier0ChainTests/test/test_mc20PHYS_serial.sh
index 798c98efc396..5c0cb4ccd92f 100755
--- a/Tools/Tier0ChainTests/test/test_mc20PHYS_serial.sh
+++ b/Tools/Tier0ChainTests/test/test_mc20PHYS_serial.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# art-include: master/Athena
+# art-include: main/Athena
# art-description: DAOD building PHYS mc20
# art-type: grid
# art-output: *.pool.root
diff --git a/Tools/Tier0ChainTests/test/test_poolMerging_data23.sh b/Tools/Tier0ChainTests/test/test_poolMerging_data23.sh
index 412248dad28c..e299ce2eea2d 100755
--- a/Tools/Tier0ChainTests/test/test_poolMerging_data23.sh
+++ b/Tools/Tier0ChainTests/test/test_poolMerging_data23.sh
@@ -2,7 +2,7 @@
#
# art-description: merging check with Tier0 setup
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
aod=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/data23/AOD/data23_13p6TeV.00453713.physics_Main.recon.AOD.f1357/2012events.data23_13p6TeV.00453713.physics_Main.recon.AOD.f1357._lb1416._0006.1
diff --git a/Tools/Tier0ChainTests/test/test_q220.sh b/Tools/Tier0ChainTests/test/test_q220.sh
index 3be6e3311b3c..8070b95a88cf 100755
--- a/Tools/Tier0ChainTests/test/test_q220.sh
+++ b/Tools/Tier0ChainTests/test/test_q220.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-include: 22.0/Athena
# art-include: 22.0-mc20/Athena
diff --git a/Tools/Tier0ChainTests/test/test_q220_mp.sh b/Tools/Tier0ChainTests/test/test_q220_mp.sh
index 3239e51a8cbc..d96b636c9c7e 100755
--- a/Tools/Tier0ChainTests/test/test_q220_mp.sh
+++ b/Tools/Tier0ChainTests/test/test_q220_mp.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-include: 22.0/Athena
# art-include: 22.0-mc20/Athena
diff --git a/Tools/Tier0ChainTests/test/test_q223.sh b/Tools/Tier0ChainTests/test/test_q223.sh
index 7a6f892cdab1..4557b7bf0e36 100755
--- a/Tools/Tier0ChainTests/test/test_q223.sh
+++ b/Tools/Tier0ChainTests/test/test_q223.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-include: 22.0/Athena
# art-include: 22.0-mc20/Athena
diff --git a/Tools/Tier0ChainTests/test/test_q223_mp.sh b/Tools/Tier0ChainTests/test/test_q223_mp.sh
index b3512943deb1..38bc7fa393a5 100755
--- a/Tools/Tier0ChainTests/test/test_q223_mp.sh
+++ b/Tools/Tier0ChainTests/test/test_q223_mp.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-include: 22.0/Athena
# art-include: 22.0-mc20/Athena
diff --git a/Tools/Tier0ChainTests/test/test_q442.sh b/Tools/Tier0ChainTests/test/test_q442.sh
index 68720ce5c8f1..b9fae5fbbc22 100755
--- a/Tools/Tier0ChainTests/test/test_q442.sh
+++ b/Tools/Tier0ChainTests/test/test_q442.sh
@@ -2,7 +2,7 @@
#
# art-description: RecoTrf
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-include: 22.0/Athena
# art-include: 22.0-mc20/Athena
diff --git a/Tools/Tier0ChainTests/test/test_q442_mp.sh b/Tools/Tier0ChainTests/test/test_q442_mp.sh
index 519c3b3428a0..34ce3e833f19 100755
--- a/Tools/Tier0ChainTests/test/test_q442_mp.sh
+++ b/Tools/Tier0ChainTests/test/test_q442_mp.sh
@@ -2,7 +2,7 @@
#
# art-description: RecoTrf
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-include: 22.0/Athena
# art-include: 22.0-mc20/Athena
diff --git a/Tools/Tier0ChainTests/test/test_q443.sh b/Tools/Tier0ChainTests/test/test_q443.sh
index fdcfc5cf58d4..9d7e3bda28bd 100755
--- a/Tools/Tier0ChainTests/test/test_q443.sh
+++ b/Tools/Tier0ChainTests/test/test_q443.sh
@@ -2,7 +2,7 @@
#
# art-description: RecoTrf
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-include: 22.0/Athena
# art-include: 22.0-mc20/Athena
diff --git a/Tools/Tier0ChainTests/test/test_q443_serial.sh b/Tools/Tier0ChainTests/test/test_q443_serial.sh
index c0653a915946..9f64f4d66b74 100755
--- a/Tools/Tier0ChainTests/test/test_q443_serial.sh
+++ b/Tools/Tier0ChainTests/test/test_q443_serial.sh
@@ -2,7 +2,7 @@
#
# art-description: RecoTrf
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-include: 22.0/Athena
# art-include: 22.0-mc20/Athena
diff --git a/Tools/Tier0ChainTests/test/test_q444.sh b/Tools/Tier0ChainTests/test/test_q444.sh
index 296d976797a4..e59d0ac3660d 100755
--- a/Tools/Tier0ChainTests/test/test_q444.sh
+++ b/Tools/Tier0ChainTests/test/test_q444.sh
@@ -2,7 +2,7 @@
#
# art-description: RecoTrf
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-include: 22.0/Athena
# art-include: 22.0-mc20/Athena
diff --git a/Tools/Tier0ChainTests/test/test_q444_serial.sh b/Tools/Tier0ChainTests/test/test_q444_serial.sh
index 0c1a5f3aef98..16a58250877a 100755
--- a/Tools/Tier0ChainTests/test/test_q444_serial.sh
+++ b/Tools/Tier0ChainTests/test/test_q444_serial.sh
@@ -2,7 +2,7 @@
#
# art-description: RecoTrf
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-include: 22.0/Athena
# art-include: 22.0-mc20/Athena
diff --git a/Tools/Tier0ChainTests/test/test_q445.sh b/Tools/Tier0ChainTests/test/test_q445.sh
index 4f20492ff675..e4307adb94da 100755
--- a/Tools/Tier0ChainTests/test/test_q445.sh
+++ b/Tools/Tier0ChainTests/test/test_q445.sh
@@ -2,7 +2,7 @@
#
# art-description: RecoTrf
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-include: 22.0/Athena
# art-include: 22.0-mc20/Athena
diff --git a/Tools/Tier0ChainTests/test/test_q445_legacy.sh b/Tools/Tier0ChainTests/test/test_q445_legacy.sh
index fe753ab36f74..03d306e59165 100755
--- a/Tools/Tier0ChainTests/test/test_q445_legacy.sh
+++ b/Tools/Tier0ChainTests/test/test_q445_legacy.sh
@@ -2,7 +2,7 @@
#
# art-description: RecoTrf
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-include: 22.0/Athena
# art-include: 22.0-mc20/Athena
diff --git a/Tools/Tier0ChainTests/test/test_q445_serial.sh b/Tools/Tier0ChainTests/test/test_q445_serial.sh
index afdba1c712e3..4697822f771d 100755
--- a/Tools/Tier0ChainTests/test/test_q445_serial.sh
+++ b/Tools/Tier0ChainTests/test/test_q445_serial.sh
@@ -2,7 +2,7 @@
#
# art-description: RecoTrf
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-include: 22.0/Athena
# art-include: 22.0-mc20/Athena
diff --git a/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs.sh b/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs.sh
index d0fff9b575c2..6367b9cca9b2 100755
--- a/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs.sh
+++ b/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 22.0-mc20/Athena
# art-include: 21.3/Athena
diff --git a/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs_2.sh b/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs_2.sh
index 55774259e69c..e9eabc74f22d 100755
--- a/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs_2.sh
+++ b/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs_2.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 22.0-mc20/Athena
# art-include: 21.3/Athena
diff --git a/Tools/Tier0ChainTests/test/test_reprocessing_with_derived_outputs.sh b/Tools/Tier0ChainTests/test/test_reprocessing_with_derived_outputs.sh
index 5af800ac8989..b270174b2aa1 100755
--- a/Tools/Tier0ChainTests/test/test_reprocessing_with_derived_outputs.sh
+++ b/Tools/Tier0ChainTests/test/test_reprocessing_with_derived_outputs.sh
@@ -4,7 +4,7 @@
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 22.0/Athena
# art-include: 22.0-mc20/Athena
# art-include: 21.3/Athena
diff --git a/Tools/TrfTestsART/test/test_trf_RUN4_r2a_ca_mt_mp_mu200.sh b/Tools/TrfTestsART/test/test_trf_RUN4_r2a_ca_mt_mp_mu200.sh
index c4da4060b6e1..3840da14caea 100755
--- a/Tools/TrfTestsART/test/test_trf_RUN4_r2a_ca_mt_mp_mu200.sh
+++ b/Tools/TrfTestsART/test/test_trf_RUN4_r2a_ca_mt_mp_mu200.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py Run 4, mu=200, HITStoRDO in MP mode,RAWtoALL in MT mode
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 8
if [ -z ${ATLAS_REFERENCE_DATA+x} ]; then
diff --git a/Tools/TrfTestsART/test/test_trf_RUN4_r2a_ca_mt_mu200_overlay.sh b/Tools/TrfTestsART/test/test_trf_RUN4_r2a_ca_mt_mu200_overlay.sh
index 4b5f1762e547..d5cb81d491b3 100755
--- a/Tools/TrfTestsART/test/test_trf_RUN4_r2a_ca_mt_mu200_overlay.sh
+++ b/Tools/TrfTestsART/test/test_trf_RUN4_r2a_ca_mt_mu200_overlay.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py Run 4, mu=200, Overlay,RAWtoALL in MT mode
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 8
if [ -z ${ATLAS_REFERENCE_DATA+x} ]; then
diff --git a/Tools/TrfTestsART/test/test_trf_RUN4_r2a_ca_mt_no_pileup.sh b/Tools/TrfTestsART/test/test_trf_RUN4_r2a_ca_mt_no_pileup.sh
index 5c7cfcf6ff57..af659afebd64 100755
--- a/Tools/TrfTestsART/test/test_trf_RUN4_r2a_ca_mt_no_pileup.sh
+++ b/Tools/TrfTestsART/test/test_trf_RUN4_r2a_ca_mt_no_pileup.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py Run 4, mu=0, HITStoRDO,RAWtoALL in MT mode
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 8
if [ -z ${ATLAS_REFERENCE_DATA+x} ]; then
diff --git a/Tools/TrfTestsART/test/test_trf_aodmerge_mt.sh b/Tools/TrfTestsART/test/test_trf_aodmerge_mt.sh
index a5321489d39e..79724afd6b60 100755
--- a/Tools/TrfTestsART/test/test_trf_aodmerge_mt.sh
+++ b/Tools/TrfTestsART/test/test_trf_aodmerge_mt.sh
@@ -2,7 +2,7 @@
#
# art-description: AODMerge_tf.py mt
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/TrfTestsART/test/test_trf_aodmerge_mt_ca.sh b/Tools/TrfTestsART/test/test_trf_aodmerge_mt_ca.sh
index ce6020046648..b42d5f001df5 100755
--- a/Tools/TrfTestsART/test/test_trf_aodmerge_mt_ca.sh
+++ b/Tools/TrfTestsART/test/test_trf_aodmerge_mt_ca.sh
@@ -2,7 +2,7 @@
#
# art-description: AODMerge_tf.py MT and CA
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/TrfTestsART/test/test_trf_aodmerge_serial.sh b/Tools/TrfTestsART/test/test_trf_aodmerge_serial.sh
index 0e6aa55d6b31..4f396ad7bccc 100755
--- a/Tools/TrfTestsART/test/test_trf_aodmerge_serial.sh
+++ b/Tools/TrfTestsART/test/test_trf_aodmerge_serial.sh
@@ -2,7 +2,7 @@
#
# art-description: AODMerge_tf.py serial
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
diff --git a/Tools/TrfTestsART/test/test_trf_aodmerge_serial_std_vs_ca.sh b/Tools/TrfTestsART/test/test_trf_aodmerge_serial_std_vs_ca.sh
index ae1d2cf929f2..a9ac4bb585e5 100755
--- a/Tools/TrfTestsART/test/test_trf_aodmerge_serial_std_vs_ca.sh
+++ b/Tools/TrfTestsART/test/test_trf_aodmerge_serial_std_vs_ca.sh
@@ -2,7 +2,7 @@
#
# art-description: Testing AODMerge_tf.py in the old/new-style job configurations
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Run the old-style merge
diff --git a/Tools/TrfTestsART/test/test_trf_data15_mt.sh b/Tools/TrfTestsART/test/test_trf_data15_mt.sh
index 4226aa6b2d8d..24f66c569966 100755
--- a/Tools/TrfTestsART/test/test_trf_data15_mt.sh
+++ b/Tools/TrfTestsART/test/test_trf_data15_mt.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py data15 RAWtoALL in MT mode
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/TrfTestsART/test/test_trf_data16_mt.sh b/Tools/TrfTestsART/test/test_trf_data16_mt.sh
index 608504172b1a..62898a8600f7 100755
--- a/Tools/TrfTestsART/test/test_trf_data16_mt.sh
+++ b/Tools/TrfTestsART/test/test_trf_data16_mt.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py data16 RAWtoALL in MT mode
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/TrfTestsART/test/test_trf_data17_mt.sh b/Tools/TrfTestsART/test/test_trf_data17_mt.sh
index cc68611dfa58..2a6f7d428ce1 100755
--- a/Tools/TrfTestsART/test/test_trf_data17_mt.sh
+++ b/Tools/TrfTestsART/test/test_trf_data17_mt.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py data17 RAWtoALL in MT mode
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/TrfTestsART/test/test_trf_data18_hybrid.sh b/Tools/TrfTestsART/test/test_trf_data18_hybrid.sh
index 647b1b6a19fe..3c6e03db54e1 100755
--- a/Tools/TrfTestsART/test/test_trf_data18_hybrid.sh
+++ b/Tools/TrfTestsART/test/test_trf_data18_hybrid.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py data18 RAWtoALL in hybrid MT/MP mode: nprocs=2, threads=4
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/TrfTestsART/test/test_trf_data18_mp.sh b/Tools/TrfTestsART/test/test_trf_data18_mp.sh
index e770c7a25b61..a13552a03fe5 100755
--- a/Tools/TrfTestsART/test/test_trf_data18_mp.sh
+++ b/Tools/TrfTestsART/test/test_trf_data18_mp.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py data18 RAWtoALL in MP mode, use 4 cores due to large memory usage of MP
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/TrfTestsART/test/test_trf_data18_mt.sh b/Tools/TrfTestsART/test/test_trf_data18_mt.sh
index 0e79b4e9e5d9..458004fbecd6 100755
--- a/Tools/TrfTestsART/test/test_trf_data18_mt.sh
+++ b/Tools/TrfTestsART/test/test_trf_data18_mt.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py data18 RAWtoALL in MT mode
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/TrfTestsART/test/test_trf_data18_rucio_mt.sh b/Tools/TrfTestsART/test/test_trf_data18_rucio_mt.sh
index 828017905104..6a250327f94c 100755
--- a/Tools/TrfTestsART/test/test_trf_data18_rucio_mt.sh
+++ b/Tools/TrfTestsART/test/test_trf_data18_rucio_mt.sh
@@ -5,7 +5,7 @@
# art-input: data18_13TeV:data18_13TeV.00357750.physics_Main.daq.RAW
# art-input-nfiles: 50
# art-input-nfilesperjob: 3
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/TrfTestsART/test/test_trf_data18_rucio_weekly_mt.sh b/Tools/TrfTestsART/test/test_trf_data18_rucio_weekly_mt.sh
index 1b9a347ce5d5..c8f11c508329 100755
--- a/Tools/TrfTestsART/test/test_trf_data18_rucio_weekly_mt.sh
+++ b/Tools/TrfTestsART/test/test_trf_data18_rucio_weekly_mt.sh
@@ -5,7 +5,7 @@
# art-input: data18_13TeV:data18_13TeV.00357750.physics_Main.daq.RAW
# art-input-nfiles: 300
# art-input-nfilesperjob: 3
-# art-include: master/Athena/x86_64-centos7-gcc11-opt
+# art-include: main/Athena/x86_64-centos7-gcc11-opt
# art-athena-mt: 8
# art-runon: Saturday
diff --git a/Tools/TrfTestsART/test/test_trf_data22_hybrid_ca.sh b/Tools/TrfTestsART/test/test_trf_data22_hybrid_ca.sh
index b174f2bde97a..5ce81f7e63d3 100755
--- a/Tools/TrfTestsART/test/test_trf_data22_hybrid_ca.sh
+++ b/Tools/TrfTestsART/test/test_trf_data22_hybrid_ca.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py data22 RAWtoALL in hybrid MT/MP mode: nprocs=2, threads=4 and ComponentAccumulator
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/TrfTestsART/test/test_trf_data22_mt.sh b/Tools/TrfTestsART/test/test_trf_data22_mt.sh
index d87bb6c9ffab..3b236ff84444 100755
--- a/Tools/TrfTestsART/test/test_trf_data22_mt.sh
+++ b/Tools/TrfTestsART/test/test_trf_data22_mt.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py data22 RAWtoALL in MT mode
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/TrfTestsART/test/test_trf_data22_mt_ca.sh b/Tools/TrfTestsART/test/test_trf_data22_mt_ca.sh
index 2d0477788c90..550e632bd33d 100755
--- a/Tools/TrfTestsART/test/test_trf_data22_mt_ca.sh
+++ b/Tools/TrfTestsART/test/test_trf_data22_mt_ca.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py data22 RAWtoALL in MT mode and ComponentAccumulator
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/TrfTestsART/test/test_trf_data23_mt_ca.sh b/Tools/TrfTestsART/test/test_trf_data23_mt_ca.sh
index 0b8151dce7d4..8fc073a39ba9 100755
--- a/Tools/TrfTestsART/test/test_trf_data23_mt_ca.sh
+++ b/Tools/TrfTestsART/test/test_trf_data23_mt_ca.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py data23 RAWtoALL in MT mode and ComponentAccumulator
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/TrfTestsART/test/test_trf_esdmerge_mt.sh b/Tools/TrfTestsART/test/test_trf_esdmerge_mt.sh
index 2aeb832f7a77..e1551f128e5a 100755
--- a/Tools/TrfTestsART/test/test_trf_esdmerge_mt.sh
+++ b/Tools/TrfTestsART/test/test_trf_esdmerge_mt.sh
@@ -2,7 +2,7 @@
#
# art-description: ESDMerge_tf.py mt
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/TrfTestsART/test/test_trf_esdmerge_serial.sh b/Tools/TrfTestsART/test/test_trf_esdmerge_serial.sh
index 55792f1fc625..3d77d023a34c 100755
--- a/Tools/TrfTestsART/test/test_trf_esdmerge_serial.sh
+++ b/Tools/TrfTestsART/test/test_trf_esdmerge_serial.sh
@@ -2,7 +2,7 @@
#
# art-description: ESDMerge_tf.py serial
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
diff --git a/Tools/TrfTestsART/test/test_trf_mcoverlay_mc20e_fullchain_mt.sh b/Tools/TrfTestsART/test/test_trf_mcoverlay_mc20e_fullchain_mt.sh
index 94da03f15f24..15773b29c036 100755
--- a/Tools/TrfTestsART/test/test_trf_mcoverlay_mc20e_fullchain_mt.sh
+++ b/Tools/TrfTestsART/test/test_trf_mcoverlay_mc20e_fullchain_mt.sh
@@ -2,8 +2,8 @@
# art-description: MC+MC Overlay chain for MC20e, ttbar, full reco chain, 1000 events, AthenaMT
# art-type: grid
-# art-include: master/Athena/x86_64-centos7-gcc11-opt
-# art-include: master/Athena/x86_64-centos7-clang13-opt
+# art-include: main/Athena/x86_64-centos7-gcc11-opt
+# art-include: main/Athena/x86_64-centos7-clang13-opt
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/TrfTestsART/test/test_trf_merge_mp_ca_sw.sh b/Tools/TrfTestsART/test/test_trf_merge_mp_ca_sw.sh
index c1703c8d9fed..60818f7792c2 100755
--- a/Tools/TrfTestsART/test/test_trf_merge_mp_ca_sw.sh
+++ b/Tools/TrfTestsART/test/test_trf_merge_mp_ca_sw.sh
@@ -2,7 +2,7 @@
#
# art-description: Merge_tf.py MP, CA and SharedWriter
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/TrfTestsART/test/test_trf_q442_r2a_ca_mt.sh b/Tools/TrfTestsART/test/test_trf_q442_r2a_ca_mt.sh
index 91be01d23faf..c4258a6c78f7 100755
--- a/Tools/TrfTestsART/test/test_trf_q442_r2a_ca_mt.sh
+++ b/Tools/TrfTestsART/test/test_trf_q442_r2a_ca_mt.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py q442 RAWtoALL in MT and ComponentAccumulator mode
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 8
Reco_tf.py --CA \
diff --git a/Tools/TrfTestsART/test/test_trf_q442_r2a_ca_mt_compare.sh b/Tools/TrfTestsART/test/test_trf_q442_r2a_ca_mt_compare.sh
index e2e6c7fcb018..cbd0c17deabe 100755
--- a/Tools/TrfTestsART/test/test_trf_q442_r2a_ca_mt_compare.sh
+++ b/Tools/TrfTestsART/test/test_trf_q442_r2a_ca_mt_compare.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py q442 RAWtoALL in MT and ComponentAccumulator mode
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/TrfTestsART/test/test_trf_q442_r2a_mt.sh b/Tools/TrfTestsART/test/test_trf_q442_r2a_mt.sh
index 1886fbd02c48..9a3e64e1b487 100755
--- a/Tools/TrfTestsART/test/test_trf_q442_r2a_mt.sh
+++ b/Tools/TrfTestsART/test/test_trf_q442_r2a_mt.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py q442 RAWtoALL in MT mode
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 8
diff --git a/Tools/TrfTestsART/test/test_trf_q443_r2a_ca_mt_compare.sh b/Tools/TrfTestsART/test/test_trf_q443_r2a_ca_mt_compare.sh
index ba0548520fa8..fee2034e5119 100755
--- a/Tools/TrfTestsART/test/test_trf_q443_r2a_ca_mt_compare.sh
+++ b/Tools/TrfTestsART/test/test_trf_q443_r2a_ca_mt_compare.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py q443 RAWtoALL in MT and ComponentAccumulator mode
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/TrfTestsART/test/test_trf_q443_r2a_mt.sh b/Tools/TrfTestsART/test/test_trf_q443_r2a_mt.sh
index 51e37d65da9f..887e9dc3ac99 100755
--- a/Tools/TrfTestsART/test/test_trf_q443_r2a_mt.sh
+++ b/Tools/TrfTestsART/test/test_trf_q443_r2a_mt.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py q443 HITStoRDO,RAWtoALL/TRIGtoALL in MT mode, RDOtoRDOTrigger in 21.0/MP
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 8
diff --git a/Tools/TrfTestsART/test/test_trf_q445_aodmerge.sh b/Tools/TrfTestsART/test/test_trf_q445_aodmerge.sh
index ff407a44a69b..3a94a6a1c0d0 100755
--- a/Tools/TrfTestsART/test/test_trf_q445_aodmerge.sh
+++ b/Tools/TrfTestsART/test/test_trf_q445_aodmerge.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py q445, AODMerge and output comparison
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/TrfTestsART/test/test_trf_q445_r2a_ca_mt_compare.sh b/Tools/TrfTestsART/test/test_trf_q445_r2a_ca_mt_compare.sh
index 15cab8c2c6fb..d2d0080c91b1 100755
--- a/Tools/TrfTestsART/test/test_trf_q445_r2a_ca_mt_compare.sh
+++ b/Tools/TrfTestsART/test/test_trf_q445_r2a_ca_mt_compare.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py q445 RAWtoALL in MT and ComponentAccumulator mode
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/TrfTestsART/test/test_trf_q445_r2a_ca_mt_compare_both_rdo.sh b/Tools/TrfTestsART/test/test_trf_q445_r2a_ca_mt_compare_both_rdo.sh
index fe92ca0485f4..7ec59fe2bb95 100755
--- a/Tools/TrfTestsART/test/test_trf_q445_r2a_ca_mt_compare_both_rdo.sh
+++ b/Tools/TrfTestsART/test/test_trf_q445_r2a_ca_mt_compare_both_rdo.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py q445 RAWtoALL in MT and ComponentAccumulator mode with RDO input
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 8
mkdir ca
diff --git a/Tools/TrfTestsART/test/test_trf_q445_r2a_ca_mt_compare_ca_rdo.sh b/Tools/TrfTestsART/test/test_trf_q445_r2a_ca_mt_compare_ca_rdo.sh
index 302957f67741..71b26e7516a6 100755
--- a/Tools/TrfTestsART/test/test_trf_q445_r2a_ca_mt_compare_ca_rdo.sh
+++ b/Tools/TrfTestsART/test/test_trf_q445_r2a_ca_mt_compare_ca_rdo.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py q445 RAWtoALL in MT and ComponentAccumulator mode with RDO input
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 8
mkdir ca
diff --git a/Tools/TrfTestsART/test/test_trf_q445_r2a_ca_mt_compare_cg_rdo.sh b/Tools/TrfTestsART/test/test_trf_q445_r2a_ca_mt_compare_cg_rdo.sh
index 1deac2233c29..b2c2ce779792 100755
--- a/Tools/TrfTestsART/test/test_trf_q445_r2a_ca_mt_compare_cg_rdo.sh
+++ b/Tools/TrfTestsART/test/test_trf_q445_r2a_ca_mt_compare_cg_rdo.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py q445 RAWtoALL in MT and ComponentAccumulator mode with RDO input
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 8
mkdir ca
diff --git a/Tools/TrfTestsART/test/test_trf_q449_r2a_ca_mt_compare.sh b/Tools/TrfTestsART/test/test_trf_q449_r2a_ca_mt_compare.sh
index 2c4ba0d63508..9fdd99675b3f 100755
--- a/Tools/TrfTestsART/test/test_trf_q449_r2a_ca_mt_compare.sh
+++ b/Tools/TrfTestsART/test/test_trf_q449_r2a_ca_mt_compare.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py q449 RAWtoALL in MT and ComponentAccumulator mode
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
diff --git a/Tools/TrfTestsARTPlots/test/test_trf_mc20_phys_physlite_ca.sh b/Tools/TrfTestsARTPlots/test/test_trf_mc20_phys_physlite_ca.sh
index fedf98c92f28..b1e5a4b45a5a 100755
--- a/Tools/TrfTestsARTPlots/test/test_trf_mc20_phys_physlite_ca.sh
+++ b/Tools/TrfTestsARTPlots/test/test_trf_mc20_phys_physlite_ca.sh
@@ -2,7 +2,7 @@
#
# art-description: Derivation_tf.py mc20 in MP and CA
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 8
# art-output: dcube*
# art-html: dcube_physlite
diff --git a/Tools/TrfTestsARTPlots/test/test_trf_mc21_phys_physlite_ca.sh b/Tools/TrfTestsARTPlots/test/test_trf_mc21_phys_physlite_ca.sh
index 18468aa8f9c6..8a6cd0f04f45 100755
--- a/Tools/TrfTestsARTPlots/test/test_trf_mc21_phys_physlite_ca.sh
+++ b/Tools/TrfTestsARTPlots/test/test_trf_mc21_phys_physlite_ca.sh
@@ -2,7 +2,7 @@
#
# art-description: Derivation_tf.py mc21 in MP and CA
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 8
# art-output: dcube*
# art-html: dcube_physlite
diff --git a/Tools/TrfTestsARTPlots/test/test_trf_q442_phys_physlite_ca.sh b/Tools/TrfTestsARTPlots/test/test_trf_q442_phys_physlite_ca.sh
index dbf96687b60d..572d40376dec 100755
--- a/Tools/TrfTestsARTPlots/test/test_trf_q442_phys_physlite_ca.sh
+++ b/Tools/TrfTestsARTPlots/test/test_trf_q442_phys_physlite_ca.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py q442, RAWtoALL in MT and AODtoDAOD in MP with CA
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 8
# art-output: dcube*
# art-html: dcube_physlite
diff --git a/Tools/TrfTestsARTPlots/test/test_trf_q443_phys_physlite_ca.sh b/Tools/TrfTestsARTPlots/test/test_trf_q443_phys_physlite_ca.sh
index 8b044e0f74fd..2a567fc500a5 100755
--- a/Tools/TrfTestsARTPlots/test/test_trf_q443_phys_physlite_ca.sh
+++ b/Tools/TrfTestsARTPlots/test/test_trf_q443_phys_physlite_ca.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py q443, HITtoRDO/RDOtoRDOTrigger/RAWtoALL in MT and AODtoDAOD in MP with CA
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 8
# art-output: dcube*
# art-html: dcube_physlite
diff --git a/Tools/TrfTestsARTPlots/test/test_trf_q445_phys_physlite_ca.sh b/Tools/TrfTestsARTPlots/test/test_trf_q445_phys_physlite_ca.sh
index 5eef295ba486..f6125fba5524 100755
--- a/Tools/TrfTestsARTPlots/test/test_trf_q445_phys_physlite_ca.sh
+++ b/Tools/TrfTestsARTPlots/test/test_trf_q445_phys_physlite_ca.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py q445, HITtoRDO/RDOtoRDOTrigger/RAWtoALL in MT and AODtoDAOD in MP with CA
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 8
# art-output: dcube*
# art-html: dcube_physlite
diff --git a/Tools/TrfTestsARTPlots/test/test_trf_q449_phys_physlite_ca.sh b/Tools/TrfTestsARTPlots/test/test_trf_q449_phys_physlite_ca.sh
index f32a9b88f646..a7bed2acf475 100755
--- a/Tools/TrfTestsARTPlots/test/test_trf_q449_phys_physlite_ca.sh
+++ b/Tools/TrfTestsARTPlots/test/test_trf_q449_phys_physlite_ca.sh
@@ -2,7 +2,7 @@
#
# art-description: Reco_tf.py q449 RAWtoALL in MT and AODtoDAOD in MP with CA
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-athena-mt: 8
# art-output: dcube*
# art-output: ecube*
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/DISABLED_test_trigAna_BStoBStoESDAOD_v1Dev_build.py b/Trigger/TrigValidation/TrigAnalysisTest/test/DISABLED_test_trigAna_BStoBStoESDAOD_v1Dev_build.py
index f6c3f178d44d..69a90afb6c60 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/DISABLED_test_trigAna_BStoBStoESDAOD_v1Dev_build.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/DISABLED_test_trigAna_BStoBStoESDAOD_v1Dev_build.py
@@ -3,7 +3,7 @@
#
# art-description: Run Trigger on data with athena and write ByteStream output, then run offline reco
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_AODtoDAOD_run2_build.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_AODtoDAOD_run2_build.py
index 4ff3417136a6..da41445e23a0 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_AODtoDAOD_run2_build.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_AODtoDAOD_run2_build.py
@@ -3,7 +3,7 @@
#
# art-description: Test Run 2 to Run 3 EDM Conversion (Navigation & config metadata)
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_BStoESDAOD_run1_build.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_BStoESDAOD_run1_build.py
index b798402daa76..dbc0776ce8bb 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_BStoESDAOD_run1_build.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_BStoESDAOD_run1_build.py
@@ -3,7 +3,7 @@
#
# art-description: Test of reconstruction of Run-1 data with trigger
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoAOD_v1Dev_build.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoAOD_v1Dev_build.py
index ee6eba8dd201..2d468893bc59 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoAOD_v1Dev_build.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoAOD_v1Dev_build.py
@@ -3,7 +3,7 @@
#
# art-description: Test of transform HITS->RDO followed by RDO->RDO_TRIG,AOD
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoDAOD_trigRel21_build.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoDAOD_trigRel21_build.py
index 631dcc57f2d5..7a04a563d6f3 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoDAOD_trigRel21_build.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoDAOD_trigRel21_build.py
@@ -3,7 +3,7 @@
#
# art-description: Test running HITS->RDO in master, then RDO->RDO_TRIG in 21.0, then RDO_TRIG->AOD in master, then AOD->DAOD with multiprocess in master
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoDAOD_trigRel21_mc16a_build.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoDAOD_trigRel21_mc16a_build.py
index 1dfb78f76eba..2f3a13710126 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoDAOD_trigRel21_mc16a_build.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoDAOD_trigRel21_mc16a_build.py
@@ -3,7 +3,7 @@
#
# art-description: Test running HITS->RDO in master, then RDO->RDO_TRIG in 21.0-mc16a, then RDO_TRIG->AOD in master, then AOD->DAOD with multiprocess in master
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoDAOD_trigRel21_mc16d_build.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoDAOD_trigRel21_mc16d_build.py
index df16cb19681b..2ae49b721653 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoDAOD_trigRel21_mc16d_build.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoDAOD_trigRel21_mc16d_build.py
@@ -3,7 +3,7 @@
#
# art-description: Test running HITS->RDO in master, then RDO->RDO_TRIG in 21.0-mc16d, then RDO_TRIG->AOD in master, then AOD->DAOD with multiprocess in master
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_v1Dev_build.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_v1Dev_build.py
index 1d5fc20011d1..2a4dbf900c52 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_v1Dev_build.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_v1Dev_build.py
@@ -3,7 +3,7 @@
#
# art-description: Test of transform HITS->RDO followed by RDO->RDO_TRIG
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_v1Dev_grid.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_v1Dev_grid.py
index 761a981a1914..0acd5c533a88 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_v1Dev_grid.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_v1Dev_grid.py
@@ -3,7 +3,7 @@
#
# art-description: Test of transform HITS->RDO followed by RDO->RDO_TRIG
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoAOD_v1Dev_build.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoAOD_v1Dev_build.py
index a8f6c432b59a..ed7cc7ac40d5 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoAOD_v1Dev_build.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoAOD_v1Dev_build.py
@@ -3,7 +3,7 @@
#
# art-description: Test of transform RDO->RDO_TRIG->AOD with threads=1
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoAOD_v1Dev_grid.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoAOD_v1Dev_grid.py
index 039b6b1d6e05..cbd19010dbf0 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoAOD_v1Dev_grid.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoAOD_v1Dev_grid.py
@@ -3,7 +3,7 @@
#
# art-description: Test of transform RDO->RDO_TRIG->AOD with threads=4
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoAOD_v1MC_build.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoAOD_v1MC_build.py
index f793b94d2bcf..ac8adfc68553 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoAOD_v1MC_build.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoAOD_v1MC_build.py
@@ -3,7 +3,7 @@
#
# art-description: Test of transform RDO->RDO_TRIG->AOD with threads=1, MC_pp_run3_v1 and AODSLIM
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoAOD_v1MC_grid.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoAOD_v1MC_grid.py
index d6ab4f06674a..a79519db2182 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoAOD_v1MC_grid.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoAOD_v1MC_grid.py
@@ -4,7 +4,7 @@
# art-description: Test of transform RDO->RDO_TRIG->AOD->DAOD with threads=4, MC_pp_run3_v1 and AODSLIM
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoDAOD_v1Dev_grid.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoDAOD_v1Dev_grid.py
index 5626eb0a2728..b4767df1e1d5 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoDAOD_v1Dev_grid.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoDAOD_v1Dev_grid.py
@@ -3,7 +3,7 @@
#
# art-description: Test of transform RDO->RDO_TRIG->AOD with threads=4 and AOD->DAOD with multiprocess
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_v1DevHI_build.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_v1DevHI_build.py
index 869a1404918c..1e74c9721ef0 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_v1DevHI_build.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_v1DevHI_build.py
@@ -3,7 +3,7 @@
#
# art-description: Test of the RDOtoRDOTrigger transform with threads=1
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_v1Dev_build.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_v1Dev_build.py
index f852463571f6..21d71e0f53e5 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_v1Dev_build.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_v1Dev_build.py
@@ -3,7 +3,7 @@
#
# art-description: Test of the RDOtoRDOTrigger transform with threads=1
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_v1Dev_grid.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_v1Dev_grid.py
index bb84713d1eac..e33bd4d05359 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_v1Dev_grid.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_v1Dev_grid.py
@@ -3,7 +3,7 @@
#
# art-description: Test of the RDOtoRDOTrigger transform with Dev menu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRun3DQ_v1Dev_build.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRun3DQ_v1Dev_build.py
index 1485e7f89b21..0990c7f3ad95 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRun3DQ_v1Dev_build.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRun3DQ_v1Dev_build.py
@@ -3,7 +3,7 @@
#
# art-description: Test of transform RDO->RDO_TRIG->AOD followed by HLT monitoring step with Run-3 DQ framework
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# Skipping art-output which has no effect for build tests.
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRun3DQ_v1Dev_grid.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRun3DQ_v1Dev_grid.py
index 65012d956bf9..e3f0f46fcf03 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRun3DQ_v1Dev_grid.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRun3DQ_v1Dev_grid.py
@@ -3,7 +3,7 @@
#
# art-description: Test of transform RDO->RDO_TRIG->AOD followed by HLT monitoring step with Run-3 DQ framework
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-memory: 4096
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_nopileup.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_nopileup.py
index 1837ed7002ef..9c699e06c71c 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_nopileup.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_nopileup.py
@@ -3,7 +3,7 @@
# art-description: art job for all_ttbar_nopileup
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: valid1.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.recon.RDO.e8453_e8455_s3873_s3874_r13830_tid30652300_00
# art-input-nfiles: 2
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu55.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu55.py
index 1daafdd054ca..f97cbb33de5a 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu55.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu55.py
@@ -3,7 +3,7 @@
# art-description: art job for all_ttbar_pu55
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: valid1.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.recon.RDO.e8453_e8455_s3873_s3874_r13829_tid30652302_00
# art-input-nfiles: 2
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80.py
index 770ed86fda1f..4f2fb28ea962 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80.py
@@ -3,7 +3,7 @@
# art-description: art job for all_ttbar_pu80
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: valid1.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.recon.RDO.e8514_e8528_s4116_s4114_r14664_tid33428383_00
# art-input-nfiles: 8
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_tier0_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_tier0_pu40.py
index 217694ee1c00..991fd0b790d8 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_tier0_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_tier0_pu40.py
@@ -3,7 +3,7 @@
# art-description: art job for all_ttbar_tier0_pu40
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: valid1.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.recon.RDO.e8453_e8455_s3873_s3874_r13829_tid30652302_00
# art-input-nfiles: 2
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet.py
index 06c9408902c2..eba90b7686eb 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet.py
@@ -3,7 +3,7 @@
# art-description: art job for bjet
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: valid1.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.recon.RDO.e8453_e8455_s3873_s3874_r13830_tid30652300_00
# art-input-nfiles: 2
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_pu55.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_pu55.py
index 98dae40ad522..bfda9c0be660 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_pu55.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_pu55.py
@@ -3,7 +3,7 @@
# art-description: art job for bjet_pu55
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: valid1.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.recon.RDO.e8453_e8455_s3873_s3874_r13829_tid30652302_00
# art-input-nfiles: 2
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_redundancy_pu55.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_redundancy_pu55.py
index c9b9750bd77e..8856c2ca817d 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_redundancy_pu55.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_redundancy_pu55.py
@@ -3,7 +3,7 @@
# art-description: art job for bjet_redundancy_pu55
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: valid1.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.recon.RDO.e8453_e8455_s3873_s3874_r13829_tid30652302_00
# art-input-nfiles: 2
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bphys.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bphys.py
index abbe786f4cb9..a9fb85b9076e 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bphys.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bphys.py
@@ -3,7 +3,7 @@
# art-description: art job for mu_bphys
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
# art-html: https://idtrigger-val.web.cern.ch/idtrigger-val/TIDAWeb/TIDAart/?jobdir=
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_cosmic.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_cosmic.py
index 4102c4cf989a..a0156d69f4b0 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_cosmic.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_cosmic.py
@@ -3,7 +3,7 @@
# art-description: art job for cosmic
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
# art-html: https://idtrigger-val.web.cern.ch/idtrigger-val/TIDAWeb/TIDAart/?jobdir=
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_cosmic_data.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_cosmic_data.py
index 5cd4e4417751..6ff85182ad17 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_cosmic_data.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_cosmic_data.py
@@ -3,7 +3,7 @@
# art-description: art job for cosmic data
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
# art-html: https://idtrigger-val.web.cern.ch/idtrigger-val/TIDAWeb/TIDAart/?jobdir=
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40.py
index 73b289513d52..1d419aa6dbd2 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40.py
@@ -3,7 +3,7 @@
# art-description: art job for el_Jpsiee_pu40
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: valid1.801272.P8B_A14_CTEQ6L1_Jpsie3e3.recon.RDO.e8514_e8528_s4111_s4114_r14622_tid33575015_00
# art-input-nfiles: 4
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py
index 6678bc364cf5..7f9843df7ff2 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py
@@ -3,7 +3,7 @@
# art-description: art job for el_singlee_7-80
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728
# art-input-nfiles: 10
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py
index b0f7d267a3b7..4a133783bd77 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py
@@ -3,7 +3,7 @@
# art-description: art job for el_singlee_7-80_larged0
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7728
# art-input-nfiles: 10
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py
index ee76c82ea889..0772ffae5634 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py
@@ -3,7 +3,7 @@
# art-description: art job for el_singlee_7-80_larged0_pu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7772
# art-input-nfiles: 10
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py
index cd12d6c4ee32..2e1a3cd552b8 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py
@@ -3,7 +3,7 @@
# art-description: art job for el_singlee_7-80_pu40
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7772
# art-input-nfiles: 10
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_clones_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_clones_pu40.py
index e82a4ed98600..ef383ac15a5a 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_clones_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_clones_pu40.py
@@ -3,7 +3,7 @@
# art-description: art job for el_zee_clones_pu40
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: valid1.601189.PhPy8EG_AZNLO_Zee.recon.RDO.e8453_e8455_s3873_s3874_r13929_tid30659542_00
# art-input-nfiles: 8
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_cloneschi2_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_cloneschi2_pu40.py
index 3dfe52b60250..c984c337df21 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_cloneschi2_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_cloneschi2_pu40.py
@@ -3,7 +3,7 @@
# art-description: art job for el_zee_cloneschi2_pu40
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: valid1.601189.PhPy8EG_AZNLO_Zee.recon.RDO.e8453_e8455_s3873_s3874_r13929_tid30659542_00
# art-input-nfiles: 8
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py
index e5e8f8acb06f..d3c855cf5372 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py
@@ -3,7 +3,7 @@
# art-description: art job for el_zee_pu40
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: valid1.601189.PhPy8EG_AZNLO_Zee.recon.RDO.e8453_e8455_s3873_s3874_r13929_tid30659542_00
# art-input-nfiles: 8
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40_elreco.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40_elreco.py
index 047a1eb96ce2..5ef942027e84 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40_elreco.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40_elreco.py
@@ -3,7 +3,7 @@
# art-description: art job for el_zee_pu40_elreco
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: valid1.601189.PhPy8EG_AZNLO_Zee.recon.RDO.e8453_e8455_s3873_s3874_r13929_tid30659542_00
# art-input-nfiles: 8
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_ellrt_staustau.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_ellrt_staustau.py
index a53be622586f..dfca18340123 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_ellrt_staustau.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_ellrt_staustau.py
@@ -3,7 +3,7 @@
# art-description: art job for ellrt_staustau
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: valid1.516757.MGPy8EG_A14NNPDF23LO_SelSelLLP_100_0_1ns.recon.RDO.e8481_e8455_s3928_s3874_r13929_tid30934242_00
# art-input-nfiles: 4
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu55.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu55.py
index bfd6c8231c1b..cf5f389f0766 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu55.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu55.py
@@ -3,7 +3,7 @@
# art-description: art job for fsjet_pu55
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: valid1.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.recon.RDO.e8453_e8455_s3873_s3874_r13829_tid30652302_00
# art-input-nfiles: 1
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_redundancy_pu55.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_redundancy_pu55.py
index dd68d8341623..feb97c701880 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_redundancy_pu55.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_redundancy_pu55.py
@@ -3,7 +3,7 @@
# art-description: art job for fsjet_pu55_redundancy
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: valid1.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.recon.RDO.e8453_e8455_s3873_s3874_r13829_tid30652302_00
# art-input-nfiles: 1
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_vtx_pu55.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_vtx_pu55.py
index 0ad1c3745951..585ac566a788 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_vtx_pu55.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_vtx_pu55.py
@@ -3,7 +3,7 @@
# art-description: art job for fsjet_vtx_pu55
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: valid1.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.recon.RDO.e8453_e8455_s3873_s3874_r13829_tid30652302_00
# art-input-nfiles: 1
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_vtx_pu55_MC16.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_vtx_pu55_MC16.py
index 3e92e3a35480..284e7403e421 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_vtx_pu55_MC16.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_vtx_pu55_MC16.py
@@ -3,7 +3,7 @@
# art-description: art job for fsjet_vtx_pu55_MC16
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input-nfiles: 3
# art-athena-mt: 8
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fslrt_rhadron.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fslrt_rhadron.py
index 2de152b01131..d079b8577a9b 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fslrt_rhadron.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fslrt_rhadron.py
@@ -3,7 +3,7 @@
# art-description: art job for fslrt_rhadron
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
# art-html: https://idtrigger-val.web.cern.ch/idtrigger-val/TIDAWeb/TIDAart/?jobdir=
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py
index 29fa473be3e6..40d907169afc 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py
@@ -3,7 +3,7 @@
# art-description: art job for minbias
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: valid1.900341.Epos_LHC_minbias_inelastic.recon.RDO.e8514_e8528_s4111_s4114_r14655_tid33662517_00
# art-input-nfiles: 4
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys.py
index 4d8c28981abf..dd8b908a03ba 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys.py
@@ -3,7 +3,7 @@
# art-description: art job for mu_bphys
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
# art-html: https://idtrigger-val.web.cern.ch/idtrigger-val/TIDAWeb/TIDAart/?jobdir=
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py
index d6752fb60666..88e807c1aded 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py
@@ -3,7 +3,7 @@
# art-description: art job for mu_singlemu_larged0
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: mc15_13TeV.107237.ParticleGenerator_mu_Pt4to100_vertxy20.recon.RDO.e3603_s2726_r7728
# art-input-nfiles: 10
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py
index 44e1fc785b89..e42044eaa726 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py
@@ -3,7 +3,7 @@
# art-description: art job for mu_singlemu_larged0_pu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: mc15_13TeV.107237.ParticleGenerator_mu_Pt4to100_vertxy20.recon.RDO.e3603_s2726_r7772
# art-input-nfiles: 10
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40.py
index 685a53e67984..76489fc3721a 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40.py
@@ -3,7 +3,7 @@
# art-description: art job for mu_Zmumu_pu40
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: valid1.601190.PhPy8EG_AZNLO_Zmumu.recon.RDO.e8453_e8455_s3873_s3874_r13929_tid30652304_00
# art-input-nfiles: 5
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mulrt_staustau.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mulrt_staustau.py
index 93e2773c04c3..29ef3b9defdc 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mulrt_staustau.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mulrt_staustau.py
@@ -3,7 +3,7 @@
# art-description: art job for mulrt_staustau
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: valid1.516697.MGPy8EG_A14NNPDF23LO_SmuSmuLLP_100_0_1ns.recon.RDO.e8481_e8455_s3928_s3874_r13929_tid30934262_00
# art-input-nfiles: 4
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tauLRT_staustau.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tauLRT_staustau.py
index 890ac403398c..124ad4f42b06 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tauLRT_staustau.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tauLRT_staustau.py
@@ -2,7 +2,7 @@
# art-description: art job for tauLRT_staustau
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: valid1.516640.MGPy8EG_A14NNPDF23LO_StauStauLLP_100_0_1ns.recon.RDO.e8481_e8455_s3928_s3874_r13929_tid30933875_00
# art-input-nfiles: 3
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_lowpt_pu46.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_lowpt_pu46.py
index 018f1cfa3648..9962b687a97f 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_lowpt_pu46.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_lowpt_pu46.py
@@ -3,7 +3,7 @@
# art-description: art job for tau_ztautau_lowpt_pu46
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: valid1.601191.PhPy8EG_AZNLO_Ztautau.recon.RDO.e8453_e8455_s3873_s3874_r13929_tid30652308_00
# art-input-nfiles: 3
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_pu46.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_pu46.py
index ca25c3aa6dd8..21370b3cf56e 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_pu46.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_pu46.py
@@ -3,7 +3,7 @@
# art-description: art job for tau_ztautau_pu46
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-input: valid1.601191.PhPy8EG_AZNLO_Ztautau.recon.RDO.e8453_e8455_s3873_s3874_r13929_tid30652308_00
# art-input-nfiles: 3
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_BeamSpot_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_BeamSpot_build.py
index 857c6414d83f..a925ba3a9c08 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_BeamSpot_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_BeamSpot_build.py
@@ -3,7 +3,7 @@
#
# art-description: BeamSpot update test using athenaHLT
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, Step, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_build.py
index 80c54f19c06f..46bc98c4392a 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_build.py
@@ -3,7 +3,7 @@
# art-description: Events processed by hardcoded chains with data requests, accepted randomly and sent to Full Event build, PEB and DS streams in athenaHLT
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_concurrent_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_concurrent_build.py
index 498df04177a8..4ffed9237c66 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_concurrent_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_concurrent_build.py
@@ -3,7 +3,7 @@
# art-description: CalibPeb test where chains are executed in parallel doing concurrent ROB requests
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_concurrent_grid.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_concurrent_grid.py
index 322ec6ff8afe..76bbed15ff54 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_concurrent_grid.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_concurrent_grid.py
@@ -3,7 +3,7 @@
# art-description: CalibPeb test where chains are executed in parallel doing concurrent ROB requests
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: *.txt
# art-output: *.log
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_highForkAndMT_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_highForkAndMT_build.py
index d0518dfcd708..0be08e2260d4 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_highForkAndMT_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_CalibPeb_highForkAndMT_build.py
@@ -3,7 +3,7 @@
# art-description: CalibPeb test with forks=4, threads=6, concurrent_events=3
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_OHMonitoring_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_OHMonitoring_build.py
index ca5d5188e79d..12719700ee7a 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_OHMonitoring_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_OHMonitoring_build.py
@@ -3,7 +3,7 @@
# art-description: HelloWorld in athenaHLT with OH monitoring
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_build.py
index f8eb5a24030e..79f87af00123 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_build.py
@@ -3,7 +3,7 @@
# art-description: HelloWorld in athenaHLT
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_forkAndMT_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_forkAndMT_build.py
index 615d8caa2dc5..949a293e9ebf 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_forkAndMT_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_forkAndMT_build.py
@@ -3,7 +3,7 @@
# art-description: HelloWorld test with forks=2, threads=2, concurrent_events=2
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_runStopRun_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_runStopRun_build.py
index eefb7ef21dd4..59cff1f48609 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_runStopRun_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_HelloWorld_runStopRun_build.py
@@ -3,7 +3,7 @@
# art-description: HelloWorld test with start/stop/start transition
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_PEB_DS_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_PEB_DS_build.py
index d7046c40abcb..d60ee53b5b71 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_PEB_DS_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_PEB_DS_build.py
@@ -3,7 +3,7 @@
# art-description: athenaHLT test of partial event building and data scouting
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_condStopStart_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_condStopStart_build.py
index 379ba96b79c0..8b21b13a25bb 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_condStopStart_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_condStopStart_build.py
@@ -3,7 +3,7 @@
# art-description: test reloading of conditions during stop/start
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_detectStreamerInfoChanges_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_detectStreamerInfoChanges_build.py
index 708b115c4866..1c1ab2715a42 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_detectStreamerInfoChanges_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_detectStreamerInfoChanges_build.py
@@ -3,7 +3,7 @@
# art-description: Detect TStreamerInfo changes of classes in the given build
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
#
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_magFieldToggle_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_magFieldToggle_build.py
index efc860a62d8c..ac06fb1c40fa 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_magFieldToggle_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_magFieldToggle_build.py
@@ -3,7 +3,7 @@
# art-description: magnetic field toggle (on->off->on) test with dummy job options
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_timeout_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_timeout_build.py
index 1d722497d9c6..268f28adcc8a 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_timeout_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_timeout_build.py
@@ -3,7 +3,7 @@
# art-description: athenaHLT test of timeout handling
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_build.py
index 8485a1decb37..3e2706714822 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_build.py
@@ -3,7 +3,7 @@
# art-description: Test of cosmic P1+Tier0 workflow, runs athenaHLT with Cosmic_run3_v1 menu followed by offline reco and monitoring
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_grid.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_grid.py
index 49e1f3ea4ffc..9e3f5705a848 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_grid.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_grid.py
@@ -4,7 +4,7 @@
# art-description: Test of cosmic P1+Tier0 workflow, runs athenaHLT with Cosmic_run3_v1 menu followed by offline reco and monitoring
# art-type: grid
# art-athena-mt: 4
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: *.txt
# art-output: *.log
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_build.py
index 412ec5136e38..56cce9ffe71b 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger athenaHLT test of the Cosmic_run3_v1 menu on physics_Main stream from a cosmic run, then running BS decoding follows the athenaHLT process
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_noL1Sim_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_noL1Sim_build.py
index 2b89bf6485d9..310d01231462 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_noL1Sim_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_noL1Sim_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger athenaHLT test of the Cosmic_run3_v1 menu on express stream from a cosmic run
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_build.py
index 131d01081c0a..ae638aeae87d 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_build.py
@@ -3,7 +3,7 @@
# art-description: athenaHLT test of the Dev_pp_run3_v1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_configConsistency_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_configConsistency_build.py
index d031468e087c..64805cc9f896 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_configConsistency_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_configConsistency_build.py
@@ -3,7 +3,7 @@
# art-description: Compare athenaHLT configuration with Dev_pp_run3_v1 menu and different threads/slots/forks settings
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps, Step
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_decodeBS_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_decodeBS_build.py
index b36fd49074a4..53900216f34d 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_decodeBS_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_decodeBS_build.py
@@ -3,7 +3,7 @@
# art-description: Runs athenaHLT writing BS output and then runs BS decoding
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_decodeBS_grid.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_decodeBS_grid.py
index a1526c40ab10..88fb9cf40615 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_decodeBS_grid.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_decodeBS_grid.py
@@ -3,7 +3,7 @@
# art-description: Runs athenaHLT writing BS output and then runs BS decoding
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_dumpConfig_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_dumpConfig_build.py
index 08ff6af84d85..434397fd4b3c 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_dumpConfig_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_dumpConfig_build.py
@@ -3,7 +3,7 @@
# art-description: athenaHLT test of the Dev_pp_run3_v1_HLTReprocessing_prescale menu only dumping options for SMK generation for HLT reprocessings
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_dumpConfig_run2_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_dumpConfig_run2_build.py
index ae71e99477f7..0024d0e60d23 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_dumpConfig_run2_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_dumpConfig_run2_build.py
@@ -3,7 +3,7 @@
# art-description: athenaHLT test of the Dev_pp_run3_v1 TriggerValidation menu only dumping options for SMK generation for HLT reprocessings, with Run2 geometry and conditions
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_forkAndMT_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_forkAndMT_build.py
index 17ac522733bd..8eccdd380b29 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_forkAndMT_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_forkAndMT_build.py
@@ -3,7 +3,7 @@
# art-description: athenaHLT test of the Dev_pp_run3_v1 menu, with forks=2, threads=4, concurrent_events=4
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_fork_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_fork_build.py
index 3f2ae919059b..23e6ec0bfd7d 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_fork_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_fork_build.py
@@ -3,7 +3,7 @@
# art-description: athenaHLT test of the Dev_pp_run3_v1 menu with multiple forks
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_grid.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_grid.py
index eab8c95ffacc..b909c96c8516 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_grid.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_grid.py
@@ -3,7 +3,7 @@
# art-description: athenaHLT test of the Dev_pp_run3_v1 menu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_build.py
index dda52f7e8e89..6b63e651a354 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_build.py
@@ -3,7 +3,7 @@
# art-description: athenaHLT test of the Dev_pp_run3_v1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_dumpConfig_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_dumpConfig_build.py
index 6a5490eb1ba6..51e319725ee0 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_dumpConfig_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_dumpConfig_build.py
@@ -3,7 +3,7 @@
# art-description: athenaHLT test of the Dev_pp_run3_v1 menu only dumping options for SMK generation
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_grid.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_grid.py
index 71eb89d3a114..0961eb39cf1c 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_grid.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_grid.py
@@ -3,7 +3,7 @@
# art-description: athenaHLT test of the Dev_pp_run3_v1 menu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_missingROBs_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_missingROBs_build.py
index d6091a69dea4..f11e8dd5846b 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_missingROBs_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_missingROBs_build.py
@@ -3,7 +3,7 @@
# art-description: athenaHLT test of the Dev_pp_run3_v1 menu with detector ROBs removed
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_noHLTChains_MT_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_noHLTChains_MT_build.py
index 0d1f513c8ed0..9031e4f2d4a8 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_noHLTChains_MT_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_noHLTChains_MT_build.py
@@ -3,7 +3,7 @@
# art-description: Test running only L1 result decoding with forks=2, threads=2, concurrent_events=2
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_noHLTChains_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_noHLTChains_build.py
index d5cbff9077f2..c88430e31d0a 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_noHLTChains_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_noHLTChains_build.py
@@ -3,7 +3,7 @@
# art-description: Test running only L1 result decoding
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_noMon_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_noMon_build.py
index 538229666e11..dce00d6a0b71 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_noMon_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_noMon_build.py
@@ -3,7 +3,7 @@
# art-description: athenaHLT test of the Dev_pp_run3_v1 menu without monitoring (ATR-24655)
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps, PyStep
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_preload_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_preload_build.py
index 95e2b67b5ab0..8d7e898ae777 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_preload_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_preload_build.py
@@ -3,7 +3,7 @@
#
# art-description: athenaHLT test of the Dev_pp_run3_v1 menu imitating partition with preloaded data at P1
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigP1Test.PreloadTest import test_trigP1_preload
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noPS_grid.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noPS_grid.py
index 74160f476ba3..a21ebbe5ce8a 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noPS_grid.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noPS_grid.py
@@ -3,7 +3,7 @@
# art-description: athenaHLT test of the full Dev_pp_run3_v1 menu without the TriggerValidation prescale set
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_reverseViews_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_reverseViews_build.py
index 782542c6bcb8..fa70bc17ea94 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_reverseViews_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_reverseViews_build.py
@@ -3,7 +3,7 @@
# art-description: athenaHLT test of the Dev_pp_run3_v1 menu with with reversed order of views to check their independence
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_ALFA_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_ALFA_build.py
index b904478ae219..9746aca0de6d 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_ALFA_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_ALFA_build.py
@@ -3,7 +3,7 @@
# art-description: Test running on ALFACalib data with ALFA ROB Monitor chains
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_ALFA_forkAndMT_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_ALFA_forkAndMT_build.py
index f1caa320ce07..dc44707235b6 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_ALFA_forkAndMT_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_ALFA_forkAndMT_build.py
@@ -3,7 +3,7 @@
# art-description: Test running on ALFACalib data with ALFA ROB Monitor chains, 2 forks, 3 slots, 6 threads
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py
index e3cb695bda8f..69b61fb6af42 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py
@@ -3,7 +3,7 @@
# art-description: transform test of BSRDOtoRAW + T0Reco + T0Mon, using v1PhysP1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_run2_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_run2_build.py
index e5ca506a0537..e6796aabd994 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_run2_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_run2_build.py
@@ -3,7 +3,7 @@
# art-description: transform test of BSRDOtoRAW + T0Reco + T0Mon, using v1PhysP1 menu, and Run2 EB data as input
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py
index 130671355f33..931efa8f5042 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py
@@ -3,7 +3,7 @@
# art-description: Test of P1+Tier0 workflow, runs athenaHLT with PhysicsP1_pp_run3_v1 menu followed by offline reco and monitoring (incl. EDM)
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py
index ddcda011bdce..0840eb56df7f 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py
@@ -4,7 +4,7 @@
# art-description: Test of P1+Tier0 workflow, runs athenaHLT with PhysicsP1_pp_run3_v1 menu followed by offline reco, DAOD production, monitoring and analysis step for EDM monitoring
# art-type: grid
# art-athena-mt: 4
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: *.txt
# art-output: *.log
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_build.py
index de56393dbcac..908fe3ca3f8a 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger athenaHLT test of the PhysicsP1_pp_run3_v1 menu, then running BS decoding follows the athenaHLT process
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps, PyStep
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_dumpConfig_run2_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_dumpConfig_run2_build.py
index 37e2fe641dcf..dd396d8d93ac 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_dumpConfig_run2_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_dumpConfig_run2_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger athenaHLT test of the PhysicsP1_pp_run3_v1 menu, with Run2 EB data as input
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_grid.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_grid.py
index 2f50b69c021b..17f868eddbbc 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_grid.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger athenaHLT test of the PhysicsP1_pp_run3_v1 menu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_inputIndependence_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_inputIndependence_build.py
index 1af2e97cf633..2e33fcf63f86 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_inputIndependence_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_inputIndependence_build.py
@@ -3,7 +3,7 @@
# art-description: Check that the menu and job configuration don't depend on input file
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_build.py
index f452972f6b08..44000ca2d0b5 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_build.py
@@ -3,7 +3,7 @@
# art-description: athenaHLT test of the PhysicsP1_pp_run3_v1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_dumpConfig_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_dumpConfig_build.py
index 840ea7cedd54..e1a94590d1e2 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_dumpConfig_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_dumpConfig_build.py
@@ -3,7 +3,7 @@
# art-description: PhysicsP1_pp_run3_v1 menu test only dumping options for SMK generation
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_grid.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_grid.py
index f0204504591c..844ff0e96a5c 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_grid.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_grid.py
@@ -3,7 +3,7 @@
# art-description: athenaHLT test of the PhysicsP1_pp_run3_v1 menu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_preload_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_preload_build.py
index 4e2401bb6e86..08498e4a3ce9 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_preload_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_preload_build.py
@@ -3,7 +3,7 @@
#
# art-description: PhysicsP1_pp_run3_v1 menu athenaHLT test imitating partition with preloaded data at P1
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigP1Test.PreloadTest import test_trigP1_preload
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_runStopRun_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_runStopRun_build.py
index 9a611807af5e..ead88eb49fa2 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_runStopRun_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_runStopRun_build.py
@@ -3,7 +3,7 @@
# art-description: start/stop/start transition test with PhysicsP1_pp_run3_v1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_runRuleBook_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_runRuleBook_build.py
index c894aac63154..adbe41591050 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_runRuleBook_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_runRuleBook_build.py
@@ -3,7 +3,7 @@
# art-description: PhysicsP1_pp_run3_v1 menu test only dumping options for SMK generation and running RuleBook to create prescales
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Step, Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_trfDbgStream_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_trfDbgStream_build.py
index 5dd8d8df8189..5b9c5123c0e3 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_trfDbgStream_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_trfDbgStream_build.py
@@ -3,7 +3,7 @@
# art-description: perform debug recovery from PU crash using PhysicsP1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Phys_ROSRate_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Phys_ROSRate_build.py
index c915a5b3e7f5..cab1215a1c42 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Phys_ROSRate_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Phys_ROSRate_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger athenaHLT test for ROS rates estimate with the Physics_pp_run3_v1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps, Step
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_newJO_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_newJO_build.py
index c93542bbf326..ab6dd31c1b87 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_newJO_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_newJO_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger AthenaMT test running new-style job options
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_newJO_writeBS_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_newJO_writeBS_build.py
index bfe82057a213..c0614fa43251 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_newJO_writeBS_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_newJO_writeBS_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger AthenaMT test running new-style job options
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Cosmic_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Cosmic_build.py
index 39499f97074f..8d9a1318fb22 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Cosmic_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Cosmic_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger BS->RDO_TRIG athena test of the Cosmic_run3_v1 menu on express stream from a cosmic run
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Cosmic_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Cosmic_grid.py
index bf99e62fa9a3..3b156d449157 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Cosmic_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Cosmic_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger BS->RDO_TRIG athena test of the Cosmic_run3_v1 menu on express stream from a cosmic run
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_L1SimOnly_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_L1SimOnly_build.py
index 84394ac3dea1..54def78da41d 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_L1SimOnly_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_L1SimOnly_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger BS->RDO_TRIG athena test of the Dev_pp_run3_v1 menu with rerunL1 enabled and without any HLT chains
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_build.py
index 8e392dbfa6db..9aef0a46e013 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger BS->RDO_TRIG athena test of the Dev_pp_run3_v1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_grid.py
index 81cbab3394a8..382b65fd5550 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger BS->RDO_TRIG athena test of the Dev_pp_run3_v1 menu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_noL1Sim_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_noL1Sim_build.py
index 154f46673c7a..971b120c8ad1 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_noL1Sim_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_noL1Sim_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger BS->RDO_TRIG athena test of the Dev_pp_run3_v1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_noL1Sim_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_noL1Sim_grid.py
index 5cacc6d5d058..4b0fa7c1542f 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_noL1Sim_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_noL1Sim_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger BS->RDO_TRIG athena test of the Dev_pp_run3_v1 menu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_noL1Sim_noHLTChains_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_noL1Sim_noHLTChains_build.py
index e5d401e8aafa..def4b3d44f2f 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_noL1Sim_noHLTChains_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_noL1Sim_noHLTChains_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger BS->RDO_TRIG athena test without any HLT chains and without L1Sim (only tests L1 decoding)
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_noPS_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_noPS_grid.py
index 82497bbacd55..2bf6db338023 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_noPS_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_noPS_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger BS->RDO_TRIG athena test of the full Dev_pp_run3_v1 menu without the TriggerValidation prescale set
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_bjet_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_bjet_build.py
index 762d74bd82a8..bf79791312bc 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_bjet_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_bjet_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the b-jet slice in Dev_pp_run3_v1 menu, data input
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_bphysics_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_bphysics_build.py
index 85241833c01a..057a3d3c1398 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_bphysics_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_bphysics_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the b-physics slice in Dev_pp_run3_v1 menu (data input)
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_egamma_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_egamma_build.py
index 5dce647d2fa4..d49f3a8dbda4 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_egamma_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_egamma_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the egamma slice in Dev_pp_run3_v1 menu, data input
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_jet_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_jet_build.py
index 02bd5db9aa2e..07004f4e896d 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_jet_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_jet_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the jet slice in Dev_pp_run3_v1 menu, data input
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_met_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_met_build.py
index 82200f68daae..f77429a3d26f 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_met_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_met_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the MET slice in Dev_pp_run3_v1 menu, data input
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_muon_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_muon_build.py
index 8759aabc99bc..e9464418526c 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_muon_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_muon_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the muon slice in Dev_pp_run3_v1 menu, data input
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_tau_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_tau_build.py
index 47a145942ec8..4dbdaf6ef37a 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_tau_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_slice_tau_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the tau slice in Dev_pp_run3_v1 menu, data input
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_writeBS_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_writeBS_build.py
index 0cd9ec029eef..48c5c6d0f613 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_writeBS_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_writeBS_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger BS->BS athena test of the Dev_pp_run3_v1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_writeBS_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_writeBS_grid.py
index 7ae91755b723..072412480523 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_writeBS_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_writeBS_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger BS->BS athena test of the Dev_pp_run3_v1 menu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1MC_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1MC_build.py
index 5a6a2669746f..f9097f271448 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1MC_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1MC_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger BS->RDO_TRIG athena test of the MC_pp_run3_v1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1MC_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1MC_grid.py
index c6dc5e6ad54e..f910471b339c 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1MC_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1MC_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger BS->RDO_TRIG athena test of the MC_pp_run3_v1 menu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1lowMu_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1lowMu_build.py
index 804afcbdd1e0..b9a8d525950e 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1lowMu_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1lowMu_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the lowMu menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_newJO_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_newJO_build.py
index f4f77f28b6d8..557d899c9a0a 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_newJO_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_newJO_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger AthenaMT test running new-style job options
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_newJO_v1DevHI_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_newJO_v1DevHI_build.py
index c6308b92324c..8b29c2814562 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_newJO_v1DevHI_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_newJO_v1DevHI_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the Dev_HI_run3_v1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_newJO_v1lowMu_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_newJO_v1lowMu_build.py
index 78b1bcad6fd2..deb42de56076 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_newJO_v1lowMu_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_newJO_v1lowMu_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the lowMu menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Cosmic_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Cosmic_build.py
index 88ab80b36d43..204f7b58f537 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Cosmic_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Cosmic_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the Cosmic_run3_v1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Cosmic_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Cosmic_grid.py
index 4aa774186fec..0365428f3291 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Cosmic_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Cosmic_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the Cosmic_run3_v1 menu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1DevHI_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1DevHI_build.py
index 287ade3985ef..d9437616700f 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1DevHI_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1DevHI_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the Dev_HI_run3_v1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1DevHI_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1DevHI_grid.py
index 507b6f44f64b..ffee71412e98 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1DevHI_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1DevHI_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the Dev_HI_run3_v1 menu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_L1SimOnly_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_L1SimOnly_build.py
index 9cd5b71ff8ab..a1f9eda20e6c 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_L1SimOnly_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_L1SimOnly_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test with L1 simulation but without any HLT chains
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_LLP_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_LLP_grid.py
index 151107b1ebe3..1aaf8cdea46e 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_LLP_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_LLP_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the Dev_pp_run3_v1 menu with SlepSlep sample to help check counts in LLP menu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_MT_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_MT_build.py
index 5626081e9864..070e97647d43 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_MT_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_MT_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the Dev_pp_run3_v1 menu with 2 slots and 2 threads
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_build.py
index e8acaed6768d..72fc4ac1cc8b 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the Dev_pp_run3_v1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_grid.py
index 51be1a11c7cb..4dce77ba3075 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the Dev_pp_run3_v1 menu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_noPS_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_noPS_grid.py
index 66a2f19f714d..14cbc8d7afb8 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_noPS_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_noPS_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the full Dev_pp_run3_v1 menu without the TriggerValidation prescale set
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_pu80_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_pu80_build.py
index f6a7f0347b57..3aa81d469b1e 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_pu80_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_pu80_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the Dev_pp_run3_v1 menu with pileup80 ttbar sample
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_pu80_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_pu80_grid.py
index 1e9aa838a43d..cac8677f13d5 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_pu80_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_pu80_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the Dev_pp_run3_v1 menu with pileup80 ttbar sample
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 8
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bjet_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bjet_build.py
index 0ae76da97e69..230e082da3c1 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bjet_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bjet_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the b-jet slice in Dev_pp_run3_v1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bjet_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bjet_grid.py
index 6c8fcec0d983..14c1f633ad5f 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bjet_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bjet_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the b-jet slice in Dev_pp_run3_v1 menu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysics_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysics_build.py
index 8a968c0a8dde..df16323f0420 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysics_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysics_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the b-physics slice in Dev_pp_run3_v1 menu (input: mix of dimuon samples)
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysics_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysics_grid.py
index 07fce45b772d..9eb0ef61ee4a 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysics_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysics_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the b-physics slice in Dev_pp_run3_v1 menu (input: mix of dimuon samples)
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysicsee_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysicsee_build.py
index 5fe9d8587b76..cc0d4d7006f5 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysicsee_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysicsee_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the electron/b-physics slice in Dev_pp_run3_v1 menu (input: mix of dielectron samples)
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysicsee_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysicsee_grid.py
index 5234ac32fc43..cc16dbbaf942 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysicsee_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysicsee_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the electron/b-physics slice in Dev_pp_run3_v1 menu (input: mix of dielectron samples)
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysicsexo_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysicsexo_build.py
index add19e022591..cf9883bce0d2 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysicsexo_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysicsexo_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the b-physics slice in Dev_pp_run3_v1 menu (input: mix of multimuon samples)
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysicsexo_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysicsexo_grid.py
index 2e11287c2af9..2afe14219d90 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysicsexo_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_bphysicsexo_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the b-physics slice in Dev_pp_run3_v1 menu (input: mix of multimuon samples)
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_egamma_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_egamma_build.py
index 58fafa8aedd5..a5a6370e30d4 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_egamma_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_egamma_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the egamma slice in Dev_pp_run3_v1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_egamma_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_egamma_grid.py
index 833a426acb22..2fdfa7167f0b 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_egamma_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_egamma_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the egamma slice in Dev_pp_run3_v1 menu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_jet_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_jet_build.py
index 48e0c12d7bd8..a568cb9a310d 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_jet_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_jet_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the jet slice in Dev_pp_run3_v1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_jet_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_jet_grid.py
index 25370e71dfa0..f964e5ca64d7 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_jet_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_jet_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the jet slice in Dev_pp_run3_v1 menu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_met_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_met_build.py
index 6c9f33868e81..99fd4f62956e 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_met_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_met_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the MET slice in Dev_pp_run3_v1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_met_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_met_grid.py
index dc802afc28fa..6f5a52564581 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_met_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_met_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the MET slice in Dev_pp_run3_v1 menu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_muon_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_muon_build.py
index 8e8c47c2c81e..c27f72fd9259 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_muon_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_muon_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the muon slice in Dev_pp_run3_v1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_muon_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_muon_grid.py
index 4c0680b78275..2431a97df13d 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_muon_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_muon_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the muon slice in Dev_pp_run3_v1 menu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_reprodWithFlags_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_reprodWithFlags_grid.py
index 3c57d0dba6b1..0bf3736a3c16 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_reprodWithFlags_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_reprodWithFlags_grid.py
@@ -3,7 +3,7 @@
# art-description: Compares results of a slice chains when running in full menu and when running alone with other slices disabled by doXYZFlag=False
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: *.txt
# art-output: *.log
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_reprodWithPS_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_reprodWithPS_build.py
index d131e7dcc316..af0e893bae8a 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_reprodWithPS_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_reprodWithPS_build.py
@@ -3,7 +3,7 @@
# art-description: Compares results of a slice chains when running in full menu and when running alone with other slices disabled by prescaling
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_reprodWithPS_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_reprodWithPS_grid.py
index d1fc2bcd571d..d4229cc88c71 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_reprodWithPS_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_reprodWithPS_grid.py
@@ -3,7 +3,7 @@
# art-description: Compares results of a slice chains when running in full menu and when running alone with other slices disabled by prescaling
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-output: *.txt
# art-output: *.log
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_tau_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_tau_build.py
index 1b7a8be04153..f57e4a1ff2d1 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_tau_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_tau_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the tau slice in Dev_pp_run3_v1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_tau_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_tau_grid.py
index 8fa4fc1c0b24..afd2753cdb71 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_tau_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_tau_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the tau slice in Dev_pp_run3_v1 menu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_writeBS_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_writeBS_build.py
index c707748843b9..ce00e88addfd 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_writeBS_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_writeBS_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->BS athena test of the Dev_pp_run3_v1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_writeBS_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_writeBS_grid.py
index c9bbe8f5090e..967d28dc11bd 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_writeBS_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_writeBS_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->BS athena test of the Dev_pp_run3_v1 menu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1MC_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1MC_build.py
index 53c297431c54..588e6fadb511 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1MC_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1MC_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the MC_pp_run3_v1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1MC_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1MC_grid.py
index 0e931f8246df..7e1f70afea83 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1MC_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1MC_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the MC_pp_run3_v1 menu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1PhysP1_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1PhysP1_build.py
index 249b46ec7894..728d48bd0d28 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1PhysP1_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1PhysP1_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the PhysicsP1_pp_run3_v1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1PhysP1_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1PhysP1_grid.py
index 2e2445c6963a..ffc96d6731fe 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1PhysP1_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1PhysP1_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the PhysicsP1_pp_run3_v1 menu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Phys_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Phys_build.py
index 9629630744fd..815c4626b283 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Phys_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Phys_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the Physics_pp_run3_v1 menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Phys_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Phys_grid.py
index 288a4a2b5e15..7554ee79bef4 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Phys_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Phys_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the Physics_pp_run3_v1 menu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1lowMu_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1lowMu_build.py
index f1ea85571856..6dd2888c36b6 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1lowMu_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1lowMu_build.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of the lowMu menu
# art-type: build
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1lowMu_grid.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1lowMu_grid.py
index 632e65206c7a..32f4f2ad944c 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1lowMu_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1lowMu_grid.py
@@ -3,7 +3,7 @@
# art-description: Trigger RDO->RDO_TRIG athena test of lowMu menu
# art-type: grid
-# art-include: master/Athena
+# art-include: main/Athena
# art-include: 23.0/Athena
# art-athena-mt: 4
# art-output: *.txt
--
GitLab