diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_BStoBStoESDAOD_v1Dev_build.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_BStoBStoESDAOD_v1Dev_build.py
index c776a0cd7ac463ef5baa0422b81a3088bf1c350c..a2a021e98a3640b506f84160b63fef27253ac02f 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_BStoBStoESDAOD_v1Dev_build.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_BStoBStoESDAOD_v1Dev_build.py
@@ -9,7 +9,7 @@ from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
 from TrigValTools.TrigValSteering.Common import find_file
 from TrigAnalysisTest.TrigAnalysisSteps import add_analysis_steps
 
-menu_name = 'LS2_v1_TriggerValidation_mc_prescale'
+menu_name = 'LS2_v1_TriggerValidation_prescale'
 
 # Run athena BS->BS job
 BStoBS = ExecStep.ExecStep("BStoBS")
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 bb619b840d5e45d127967c41ed804846949b5b9f..9dab6fd4bdac12a013dcb921904a47b0121794f7 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_v1Dev_build.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_v1Dev_build.py
@@ -33,7 +33,7 @@ rdo2rdotrig.input = ''
 rdo2rdotrig.explicit_input = True
 rdo2rdotrig.threads = 1
 rdo2rdotrig.args = '--inputRDOFile=RDO.pool.root --outputRDO_TRIGFile=RDO_TRIG.pool.root'
-rdo2rdotrig.args += ' --preExec="setMenu=\'LS2_v1_TriggerValidation_mc_prescale\'"'
+rdo2rdotrig.args += ' --preExec="setMenu=\'LS2_v1_TriggerValidation_prescale\'"'
 
 test = Test.Test()
 test.art_type = 'build'
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 517fc56c9fad0878fc24f4caa024d5a6e3e49af5..5ef081fd7d28d461c985de2c8687145eabf7397c 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_v1Dev_grid.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_HITtoRDOTrig_v1Dev_grid.py
@@ -48,7 +48,7 @@ rdo2rdotrig.explicit_input = True
 rdo2rdotrig.threads = 4
 rdo2rdotrig.concurrent_events = 4
 rdo2rdotrig.args = '--inputRDOFile=RDO.pool.root --outputRDO_TRIGFile=RDO_TRIG.pool.root'
-rdo2rdotrig.args += ' --preExec="setMenu=\'LS2_v1_TriggerValidation_mc_prescale\'"'
+rdo2rdotrig.args += ' --preExec="setMenu=\'LS2_v1_TriggerValidation_prescale\'"'
 
 test = Test.Test()
 test.art_type = 'grid'
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 b6cf6b5878f2bd58a1aa49a2d1c0af05174bc5dd..09c42c60c218c096ac4424838c86ba026349608f 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoAOD_v1Dev_build.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoAOD_v1Dev_build.py
@@ -11,7 +11,7 @@ from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
 from TrigAnalysisTest.TrigAnalysisSteps import add_analysis_steps
 
 preExec = ';'.join([
-  'setMenu=\'LS2_v1_TriggerValidation_mc_prescale\'',
+  'setMenu=\'LS2_v1_TriggerValidation_prescale\'',
   'from TriggerJobOpts.TriggerFlags import TriggerFlags',
   'TriggerFlags.AODEDMSet.set_Value_and_Lock(\\\"AODFULL\\\")',
 ])
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 4d5c93882d632fad20582fd40c4170f4c9d66a2d..851c4a38167ac09427cccfc6862e3950981c7d3b 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoAOD_v1Dev_grid.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoAOD_v1Dev_grid.py
@@ -24,7 +24,7 @@ from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
 from TrigAnalysisTest.TrigAnalysisSteps import add_analysis_steps
 
 preExec = ';'.join([
-  'setMenu=\'LS2_v1_TriggerValidation_mc_prescale\'',
+  'setMenu=\'LS2_v1_TriggerValidation_prescale\'',
   'from TriggerJobOpts.TriggerFlags import TriggerFlags',
   'TriggerFlags.AODEDMSet.set_Value_and_Lock(\\\"AODFULL\\\")',
 ])
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoPhysval_v1Dev_build.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoPhysval_v1Dev_build.py
index fd7ba59ad698b7a2ce8b66f4b1f4dee2e4b6f2ae..46a33f26e36e796a3851f8829ec2c476a4a50656 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoPhysval_v1Dev_build.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoPhysval_v1Dev_build.py
@@ -10,7 +10,7 @@
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
 
 preExec = ';'.join([
-  'setMenu=\'LS2_v1_TriggerValidation_mc_prescale\'',
+  'setMenu=\'LS2_v1_TriggerValidation_prescale\'',
   'from TriggerJobOpts.TriggerFlags import TriggerFlags',
   'TriggerFlags.AODEDMSet.set_Value_and_Lock(\\\"AODFULL\\\")',
 ])
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoPhysval_v1Dev_grid.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoPhysval_v1Dev_grid.py
index 56a1f27ccfd334f853e1505519e191a328bb14dd..6525600e8122c47c8e2a450024cfdfc418f4480f 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoPhysval_v1Dev_grid.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoPhysval_v1Dev_grid.py
@@ -29,7 +29,7 @@ from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
 from TrigAnalysisTest.TrigAnalysisSteps import add_physvalweb_steps
 
 preExec = ';'.join([
-  'setMenu=\'LS2_v1_TriggerValidation_mc_prescale\'',
+  'setMenu=\'LS2_v1_TriggerValidation_prescale\'',
   'from TriggerJobOpts.TriggerFlags import TriggerFlags',
   'TriggerFlags.AODEDMSet.set_Value_and_Lock(\\\"AODFULL\\\")',
 ])
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 4f9c61a1faa0a064613760676e4e76e47255c334..833319e233f4b9a35419a15e2d46cce423d78941 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_v1Dev_build.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_v1Dev_build.py
@@ -10,7 +10,7 @@
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
 
 preExec = ';'.join([
-  'setMenu=\'LS2_v1_TriggerValidation_mc_prescale\'',
+  'setMenu=\'LS2_v1_TriggerValidation_prescale\'',
   'from TriggerJobOpts.TriggerFlags import TriggerFlags',
   'TriggerFlags.AODEDMSet.set_Value_and_Lock(\\\"AODFULL\\\")',
 ])
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 057bdfcb09c9219e7305952758c2b948c9976c67..f6e560d39edee0e070f0d0e3d13454ff7043cb07 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_v1Dev_grid.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_v1Dev_grid.py
@@ -23,7 +23,7 @@
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
 
 preExec = ';'.join([
-  'setMenu=\'LS2_v1_TriggerValidation_mc_prescale\'',
+  'setMenu=\'LS2_v1_TriggerValidation_prescale\'',
   'from TriggerJobOpts.TriggerFlags import TriggerFlags',
   'TriggerFlags.AODEDMSet.set_Value_and_Lock(\\\"AODFULL\\\")',
 ])
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRun3DQ_v1Dev_MT_build.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRun3DQ_v1Dev_MT_build.py
index c9e340f28cce0e598973ae37770ce389bf479cf5..5793e8e5f2cc078e1e1f4860bae5e3ffeebde8bc 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRun3DQ_v1Dev_MT_build.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRun3DQ_v1Dev_MT_build.py
@@ -11,7 +11,7 @@
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
 
 preExec = ';'.join([
-  'setMenu=\'LS2_v1_TriggerValidation_mc_prescale\'',
+  'setMenu=\'LS2_v1_TriggerValidation_prescale\'',
   'from TriggerJobOpts.TriggerFlags import TriggerFlags',
   'TriggerFlags.AODEDMSet.set_Value_and_Lock(\\\"AODFULL\\\")',
 ])
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 99ec38f567be7c275984fb2c8982cb63c4dfe443..d3ae2deb5956aa13c30212ab9086019e9cab9469 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRun3DQ_v1Dev_build.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRun3DQ_v1Dev_build.py
@@ -10,7 +10,7 @@
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
 
 preExec = ';'.join([
-  'setMenu=\'LS2_v1_TriggerValidation_mc_prescale\'',
+  'setMenu=\'LS2_v1_TriggerValidation_prescale\'',
   'from TriggerJobOpts.TriggerFlags import TriggerFlags',
   'TriggerFlags.AODEDMSet.set_Value_and_Lock(\\\"AODFULL\\\")',
 ])
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 22adbb616d325c509952606b48747999d9d0e0c1..ea55ad82a889a8c134dcde8cec5ea3c010021b49 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRun3DQ_v1Dev_grid.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRun3DQ_v1Dev_grid.py
@@ -23,7 +23,7 @@
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
 
 preExec = ';'.join([
-  'setMenu=\'LS2_v1_TriggerValidation_mc_prescale\'',
+  'setMenu=\'LS2_v1_TriggerValidation_prescale\'',
   'from TriggerJobOpts.TriggerFlags import TriggerFlags',
   'TriggerFlags.AODEDMSet.set_Value_and_Lock(\\\"AODFULL\\\")',
 ])
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 adcb8d91e7fac12900ba6719f1cc1bd6dc66b3d1..0eaf58531c40479aa209f354a4b3a3e1ebe4a80e 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
@@ -16,7 +16,7 @@ ex.input = 'ttbar'
 ex.threads = 2
 ex.concurrent_events = 2
 precommand = ''.join([
-  "setMenu='LS2_v1_TriggerValidation_mc_prescale';",  # LS2_v1 soon to be renamed to Dev_pp_run3_v1
+  "setMenu='LS2_v1_TriggerValidation_prescale';",  # LS2_v1 soon to be renamed to Dev_pp_run3_v1
   "doWriteBS=False;",
   "doWriteRDOTrigger=True;",
   "fpeAuditor=True;"
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 bf4a455773eb663322aab8441abf82b3b8809e21..cd1f8fa8f8c7d708f2cdb273e1697e114a5e9009 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_build.py
@@ -15,7 +15,7 @@ ex.job_options = 'TriggerJobOpts/runHLT_standalone.py'
 ex.input = 'ttbar'
 ex.threads = 1
 precommand = ''.join([
-  "setMenu='LS2_v1_TriggerValidation_mc_prescale';",  # LS2_v1 soon to be renamed to Dev_pp_run3_v1
+  "setMenu='LS2_v1_TriggerValidation_prescale';",  # LS2_v1 soon to be renamed to Dev_pp_run3_v1
   "doWriteBS=False;",
   "doWriteRDOTrigger=True;",
   "fpeAuditor=True;"
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_deps_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_deps_build.py
index fca53a86195dc8ce91393fa396c17b566ae67eea..c9df3abed69adfe6f9839e9c1fb95168303c1fdb 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_deps_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_deps_build.py
@@ -15,7 +15,7 @@ ex.job_options = 'TriggerJobOpts/runHLT_standalone.py'
 ex.input = 'ttbar'
 ex.threads = 1
 precommand = ''.join([
-  "setMenu='LS2_v1_TriggerValidation_mc_prescale';",  # LS2_v1 soon to be renamed to Dev_pp_run3_v1
+  "setMenu='LS2_v1_TriggerValidation_prescale';",  # LS2_v1 soon to be renamed to Dev_pp_run3_v1
   "doWriteBS=False;",
   "doWriteRDOTrigger=True;",
   "fpeAuditor=True;",
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 4e806448361a610ff5c2fec6b12b939bd094030b..c170bff826765a3d748e3354df3cae7cb25268c1 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_grid.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_grid.py
@@ -28,7 +28,7 @@ ex.input = 'ttbar'
 ex.threads = 4
 ex.concurrent_events = 4
 # LS2_v1 soon to be renamed to Dev_pp_run3_v1
-ex.args = '-c "setMenu=\'LS2_v1_TriggerValidation_mc_prescale\';doWriteBS=False;doWriteRDOTrigger=True;"'
+ex.args = '-c "setMenu=\'LS2_v1_TriggerValidation_prescale\';doWriteBS=False;doWriteRDOTrigger=True;"'
 
 test = Test.Test()
 test.art_type = 'grid'
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 c832577a846f826e2fb856c9efc98784292e0eb4..029510946781ed8c3689d6ed0495ad30724c63b2 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
@@ -15,7 +15,7 @@ ex.job_options = 'TriggerJobOpts/runHLT_standalone.py'
 ex.input = 'ttbar_pu80'
 ex.threads = 1
 precommand = ''.join([
-  "setMenu='LS2_v1_TriggerValidation_mc_prescale';",  # LS2_v1 soon to be renamed to Dev_pp_run3_v1
+  "setMenu='LS2_v1_TriggerValidation_prescale';",  # LS2_v1 soon to be renamed to Dev_pp_run3_v1
   "doWriteBS=False;",
   "doWriteRDOTrigger=True;",
   "fpeAuditor=True;"
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 b44906f430bf9a6542815ed84b1f8958efc47eb2..daf6799083f76f73b2e43be68d82c3c25576b4f3 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
@@ -28,7 +28,7 @@ ex.input = 'ttbar_pu80'
 ex.threads = 4
 ex.concurrent_events = 4
 # LS2_v1 soon to be renamed to Dev_pp_run3_v1
-ex.args = '-c "setMenu=\'LS2_v1_TriggerValidation_mc_prescale\';doWriteBS=False;doWriteRDOTrigger=True;"'
+ex.args = '-c "setMenu=\'LS2_v1_TriggerValidation_prescale\';doWriteBS=False;doWriteRDOTrigger=True;"'
 
 test = Test.Test()
 test.art_type = 'grid'
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 11a392f1e41ad6b1cd2d329b972460bb2c32564b..1df9248a415a4f90030f3646e6516a10d53ba4b6 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
@@ -16,7 +16,7 @@ ex.job_options = 'TriggerJobOpts/runHLT_standalone.py'
 ex.input = 'ttbar'
 ex.threads = 1
 # LS2_v1 soon to be renamed to Dev_pp_run3_v1
-ex.args = '-c "setMenu=\'LS2_v1_TriggerValidation_mc_prescale\';doWriteBS=True;doWriteRDOTrigger=False;"'
+ex.args = '-c "setMenu=\'LS2_v1_TriggerValidation_prescale\';doWriteBS=True;doWriteRDOTrigger=False;"'
 
 checkBS = Step.Step("CheckBS")
 checkBS.executable = 'trigbs_dumpHLTContentInBS_run3.py'
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 d25b9b9371ef627b4815e650ae2e8a781631f3b2..0c92fa833fd57055513bb7cc7a6fab2fe92e5ff8 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
@@ -29,7 +29,7 @@ ex.input = 'ttbar'
 ex.threads = 4
 ex.concurrent_events = 4
 # LS2_v1 soon to be renamed to Dev_pp_run3_v1
-ex.args = '-c "setMenu=\'LS2_v1_TriggerValidation_mc_prescale\';doWriteBS=True;doWriteRDOTrigger=False;"'
+ex.args = '-c "setMenu=\'LS2_v1_TriggerValidation_prescale\';doWriteBS=True;doWriteRDOTrigger=False;"'
 
 checkBS = Step.Step("CheckBS")
 checkBS.executable = 'trigbs_dumpHLTContentInBS_run3.py'
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
index c1572a7226cdd9f11d1cc06bc76702eb96eef20a..a2faf47f8358107ccca6d791467baad01dd2c188 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
@@ -806,7 +806,9 @@ class triggerMenuSetup(JobProperty):
         'Dev_HI_run3_v1', # Dev_HI_run3 for AthenaMT
         'MC_pp_v8', 'Physics_pp_v8', 'MC_pp_v8_no_prescale', 'MC_pp_v8_tight_mc_prescale', 'MC_pp_v8_tightperf_mc_prescale', 'MC_pp_v8_loose_mc_prescale','Physics_pp_v8_tight_physics_prescale',
         'Cosmic_run3_v1',
-        'LS2_v1_TriggerValidation_mc_prescale'
+        'LS2_v1_TriggerValidation_prescale',
+        'LS2_v1_BulkMCProd_prescale',
+        'LS2_v1_CPSampleProd_prescale'
         ]
 
     _default_menu='Physics_pp_v7_primaries'
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt b/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt
index aec1bf6342f44cffd13852b2c26dbce60362be3e..089c345ce00ee201990ea5332d1494f299d4fef4 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt
+++ b/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt
@@ -166,4 +166,6 @@ atlas_build_lvl1_trigger_menu( MC_pp_run3_v1 )
 atlas_build_lvl1_trigger_menu( Cosmic_run3_v1 )
 atlas_build_lvl1_trigger_menu( PhysicsP1_HI_run3_v1 )
 atlas_build_lvl1_trigger_menu( Dev_HI_run3_v1 )
-atlas_build_lvl1_trigger_menu( LS2_v1_TriggerValidation_mc_prescale )
+atlas_build_lvl1_trigger_menu( LS2_v1_TriggerValidation_prescale )
+atlas_build_lvl1_trigger_menu( LS2_v1_BulkMCProd_prescale )
+atlas_build_lvl1_trigger_menu( LS2_v1_CPSampleProd_prescale )
\ No newline at end of file
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuPrescaleConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuPrescaleConfig.py
index 7ff099548b03ac841e6697e37a1920f19d88c760..41568079242c9648db22fd9839ed4ef152254337 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuPrescaleConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuPrescaleConfig.py
@@ -29,10 +29,18 @@ def MenuPrescaleConfig(triggerConfigHLT):
         if 'tight_mc_prescale' in menu_name:
             L1Prescales = Prescales.L1Prescales_tight_mc_prescale
             HLTPrescales = Prescales.HLTPrescales_tight_mc_prescale
-        elif 'TriggerValidation_mc_prescale' in menu_name:
-            disableChains(TriggerFlags, Prescales.HLTPrescales_trigvalid_mc_prescale, "Online")
-            L1Prescales = Prescales.L1Prescales_trigvalid_mc_prescale
-            HLTPrescales = Prescales.HLTPrescales_trigvalid_mc_prescale
+        elif 'TriggerValidation_prescale' in menu_name:
+            disableChains(TriggerFlags, Prescales.HLTPrescales_trigvalid_prescale, "Online")
+            L1Prescales = Prescales.L1Prescales_trigvalid_prescale
+            HLTPrescales = Prescales.HLTPrescales_trigvalid_prescale
+        elif 'BulkMCProd_prescale' in menu_name:
+            disableChains(TriggerFlags, Prescales.HLTPrescales_bulkmcprod_prescale, "Online")
+            L1Prescales = Prescales.L1Prescales_bulkmcprod_prescale
+            HLTPrescales = Prescales.HLTPrescales_bulkmcprod_prescale
+        elif 'CPSampleProd_prescale' in menu_name:
+            disableChains(TriggerFlags, Prescales.HLTPrescales_cpsampleprod_prescale, "Online")
+            L1Prescales = Prescales.L1Prescales_cpsampleprod_prescale
+            HLTPrescales = Prescales.HLTPrescales_cpsampleprod_prescale
         else:
             L1Prescales = Prescales.L1Prescales
             HLTPrescales = Prescales.HLTPrescales        
@@ -109,7 +117,7 @@ def MenuPrescaleConfig(triggerConfigHLT):
 
     return (L1Prescales, HLTPrescales)
 
-def disableChains(flags, trigvalid_prescales, type_group):
+def disableChains(flags, type_prescales, type_group):
     signatures = []
     slice_props = [prop for prop in dir(flags) if prop.endswith("Slice")]
     for slice_prop in slice_props:
@@ -125,7 +133,7 @@ def disableChains(flags, trigvalid_prescales, type_group):
         if type_group in chain.groups:
             chain_online_list.append(chain.name)
 
-    trigvalid_prescales.update(zip(chain_online_list,len(chain_online_list)*[ [-1, 0,-1] ]))
+    type_prescales.update(zip(chain_online_list,len(chain_online_list)*[ [-1, 0,-1] ]))
 
 
 def applyHLTPrescale(triggerPythonConfig, HLTPrescale, signaturesOverwritten):
@@ -160,10 +168,15 @@ class PrescaleClass(object):
     #   - If only the first value is specified,
     #     the default value of pass-through (=0) will be used
     #----------------------------------------------------------
-    HLTPrescales = {
-        }
+    HLTPrescales = {}
+
+    L1Prescales_trigvalid_prescale  = {}
+    HLTPrescales_trigvalid_prescale = {}
+
+    L1Prescales_bulkmcprod_prescale  = {}
+    HLTPrescales_bulkmcprod_prescale = {}
 
-    L1Prescales_trigvalid_mc_prescale  = {}
-    HLTPrescales_trigvalid_mc_prescale = {}
+    L1Prescales_cpsampleprod_prescale  = {}
+    HLTPrescales_cpsampleprod_prescale = {}
 
     chain_list=[]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/MenuMapping.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/MenuMapping.py
index 0b641377b92cc9a4f4009f5775bf6cb4da8df81c..cd94ed0aefc7e6bcc291a197dca7b8a7f5832b67 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/MenuMapping.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/MenuMapping.py
@@ -20,5 +20,7 @@ menuMap = {
     "PhysicsP1_pp_run3_v1" : "MC_pp_v8",
     "PhysicsP1_HI_run3_v1" : "MC_pp_v8",
     "Dev_HI_run3_v1" : "MC_pp_v8",
-    "LS2_v1_TriggerValidation_mc_prescale" : "MC_pp_v8"
+    "LS2_v1_TriggerValidation_prescale" : "MC_pp_v8",
+    "LS2_v1_BulkMCProd_prescale" : "MC_pp_v8",
+    "LS2_v1_CPSampleProd_prescale" : "MC_pp_v8"
 }