diff --git a/Control/AthenaMonitoring/test/test_run3dq_q442_aod.sh b/Control/AthenaMonitoring/test/test_run3dq_q442_aod.sh
index 65f1a8b335ab60c582655e2c6a0c88f975e0fed4..431bb6738af2b236fd8c714d225b93ffaf65ff60 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 42acdca05e435f84ab7278191da6aac28ff3f275..4a48ea70f0b09f748f5bd2100d41172bddd6181b 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 7cf635a653ac6aa461e5e59657743984df445551..3ee835b863ca21726d71a6f1207480b55880a361 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 2463753913f8b9e94072d1e57b7f223f801b2af1..3cb49d07d67d113035ecaa21b1d0c846cddcf474 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 407a6ec64ed9d084dc583af7c518a8411df40b14..4858912900b71823879cceb95ecb6a9a755c2fe3 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 0a4378ad788293d62b4ba5506bbd6f6127144c57..c15063282d2bd3a2b6a798650ff9adb366566fb0 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 552dae92ca0c831839975f28e4354028e793127b..31d0d91dd55bf637f94ac495d8fe72b6ac8045de 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 1b2cc7491044565b84b4b6dc2d377f4a6ebe3906..da66e9334d47d608d95432fdd96b6f705d5442e1 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 051d1a9c6297b04c896e7750147fc22b1ec5d2e2..c25b7f415b0dab0d42bc635929d40f2fa71abdd7 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 ebb86e20ec1ff25833fb8eee3d95d5b1526373ea..ece010fab4755e72e7c9c560f6f533bd68252128 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 e5bc782e95493713c3ceda37ea2ae99a71229c2f..d21c7b8f83a44c0d861a7ef32a2d562ee141ddaf 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 648091cf961c50e77a77920e2fb61c1c97ed7474..5e08d139c128c72d3f07bfa4933f7940de8a377f 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 db4aebf46f7cb161998f312a1c407a2500c371e8..cd14f00a30882ad049be1a44600f1c7a61da30ad 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 50d971a15e2696d6db1ac6537d0e39b1d486ab1c..f0151d60dbfc31c7f22d59ac0eced72fe95ef31e 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 9090569cd8c78ce805e48e1a4be584613f398089..de80482c7564e055806db768acd3bd6d4672ed3a 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 ab6ac23a22da5ca084e494ea1aa5244321dbd7dd..39d123411299a55e2ba9c3d879c197e965df9dce 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 c92fc897d17de02ea3aaa8afe8a80280719e32da..afcb66891abbb1c2ab7c8280f432247cb7325d49 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 b49213746b78ab2a85859d5f68d593c021b225ae..1bd1e799ac2787cd4832666688c7014044abf163 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 f9f28d1cd332aaa9aeeb66569f567cf66e0ebad9..36a59bd21f4746bb42dd289b2be4856e9f011644 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 0342c428641ed3bfcf89768ae957d079bc7c660e..8ac261d5cc127c9e9c1b56e584ec956d405dc11c 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 b5c6a75ccde1b4a173fd5654e93e93dbaa4786fb..353f19a3fece8639d26a25a5948d4dbb2d04bd16 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 6f901407534de5519f9a838eb7fcd7e849586697..cb71be8db4f72959d12be0a4e05df79d498a99c3 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 39a19a68cedd509b327590d4c05379c1538952dc..cc4f6ca56ded66c44a3470e4026ea72691cacd1f 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 9c33468a63ced89eae3b59205361bcfe487cebbd..d593279b2fe3aeda2764e84c5d4d85ea91154109 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 f095a12627bc1519e5e9cd8c0d926a6b10c026a8..0b3f68816b14e3f5d130d6c715a1d6759bc6628b 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 9949df4c9d0b8dd77b77bad4ec2ce1221fb8a289..24c04a4c9618e7bcc45cd97841cdd14eac59edcc 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 6ccf729abab6202d35114ab0cce25e4ba0c2e315..dc260c7cd6c3ea8833988b46fda74d7badeea532 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 4b0d9d865a5b399b93188deff868d765f0b06e79..10482a702e968b9a0ca47a31e38239fec132394e 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 ab73d930bead3b1c944073a1d4429f5cfea16beb..1a6a928d9bf694dcb4442f9750a553ba98a0b612 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 3479e00c4a0c868208af2bf4bc7b3ddd4dbd3180..1dc5d7ba076027f398813fca8ecee514196f58f6 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 8721b1f9a9a3da86f3d174ea8c389d6d558e25b6..a4787239267dcbbb0b9e4d1e69e079f381ac7cdc 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 885aa3e288f2a669024ed870961040711fd67031..4672cf7471598b3c8d800693b90fcf5be967c199 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 3107b913116ed272b6877c594f28638ced07dc0c..3a2e6c7d8dbbde7cddea57691957e67511756377 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 d81c48e7b58866f8e0b03f059809409350a7e42c..3ffc8778147d73444ed07c66c1f5c42e628c18b1 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 cf0c8f28926632e1108143c84e93f68675aa34e4..a40a15639e5b3bc78d064d02b4845153ec55f574 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 46ebb354a8d250fa0d9faf255169cc6e36aa9eba..17d12d7e4681ce96d7b255c7b8e7c49c253dece8 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 5ac1ba360ddcc70ca5ad0372b66d572ec2def673..c1400eabf108f9c5e1ddbb926b0ad33f2be1be83 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 d9b099dd121b36663cdffe8bf9e5470b99c0bc39..ba6c45f28b9e10b9afe1a82b4a895be83d9f4a2f 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 ae5b54122f3c80b1fbf2be959d9a61984f335872..af20a3674c96c8fabf2fea993301986e9a16b67b 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 e12ccdefc0a25c5fb7a2d7fe3fec48229dc2b3b9..a1a121bd2d49bf36db952b03f261ccad16c34406 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 73ed1448653a10ffd54907a86a52bd54156c7697..c88266df5c9b0d653120ec6918d55290d31059dd 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 6af253ebf276a34990195dc5887f54e00ce2cf1b..e1db291189cee166238eb04e22f1f4b55b1db07e 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 fa77f6e87a584c18cb8b074d50a811ff9fcefd2a..fe7b4629ea685af1b8986d32146c64600f4a577f 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 12e6779168f150b03bf69daf16fcf96a2c2b27ba..93bd2af9955580f9e79cf3d0d12d92377235cee3 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 d4da0ce477eb83344a191a90af7ad9d957e09578..71a5764c1ee347c0bd7235f8cd5a45df75c76d2f 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 7babc52af08de822c683d5fecdd459e4f1326e8a..fe57e127c52226fc5b7970fd64f27a1ad6395392 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 ca87313ca83d3eeb51aa4387262d1a1191cd1857..7a2da8b17888eddf8ebcd56c890f33658465cdb9 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 844761b2735fd039eea41a2be903d53d6704c491..d4f451749a66d5928392d624f5157a70b7e8b197 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 1abb86f1e462c8b9cecc6baee373ba09eac26091..d65d028e53a1dc8f6f8bf873e89a99326cdc6d76 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 5bdfb540e0a3e940e9fe26ea4bea5e7ff5f8f8f8..79d8596d6d61e8fb55c1fcfc1a450633f3fc9055 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 8733cc6172a226da60882297665e4fb7371315de..1ec99a012d8712e116c20d1d719209478bdbfe4d 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 5c014785b957141ff9bd8786a8ed28062d42fe97..3a24931213eb172e3572a1a81dfc0c18b3244164 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 bf182ed4bf6dc2f7da2adce1ef4bc2955ea5155c..f05565c07659ce2e89d1bcffe3f3329d557cb132 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 ffb8608f55e78508a8565d40d38578cea8bbc798..f030c4be78a914af8da24fc4c8380857ace5766f 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 d809ad37a0b25ecf4c71606b344a8e293c8c6e33..5451d528a367885a4bafde0312ef5f44c82c82e6 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 2ab9341c2262fe008b532605be1236682fe351b5..a3773cf1503c3dc2baf292ff480b5eac6f08cffe 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 4af43b91478c762444d458de46c26d1bebb94077..d9cb77bbe0a55d99a2edf17b8441cfc012259e95 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 664665e07dbb6bd1d30e3784ab77eee5ba822d1d..0a78ed1d99dab5f8367f6c9bc724bbdc76ea62e8 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 8911864835de57672301a07fa4537c85c8d9860f..81685794f21e8d8f3f07ef1b53ed0e45a85a9fe7 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 9477964d4a796b722069f8a94bf66ceb95c36733..5791fd02021333b4a34bbfb570d3997fb9094dc4 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 1da1ca1f68d1ce4fc0a0e33ed1f7ee59eb4b3132..22f086d93208320255378aee0cc2acff962c5c8e 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 1405eba01c9715027532cb8e5826dbb29b3d0ecf..29d9f99a699bd53d846230f5b64ae64be3489b33 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 013783d64f6176db1bd11e2a8608cbf341c54013..653f4c60bb75c66c271615f1d90445fe0670adcf 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 c39295a0b4a53c322f5e94a2492e438bfa8e396c..9b326adc4f0c5a6e1ce28881edbcad0108b79127 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 36f3a3b637a0ae2994731f3a0321bf748a6b6889..44fc2970d8aadf6425d139a070880af54cde5257 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 e3d43e2761004ec7926784872b412c8a77c482a3..184ba6395cd500ff087658444e1c74bb47a98085 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 33388ed28da7a31c26b704878b3360bd6b5d4c5e..127c478ff43fddeed260f1adb1d6125bbad77242 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 80f1b419cd0a3ea680e315380e4b7d539a24ade9..dcde27079c0da11893f33122467dd4dc656894b4 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 f26ccd427bcc2d2b2f3701039c64e5dd45298262..634f27cab4b6ab7d3cdba5f928b288b7eda74bf5 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 99af4a36a1fc486c9acc603ea5c4c780f5c1ca85..ee664d6eb6f65ce5a39adc1d8e6aabeef5a89fa5 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 6b07b1fb3868a1f1fa18982a8ee90820667149fc..f135ba719c93563798afe51fb734c935e7a32486 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 ae4c07461d996f6b91dc9b276a2ad324391223aa..be20340ca023ed3149f244e78ca0ee8d923f891d 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 e6e61c029270617dd589274ecbbe4fcd27f48ba9..ed6402a0ce9ab3fee962799bd84070d1c6113eb4 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 eaae8138c2154bbada5b095a8d174b06ca8f9326..7af97ead13e480325f25c7c48ce4694b95404ef1 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 dabecf1ff527fd484ff085ee91f551d2d31c2431..fdfb294ffeb75b191a3978be73e66af660396007 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 ee41cb4fd85b00e50b5dfed5da4987ad23c2f308..8c6e85534f7c7703a00a73ac7b2bb3536674f897 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 0db6742c8fc4b6afc01e0e43831634b5984df886..a2347a93d7cedd40f54df1fe9612c33e096944cd 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 6c86c1054aec39565e4b0cedfd3cfc0acb421a3c..69321774102d81be60f4919d979116d9b6350a89 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 a30b642b63ecc760ec6f65e80dcf57d5b5893842..bb96f85b7d8e442233d953e7f7b75851fa3bed5b 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 09729d2b2735b26bd307371ffefe9fe9ef5d5422..9d6dffa3d9081e3d7b52493e5fa555e3b9e14ab7 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 b537955c4b42d4da27eccedbebf6e7ad1e6e766e..82db38c94bf19bdabe079223fc79b8412b421bc6 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 76f1dcfbfde709a4b2ee21edfc5a68305ab68a67..a77cba42276cb71d0968d697d3159c8a718d5b98 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 a92e57a3c94712ea4bf2b28c6743099cf2ced9c9..acd38f0b211c58ab2eb93317bbe859250c8da2ca 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 3d380287c410ba6b4c2d26907520419594f45aab..1a73d40427e3778ff6250471a10b176d805199a4 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 091b971e54fa488abdcada51d9667ee7a6ca1a1f..c47dd67306e34366c651175e7dde88882ac11237 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 87e922e5bc2a1f92e014d73255e4a94c48f6e408..c5bb902b4f6a20d0948c7e314fbdd662e20ed87f 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 aab29a67a5012196657199ecc40b1cfc71dc6957..fa948d79a0ea38c2e014734b8a83d3b7c22b8689 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 1875fc23cf668d3b8c818687e68d3667d1356a7c..86ad8ac649fb56341c1606c93793fcacb4f51de5 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 caa40c7667940517f51ab2989d52b0f0b0a19cb5..2c0abaeb04776624f752eedcf3e1b4786515b4ba 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 5eb6d742a7d1f64414a95566ad6ab604ae661101..e6405f60ffa77cfa99fe37116545539d86b048aa 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 691144839eed1213fc59da166f864f2f73220a69..5d67dd5f82092b4668f83adec98ec083ef73ce18 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 ab2bc2e9e7794f116b6fc2e4f43234bcb18c3459..4226105f1cbde0f34cdce143a53fbb300c2e65b3 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 f9aec44af2dce9aeaabb34d7f83f5eb694360ebc..af9f04ea2a4367a283d9f3f5724c3331f0739571 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 efac7449b1c4fd48f320d2e25b1e96d3c19cbe1a..c72d7d80b41e40688e2df335db23bced43897339 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 6622a00909d8b50d621084fd8ac18febc560656d..2e92186de37bee775c06a30b02dc644ffe83a7aa 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 e2970c24834d0f5ed0687f285befd6eae7336520..2ae2025be9b668fe004b1b028a95819ad6c8cae9 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 cf8254177901fa0ffba3d70f85df94c635e264b2..5e850f4d847e42c439b0a389f30144f6a210a430 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 83e88bb970aab4cde643527ab2e4318f43358d0d..fff2f4217b48e7d932d696fff5c62cdb2221f7b6 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 de0590bfb5701999ba2fd364d042bc380dc20d41..efe06075e982841ede8f5eb81fb97853f8e25f2b 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 854bf7f9a194d3c967409a97946ea9688e8dae09..cc9aa7a1db2674da6727318a83b7fa12f416031e 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 a01e5be02be4d452dbf0a191570a454569a321cb..76e3f4d5f6b6af25b6138ac7cdb480c8f0012d33 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 caaadb8d0bf5088f45a84f6ffe36ab964882da72..594cc74d3a45dc0ac7ffb1d3018690bdb6e3543c 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 32af0766ac9b4fbfd809e531173bfa819b05fc6b..13a4a897f3e0a7d2026c351e4ffd781702cc7177 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 64da035806b370db3de770b2f84a98fc205be059..c5e34d93b618da16df4a374241a06f2aee2afb1b 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 409be46535d6bf0ba78b384b343d300b53c88708..1c6d6e48d2eaac764d8463f7697fb8e949265fd9 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 91ab1eb77dbdc25c1f6d58d91c2d7213056d1d31..0cde9470f809b100de922169bd39cedd41503682 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 2bb06caae2b5cdb045673b2bd70b93f3aad14922..7de351bf8819b3af131892f746cc946029d10c0b 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 a4dcc066e4a6cc90a7d37c8e0a54ab5b9a5d500d..7e8b78fb178b2319d33186588afe7e8922e618d5 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 e8c1353b5f3bc7612965d6fd100a3709e6630a55..9069c510efd9a32eaa41459f65250f0177f46031 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 bcdd8d122eefd016de4f3703596ad151fe0514b2..373c852a7d27c8b3b190de7388718386323d3d80 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 9944f59a519d6df7b9319f849287915e005625dc..9964868322b15a30e14dfb0a91ec05924396fb41 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 77f5bf88970f22a2d5305e39a1be8409d936ba83..7f027a1604fc776dd6168112f9d346a5cee68f53 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 1882173b04023051b0edfe1de4ad8b0043780c23..7951669285313871995e75bb2e1f573ecc7e1d8c 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 77f22078e115379689ede1e3165b9b45322d1227..68c7147ded3d5e67b849b23e72a0f9d43c29accf 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 fb0facfae67e60823cde2c9e4f2445b7324465bf..884b1160ceb7ee464c8d9da50097290f9811a607 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 096a21895382e2ff6998452339f67f5e92a22455..82d116b46a7e3944661e09be60bdf434596797f1 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 7034938aab2e8db98503049c093912b9f0f8c088..365c3d88c0f7277b93342ad71bf16fc2fa295522 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 93469c78bb817e8047038904cb93a12b84f28dd0..da62cfc7e43563500520ab8db483ef318d4cf19c 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 ac251f6fe099d6b3862e41ca3534688ab533959e..802b9f7e266a1f4d7ca9b15227756af0e638f9fb 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 1ee68c15fe8dd8301e7df450af80fb5d246790f5..fc74c4584598e1a1c7ed78ef0c5414c657e8d170 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 32b50369e95cd7c8b895bfb938ad22898208680a..18c0f100801564f59d60b6ed88cafbf3341a90b3 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 49255dfb16e8d5e74ec4e6c1e4fce08ff7019c4f..c08d6c6168b54dbf5b1418f21df72b1156d8cd8f 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 a6890031c12da34d56e79b0d42ac9a74c9cf5f7a..d3f2544fe66f7b44d04696cd68b981c7ab72f5a5 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 5c69d798dca42ad647d2174137124e74c8c741ff..4280d313babeb39ac02912ab28b1ca09b9377862 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 464f45658c5903582bcad874153c911a185ac799..720bfa4940c10d3d4984d3b570852ff222232271 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 22318823918699a05109e3a7cb2c7aa908851ef3..3def391bb34fae0af052726264507299d2ef7a2e 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 e1d1112ca873d3d3663c4b2ac6bbbbc17d38f093..392d674c3199d737f44009918e36094d90077c53 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 ba8a40eeaa4b33491f6a2f2fe90a446e6695ef1e..b632fdfa1c7aae1161e8013cf7c94beeb6366119 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 2bec28ded4b9d2b94318feaf3f8dec92493289d5..d59c118063de9546481755d6e1c46220dca5eee6 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 85e5f06256c27a8d404747ee7208770423bc7d6e..8e88372d807a4becf011efb958ddbbf6993499a4 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 d99ed810ef6d9cddc94805f8c600d1d8f01a3f40..ea74ee6945d5b629e408b85a0dfbf5b2f6de6dab 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 f593905a8f67c8b2a7c4016e71556481e519047d..0651459a8faa7135084e09ff302e6647a5ce6b2a 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 b05ba7baf7924def00f61b44f8af523ea0128d1a..69d7b980ff6e739abf5b5b7502dec4db654a227e 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 9eb13c326a667e02ac7340e052a8cb7db4d1c58d..5f2ccd9324f8ece34d6f3d35cb5365244da11fe0 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 f668331d2bc5f2ce5e84af17a7b83eb31a70b3cd..45cd2fb7b3efcedf7b0a9432cab3be08bcea0221 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 69aa8a7705702c4af474e176e7fb89c43594aabd..7cc5b2015eff2dcfe2b01952ec13359add67f225 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 b407a3917c6109321084af19f63ca83411a5f176..7c34ae9a950d0c3ff5ead33f44cd48be689841d7 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 095e09dcdfa551be1505e3bfb8e9efdf5fba996a..80ee68adc25b32cdca7a61ca5ae87d635e1ac2ec 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 53306c20a3a63e7f74de1dfd1504b862d78a4d63..3ddea0edbbd54d8afa4c3a12122ed37d76436bd9 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 c19c66686323872e11e6cf8ddb24a82a3d6274aa..bf92a654dc16c8f9e7bc590a0abbac427ba6ad63 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 46cd354a7612a498e024029655167cf7e27322c6..a898d4653f8dbb479d9b720bf769de8d6d5b3472 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 9275ae445cc0bce21c9d7c4bab81cd0b3f2e7ea6..ed202e294c2ebcb555f096da49ceb84de8809aa6 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 c62e7cbd50f0f8e7b19b8f44d8991eb2afc3516a..ec821dea310b4b19c1a37df822041e0cd7362019 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 bc15c8a062f9ddc1848a72b2d51cc854370fad95..d24791348046b9c9012230e71f32b576e56b6a06 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 630089822eba1bfd3e5cb5b09236178f385b827c..c9835cee76cf84a4e16591c73e120c4064089931 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 e5476d4ca2e4d6fa88b3f507d2f972353eece83f..e9505dd15b9a07513789f08dcccfb7db1156a270 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 159bdbb47722a2a3a58bae504c8604ee371e8f13..e312937765a32e14d0b447b74fafc09626b68032 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 3d309b4e5aabec3bbb001e106bf2bee88de9dbd0..94e89f19ea2637a59dd06294aeec1df6ae752a4a 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 50f347ca3193b11c3c396ff3cdbf7144046ac6ce..70d4d827c2372aeb6b3b8e77c42bc5fef8d76b48 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 7d92fdc9910df7bd0d4d8de2d95f36c0c8b200a6..d2ff764e22834a307301379412392755f8369590 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 4d30d09311e1daf3b367eeb3df0e16497edc7b85..c4a5914ebcee86f5ddc16b0788f017379c124415 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 24b3191e73c97d479c76c3b7069849b2467e7f9f..14ad669d859ec538ad2e6ccbe13a8f70cb11251b 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 b25789e5f709157c1477abc04baee238194e0a13..bc17cfc2948cde4de82144ddcd398d076cf6d9fc 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 c2ecd90d55ead4df78c6e5f8f4854553d459fa96..d4bce3905e6ae5f1fc00ecf188b559e63dc8f06c 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 a3505c75c08a0a71ff568c07ddb4176eb3e208d8..c85dd97f86dba91488043887f91138c66a3583a4 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 234255f95d85fa84286e053516f205b3790ab5de..7052b54c0f2eaa55ee0aec05c61aa2c385988a7b 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 ff047f95ad68abc1015e009474a05417fe518404..79a2f420ec6cd6fe12beb769b4cbe2a661b49dac 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 b863b4cd8f6da2568bb7ac7b51c9f47672fd56ce..8937261168bb62bb089c3d18299e9217d6831e6f 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 8f45892dcc3998adebb2d0234cebd548fbe8603a..0cc76e98e75eee59416cdfe344a86633d2aed3b3 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 84b86efb11a994ba54fe6fc2ef197f153ad30bb3..81818126bbf7460d2196800b8b5e3ec81cdadc89 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 b0e992bc64ee57e7b1773661b8e6a2b526d38c03..c1873aa14cfd1c5021693f16d68238a60102785d 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 fde1cf4cb02eefd30e6b3428ed800322575eaf49..6bc8d05355ec632529c109e5f5a17fff449d647a 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 2f5f42efb1378b91502a6f998f2a752bda8e17e5..00ce6a1c344a59382a4be436d8fe2217ad710333 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 a5cec2b2f2fbbbeb90a5cb92e9b1b34fed61b3fc..8955afd5cb5ae5e7c1f2a946587da5aca9f234c1 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 901dfc879ec2943d031e10669521d0075c0a1cbe..a2004f225b3b00bfedc04dffab3cf58f78744613 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 4cf2be6510b4b45cb18179b967137593a032db08..11ad51e7b6900ddcb677f80c303ea344ec24406e 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 06427d7a9286e50ee5bad3fcbb1b0485386416b2..3865b93f160a77db9b795b435e660c258c35d546 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 15a10074b65cc755111fecdc7f2d275fc4d0f36f..c2bfdf712c8eb7a5cd7edde0b7c15d8593859224 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 4293526ccf5a73f170d62281497327da8a78241f..a972e85c2a3214123e0a8fa3b9c58ab406ab3bd7 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 fd7fa1620232d13d1b60e4174952f3c0c70bed52..904c74db1bf37caef6f3e9f32161c63c54f1e4d4 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 52731484bf72bd7104c657a2ef62122b9d88a8c4..dd66b2f4da589119a5168d85536714eb500a5e5b 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 aaa17fa1ac2ed3768668b78060570be22d543ca4..98c3f41918487f3bee220fa90a6b0edaa7074749 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 23cac001bc65cc9735347f7cf57cbfb369314dbd..4d0896b6fb0b3d6c5d11b741991bfc26b426cd2b 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 214099f49a0915f73de7d36c98d0ada2bc0ce77f..b00b6c5a6532e6e6d406c7167f049357e47298e4 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 aa57a55264a365be00884b0fac90d733641da918..57f19b8b7659cbfb9047f76854e24c44c78d73dc 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 0e53733e4e0fbf27abc41aec58e3ad7d18538c17..f65543ae274f691c324e3c4ac5486928f1237001 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 58dde9d90c2c8d934fafb476ca4deb7c406d4b37..99c0b2bd9c84ddf1c498843f947044cf287a2682 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 841934132a82c04f08d817c95bb15c57a1304e35..ef88960fe2fcfca6497ac24511cce50f1f853699 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 929f3d75856093f73fc55e06374af2153d0a251d..4f2b09ae24203e6670a5317af87c46a4c2520c4d 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 307fc00bc4627a43282bf4637ec8f62968e99447..5c0c6b78ecf1df1b080afd233bb5ebe8152859ba 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 c4840f79da4702825532f2a6bb5376dfb95ca631..3a47b587808bf0d2541c5b73fb35648ef3edfaef 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 a3e5eec28e24d93fdce24885affa8b3fe05e5fc3..e32e147d139e77019d49684b9f6d6d411a521f0d 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 fff044b320cab407c97bee5e6db1603dc39acb0b..78a6328effc4f21b9261d3a973367aa4fc89cfab 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 aa114abaccc1b969e6735ece87239818bf373252..db9868fa3b4546ce108ca04bbfb695f1309119f3 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 117a19a09c83cdc9d91c51858ab52f9bda2966e2..3a7be41a8721d593978b765de2f6bef14a1220a0 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 3e4f2fba18e2ff4102022676946b0656a25dba0d..096c944c9fd5fb3a24d7ca7bbdab45a0df6193c6 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 d01ddd04b30c5364f7f7c890d9bb5a6ae0d5a302..bab7a684e06ad0f1c13a50a94d18e500b25d393f 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 d0962e43531e1d7c9f0b1b985e7f6b297de88264..52f383a13b0cdd8eb7d2190519ac43fc1973ef26 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 0d1c46a63fb252f3cff91f216755a230ad74c0f2..482309b8f65f2bd780fc1d12b80887124bb77686 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 1e7485bed214f0c11000a171663afa2077ffbb6a..7b4e67591d9d451a29d13b929a8aec93732b6afa 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 f8c1f8a48ea1a70f73c3c6e76b810356542b0d5d..99b09647a2f77aef01b8600062df7abeb4f3574c 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 433c92bb00b479e2431d42c4a270fe5e56fc55b5..95da5cd5a3ea844107c7142854dbb40ca36a8b9e 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 b3a41da497e1c3d817a894de275c2adef1349c96..a280729a0a5c4fea4c6bc7e267fd30e037cf3319 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 00bea20ca2914150e2f3d1a9ea5f5646ffcd1708..3653c50ddd930e77c40840ae74018c2913258948 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 f255d630080f616adc5219c2bd88d06fd36e4def..9b1d41554c182108a313ad5e1bdad96dc40892e6 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 0506973539c3e5b702117a911d2aca89942a3553..78d23d2ab95393cdc31790f178e1cbb1a8a9e155 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 707b5c8893e636f32c9f6599cda4e479eab9bcb7..de8573ac28c61aca9b2e4baed638c0d987646095 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 b3b83c3d37081e5b0eba23e1ebae3b96f0dbc376..67f55a84ef42e844c47b88f003394c3bcf169afd 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 96d4f56a5bc9114613f208e4b91165c1427d49fd..886aabda9830628e31014c8801eb7fcfdc621a97 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 79cd109636da08709c970defb5777d5d92249758..c2c372b2c78569cc03315d8c70b864c8a1c01521 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 5a5dfceb25df6b275f5fccf6dbd31fe7ac4f7870..3410e19d4b49de2df057b5d46e2292f3f8cc0584 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 4d878ab14b1a5798be4e96b57b1bf4c2f3316b75..31587a61bf49b2a273d52baaf61a78b812932d81 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 b4b6d140041a9f401de42e5b0d6fd61f26944639..9eaf3fb1fd24c1aaf6ba2fd613d35ff92b1fb9ec 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 765fb6814dee5350855c9d85d5ac1b2b122e32e3..5b24339149bdeabaf37527294398a2115776bb75 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 94f243e76950f637b4d37766da85d4b06946ef79..fe9f525ae763441edb02ff161eb74ef72c383fde 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 4472ac7804286d0a7f7d8c6456c8117eb8cbbf66..460c81626c0a75a6e8a7b18086cff3013a1dedb2 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 135383179f6e9a92cfbd30a31dc0527d1cef2b84..1b07562206ba66ff924632fbbc3b2dd8409aec83 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 09e52ee4fa056fee8b3be09398a82238cb022e29..dd3bd5e27c8a2e0999821c7dfa96efb6b889a4d9 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 79d6e056d74805b579251eb57c983cd54e12079f..e1b32d1f1a9e2d1c501d9c92c6cbac1f6c790f95 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 34406808cc1dc477a29f8e6a74de0fcaa3671dbe..9d4b37ddb85e70a4a67951b21d2c58022478b188 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 7cd4fbb70431be92b8aedd81497d7725e8c66c0b..db611408c4ae087bf760a1b1c37edb696bdbc0ac 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 f910456ac8ecd815f6515d1abafd303a07a0a4ee..2c346b8d6c0e6d3c7b8a7b2f897a2ed5dc696144 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 494cae8c9dd15418414cb76bedeb5b53209dbf26..aa048ae747625a22639ec40250ae351dbb2e0751 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 bd8c6de64b730777e07275a6c76efbba7de148bb..1209bee02b20b5e413dec2851c46aa43b7b19f1d 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 41bf66e5295f05c1d44d91f7a2bd4ce865575ff7..10bfa201f208b56b53bef9e494fd871347f5f2be 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 72e3dc0e143cd155d3f9750530eb56ca127bc01e..b38379344a2ab44d33946dab1bce685ea357fc96 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 6c6991c6e0b2cc6a90abd1542b63362d6c3a2437..b1ec080741612042e6fe4ffddba8ffdbc26856e5 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 f711762ea0831b608ccd044c61d00f8148c0b889..e7deadcb32ec09e64a9386f3e8b6613461b04df4 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 25cf5831768a6b7b375c12b5d7216fc8a89a2fea..e971eb048820543cc571d90f7b399089704d1ae7 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 28bcc2e83dcd1d46e96e1cea3f4c5f2644af72a6..13e65c873ae38cf4b739e74bff1e177ce1d61dd5 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 1182fbac519e5dc3281df701b6741a60b6d27ea9..b3615f74e746a6128de1b5ccaac848c08dcbe5d6 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 3e667dc3363244cf058beb6b1acccb4a2b5d68f1..67b314df7487a865fbd14fe1a2cc2c75c6b44137 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 69301807591fe7f1228b362551c14afd7d8f565a..73c7a210df06836c04a97b10acddc3d5e6fdd7e7 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 151fbf00ffe033ca365b36afe9d5d3a93eb9f1ce..ea911bde2617ffd0066cd98cba208654a7f407c1 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 febf88f5b5fc2d35c333832924c6c03beb06e96c..412e5f102a8cd40aac3bbca58014a04047bde8cc 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 010f4670030c7b1e72196c61feee586c19e86a50..a70968e1925d1997a495448c4b8311a905ee7137 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 24f92cac3beef04a5f1d871abb191b005a931a0f..8f9b471cbcf80e19e683a1307ad8a7b49bf87a18 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 7a35e9d899dd44ee1ece0c6f6fbff2264c5d67c2..36bdb66c14534b3a2b9d01744012da629b5067b5 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 cf14a3558287d74a53025150739b2c4b870a3760..14fff2ff59de798ccc1284d2e4f40bbefab6c216 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 7a578f5287de0a812c4116333c34bf2d23a3bd2d..df6bce14c1c6cd084b035fd84c9ca7455b9a723d 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 04c1307fcb1cff9f71ed729164b14cb3b1ca395b..e9aee9699c932c9742ebb8417b72b14a233e0dcb 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 fa641470f55942b8c921c3f5c6a3c2f2d30d3879..b427a207435db910007175cf442df622c91569e1 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 cf775511f116584e9ccabc83061d8067eac2dcf6..a7020b6269b51df9b56f39c1407dca5e245ec6a9 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 e7b35046d09a1476eb4a4efa82f63571ee8fba3c..f3c23328793738dbd590518786d51c6120e9ce4d 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 d55a908a9bc4d3668554203f2f31d27e69a78c26..e9df596532536832977528933d4614d3a13150d5 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 91781ec227a1be36279705384939cd562d6f1bb7..2cb281f27258c34826d2295ae64ee0f9788f044b 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 40b0e1f762c17d4069e236de4fd2a80dcd319f7c..20f0ed94477f80c40fd4d14f0bb1c12e8a90d993 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 989a2deb7171fb0ce60f6a8a995716100b4da1da..5ed31a5a2afef6b352928d1ed584b5b37c40fcde 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 b37a5959f199556a6b4b66e875872aa9740b1993..5c982486234f3795c03ab25c6d89f76c174165aa 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 ce7421566c220d4aca1dbd6bbcb3d628753ee3dd..73acd2dc0305e31def64500ac18d035f606ed81f 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 8b547a11020573ee8324cbb110549a700978abba..bb2f273e1aee3839b834042ea0ac37adb385746a 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 06f68d26e58da589955f96847c16774e5f057351..4aac0c56e9312540a50d96f26cfeb0f66d789f7b 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 77306136500ca5546280d49577f2c2521e3a41ca..662177e3ef450fa0af96f4de7bbd19a184d1d697 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 f4bb28d02b222b10397cab46c16c5357b2f45edb..8bdfcec1d982ae1e98b243a2e77a2bacc73d74d1 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 92bea14c762497c56f064b897f3767c0b6e2bca1..b5b45bc900bb632e27016e28d1a9765d59232f5c 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 13a8b8c4fd2d0333980ea17e5889ba3b5dbc3297..03fafbd9d97d7f5d066504f078d0831d98fce007 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 e2898dc8c3267532f8088be64803d6d1d8100c35..3f567047741b58515d093724923c84108e3be628 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 f35546cf1e391a10a6a4c78799d0bde0c4ddd3c9..13225f338aed1a08e80d2ed924a4d0dbd08eea49 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 84fe82ff5a7aefd7ca7f5f7ef1e42a235c030dea..b0c90f4aaaf55f0275be996e06194e6ee44a8150 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 3ce33be45f0aa75fce5779ea1ba13b28ad774cd9..a73669ae706b6c2318d79d7cf22b50dd99fabd46 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 fe2066dbadd65518a15be8b9e443786fa5bf24c6..0ff273f28b25c2d5463f981f84d753d86ad0bbfb 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 1a805feaf86aab606ca00dcb6895d66763bc4328..45e956a112df352b67cddc2d7c791611fefcf201 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 f9ec299a79af35100662a10d8d4433d06b19c504..bf47f3ca9e43088ee370a63cb1767eb6af80ec5b 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 56d32a5674413874ffa23cece035a6a850e59941..90403350045d2582501ad4f9765526714484df29 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 1083e73411ac14c9020e0ea5cfb7164460557f47..1f99ab726b3a8f87dbb1e6dc129531a45365e04c 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 a260378ec5e62dafd3090a0aefe89536e2ffedc3..28979874393ea7a7a0936e4d489375bee0b9624b 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 6c3840205cb640cb88bbafd9689a9a8b84913c0c..fd6ffa5168932b5621de585c019efdb89e07ba92 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 452026696fcfa8a9b76518be909eb0ef7e458fc6..9c12993181b7439af6339b52603771aa98724b98 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 8dbcf03d67c5ee2374d9335f8dffb65d36c649cb..f3fe94b6d257f818ffa505ab87800c8d4d1b7bd8 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 af0713a60b9eddf178572fd3d6663da496bb345e..8e6e4a1b2c33f50a176a6adcd0fb2bb30dfd7a73 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 bb8fe470df12eb1c4200724bc52ecc9ab58172a3..55d93bb75573c604cd53e503c6af099c69321b0d 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 b7fb3e147ec406852cc32b054cd38cddd41e3e42..bb2d219f2182b98dfc4b920bc9659dcf26550397 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 331a341b2578adb2f9ef6790d1d79d871cecd168..04b891f2ef92c4340a3a7fa75b3936202a1c99d0 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 d88915279cec81b8d6bcbc976d7415a471ad4800..c6687876e9b3f9f74c1224b2e1b0ff18cc4911be 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 9ca7014070bca641ee66659f943f513425a5a17a..c9324e601db4b75bd5f3dcd38b93bbb11b53c4d2 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 308482830b27f55576e8ef92b18f7e63d53a9fe3..9a84b891c14dd8636fb1a07e845f3244b555f315 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 3b42e4abb2e6edc5345d191baa430b7c22e9b45a..3cd60b19c10b45affb46da5676350549e6b192c1 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 7d766646628d050cae4116dfb7efab500b03db31..7e189c479ca0dcd73110444235d3491c62c4f07f 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 60b44159ac54b85ecd78fd410a83811350ad06b4..94b08b630834eb799affcdc971b6ec5b8f004a65 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 dcd52f09caab802efcf79feae75e670d73d6eb2c..73713563424d79708ad6def32444dde54e6ca95e 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 15cd15590d5530f3fcc4800c33c317917f5fd706..663fa2995d7a545b58806207fe602b065ad935a4 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 65513236e3f260ffdc4437066fa6f81d06ca59d3..cb92250ac2334313a59e11fde15edbae3306fc2a 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 280b7f98c03ce8e547de53014a69d636019411e2..b8a04966dd8f061af135fff4bff3dda78da55353 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 fd02531d7f499aad2f856e0ea7bfd677cc68ed11..4e86c914320a13d615980b0f5d1b0e06be3580e7 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 ecd9e228f050aeadc572b2548d48f0ca77c6d9e8..25ef57c3ffbb8f5cd82037b553cb9a12f0de754d 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 b42df498fcf31a1c5096b1d2584174de4769a054..b1960b4bc81a4fc02500160f3fb462a97e039af6 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 431f544d356d2e44764d7cbf02d5dba68f59ebb9..f1c8adab59dd5a3deb69500fb8a01b767903b7ce 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 bf942487c11648feed9005f0a38b8f05b2e967a0..0c4b124b44d8c2b6fc520923bb79e6c99fabdd0d 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 600c0af2446581e2689a3013f666eb9b8856d78f..04917e61792fe24dd3b4954b3777a4f0ef2f97d3 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 a1f178bed8b3d2afbea9b12efeb55aef9147f74e..d254a4b5dd3fcb925f5bd45f9f1f662785df2007 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 d6d2dcd414464ff035431802eaa47fd1551cad78..9719fdb24286cdad43c4e3406f396dbf261a3d43 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 b3842d20072d428ce93a0c22d4e9f268b042a76b..876bbe38f87fee64d1612c0e62d51669f1a5c051 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 1e7ec594020133919bd293f1eef6977a95dac07b..3296fbafe59c2380dd2e26926f206457092c127c 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 05a2c12c137773ceaf12b09908541ac038f7d155..158010db02fc551b1e30a4f2cc6446051bf76a5d 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 0941f17c153f9b9b19137c79c40e3dc3ef7fe0b8..95850ab3a4fcfd0b7b96f1480830ba9ef261cded 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 765c4778b13fff9f4e3ddf2518503ef0d8c973b8..61424c9b86d8c50685dd9616ce50b6adc59c9e3f 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 117d56292f93463a469c93e6e323998986f00a34..7c125b47df71d112226ec0455cd61655f8474551 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 bea993403eb653bc0463d5a296a5b891c43cbf15..e4b8a3850f2c246433dcc3bf3b71bc993888a7a8 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 732f7355c24fca93961e193605883525c68b2747..3b697fb272db3f59a80372c20f210f67ae967633 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 9246cf1c0bb0eaccf9945accc9c19977c339489c..0ff5be5f1728fba6625af03e7cc90fa791d25a7a 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 8f0e77959059e221af9b96f6b41dc01ff0899dc8..e0b2e71ac5df08138dcc3f1a856eb45053f149e6 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 91f56bd45e05bfe68e195aa16eb8c8de2c597c0c..6e303fbea669e35c253aea7bce30a430bed217ee 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 665c93225246167418d3740428c98191290fe82f..ee0519500264ec9213d858f5dd1f2c59dc69d158 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 bb1c3ff2e0482b88183e9f3a031bd9bb3a284974..8aafbcba5dc075ec8770f08a23be0cae39f43852 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 c2deb02c5227d9d61e8c43a82b9f5ee4ce401555..e8760dc65de7477f8090434aa4b02c86c14ffffd 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 cd72d40d9165c2f9d98462c3c5d42e6e05bab6ad..4cefbc1620deacc6962cc608aaefa1c85f9daf07 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 ba68fa49c751a6bf2a2b1a99f3c4c6d435110557..7cb5fbdd01f9a164ead265760bffd17223865a6b 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 d4502970a6128b1817b196e06b47fad8b7bca55b..7c02f64440e8aca081afbadfb178609f539ad7c0 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 e0deb78ce90dab1cbb69b85b9e222a8f6f4ba9b0..1d32adf3decca783b50207d99c44b6cfdcbe0bd6 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 1cc71a097345fa1ce84eceec845d42837d55b2f3..42f40bcff242396d54895dbff496c4dc0d51b190 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 827a805adf0e958c798c7edfd797be247d77ef02..0b937e2c0f5b9e72fdac971a8124d1d167ecafcb 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 a3858988f916ffdfe9dd9308b0acc408923c365d..8bf33c9f5a670bf0e72134227b358a899266aa33 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 f350b4d7650eedcd2921f96f8736ba164cf657f7..8d637179510da3fc0298eb4d2ac536cb7bb96aff 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 f9226b5a5379ce2cefda42120161f424077a68b2..cb29577fac7adf28f80547cab06f421eadc98d74 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 e5208a52cbbbd72c68fee9e6d5e720f0653841bf..fa18375246d8ac45c5d515ad3401bccaceaa967a 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 75732d9d300c0f1d6a28c254085a87ecd0899076..b0037b722b5d903e57be2781f53010fa06fc59d9 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 5e67fba629b393b0ad830a423b3b089a98b02ec9..47748c779009ab784a177dfb8038c51342ed9992 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 651ab4d39397154dddb4e56cc20e65e372aad28f..4074c96c55249cf58df7308b45a94289b51f1081 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 5304dff3125f0fe73a634a0c76b4ab5cb1106945..d46b4f1a9fa5144decc794d34f6360300bd6fed9 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 3284d1f0e5ab029182950bad045d057622c60c2c..de5d59216fd84d05bf47c1ff103ccbcc918ea070 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 8eab8e4cd3a045316cbd7cf0a4414e6c8a5d9539..a04bf841cead41ff3bc86dc291e212bb7b06dbbc 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 ce01af3c57e65f0d2827c211626ffd1fc6fa786f..ec13d409cc35fc78341499fb289b4f606d5eea08 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 91eb26f53a74a6b859de5b58113647cd0050bf5a..d47954c8e9885a3f82d669529a6e640eed6f1bd6 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 b84100782e3dd5c4dcdd311a7f1fe668a5225e83..b913276f64ea6e63599963d12f60da2c8a565eaf 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 9aec0833d6f5c9c101ab77c52fd7a64843a9ded1..3b97f90d56ef6203e35806f884dcaa74b6b7ea50 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 e23d2e40137976febbb74c62c97e5befe9fa5ef2..8c1bc2334e24ce606dd1ac1247330f91e38c3459 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 7e938e8518547a5bc60ed0f00dc1cf41ce55cc3f..124e65d3bb9550bb4503b589e022c276d7dd39f4 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 f7cbdf5f7749b5bf1f9de0110a259fd69b1e3215..c1a7e2372acd83daee24f9443ca91c0eda594fa0 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 dcf722f6add518cb3f850a86b15d1d72859c4cb5..e8a7fef79368e40872c3957164c6710c04f47520 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 3ed169a1d719ab7909b6df282ffd7a0874a116ce..97ecbd579e37c32c14079cf32c39d12d73996bd4 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 5d27367db40349300f5591b1273109146719c6ba..8e797b41934b8aa62b0575be2be91bd0d45a5aab 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 d73e52f55fa6987879db68ada8c1a49591cdc784..90d3bc54c943301ca707425b8c617ea3bd032c3b 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 284ecf055d1a407b514db93097bc26df36cab8d0..e190f95c5dbee79af00a57ccae9833de3bffc627 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 bd72d26bf42645f874dcf22a0d87d09222ce81d1..3ed4b7e635edde77df0e97522d38d3796b887c5f 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 f51a0652c0cfe4ad83a2309cf850292d326847f9..bf9c183be2df40348467bb5f755e7de1a7bfc608 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 5557314948fc83944e63f59990ed18c0413f395e..ba88a176145e79b683a3755218d78351fba320c6 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 580724135fe2587fe76fe30cc72ead9444fe2025..09c9fc07bcfb1bba40a0e8abc20d72a882931a11 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 e88ddd24c6eeeab323c6deb1f762101b825bb718..bb0d540e8b24730ea979228883c4961b6a22fad0 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 1ca6af56168d08c9bd468f97e43ac31c351dfc2e..b7f460427fa2fc9ed70d8ec3d42fff244a65793d 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 71b8e64ba2277596a3b2dc876715b55a773b71eb..fa62b877650ec9d7b2f3e15360ef4f23b03e29a1 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 6912ddb8914962b0e959e0e2f4f379433193cdbc..9fa9b97a5d383889cae1b7fd35666b884faeaae4 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 77c9f12f25bde5eecca280c9db8f0263100a56cf..deb4374d4960d9a21fcafd4c1c5b94e5b4f4c23c 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 cb12f81b5bdef32fecfc328e0ee0806de5b2953e..8557aef54f9e8349eff7a37afc8569ccfc5a4b4b 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 16a50adda6726e34c538c6dd5619db258f4c10bf..56dd2cc33ebef453b2ba0a224493f05f09154181 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 f5e685e2d091e5640d06b6648a14eae9e8c4caf2..197e4f3c04b0ffae193dfa014aa2b2cc8766cf34 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 88e241cd71ddadba8806f534242dfa37d3eeeffa..562ed67ee7bd9c2719c6ffaebadfc318b4198842 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 5a2ab0c1a5423a3557214c231ad38ab825f2719d..b7115d975ae5655b250b68a0c85040e2377c908e 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 d8e5299a7d1ab242b2751c7e3de5c75a6140ca4a..c9f7cc6f7e3875a796bed120fe678397344c13d8 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 2abad133efceda2200f785daf22dca5552ea28b5..1afa31e4c704bfd280a89277cde564e4f90e4528 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 f846758082e4cea44c148ca086a3d9668a04b1b1..fbc5f1cac609bccb3c0bbb50b8f07585c7a5817e 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 fb02c77eddb1de7ea2e425e453151598ca6f9d10..3db337509b5a3a2db7e73d2b5f32adfd5e5443ed 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 097ff62c7cf4d4780ec42f3edd60074817290a4b..39a7b764d3224a66c1c97e17d0a231c7b6c15142 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 12270b3156880bb85868192958c5ae0f33371a3e..ae20411564e35c547d3df5ab7f16d5137565825e 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 8dcca408b7ff2de79544d116cb69a8a99875394f..c97bbb4e00613e7ad9a2d486f17c81353ce23487 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 b248410d5a7d3ca3f5cabf8cb7bd924c007b1150..96540746b31a1c1637e5d30d3d2e05ee2969f059 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 b1844e75dc70c3c08881659496fb1696d00d6aec..767b94db4e77ff06d2a209676da6b0bf34543ad3 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 25621dfb7cf7ad8cb64218f5954842c039d4badc..a247bf8cd07476d4f203d252721cf1f9b90869b7 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 a1373720de448a59fd4c0c3633dd32debe6e5f49..71e3f51a5af8f5ce96373b385942e4d284823030 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 28ed83b75164834cc736781e878e5b7015c19348..19f70899e79bf0b29a0ac23cf610583cffed3b50 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 0a73b3e8bf5c9176271530ca0f559604f4a9b1f2..18f9fe711c5ac9e112daf277c40c292b208b2a40 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 82275fbd3bdd4c47fd6b2b270f445b012f97978e..8b98995b2cf26d1e43ae1a1a3493838dbeb1d445 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 2c2c0cba5549b766b9fd7c5d3f5ad6d47989fbd8..b14e050bbef6313ba62bf3a44caf2ebd8b497d61 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 f6459be7c79f92f21be9edef7bd70540d8f44f98..c5f6afc38bc1f9d1f0510ac901e4fa42ae15a2be 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 3240195b17148fbed772f7aab6a0d0402a5a90dc..b15443c3e7970040e2916760630f52aa8dc731cf 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 88fcedea8e2c6dcbe7af4783e971b05cec3d7354..0b632941bfa4816c6ad18d96f68236c2918bbf28 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 1a63b7656b4b3ee290518db077e66b4e40f69cf4..74b1ff46c8fb4a0166f6322530e1d1f8ff58342f 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 425e454992b9ab66f0f307cd0bb647b520b0a893..012b887a960cc241a5e7745cc99da30b608da997 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 923f037a9d3ed97379e838d4c731e9a0b77815f8..fd3113b9bcf2781d59cc767342f9555f319d4b75 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 f020a90153faf7cef88966d73d3d8e3d3f018c10..e55b92c342f5d3c641ff470818358a1b2ef737cc 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 de3eac5a646eb3a7f9f0ce30b6cc64a667a6a498..b3274ceb2a76e054d4fd319c0ac50a5fbf1c44c7 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 4d602da175d0cd6ab67b0f324430c3fbb37f725e..4a6d876830be64ddffbe3a935ada9408c9a31bd0 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 bea7160bfb244b1dfc721fc4edbbb481b2ea9352..e82ab1edde0f41a9b8c0e3aa1cda194ba640f555 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 bdf5431465dc1252addc40f1ea61f55b6385895d..65743bdc99f581380ee13ecef6e59de13ad9d548 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 75069048557dead871ab9b99ae1bb46f91d8d5a4..90f8c9fb9344f7043f36a4ef9cb3e82e42943138 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 bbc930b24a21f258ee59e9b3fcb5a28ffef8ef6a..95c7f27eb8de9fa8d7546b13af2d329c4c4d66fe 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 dff8834e8a3422bc46c03105d4a0dfd35ca1e890..16e61c3fdd22b466715ac1e986340b1d280bdab8 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 4277e3442baf8bdf8383ed7159151ca296da120d..27b0b38083ca48837d20ce078f66ee12e4b60695 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 3badb68614a4223c8597ab3d7fba344bb06002d1..c18f58d15ada1c82fbf4491d9f0f7b8ddc6c4767 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 43bd2cf09903414148afd05e805fa386412e3f01..31305bafc10dc680cc98ec18c56cfed6a2378c1b 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 bfba8ad27cae2969ebbc6f25bb0a7f0ef5491ac4..86e488fbb3368f26c92ee25613c43f4370d301e4 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 bc67875140eb708ea5d93ecc87e76f8e5aae49c4..a94201e31b0729ead16b60b4cbca06a17e6a0656 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 41e977ed9fd448b3d2397d847b4671e5a6f4ef02..0dbeb3bc589e84751a25bb08c87b3c0aa8bbea1d 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 bb4307a905a910dc4904a6dca3aec6a474e24937..d59330272e4f69d6a0943444ccd1d883cc08d05b 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 66cf3f7ccd41e308c41160dad5feeddafa8230d5..079c5ae9b6bc1c05f6086a363199570a601c6c84 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 96017896df81e10d34d087713c9c2e376cb72c02..506ca8c8be3d3dea2b17ae69fff1732da3404a59 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 9609549e9c544903bf405ac1f0e48bf3fe063bf6..7a94ff58d02677af827db8e34ff06e65f887ef8c 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 8105c80861fb07a2bcf3c444237830f05db9c1f1..6196d5baf2016eee560635246c2b36d1254d0283 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 98e87f80ef42adbf2e960ea01dec00eefa643cd2..a10e77f9d1fadfea9509d835045a0b71bd4867ba 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 b3c93682f751f7df637c6ff720d6b0bb6408a8ff..94c4a9a0df0bbc1de8c4949dd6d50ef58b55eb45 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 aae36e879fa959e0cf2d2df59c66949904269f50..cbfdedd83cfd6a4d59bdf8e03176929d889e26e6 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 fb5db47dbb23d73ffb10b9f3dc21e12d18e23ed9..942a00fec9f3cd198c9f26d85358f8bbd168f5bb 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 8c39af5a5492b5f6a40130f3de3233055f561b77..657385aecef7c3569f8a8a2699866245d58dc451 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 c9f7db9d3e72af7d44504ec276122ca2ae4996a7..825e62e3a6f103adb613d74a98678fffb4c85f27 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 633468b8330d4acaac133ea9149dc5008e45df37..8ce497a3ba001e31bb6192b8e02119aafcc29477 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 f01f294e75c179e843baaa167ca5091c099c5624..e83c7f180f770e0ef8313c0405d229deff9bd375 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 32086a2f6a44ca0b7f02f0d1a8c6fc913997a159..64b7dbc762765c8ea3cfee1f75f680257eec5b68 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 d30aba5dfef3cd66a0a1fca42cfd28821a0affaf..54f58cbdc29d0ce809c42d26346f28d8dfcfe809 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 c312800cf4a67fae56142577bd3f0a1b28c1ff9e..5e7c05eb16ef42ff0cacedf4a0fb97c68a69f8ed 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 b0d8cf4f5e0681d23ab904df7d214f803537f327..11b8f466eb35bfb027e62e643fd075d932afa9ed 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 11afb8a09a9e3daa9d7126047c3c2e9e4f7f6303..d0e1b8dc0d70a074e1dff3b46596703a7e4f575d 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 b2ebad6548b87a173fc38b740de86e35739f01ce..3268afecf7967ed10802600462f65c5157888767 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 92e7646e711b133eef85ef7106c8e557571e1327..2c428bb6035421057a86efa7ccfcb6fedcf971ec 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 a9ec0dfd42306a9541855b711d6af8068753f655..f0b7260b8a4b417f2b03da99d79be751965e135c 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 c4bb3b4572213b712b2ad64ffd210615e225b7b1..7f0fba725b3098d76e086a6b04cd455d24f46f53 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 b010c848ba55de3347f6a2288e53793112f7f5a4..529e796b1028cad3102bd00d16409afad07f57db 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 cb39ae97654f000777619ab8bb75d5e87bc9f158..c6dbcb8ebd884e4791091086ba536c9a49eaffb5 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 2dc7b74ee2927df56e582e0e53d2e386c900b1da..a29abeab5d459e6f922124191804dd9e567e5d06 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 799c477c9fe4e8e43a012fd24dcead35fdd73819..491c99e3cd635af0e68b90194ad1352ee0dfa76c 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 e3483c7714e7d91e217f2fd5ba16c326b2ff61d6..be108e167af95e00aff5df04edac6fb846615065 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 252ef7602b140ef059170f8c346497e6a56f2f0a..41aafee75baae54e3b252bdbd295a936dd6c3cd2 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 581c94aae1ae4cb2824101c60e29ea205e678d15..f3d0e5903e78c857abdaef2562942ff760f37370 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 a8e92203509f632c63222b5fd67cab1b7598b05b..0c09a9d67ddd0d3fe57920bd71bc8eccc859f1a7 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 a56a883f7072c83ccf7a8682f794cc76aebcdfc6..9aae9c1156fbfe18cc18630e48846510ac65d7dd 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 f1bce503d0d620ce0d0f8bcc92df24a69fa801cb..581091328eb8b4552fef8ec576cad97e3f30a981 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 097c9a6d38d9c787d6338ba71a01b450b266b143..be5847e964868fba0033b486c561cf3b09d9bf92 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 86ed3f79d0a3d07ec5689e3def687e0e5ac22ca4..d51302e7276c68e76305a38834281be77b6a68ec 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 5033cec110394bdf7d57812e35535db748d70110..7a06ae619e14bcaf8a95440ab9e1befe72fcc92d 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 2fdb3dd65f7fee85f4bd4f88be97f3bece5fbeb3..4ef403ff1725141d380ebecf6281425f3d921c1e 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 e1ab32d9266511e7bae11452352ac326c8d025da..631f714001a5697bde546b1d51a96e27d0390b64 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 047210e58d8c5866f01465f1a20fe1e31be08591..0b4850da63c1ec4af197cbe6043cc5aa5470b506 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 25a36fd567e04efe756d9b03c00b8ac409b74a57..c445f9408c88244ca6bb7b2593f677a9a177d500 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 8c33215dddccafda726e811da55e2abc9f5e385a..dc13436a9568a086647d965c7c81befedca9f227 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 4a5f1ba1c85a077eecfd1dd4b6ac7e2a39e33c9a..85803c30946a345f83ced0205661d24adb7b46b4 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 6dbf74995812c8713e54445473895f749578535f..351833b11c2bc4d0dad255cd061875adeeb447d4 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 01e159eb677d4be46da12931a65c5db1667f48a7..819e4b47495e2f1fa2647bbe5e3d38276affa629 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 4e02ef9168289a02cafbbd06cd645d9819a4bd64..7ba0372e29a9e132f2fdb46a31a8a656ffc152e1 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 ffb6575c25d61435a9b44ba1587937f471696634..d84363e8da95f733fb2a2b915673efbcca7e8659 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 9c5abefd7399314e948bfae6e1e445d2383d2c8d..1b768849073fbbdfdfbe562053f79bf0da03f0fa 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 07ed22ff3d86b777ccafea1643985f944c12015b..cb7a5c9d4e2831e24fbcbf2c9e7be4b33cd9d21b 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 f3c935ad28ebed030eba496a00039af179259cf7..b30109152e06cf5c3fcfbbd353a9caa76164fb24 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 04e87ca3b7602d0d798a1751bd130fa0d5f70874..8b8b58124a77d3b1c86813b2e8519278efc18e61 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 e34cffb4b55f1c36fe1fdc0ec863c6b5906ae52b..0a52fad8c529b28fce191e47cd6538662d8ed59e 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 e53a4648a1a24f38186b61daa7a0d789e3f74fe7..0dba7b9339bf5c96167d879ceeba34dc18459e0b 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 2ef097c15a8fd7a81cd8c007ec1cc69289159c41..fe43be94f401de443e9e56de110df76dea390b69 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 e910f587f076bae00b1904eb8cf0fbc8b221a744..aa42582314160ba22eeeca03b15256c398774b2b 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 a41d6302353b584b0e81eec95325992875a6201f..a1c8282f47c7d1094e78236ee00c7b185a0f1a43 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 715a30be11edcd5f3019037188d975f44a754109..a69e02a805c770bc9dda56eea3d1f1fe4673133d 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 f9f8550752cc779322fc358c91e1cf2c9532c023..24b76b16c3296f5bb0c90e583260e763e77221b9 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 526b943e27eb128fb5a7270f2dd6921ca6840595..91e8a06c0a79277fab731fc48e00581a1022a56f 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 354d151479536e11b70eb682f02c50ea7162e96a..ca701f3c2f2631ade7a13e16ef2776f408ffe17a 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 138a1075a1337a5f9f07e0317a2f1c54619b315d..28f7c86b2bcd413eaf676be82380682eeb9f05b0 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 d1b7ffc7badd7ebf229f45fa1166e53e9eaa78bb..91a1ec2a8e566debc4ffe54e4d7f8b2cd4012f7a 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 70d4e6c523be75e1ad20c5d235fc86c33099e966..7a1578528636d100a3df0730b1b2dfb750877212 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 f9a882eb2dc10d0f3713216671df88b66b16406d..cc04d631719d67aa3f696e76fcd234ad5c9b915f 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 a860b0ff3adcc0112e8d37a66b5965efbe035eac..969dece5620b5d6ae43cf1cf262e39de89796c1a 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 bce38338e0095427e2b3a88b208963721bba7baa..de083458ee5171c4765b464a4c6c946b13e1afb9 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 6fd284cff804d37b5e85f9c9d9d69ab0c22bf3d8..f46027c719176e508d73af6ed937c75f10350bae 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 f840cb2b92ad051c72968680b6ffa96965ee6c8f..f93cf053bc33466f19b99205eaf3dd75ca6b72ec 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 9c844171d38623c9d6b86b3660900a402f1c76a7..612027cf0bd333f7058f23b70720765e167a96a2 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 b3b5485eb3de2504b3b746ee25927414bd9eb84e..6bcb9f5f0e78d8be5dd2e8a1c3cb30806b14491f 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 cd74eb7d005fdfdbec0dc26a8e719bea433ad223..e202186e0c8c64052b6fa5bcaa70daf4002edce0 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 6f5311610ddaedafe1a7cf559b7f4665595c7365..3e60b8bcf9407a23f958292f00375e85c71a3170 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 9c93825c7d12f7bf7dfe9a0b6689e1ce88abcc8a..f19576c68ae68542f3c178c1fcb50efe709bf4dd 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 0f87cef39b9b7cc0229350436e5e3fbcfe3597a8..ce4e76a3994dd2d302a07a71526bcb3182e1214d 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 1b19bcff2644c1823343212959756e94a1f58121..18a63bdfa7f716de9c5b11de93ff87561c732ee9 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 be1397ef0679838050b28c11c7e6b89522254878..b7fd6d8b2a7da42699b4de5c36585755d72e684e 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 2869eadb5a35c24d0cbbc030ae5732c0806806c8..87953e262c8a4391fe9c40fc36d8040f332675dd 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 93a187ac60b9e55ddfedd90577d1a59bf0679f84..de304973f0ba94c65654d91a4d14c9a1b6c6d03f 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 6ba9bbea2555b31f2c5f47673c6f2712f0c3ae3d..f07acf64e7be0b2b7b97b58a90ab947de7900eea 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 75258166c4670407198c9bd07d897d6c35be74fe..f89ed54037965c0e651ff0b637801adeacf2cd50 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 0931021e8ececafe8ced04cbf418529b7055309c..ae0c453bbb6a59d16fd6ba0b5b5d371a91effbf7 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 384b53187781cc295a713ae598ae7e0e0605b302..a9747fa2a5362910c13c3e161fb242720b46ae4d 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 60fd66487b69999150cfc52e1a998025591c4e61..00f9b78ef00ae89ae21d3ff13585cc2861a6502d 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 61239c976aa351b7a1887ee15ff0312f6c98a817..eb88635b77a16936b30e0f569b7b140eb5fd3eeb 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 410018c4105bcfcec0a68df392dfddc04456b2c9..e0e472ab5982cd097839613744c9465c6956b45d 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 9c926087fff0d2b190dd2cb2455ed0c68f8b456c..5eab6f2169bf9ea2e0f39f857d75b393bf132e8d 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 6ee17132e18fd69de7be1b45833fa3a109b1033e..a056b152fc05bed52b456e3f83b4ea2a75b5e678 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 4d46033dee7f5a57ace79a46d98eff6fee0fa5d8..22285dac839b02a835327486a6ce00d7c224d809 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 efe051eba5297a5fdfc9839d82f909e22653a660..a78e1b5d326fffc5a4e6db954660478e8fc74287 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 7854b6f710ad4b1d21d0bb7bf3d5f4d82a7f65eb..43b4fc5b3e2b797499f2ae41d522b9a5c3717bc9 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 0e3b5018d9b25f9c16e09025cd86ed392f8f3abf..6717ea08eb769fceda50bc1fab56b58624f5324a 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 bc47e6fa1e93ff27a7d843eb29f6afaaf16a60b5..f0954bccda52d14f6f22525bc6dae27556d59f1c 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 e64cfb05c8129d24600790e2819e462e44d200bd..b4843fa37d1031bbd4fbae2263628e0a5dc88fe3 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 d9e451d4b3a124b7d088b182c4a4758b5c2220aa..09895fba861f885ba4dc4305095062e6bce16332 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 800b5a532b4892224b29f0a28e3a5d60b4e37851..7a3ce95f7c002d2f3ba9343e70a4182779f5a958 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 eef4c51daede2139ec5aab1fffd2c78cf28053c9..5c8716fa35b403bba3c5ec5f112a3cf44c9a428a 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 913d54ae04b65c86cfe7369d16dcd12b512d7eae..2e5423e6ce82bf3e3f760ef1391457ada08c2c31 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 6dce74ad71d57b9115921f1d51c9834433126ffc..fdcafe217a5446cdf1c41171ccaa095a860a3953 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 982fdf16a8f61908466e69cadf69ae8246cb6707..c083d2ba65d61dd80de97e50ea1eb8080a6efdf2 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 8b1e7c01ec81a962b378ff417da1e1d7bd3ede2e..88aeb1272e78dfbeec9eebb72090dec0878894de 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 1d0934afdc7c625677453d87d155dcf26aecbbbf..48dfef260467a0b5533b3f9490f6e4b7c9aeff79 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 c5061c78dd0dfa5f545fdb7d396d550070089acd..424b30b3f81a5f3d4569909b08a1fbacf3563e94 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 d741de659b7ba8095c89476b168aaee2a97388c0..a9a4642af5fe33f844bd0e889ff729887cb8af32 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 a9bf44b790051e2b579a7fe828b1236ff6e5be4d..9c8f795ae79a30c67557572dea9267ff178eab25 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 1693a26b17c3c6a9f7d0127cb70df470cfd18f46..2b45b2900d904caa4ce51ef8f532d5168284e2dd 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 8ec6513020f2f3e4ffaae65879e3d33bcff699e2..4746e67e6d85738bf0edad46ee3e4a45f569473b 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 59d9ad118749ab66d5505270a93a2b7d190bfc9e..8dca9391a48a9fe7022d834edae8aab5faf2b6e3 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 ad6e41eca31deaa60ea3dba95bb1940b5d9d428b..4c0dff598b116b9a66fa6991a8df789db02d6915 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 aa5c74540a85652f2458975966fb803c7f9c3dd7..596cad56301d6350e077aed5943622480742e22e 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 ee431a6be201f4812cfb02eaf6ec893b9302652b..fce83263d5437f54ddb363a5d5bf910efa299be2 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 88d57f30d286c26a52ab54d77f3797492cad4dda..c987874cbeeeb1d6bb1f78c5e7e1574adc700c0e 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 66d183d5931d05acfee12ceee1a8dfd16931d13c..0c1878e5df388273aab2a59590264d7ce5013984 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 2d4a0a0d7686f51b5665eb470c921f37121794c6..d814554feabe91f8b86407695cf951a6287f4013 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 fb9a59caa1ed345c8dea75102f44b17db0b6c6fb..8d8533bd7c6808f20db8e01309ca67108311af1c 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 61f351bdcc6b460b7c0321c69106397b9a379f2e..1177c0a697c25e3e3f8b488fa183d9e48d23750b 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 95c34cae95101d075473074085ef961d9410e39a..f7b6e1948a86735a52795a5bbd455eef0e8f65eb 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 26da574cc565d66cedcff2f08f6f3911b828c19c..ef2f97f98063bc83261aeb2322162039d1004cb2 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 af2bee5646bb5cab7cfd08c8aa5e22e87d39ce12..17da1cc81dd51eac48e098cbefeb36a56d244090 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 88a96d1388ea07ef378f7f71cca298e6ff893fe4..e7d5c7f01f82bcdb9c57d373064caba730baf06d 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 999881f5b71afc9a7ffe5a11f25d9625dd7adda9..e1f99348ef971f55cebbf4632ba6ef0166bfc835 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 25e4c788960b17d7befd1716bf95eae8cad0df9b..bc5c4ff2654b6ab5a789b295e0efa3adb8757800 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 8566fdabd32bca43e713b8a01c9a3a0f9c81b42f..15f28404091f72c7d62b32793ace7ae979b392d7 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 22ab94e188f3e8acc2a662412172cecbe6473e35..1e2c3ed40af39f2a3120684498e6587ef9ad690e 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 7d641f53ecccfb07557d3ca79b7088e2a9cc931a..ce2f026c751e9f8e5d735184e8975bd5b9d8172f 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 03771cdf31b7791d46ca9fa06283dd3cf9afcbcb..99c073617b5fef44c3403d0a348d5d9d92c43011 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 d9d3bfdb7dc117d33f55389c077f3b28648badf7..6c78396f0cf16211ba314da5db8552edda0d8026 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 c72e01f022a54b004b2df0585f7b300475edbf4e..2da8c236fb11d6426253c89df4a2b01610d431c3 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 506b0292ff8dacaa2b0dc5c54291772d22746287..dfd7a2df92c60a9c5d4eef7bffa0eed791ed8d76 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 b524f69f66fb24d55620008f3be930a00ccb816c..7e89591484e5fd0f3e2e4f6e9f3da9b6da64aed2 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 920d82f848ebe28ec41a8c1f12eba2cc215a5f78..818022597d4bece69ab6229b3f07f28753546e91 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 05ebfcb2b3a6535e6477b6c20fec718c2f19758f..691473b6b81bf1a62ee88a6781b9f58e20bde912 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 3aa5873e83c5837cebfd6b267ff0b77474499da5..efb34dc83151b084501d1b1ca165f35567525b6e 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 13166f7b4054b49a8ef807e54aff4a33e151eeec..fcd8f0e839d47fba7da6347320a469623586cd2f 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 d9f82778fa8659a6539f55ed23d6f3707d873975..ebd77e8c134cce35324f22db9aa9708451c7dbf8 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 b35b5abd27c3f90b7a8fa2f5714f70b5bbfb7197..ced0ef24a23c9be489fe1fb1f3706509a183dd92 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 8d2dc79378e78c2972623d8ecab0bfa7a69eaf0b..da4057cc7c2e4571b4f342eafa8f058e2de2025c 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 f5d4d128019b56a89681f6750fdb7cae859ca5c2..7d6cc0ac6210808dabdf2266330d6b359edf565b 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 d3a0fd6ad9c60c32909474f29e5feb2a343af139..00767499a24ae80f685787e12d4297577508e2ef 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 88472e63243045066a6850d05318d0c5b413aa94..4d9066b2c0680a32c17952fcf68570522819d082 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 d7522b6109460cbe110bd1892065e114d89d5511..8425790d8d71897d3b0763f2e496e8e115ed6b6d 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 c6afb560829c795904d5463191dde9d5562fa260..b6899e16773cc02be5660ec500ebb08c7229c1bb 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 7f9200e68ca68db4ac6abfa484561d31c9782738..86a431e53c6a22e2c05a37d6738ab74fceabc242 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 cf4f2fa95f6a0112fa62882ab41bb2a14d358761..9984bceabfc0dab8239000cdbfffadc384e82ba9 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 13f3697a118781a5709c7840f03b3b34489d0172..0f60609d34d2ea43afcee3d5109589d27bf931c1 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 355a6b4a43733a91a441a4e4bac4710321825ac5..cf1238cbb2c71f2b0744f7725a2f775089fa14d9 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 06f5421e7580da4dfd9e9f4c9cf4569a40cddfd3..40e6a813f655359fd98af9bc74c60afd60031930 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 2e6cb9234e3832aba19eebf9418da6c602b0ba16..bc90b29e42d333ea219c60c69a0709a58d24919e 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 8b8ad044eb40dd07d6d3cfb8a3b7c99cf68c9c24..045cc92a72b5057b95f3d9dd69fe46cb76e9b68d 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 4853217d5f1d9abc443d9045697c87dda019deec..dee51717b881fc3c52c8bddc2d7643ceef6b2b9b 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 1be4f6cd81d58ec9a109807707b528fb2d442ac2..d19180f1bcfd9cf0c8ab903def65cf7d0d35cbe1 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 82671e94a120a055469290522bea723ed5bb99af..a92dba7f07ab1a40dcb41eac489bb7b4da910d94 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 0a6c526a3cce56c82907c07009ddd72e7e28b7dd..cadbb8b4c1c2bad949c8ec5a5fbd7c757250f7b5 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 0a72b082e68a9844e0c2d6ef948e6d234a1cd42c..526d3ea4b2426a78327668a07b2e8971e227cda8 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 4db733f595b8c701c2e8942a9096a9b334d23b7f..ef2352a17151806d6f8f7ea87d33dfc1c5ab2f8a 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 333fc2d457ac55019082264f3fd5659974084cbc..e9575f3f1057e01def92f2c1b21e70d943ec68ce 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 3bc44945d1718c5e5133d7c39605d7bec6c4160f..ef77d6f9bab1ea31b5b604179a7f80c75d562d14 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 4ff525947bbeca2096fc2685fbf8521ac9dd1260..71001e7b0358f0e3bb14239c23ea8c27bea7db2f 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 b43e8d006037d799a3a4d87c4b319fc279b71473..7eb532bd1bcc12cdee9b6a20c2cb57ec084e042b 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 2ce4c92cbf2c7e1c4fa91ea109b8a566ea2dbfac..5594a8490308833ae156c5f08ba9dff3e07342b3 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 11e8965c90860f25bd17ef26d8d01f32eb856b86..cce95a59136f3b6e934d0c3a725aca11935e79af 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 0b9e97e030bb881306cae2b7c4745b453f12e373..80c6e1c73e246b047f9290820217d3b3b071a6f6 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 7fd02eb07a2aa3edea50b9c8634085b2bf5b8481..b2ac632d0c3e185b581fe9fc6a01a40f89ddf2b9 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 d6790a49061cb4b05c6c85e876fda8aa3e1d1166..ee5aaab227fb0a1f35fc1cbf9c5a5775480e36f6 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 9ce0b0fa7b8609afa504014a57b074b714045461..7e3fed64cb155a38809a068b6a8e922656e8d5d4 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 511d4cc87202040b07a18adc3085b45c41e9c6ca..05294579e8a4a31b60465ae27ebc2f00d2499a6d 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 8ff7cc80ea139681e6b8e45a434b4492cd03e49b..62055effeeb1b88b5ef9f7144c1c374f40452d74 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 23beb5dc225861dd67ccbe7f2e29515a15310b54..a02f5cb1e2356992c6978bedfb5cd8a8ce73e753 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 e2318be648e7848c01d78519750ddf716475ebca..37651609d60d116af50fdfed899f64be2d0fdbb2 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 e85e3f67b385f23bb358322d467e3ffdae418293..2179f38ac3a9c390fa35bc03a2175c13304d3e74 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 bd69a8dfb14a65b3671312c4638206100295ff2c..10818573ad2851626a675e61d2de8699629de111 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 56134ff4b1940c3f3d2ffa5cef3d9fd502777aaa..e85e5e101007775adc45b433818d32e46cb13ce1 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 a65f60a5468fe9b3e6a664e41285391f70b437d4..c7724c01906dcd0b20c3860273d0298ed0c906ba 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 f3428e260dd5cf223c07f1f4aabf691537b6e724..905334b6d75c1eb27677d76087a965fa17da1ced 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 6a73002c9993a7365245071fa6246f0099309000..7624fc52043210e734b6309686a9413e980d92ad 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 da8cf035cd8d28b014206c8617739c5836923ba1..50cced94ddfeaf5dd8961d8a384dda55b6ec1d55 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 07330ccda390a0a7a180531a327a5fe2a32422f6..eeba418f44c35c38a2f22b93d114a953f5856c2c 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 03b1cbd93f12318cd450609a5c968ad3da1f015c..79083b0f28c3f6d7c8ada648f449a1f2de8995ba 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 7cf812c002e74bf28748d9ce881571142742e197..872df3c39770c3455488771be681306c813341e9 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 2eeda6ab1403033aee97b02ca7c9f6ff753a7d9b..b937b9c2f66d6154dc510b0ebcf8df5493d9b926 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 07079175320204fee7e9f6edd20535a607e9c18a..5e8b8945599ebd5b991e5226248bdfbd8e8be032 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 7d2bef93dc818fc0a893d6512114916b95d023d3..bb4e0003c1792268d0085a07e961088352634f4d 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 16a5a8b42aac5d63fb394fcf195b312fc9dd2e4d..cd5df6a7194f0fb9d54166cd91af320b7817f54a 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 9c854b22239741a45d289ebe2a6be429e8fe2971..19755f9dff80ce9ffa8f3d3db7c1456f97b39056 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 e21d5e7244018bb1699937f87b8a8bda92701714..fff6c37077dac243ec39bb7b4d9113ee13009cd4 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 880d83d7fc2de1a8bf2c5d26cd459677fdee4993..e6fa2c984cd499727dfada59b5de709888579593 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 45e377cc0442af89bfc2879c394d43a2d0b0242d..08c39acbdc0a06859fb3d392b51a2e248b2478bb 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 df3d1627b65478494e796cf26445b4465122e1fd..1c838415b9b5108233f3f906e2b56cc0a344c674 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 ff9d7a239435e75f56a3db592c32613cbe2ac0b5..fb660819c2e26055d74fd5e6500f4cb244d26990 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 d3c8b05cc4f566552bc6135f9c6e58b9732c957f..deb06a164fcecc77dbe21031bd307d8da37914cd 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 55f03b1970e15a88620b8c2d5e286074e53ccf06..4dd942642c57ab5f9b948361284891ff7515c409 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 cf8aa76bb9a36f51756c557784ceccbbf7121b75..fb428071abe13364514d5a24f3b0f060ed6d86f5 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 4a3e2858f80e8332378db6dfce116334a421db8c..e652f0f5a31add3d06e591fb52c4e651af3524f7 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 1d6519598e32a475f07ac6cec95947b37f8c2447..f623a13420728d2a45ac6c30b5ecdd57d0a487f3 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 475babffd1bfe626e18d935db277db82d2004f58..25c3a150842c7611cd7343281e43e048d68ac9d3 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 e9fc95ec199283370eb96b826cd28ef6726fb8ce..97b7d0e73b661ae319e6c8e463fa568086d39a3d 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 22bc8a34db20c1200ce4d2803907975ce21123fc..24e838432b0ba5143706c5a8ffc305af019cbfa7 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 2a91d6a0f5ebead7b45e45c224c26d8cd64e14e4..77e09745e65de38b6f38d61d50adf29335359770 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 090813a271bc4c420ec8033d7621b3352d63d0af..89857a4b1b4ba2ca57d39f037d576e0fdd0de55c 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 d4d61691ccd6237101ddadc7f1c0bde73211ee89..236e2e4f88f7176cfef2738170df300068eca297 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 496d86f941189ec4b3c83b293042dd93f7bab45c..cece28ec60a4382b683d1456e443f0be6f29f836 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 a7c2e22c9d73146b25a22ed9f7761322143793e3..f8efeaec42887b1614fdf447bc82c4644bfb3195 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 1f43c16413e1eb982e38e114b7a2a2875413ddca..4efd1a8e2aa0d07e8d42446d2dd54eecb5daf91f 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 f72e3d77813ada5739f2847233c0b417d37d7d9b..58dff50dcd21348522007045c4718aad5d094a7f 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 07c456687107455395309cde1f0f9797c81b297e..7936a04f267be33e6e5e868bdd2f5bdbaa82b123 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 a6fac5c60a9291a4609d19ff0ca7d3d300816ef5..eb05e810c44328bdabf114cb924de02c1ffa011f 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 c9b0f3854c2f7dbc380ff75f4cf8611ed2ff5ce4..888554d6ecd2d4a27b6fc84dcc5d2f8e83ef42e9 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 276c6b4d995ad6583ba1f0d8e622456c87b10261..71016c29f32d89e53f5117b21cf100f0657492f6 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 8c2d81a70c1edf34e8e6b36d5f8b0e8815071be9..d70689c71d5433035293dfd91571d23e684159ef 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 e00d66feec90c7b95ed10c3e8afd2d8d7b705fb3..d4111bfb37c0cc114de66b5450358bf2588505b2 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 1d0e1b80f90fc25ea59d2e67ac09dbb77b23d0da..8f3046a9f88064982ff26a3f08c15a6eccfbf600 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 b737c248bcdbd245122a698bab944e409fb708ac..0209f04a7f0f25698c58ca27cee6b29788dd7149 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 ae955784a90c7d45efaa0c4507144b147334a101..83cd412e1f9a2f52358398acc3a5580cf0ffd6b1 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 90eb6afb7e260321e3857fdda98c16811f769922..1d52a2a69aad6e076543f1651dfe261fe467c2fe 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 efb33e962435497118b28e123f31c5c9f00aa63c..458266419ecca3b8c6a620dd5219c10381c9deaa 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 85a7f33619de807c1d28e87d6de8155afdd4bb84..233135e010149a0b4ad8124b2e7acef6d30f50be 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 aa2204710b8023b67ad0d34c0025e92802be679f..131840f5ca948735ec38b17df76bb6c52383fafe 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 4dd3e6faf65849897069cedc7969f187a1129b35..d0e766863d98841b665eb51fa15d6b65fcb94fc5 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 20cba89f34d777547a2e3c5064e01bfb9e1f36be..d952916cad6f429dec0bf5b7e5fbbd411157285b 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 6bc749a11c80192044640d48d273eefa9e85b2ad..39c737d8d0ed1a91ee3caea8cdd1650be73a96c5 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 c821c49b21765b1476b0e230a290738df4676f80..f6d5704e7601fff15522811ee5f41269ce7e72c7 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 8aec8d45dd27ff2f593d7a552ac5e7e849094d4d..be4e0214e087892ac9c3eb41e9eb7719c32c39be 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 9ebf5a929001e02cade1aefe66b6e7485ae28c38..6e87e210345fbc4411934d5027491cfd5f6dcf7b 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 90f3329e79ba21eda519b175ea77ad3804514136..acdf70f0f3de00918e6826103a9a3076e92a4267 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 3c07334864bee4da4c7a81ac345d95f7a1d98211..50a123a9e7decfbce9e80624a2f72904af6375fc 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 4e0b99ba158c51fcfafb373588237b0754ffa346..f6af9d2e0fe4aa63c545154b4523164e0fe4d259 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 a07f6c7f69e8fa95eaafbed2007b68cc9a1e8632..6f6b0dcd6583085ca589bd188a9e07132c430857 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 b5acea51fd76814aecba8ebda666c288aa2c05ca..76a7caea7d27e66756c88159e20d4a46d6d744e7 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 d0eda125b045f9b74d32d7ecb21fcf6b0e61d514..b6f2c950dc964bcacbf45f75d8fadca3713e59b6 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 e2c833c29038677f6d2752c938652da560b0ac1e..f764c44bc23afbb7073e303e90bee6454415d570 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 8dee7b86ee5eecb67fbaef0655f277b2b3f512c6..b4c795f5e999ce58b4ca429530712d0bfb4fe54e 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 ec3c652ae5319091b0cce3bfe1eca6ec35153ec5..e6b1674c35ff97cf73a266569c40edcd27d080fe 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 1d337cebe3fa79dd75639492a478fcb0acc72fc2..e8bb330c6bab85b09f4816f386fbd747f2d9e77c 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 d15ad32fb61dbffa66470cedfface10691678c8f..cf117ab9c089bcba08127df4da3c2c1ca67aab97 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 cd8d253e7c2386aa1aee6a2d359c04129b8f409d..0480eeed1d6a8d7c31b7991ba60b5c450ed922e7 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 b69a74b79c8ff98d029acc487d5d323508913125..39c6adcfe47889d3ad8d5df67de2bc3cd59ebb8c 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 e60afcfaca20dd109429664735734714815f227e..b5838e44420ade6cdb45712e789545a62525cc4a 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 a0c8500e438258244973c00a299539ed7592e1f7..23419e5057de64ad0f0842a119b768386775adf8 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 2d0fcd5d6439708536cd0b20c013b26f3ea47f71..3571c2bcf78ee67e35d17422bfd895de3b92cb81 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 8b31042cf154b390b976b345706153bb17ab7fc0..55e7cd706b5dd19cb83995dffdb41f5de0209be0 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 4f6cca525397f808a7eccdb3219609fd1b8256fa..80107c22b83aae89d2740bb53469d20ccae20b38 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 b71fe2ce638026b98321d482acd43af407797818..05d3d12a798927e3d6917cd44c207640b20ae159 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 7efb33f7c9f42df496b57de9a28c624dddd8f301..fb059d537f3af17f0bbdd269fc276f54a6f5cf1b 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 3316284ccf83637758f446cad46e1c5edb3380ea..9d0a2e9d3dbc6a6a6461d5e6faba419f082c92e2 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 13689de1551c14d969d5ed78c7e0c6f3f4815f6f..ad99fcd1b26fef626566b7c1ddacb03e145ae5d9 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 132c12bd5ec754a1e2914f95617a007074f50b02..d8e73f36175bbe28d2f25ad3563fa0741bf9b2b9 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 79b43b0971746ac93faa1b8bcc577b66b6c98f97..c5b4744e994f5da4458042d72c9685b5d461fb9d 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 3309493433bff74347529990969cc0493961f4da..e70a8f4b8ee10b28de373127a877bb9650dc89c4 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 77ba2011042e5c758f7d6479335d3dbe58b1859c..0a82af9d1adc52e843f89048d1661f917ca7ec71 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 0e706d6af1874b648059638d5471fc1805346d43..8444ae3b0873cad0dd33e5768c8950a5c81b83e7 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 4ecd430198e8e59a6f18b740d0c8b6bc14c00ee3..f41ba01f79cbb9cfb9ae023d7c83fa6f8f41b52d 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 bae23e28490ca08a044121f352d77d7a9dd0139a..08f5489d4345f23f2e85c9a17ee1dea8f4813447 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 dac50f09f234a2e7595994d3087ce3910fcdf666..3894bae0824755cb7904cee9397317306401aa8c 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 b865067d0475920726e9512af4beb315153f8f2c..0bd422110fa08565e7b644a1e4a62323dfd97a20 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 f4620c3c4618c613459e8d07bfa03ae8d41b1583..ecf56b7442854408b0c3c87246eec297ce1ec894 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 fc48603684bd254cc7a0676231d1ac18ec44f0c0..c78fb064f63d0db4e46066b29e81c95fe808053a 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 920c73e4a33684cbf55231dff75a555875a0626d..eeae5a7e6e1427ab4e262a49e999a240cbe53a26 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 b6ea5b7120db1935faee0c490d8d957720b67cb3..d1d006414872ed2f963c7e21919c30418b9cc67a 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 470af89695c8dc5bfce81e6c650fce038bd338f5..f8858923fe160301d5025d71ec75fd14a9456dac 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 410eb9b5bacde8004b346653bfba7a770d330e1c..c0cd5c3ed5867ab0aa346b5d1c08719e4293b351 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 f730013375b82c6bba7599e392d5baa1531f1a9e..347d2aefcdd06453c4b00a7cf01c82ba0d8b9a9a 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 dea25dcc4b3d16ed43decd16912d0de891a8631e..f6af1097ae98e54c70a7a531f51795bf1d899574 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 df17430da46c98a7b30840401d09c174027e28dd..e1632fca8244ed70fab97465db4717fbc2e16b2d 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 e1ca40fd3a0d4439aed61d780a32826519f16b99..ba66a793a0d589ca80711d55e63967f2b96326ce 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 92fea25cb0c506de21986bdb8e0e058a9e0a9fcb..9468768ad1b07adf4a27f131c044e304300802b6 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 737f2c4524ad48119596fab786f18c31191c77ab..5ef47dd0f8ad2efa7e89a6f56412b2f30f684a53 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 c90097523ec987fd651a4d15a379547b74fdd622..20f31713e5c2579f4fef2aa41f5760736d80df1f 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 e60432d33df73f511c48174b79fac52131947692..3f4d206236e295294be7f5b916ab8c1c321af779 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 72e06e30337f20ce75dc1d2735bdda984f032e74..3144c7b12fc12b4a2b70177866f07e998b22cd30 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 cbdb177b425fec426e45f15173cfdc1bf2608e98..ef9c5e7142e166e131f3000ea7615a2920922c13 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 ef47ef9afa1d7cc22ce96c93c199fe44f3e66bc5..5b25c36b6bdc79a2cd04d79e03a16b260888a1f4 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 1f31e066220f736974256446619848ee5d0016cf..ae23a00bcb9d38b915522cca43e941642797d609 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 fd39d2b447baff31146eacffdfb2bc357c03f05b..088ef53d5535ef4be85ab10c4e45ff89b9a06f13 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 5d17dc700dd1de03954dccaf83d7c30623a80799..396241f9cdef624911b8a5be88259c2e93b99b1d 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 49d62dcef111dd6ca1b0b3aff2ec463d4cb49495..0f8de50832b42b01da8a65302347ca427471418a 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 3e6738dccb83cbe8bb80d3ecd21e23b1f26fe4e4..f0ecd2146e594640bfca96cecfe46a56aceb8cea 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 6853938530a5bf39ffb7ac517408ecb86f09e7d1..95e634cebe18b7a13b0eaa4bf14da3208d39906b 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 edc7bc43c1988ad373f3dc37c8ba690a416ae355..22bf7e714233ba7c4d77ab7ce9476cca86373507 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 670c462ca400bce60b97eb60d8eceafc4d215263..6bb90e93dc94f7e62a76805211918962a1342f2c 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 73d976e9ebf600f097186b196d6802fe91490e16..552364e105ac38d80655def55934816a98100a8c 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 4c74df74af06484ec216bab69c54f2b606b920a3..3630a955573788b163e2d2328be6b6d0c7fa1035 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 a9184cb8ca96a4c7671832019f912dbd2f505186..da9def9a78874516a766eb28e7c7c66b52e35d4e 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 f9d68e7f1fa2bec211a238fedda7266ce851ce27..e7dbf9f8a705177a4cd530efa04c368203036013 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 da215a06619005aab6216d54fc473f0ce0f52e5d..11dbac8f6f76de70a661914eeee4f0fa65899a2b 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 18a020edc3c55cdd438699a5cf3f3aa3dc4a93dc..23c8e99b1455fce10c4324347231d05fb54a054a 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 57a94f3eac9f41f7d8bba822b900877d7fde7721..03807bf6990e2f57ab6333896ac05697a8a2a935 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 b659d964c2f6f4151159bc21998cb97810a1c5ac..53eb892330f24b28e69129d815ae659b34c8d263 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 9af32f25a42aebcaf7ffee1eb355e17618cbad2b..99002d45e739179d6393756272e9baa09325b4ee 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 5d66fff6afc0f8f66a0159359b0e4a7a12533e15..cf4ac8e0d0d3f783dd9dbe024bda7595d3e306c7 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 ec8c156cc8ec37681d304de29520c8cbb555198f..5f114d798ea286586d88dd12453cbf007ae80ae8 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 57a9afb2f3d20b093876d8dbf5b26f890ebadbfd..2b990f114a7b10c0613ac676e7ba644cb708e782 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 98a1ad31a936a85c2644058e8acaa2266f26e093..a6e052442c97418802f4641f7baf480c233ea9a0 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 50ad19fbcfce7d332deb6095c5ce58aebf895dfe..0b1342f6bf89f86dd5d157ff3146ab7574c7d4b9 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 f9a67f2bb90e2e376cff8a87df4ef214ceb7ca8f..06806a9aaf3fe9ea530a2c6de1fd76ebafc685d5 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 48c5c3f010b441dfcdf29f1954519497bf7551a9..6e301f999fb8d9424b4e8b54e271e78381cdb84b 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 d5845415e10a22b9cfa35f2bcd83e50283302826..d1abf9d2f08bc2222a0f05533181dc2d6b260029 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 c051989b44244fd38cf3c8931cc50e6976353058..9d4cea279eb949f0be754d176b7599325a565d7f 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 83ac1dcd3b96f4b8c5e97098f5df9435c89e03a8..bcf071ce53d08b844040083033239b05d08f4af6 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 24be7f0c87c43262a8447d50c0dcaf6e2be0cd5b..0c8295647863e4450d2e2186edede452d825dbdc 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 a011a1fbdf29f1335724b3ae2392000a1ec8dbba..c0f1293e6574ce16d1785e8e06c329e195d6ec95 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 6e20f50185362536a17bae16d0b946f72e1e0c77..3816573ec8d1fae12d53a169258d9f33e75bc4f7 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 5efe26ef9953546a1d0ba8518b6227f34e170559..39f97bcf5b609eba81e6b183dc07c9dd66593b10 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 9ba76b06faa317d0823e5279733ff3e01197ac7f..e83c99a895100c2a4b9e10bed11c0c54614f661c 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 9d5623a380ab3462d9a8b3cd5f6a8e6dc0e906a7..636ff9060d888ee25cc3a852acdbfa687936332f 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 8142083d095503dc7d5f4fb39f3ff3172fa1ea48..4dfa0ad9d1e791aa8f00d23563cb8e45752a75f3 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 20cca8c8b1c8870d215304e6e9c779e48edbea52..6c26236a1374188908ae948bc2137bd5f2a2cc16 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 ffa2277af06bc4d27d16466f49595c6302dc9d55..5f50dc779d0050a406d23b7ad13f1a28c62e9e7a 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 eb1f5d1fe6b44959a4099e1e8a3056e891996d4f..04935e1a4b11e2255c77e75464575713fa990767 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 1a81e4b6503d4c32b68e4797316f64f5d3fa25c7..63055c4482cb2d557bb8ed3ed6859372ec4c57ce 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 bafa4fd3a3e54bdd7107a8bc9f98d8b9ebd1b097..418bbdaceefcaf23b4fec8a4c14a45ededa7508e 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 b3a2eb524a8cfa18b783344791631868ae780b38..54a79c2e236a07f46aff846ebe0d825dd34a651f 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 8e6a8c1927c22df0d3dafecd1a7a58cc8ca01996..726e3f8d077d545987cd51eb46632ed0f1fcd838 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 d37dc2f9eac61d13a97c04f28dc5cef3e5b20492..b0bc1f4ce0859a668d434534c7ca6e28a98dc4cf 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 b6272b3083c719f78b3d2f0f1c768a2dcda19582..c70fa72b643a8b24baef70c0e822358b14b0f481 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 0552b65ff9b2e067936c9ebef5163360feaccb58..f36273fd90936e88c7850bac091a6e7e539ddb5b 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 a4f1fa53cbec70153f3fb35c1de5fd962876696e..5b44a5784b4dd2ded7aeae780ad565a228f326b5 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 97ea6e57b97cbaa3f8702f8c257ed082b83e65e9..63de5b077c568dde0f97acf6f42acaeeaa0af824 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 a873775292500ff27efb3b5c0036036feda7944b..efe26367bdc1fb3e7800697d9eb9a9a62d94a125 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 63d9101bcba6fe090fae44c141d5b8bf54808826..502901f26e2a23d4edf7dab6abdc8df0349bd1ef 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 18a070fa9e37b0e1260a63c485fbe09ab825b48e..7205e696db5a6b4ae7af4bc9eab84071b07c7f7c 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 62aff4408cf2708102aa52ea52d549be66856607..7f266bb85b80a1dd1e2ec348a002dc07a885173b 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 d0ad90f26f2c7646b602691a345d9209a5dd7881..fe167ef1ff987d5f0e8603de720264553a378dec 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 c7a83d79beb5dff87ae0d157326f78771f6a9c3d..7492aedb191c2ea3153e1099a884ee168df25a4b 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 cb71deaee95fa97f2bd10ae6895a88fa8a23d33a..04d00ebd225666e1e80058ea3a95d3ed59afd377 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 ea95ba034eca53b42bac6981a3cbaf8de97680d5..c4deb20297081077d9a20510e2df281819d887ea 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 df26a904f05b8eec4a08dc2adf51d6639a049bca..fa6b3e19a9bbba92f379b04333e7d8c62baf7a24 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 4e354958b353e78c1233fa455c7bf75784930a00..e18c35fda4b42d4b71b66a852c5dada8e0c98140 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 ad03794d9ec290e2007df7af57905d78f0e419d4..3ddd5edb2b6d88c6571228c9cfdbe6942e23e997 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 18394daf284e53f6ac8cf5531af5dfe93622808a..6762e41eafb54f3f522b53d8157f19ff5573e08b 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 53b07b2d96b94084d26ae7015b54d4d0fbbc1074..948fc34b82b818a3527347850efe48a0b36429a3 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 103188f2fcb4e28fee323b77eaf25ac2fe7f0710..b2d6744028f1e4dc37a054392dc1fb52cd888d62 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 2184935d1cb84abf58a671431cc9f8cd12ee5c27..d12e6c39594770b8eee888d2ccd7d97411ec66f4 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 798c98efc3963a309b2b6f441bc0439f5bb90b3b..5c0cb4ccd92f1dd06203019522dc39d32c8b5a38 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 412248dad28c1d1d5dc93839a45462b32478e41a..e299ce2eea2db64fa6de1eff0cdca05c89fd149a 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 3be6e3311b3cc3219143c344429da90c6127aeff..8070b95a88cf32b4097ef9e3e394ddf2554fb1b2 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 3239e51a8cbc41e8f5112fcb621e0105c412bc8f..d96b636c9c7ea014f7983af67114026b9c55db6a 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 7a6f892cdab18370620e19bc4e64e25dfbebd5d3..4557b7bf0e3607ee3b029a719e4399739d500e56 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 b3512943deb1582a5c2dbe043cccc018586c3ab6..38bc7fa393a5e1e78b5f9173e4b89744ff357a93 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 68720ce5c8f18ccfe24b6a0262fd1684b76f6393..b9fae5fbbc22bc92338f899d32cfe88e16d98cc9 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 519c3b3428a0874776653265ff939148d9030e5d..34ce3e833f19104906f020b07f74b0e4e9589608 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 fdcfc5cf58d4de46abc56e46344bd45ffc6ae78a..9d7e3bda28bd957146713e4a60eded60f1db9172 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 c0653a91594684dc1bc9ccfa45b473c773dc1c3f..9f64f4d66b74ef8eeddc84630c0b13d5281d9325 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 296d976797a40c5bf26ee410cc44abc831e16c7b..e59d0ac3660dccb9469082305e4a2dfbb4778775 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 0c1a5f3aef98de58091b537dcd2532e8e818b8e4..16a58250877a5019e0d5c9c1298d91e6cfcfd5ae 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 4f20492ff675849ff5a474bb79b169ffabc8243b..e4307adb94da400c2fff092391e7fe0df29e1baf 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 fe753ab36f7496deca24e5ec39a6255dddda6f68..03d306e59165365a8c61f7fb980658d2d819b533 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 afdba1c712e38619daa6d5884cd9242ca8d39b00..4697822f771d6c586903f21f40328eb7ac000a94 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 d0fff9b575c248822f18a6a9d4ce0c4f13b481c5..6367b9cca9b288384df820c1eed580753bb8f794 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 55774259e69c6069db737cbea2db845fb08c13f3..e9eabc74f22d2bf95652409d6f87fdf41f17b72f 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 5af800ac8989362a4c993b1c8a223c68a9f97fca..b270174b2aa136b7007cf46274baa11b198adb13 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 c4da4060b6e15713f70b93ba7b26f6303099f83c..3840da14caea23cbaee77dada89585fb3a3569cb 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 4b5f1762e5472c3bc359736882cad223a15dcdcc..d5cb81d491b333ee0bbf9e13c522a011c8a8e85d 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 5c7cfcf6ff57f014a9a7c5b9c1624ac808c350e4..af659afebd64ae9f16c35e8ece8d9b1322512e29 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 a5321489d39e358b8a413ef9dd24923c51220459..79724afd6b6056fee882821d4061eab482493f2d 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 ce6020046648b488b0fb72e7e16bf946d87a20f7..b42d5f001df5cde59bce58d8bf19cc1f70bd8638 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 0e6aa55d6b3140d42e4c82b01059fb77d19914ee..4f396ad7bccc1b531afac1412a7e51cef6026181 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 ae1d2cf929f2adb0c8e9b206e7cd5cb460c221fa..a9ac4bb585e5aee5299f949cdb65ea44aae4d613 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 4226aa6b2d8daf5cda5f52359ccd7b169874a1a5..24f66c5699663df5806549c012b2cda6069207ea 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 608504172b1a772386dd280aebd6381b002f2277..62898a8600f7199226874849087b81c04e3d753c 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 cc68611dfa58733f10a8556a7d2e79115dcc2ad7..2a6f7d428ce1ba8038ddf2b9f4e7166059b924bb 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 647b1b6a19fe8c81856b9b981ae29cef06d9cda2..3c6e03db54e10a721b3d1cee4c9eac5977ab7132 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 e770c7a25b61fd8ce71120171daba0e21f04bcd6..a13552a03fe5cce12337624b2c1dc510d07d0fce 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 0e79b4e9e5d968c9bc6aa8e39189a6d204c6261b..458004fbecd67ce77b3dbd68a0c331feb092245b 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 828017905104596179b1feb337d9b51db39ea4b4..6a250327f94cdb813806ae6bd731ad55a5bccf7a 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 1b9a347ce5d552d37bb69b13bc2d6cf608a67143..c8f11c5083290a63de0dd872a101c4c434d78a29 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 b174f2bde97aa8c2377728688cba087212d2dca8..5ce81f7e63d3aedfbe1fc40bcbac069a8fbea7c4 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 d87bb6c9ffab6f2157d2c09fab1d584db89e6158..3b236ff8444498d8e40ace34a57001803e2d5a66 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 2d0477788c908706ab95ce064f549ac5ac8005d4..550e632bd33db231896af0311a54babf1e7b46ab 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 0b8151dce7d4a7e600587066cfbbef29c68296b2..8fc073a39ba91efd5fb7565a15b1375e4e2b1c02 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 2aeb832f7a7763cb112acf420d0c29740e07c652..e1551f128e5a108174aacf718e3bb165f273d0c5 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 55792f1fc62502fd2769dc09df6b12c6202b2d05..3d77d023a34c13216524c6877272d4ee7ca7e6cd 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 94da03f15f240333ef79dd046f01e87a6565eede..15773b29c036f00b3cfcc078ddc607b89e2fe1df 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 c1703c8d9fed23fe5d4bbe0bef8cb289c511e6c1..60818f7792c2d7ae7800595326f1cd8682cac8e1 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 91be01d23faf28a9411c25ed0bc32d1ef395b696..c4258a6c78f78d0cad2df572b7972587933b6de4 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 e2e6c7fcb0181479b4527d0ab7a1ee74decfa24f..cbd0c17deabe9098aad652af68bacaca19949058 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 1886fbd02c4816d763a4a71b69561c323d0714e1..9a3e64e1b4874b622b6205b45f30eff2b1c7e297 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 ba0548520fa8510d57ff2d3aec4c5aba536f6e56..fee2034e511959ed19fea1c9ab32cee08c15eb3f 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 51e37d65da9fa4b945ca8162636eeb3322e57b3a..887e9dc3ac9918fe630278601f44187ec2abe7e5 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 ff407a44a69b4500a7d5d07d24acd0478a9d1f06..3a94a6a1c0d065f35f96daf28d7a0f591b7463b7 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 15cab8c2c6fb611a7e5593f57ae166e38098f335..d2d0080c91b1be49abbbb084aafc18dcd41a6a6e 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 fe92ca0485f4ecae70c7df95b90c374e982566c3..7ec59fe2bb95459fd66c4949c90f05921f8f11e1 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 302957f677413aae3c0f32b33034eb14b373e045..71b26e7516a62368939571bbc5d7a22855e24e56 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 1deac2233c29ae6d527d8eef737862299081f91e..b2c2ce7797927593afc36204eb01379466972836 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 2c4ba0d635083cacca59068c21e5e7e02bb0a4b5..9fdd99675b3f9f0176600274e22cbc45425693c8 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 fedf98c92f28b33e5054c4f791bc7cd8e2e05684..b1e5a4b45a5ab22075fee2690619eadabad22225 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 18468aa8f9c6b58031e36a34236df9cab0d0417c..8a6cd0f04f45909a73a736d2c4cdd13c69825a17 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 dbf96687b60d4689dcec2be625bc094055786cc4..572d40376decb737af5bb30c103307f4096eb742 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 8b044e0f74fd5b860dcc71a19c68b593dcc32972..2a567fc500a5019836d2498776bdd061f99a80e7 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 5eef295ba486c72dc4dd22c45829de432d126c25..f6125fba55247f4dd8807cbcd9fb998b75da1431 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 f32a9b88f646fa0017aeb652f1c319ff2994d02f..a7bed2acf47518d0ebdd3be618e54251c17be7e0 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 f6c3f178d44d317b7c0325984eca7b94e30cc00b..69a90afb6c608f980650da012c137d3fd2a0cb40 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 4ff3417136a62c7ede24d2efe6dc925c81d7d620..da41445e23a0db3fb3bb525da7a06b5e59b5279e 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 b798402daa7614622ab7db094191789eced6d59a..dbc0776ce8bb5c6af9159788d6941f954ab9edf4 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 ee6eba8dd2016fe4b7c2d994355a6aa5ad10d9b3..2d468893bc59e051fa2c9d95db657934d6d2934b 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 631dcc57f2d538e57e00eb07f184fb2004778df3..7a04a563d6f3a4602cffd151ba743a92396762f6 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 1dfb78f76ebac778f19dd6fad7a65f2e6b7cdfec..2f3a137101266406d8abf4d3f0d3531ed80dbf31 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 df16cb19681b3815a5d857a2cde87efc7c027d22..2ae49b72165338859bbe739309199bca8b1dc4f0 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 1d5fc20011d11dea038a093f819926b3ffcde9a4..2a4dbf900c52663c80ff7784ec205e9857c060eb 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 761a981a19147c1a9b112247202179ba18123394..0acd5c533a88d90d5859f0f5c001ef43e6182714 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 a8f6c432b59a938c71fe347fb288986ed4f05f95..ed7cc7ac40d553e9bc1c916269c33d72c4f13a24 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 039b6b1d6e05e630ab0af0b144a6cc5f6f1b5778..cbd19010dbf0dfddcd6458acdf8bbfb8ceeda41a 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 f793b94d2bcf4d9c6fc1e1c6face3d607c2eb6ae..ac8adfc6855354c3919cfb93c84c75734839ad2a 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 d6ab4f06674aed6eb4163c941065c3c87236ce47..a79519db21821c2719a2bf8af347ce349b580043 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 5626eb0a27283111bf6a4c2855575f1554a9f844..b4767df1e1d52c882a9b4f8e66d46e095bebdc94 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 869a1404918c1057330f7407a569b292fcd2090d..1e74c9721ef025ee1cae9cb1449457eb28aaabb9 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 f852463571f68ac0bfdecd52eac111d4dfa80a1a..21d71e0f53e56086fddfbd13e5a115f4cce51e8a 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 bb84713d1eacccc9be0021ae837f3180f5e740a2..e33bd4d05359442422a1e530989201576c34306b 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 1485e7f89b219b8aa3833846572c40746925307a..0990c7f3ad9584d44cfe7cd083e55e2e3552c34a 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 65012d956bf95380e967260592aef7bf8056bc7e..e3f0f46fcf030a2f5d749d3d3cd0a9a2702a9070 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 1837ed7002ef8fb18e99dd22a6ae54995cc5fe2b..9c699e06c71c056aeab8126bb12faf10eaa90783 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 1daafdd054ca5bbbce7ab9607dd70302d632fb23..f97cbb33de5a2dc5a0e29921b48e89561e2403cc 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 770ed86fda1f9a25beaebb88e4741b372da9f45c..4f2fb28ea962da68beb0379da877c0c827370ccd 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 217694ee1c00983d67e33334b0085552c90a31b8..991fd0b790d8dd3bbba8b01a17d97fa9e711818d 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 06c9408902c2f6d67e691a3d3cfe8ad41e966903..eba90b7686ebc8124a1e9c81816f65b8d9573263 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 98dae40ad522e83d31dd416c950003c7c7e8b7a2..bfda9c0be66001e3a698e3a4c7f12741f8e13c04 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 c9b9750bd77ee918e1700758308b8c011b93b5fe..8856c2ca817d8ced50d1b7cf262708673dc8488d 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 abbe786f4cb9f77f553c2d1d3f84d2ee0f65fd59..a9fb85b9076e36dcd34cdd3962f8ac0d95f1d965 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 4102c4cf989a477b3d1512bc45fc25a2d57b492c..a0156d69f4b05c93ff0b663a8f7364118a5b8e5e 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 5cd4e4417751afa793369726765fa413d8b3e649..6ff85182ad179e1065c6ca62a7bc253a6af00be7 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 73b289513d520481ca8bfae9377c165a757a5d57..1d419aa6dbd2474232c72a2bc92f0042ad3e9efc 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 6678bc364cf59164178883e2232b09b21e437bff..7f9843df7ff23c1c74afe3ebb82e9b3065f8dd1a 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 b0f7d267a3b7548fdb118f8858bb1480c01bd580..4a133783bd77ebc9bb244fbba9365cc891fc6ade 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 ee76c82ea8891d0f0735bbc45a9dae75c3536cac..0772ffae5634a0dcc9bfaec9f9fe8ace57237068 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 cd12d6c4ee322e6ef56f7965f3ba85b80cc25507..2e1a3cd552b837fa22d89dd5355e17d354b6216a 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 e82a4ed986001dd866dbe5cdfd167e8a605dfdb8..ef383ac15a5a1971d244405857b009efa0765bb5 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 3dfe52b602509e618d7675d2de74a1e1a5b1c915..c984c337df21fd6d671cbdb0b762ac9bdd6fde99 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 e5e8f8acb06fdfe16b49fd149c193543f57356cc..d3c855cf53721bef4ba7d05ccfbf3957e07e87da 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 047a1eb96ce24a050016c169c3f0da2180ccbf6e..5ef942027e8414d17dfe25658a72a33b8c40dd64 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 a53be622586f31e37caa2b1990062e764876e6ef..dfca18340123b4b69276242d1e547519d68522d3 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 bfd6c8231c1b719bce6ab40a813e33d83c0e290b..cf5f389f076666d3221bdbc417acf254bf5b21fc 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 dd68d8341623e781049872114134dfa27ee30977..feb97c70188007e8e43f38cac6d9ea9f474dc567 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 0ad1c37459516da97c8b20b697e50d66bc1e60f5..585ac566a788e01cfc696dffda47c82724b180c4 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 3e92e3a3548041e7a247a304f5cf958913cc6d32..284e7403e421dd9c507d02b1b04082f1618d9699 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 2de152b01131353dfc77e75bad6500ba3d663f04..d079b8577a9bcc29ba1e8bf5d09c2254d333e682 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 29fa473be3e67b7a279ff24223a347b8b037cb5f..40d907169afc5b07125b1668047825bb9511e582 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 4d8c28981abf88a7a2ae67c2ee44f6afb83f856b..dd8b908a03bae6460e43d15026e6022a28b1cdd3 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 d6752fb60666a9bf0f97443887c24bc1606cae81..88e807c1adedac25166226113d4fc424c4f72674 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 44e1fc785b8937720db5407428b4143c491ee8c9..e42044eaa7265bd43d365aa6e90a480cc1565d9c 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 685a53e67984faaa17d036f36e537e3388fc4990..76489fc3721a833f26bb3a10c9aba6dc8bd4fd3a 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 93e2773c04c3c725d9e33a69995305564737901c..29ef3b9defdcbccf26356988f317373438f9a710 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 890ac403398cea2d9e1557bbb9e91744de63b14c..124ad4f42b068d6fd8201c635a9c3dd95dca2b61 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 018f1cfa36487bc2af6e73d329943c8affd4cf14..9962b687a97f7cfeba12671bbe4a0213972c9f64 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 ca25c3aa6dd8f15adf0f4c4b14d48761f8c1e7c1..21370b3cf56eea87113dd490f85a1b1ec0084239 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 857c6414d83f5943274d5c925783520cfcffcaa0..a925ba3a9c0877a2f4f15616a9d8e82681176121 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 80c54f19c06f134f89ea1f9cfe7bbf958e7bca9d..46bc98c4392afaf4b20566a80a9bf02606ceae0a 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 498df04177a87684a174f23a011da4dd6d82efc5..4ffed9237c66da6422f29339b708a3d4ce4c6000 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 322ec6ff8afe2917d644303a6839072fd042d499..76bbed15ff54eccf64f9581d810401c0a8dc9758 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 d0518dfcd70831b8cbe3ec0d8b4304522afb1a3a..0be08e2260d48dce534cf59aa3ee340071cea5e0 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 ca5d5188e79d0bd67c619f53117dba5e844e1f1b..12719700ee7ab74c662c3c58e34af6a10caa5663 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 f8eb5a24030e7e91dc6d9500abc93bf8f03f4309..79f87af001236feee6d1fbece3645cda68755efd 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 615d8caa2dc55037c19de8dee164c86001a35479..949a293e9ebf3f5332aef64db9d7a34b1a80a146 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 eefb7ef21dd401da2e983103f3f5e8394e22cfa3..59cff1f48609636bc798bbf1916418c9f6a6d0ea 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 d7046c40abcb90d545f08bc958dbe0a21edd4d31..d60ee53b5b71e1598290c1bee2058115cf399bd7 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 379ba96b79c05737eff0c3e07d9b6e9d26e24beb..8b21b13a25bb11530eab98086cefc86eb8e602de 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 708b115c4866f030d86c123860174ddff09acd30..1c1ab2715a420fc1003265609f505e265b77b19d 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 efc860a62d8c5e6223e39fd473a12d1cafb7cdb7..ac06fb1c40fa666cf9a1c63597fbecf1029410ac 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 1d722497d9c6b18a5b32a09d1f52b00b61759c39..268f28adcc8a0532cff0f1bd283f124c3c98545a 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 8485a1decb37df6797f38e0c39b2bfaf471c9275..3e27067148226589649d738981ac912182106ea0 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 49e1f3ea4ffc39c247a0b707c26b6d721d187fc2..9e3f5705a848ba449f60566512770e5a6249e3de 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 412ec5136e389352daf31aac74137a316918112b..56cce9ffe71b2101a38da5c039bc90062a3c018a 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 2b89bf6485d9917733fdc5355f0894ebeb041026..310d012314620d831c459b57f5b5eca323c87ecc 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 131d01081c0ac77cdaec0f07b8659bf3280c3237..ae638aeae87da9756e3dd875b58b8793455887be 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 d031468e087cccc53a42a85ac1c3ca063a204803..64805cc9f896cb6a4b87ec180d84d19a202093a1 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 b36fd49074a4f64a75ebfcbaba0e8f5e835df0bd..53900216f34dbaaef2edff507f6039a27bbcc0ce 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 a1526c40ab10b6c7124719a09066ade7090ae6af..88fb9cf4061597c5c248a5fddeba31bfdfd6dcdc 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 08ff6af84d8566850650d233061ee105209d68fa..434397fd4b3ca8f4c14c4ebd56d8604b17883ba5 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 ae71e99477f7bd050d85e9b2c5aa31a07117a35f..0024d0e60d23258bab7b671799397f387d737259 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 17ac522733bd3373493f6183d21c2f9ca64a43b2..8eccdd380b292eafb3baf1d2838b4c1c6a01e6fa 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 3f2ae919059be61d6d6c9c05bd7543e0aacaee77..23e6ec0bfd7d44988be23e48706decb97a87a4b7 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 eab8c95ffaccb67d9e01f709ea9ea9943111a429..b909c96c85161507c775e2125943817862f2d42e 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 dda52f7e8e89acb8be080c770cd97825058991f9..6b63e651a354cd459844b50e3f9f7e324268a733 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 6a5490eb1ba6f6bd3d2355ceec60050ef7e7907b..51e319725ee07145e9c8377c9271cad60fd2e0cc 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 71eb89d3a11431af9bde2c1be34e4abd1679a54b..0961eb39cf1c93a2b286e1cd644fdd697bd4517a 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 d6091a69dea4ed080adf0300732fafa34e60f2ff..f11e8dd5846badd3a75adb507492fe30be460b73 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 0d1f513c8ed0f56fd915eecc0c0b8cebbc234401..9031e4f2d4a8109f9610d0a7d1ca4bcfd08e93f3 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 d5cbff9077f22934a53bfbbe194a865d3c06d9cb..c88430e31d0a475c31c922add9ee0b4fe2dcb44f 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 538229666e11c6624c9d46003f015f323771a96d..dce00d6a0b71c4b95f210a5f67a4f05502c981d9 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 95e2b67b5ab047bc50fd224bb030d83b56a6beb5..8d7e898ae7778446a63b06725eeb0b934fe25df9 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 74160f476ba358887833f5a8827d98a41c047366..a21ebbe5ce8ab1918b03d2885a4e1639a99cae37 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 782542c6bcb87775211cfed5d1a564502fd9115c..fa70bc17ea9425b8ba7013d179a25a2776eaf0eb 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 b904478ae2190ae945a2e853d15949dddc7ea93e..9746aca0de6deeb57f4b386620bf7bfae5d21116 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 f1caa320ce077e30b14783e6187e274c21785a87..dc44707235b60e8dacfa6a82c4193295bfc05a95 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 e3cb695bda8f773c9ab2912be9efd5c8e12179cb..69b61fb6af42d00fff7acfd214f0a459ab8cfe5c 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 e5ca506a05374f87aa398b2c80f0f447f8386848..e6796aabd99498c3d208733e983e03a92f5c64bd 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 130671355f33790745faeced26bfd33eca695fad..931efa8f5042354e760b3907bb226681cdd7204b 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 ddcda011bdce46f3806e1031a080d7c28c11e62e..0840eb56df7f743024422169bca4045397351ef1 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 de56393dbcacd9a54675f486b927c015a82899b5..908fe3ca3f8a399f2db6fbe2ca5186a9e5107eec 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 37e2fe641dcfafc840e2a66cd7a1aea15893461a..dd396d8d93ac1b9e8a0891f8a299a26f96ce5aa8 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 2f50b69c021bd6c2a849a21c65388708b0eca1a5..17f868eddbbcf560716e605b0d8c6a10c15df32e 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 1af2e97cf6336515707fb357c584d28bcd76c2b1..2e33fcf63f86789a7275676235773c41076b06a1 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 f452972f6b08dd82465c31a7a07ece85339db9ab..44000ca2d0b561f4a98cc1053e47c34ba21647d7 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 840ea7cedd5424a1657592a9cf1b91e8e16557e7..e1a94590d1e24295d0b8a01acf1bfb2f24638ce4 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 f0204504591c142f9968b10540298308a46c794b..844ff0e96a5c0aa869b3fee4750835ec75ed83dc 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 4e2401bb6e86d38da1e3f78144305c8d560dc067..08498e4a3ce9b5c5daa04c512a1a566ecd3cc5bb 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 9a611807af5eba314b5b993042904bba04fee4fa..ead88eb49fa270b6ed8e28e3801a2ee0a49e091b 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 c894aac6315468bf18d3bdd738c518b01c0a98a3..adbe4159105054ad3f3a6027e0a8a9ce588981a3 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 5dd8d8df81897d10c3bd574d8ab1a8648255a353..5b9c5123c0e38ad38d28729d0bcacfdfb0374f86 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 c915a5b3e7f58135cc30cd9c400c415dd80d1484..cab1215a1c427a92ba9e947ee3b6c431a076f497 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 c93542bbf326093b05f626e34142445bb7c5bacc..ab6dd31c1b87fb5ddbc795f1f17c929f1dc1b806 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 bfe82057a213046ab57132bdaa0cd9de64fc1f0e..c0614fa43251cc4f691354da7529d8ebcb82464d 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 39499f97074fb702ce596b44632648792a852e10..8d9a1318fb22850e3fcb0b36abdaf07dc02e59c1 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 bf99e62fa9a3629ef41658e24b355742e2f753ce..3b156d4491579f3338c574f8ff44d0f7bde29706 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 84394ac3dea108eb70ef7c8761647db468fbe152..54def78da41d8315395890ebced9efa60907dba2 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 8e392dbfa6dbf204f619ffb2c19d89d9e4736bfc..9aef0a46e013a387a0172f4cbd986eec11f56e74 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 81cbab3394a87f3301517197a0cd8dc40016b6c2..382b65fd5550ae2f67eb909ed50566468d98da07 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 154f46673c7a030872c081d0caf537952ccf912a..971b120c8ad1c3f268a563ec337ff7257a98b274 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 5cacc6d5d0589d92aacfda83fd07ff0963842a67..4b0fa7c1542fded2398540d29e31ab6261c2c0b0 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 e5d401e8aafa6623d623aca94cf6607d8827b086..def4b3d44f2fd66743d1ee5fb93303e5172b67bb 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 82497bbacd552052314938b76d9b75722cdc337d..2bf6db338023b30603637850ec6b2e76fe044ce1 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 762d74bd82a8b5d6b73d9cbe4aaabb7aaff639dd..bf79791312bcd42ab5af27a2f227ccf95a48fde3 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 85241833c01a994992553a8b29c2b987153c8690..057a3d3c1398a414a13e4bdd9eff1553e04eef4c 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 5dce647d2fa4942782df687d27f9ed4ba6850300..d49f3a8dbda411d3681c530f6a06c23f41febc8e 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 02bd5db9aa2e73b57702984ef753a0057995c854..07004f4e896dc61c3702626732650b0c4a80ef79 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 82200f68daae9e6d1b4a511053a6f498cc5e468b..f77429a3d26f3f03d4355078651ebbcfc008e6c9 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 8759aabc99bcf5cbb277e851ffc349d52682a3ac..e9464418526c40bff1b24372d4f926e2e9f7044d 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 47a145942ec8c4e1e31abbe346b3ba68b096446f..4dbdaf6ef37a21c6290ffe43932d470d21d38993 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 0cd9ec029eefcd8de0add160af8795b2b2992a6a..48c5c6d0f613ddd7bf52d0e507ce8bd5a593fe52 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 7ae91755b723dad95d23bf9939b0ee133515b506..072412480523ddc672324c96c495084b027c8926 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 5a6a2669746ff8473745268c164df76da922e83b..f9097f271448999bc7de22c718b8e86f1e05e571 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 c6dc5e6ad54ed6176fb998b84811574614227a3b..f910471b339c579fcb2b6a109092296dd54ee820 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 804afcbdd1e04304a594902bb69816fdad8ed02b..b9a8d525950ea02f742858a08d45c5f0c59c7af1 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 f4f77f28b6d8b87d4381569bbd263ecd92027b89..557d899c9a0a5e4bd21386b51b6bf3d068d1fc82 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 c6308b92324cb9228fe21f94cbd0eb232afa8f00..8b29c28145627e0710156eefc8a78ea696a4bca5 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 78b1bcad6fd2103ef1dc5ccaca7503fc991edf32..deb42de56076b990846aca73214acd51f064dc5f 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 88ab80b36d4344b50351c925399ab6bb98a659e6..204f7b58f53715479e8fdf6a944125dd35a02cf3 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 4aa774186fece2a1c4e8aecabee91878e903ef19..0365428f3291904ca93af426c82359e0b9b75d1e 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 287ade3985efe730a089c70096a09215c1d89f37..d9437616700f0fe5902bec977b22eecad696c5c5 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 507b6f44f64b01a21b38aa83532e4d482c48d021..ffee71412e9889ff9b6f350015fcdde0703b6764 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 9cd5b71ff8abdc659436484ba2d91c5ed5223251..a1f9eda20e6cd4277424e14a77ef5ed7857ab500 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 151107b1ebe3a296ce3b936e89dd198e97f02f44..1aaf8cdea46e9a08cc3c7f8a7a0b2654eb317c3b 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 5626081e9864d025192a7c9671fc35cbc6ef0d0d..070e97647d431b1dbaaddf0ff3b9eb42ed58cd3e 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 e8acaed6768d1015c239c25a2264f4e4e2084952..72fc4ac1cc8befaaeccb23f58d20a274d7556b2e 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 51be1a11c7cb4075b32fb31971024c65bd04c7d7..4dce77ba3075322289ea3e2ef2f349049addd257 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 66a2f19f714d8ee08c0a930aff57386c5ac23ae7..14cbc8d7afb86a53367333a687d2317e2c2a0e70 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 f6a7f0347b57fcfe2a238aedebe3b07c1b380907..3aa81d469b1ec47fc213bf1d399a0fb0fa96a9a3 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 1e9aa838a43d0cb05cb3beb4df070ad94238833a..cac8677f13d5396b45c0094b1233aa6edee210c0 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 0ae76da97e6955b4c4441b4d01a4df4a2a96113b..230e082da3c1901ce96f84da40bf1afe29abe75d 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 6c8fcec0d9832649adfa9c6b8222dd1f1170832e..14c1f633ad5f2f137fadca91a98cf19f36f9d520 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 8a968c0a8dde10784b8d1b2b9b8f9871700f0fc1..df16323f0420ea1e7beb0d551d5a1a13ee75d371 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 07fce45b772dea60b8d55b93f466160f66dc0857..9eb0ef61ee4a82f6e4f821a1b4422caa7a7e8b8f 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 5fe9d8587b76879b9509543c1af3a01d895f01bd..cc0d4d7006f583f614286434f71779c34ec67763 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 5234ac32fc43616e2584b8c3b62cf11fd0f36e4c..cc16dbbaf9422718cf3f5511bafcaee2e4907ded 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 add19e0225913a69323874ea0546a5b7c7049de6..cf9883bce0d2b25959cff9c443a8c3b85a86520f 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 2e11287c2af92ea086ce8724284f8f54a6881212..2afe14219d905bed0b02e567fda577bb2861ba82 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 58fafa8aedd5a14134d701452281146d988d3125..a5a6370e30d425403f21a5ecd9a9a46eb7c83593 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 833a426acb22a21ecc1e3270d565c256343a5fe1..2fdfa7167f0bdafb440d06f5256d40c5b5dd1658 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 48e0c12d7bd8f45001bef500ec877e0da37ef13e..a568cb9a310dfac709d728696af23b2371e6de71 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 25370e71dfa0cca5352a99c8e0cf0caea367e9ad..f964e5ca64d75347b17322e94ec7945dcca19090 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 6c9f33868e81b1271c9becf3320bd5bbbefc2aeb..99fd4f62956e08762be98995073c24396a1025d5 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 dc802afc28fac9106dbd0e611b4afeb496e26069..6f5a52564581c010723c37d22df909b241203301 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 8e8c47c2c81e4d153816f7dc15b2ea4b63f7ae87..c27f72fd925984c91163b9c7d3dfb0e1902e338a 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 4c0680b782759c6555815bbe89f9fc6fdc16698c..2431a97df13d06c37cb92bec4a5a4467cf1978d2 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 3c57d0dba6b11d86f55f5829d4021f9ac5ff39cf..0bf3736a3c164487dcfe8717e1c3eac66aa7f213 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 d131e7dcc316a280a9f4900ef5d66ad1ccaf5e45..af0e893bae8aab194b6a76c2fb3f84bace7666bd 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 d1fc2bcd571d3b5773acf46d0f32d611e08c3d88..d4229cc88c71de9c6c42d5719acf4ebbb2a25dce 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 1b7a8be041535adb967ac0cda746747c7f3f4e66..f57e4a1ff2d10dfdbceaa8e153411b4cc5f76980 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 8fa4fc1c0b24bacbcde88ca3ab5a877be8f929cf..afd2753cdb71dcb902392772dbc12db06f856bbd 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 c707748843b9db087ad781a5305f6874ca3a59d4..ce00e88addfd9eaeb59e03a179f0f862eb48ecfc 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 c9bbe8f5090ec3b2b4d1110aca7e415e643711a7..967d28dc11bd965926cfe1af49dcc5feeb9c1dfe 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 53c297431c546a6804c5420534490a319076ab03..588e6fadb5118f736dbf2d573712962f0a2681e0 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 0e931f8246df1096735b16fe350508783c175fc7..7e1f70afea83ef290be2ec26a41a075adc48f000 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 249b46ec78945f91032c40f7828b7be38875169b..728d48bd0d282bcf34a874aad2ce348a9a40900c 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 2e2445c6963a2215ef578951f7458ef56c3fd1bc..ffc96d6731fee59eef193d81ae4f3b0d10c49aa6 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 9629630744fdf7d73d2df782dd27a6e59adb0135..815c4626b283badebaf5aecafecef6278bdf1046 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 288a4a2b5e1585e32eaf93d003113766b5629a05..7554ee79bef4411c95fc189c8ce908981d13f456 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 f1ea85571856c792f828aacdac47f54878b29e7b..6dd2888c36b6321646ff3b36e09636010f354cbf 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 632e65206c7a8b5bb6f8475197ce9ae26a95ec0a..32f4f2ad944c0b8c673a8e6310bbbd157515956e 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