diff --git a/Trigger/TriggerCommon/TriggerMenuXML/scripts/XMLDumperFromAthena.sh b/Trigger/TriggerCommon/TriggerMenuXML/scripts/XMLDumperFromAthena.sh
index 3a2fd4dc49cfedda009b63793d0d3b6ce834a165..b5b08edc2b030842191fe1a0082219fb52eb7d37 100755
--- a/Trigger/TriggerCommon/TriggerMenuXML/scripts/XMLDumperFromAthena.sh
+++ b/Trigger/TriggerCommon/TriggerMenuXML/scripts/XMLDumperFromAthena.sh
@@ -66,6 +66,8 @@ cd $rundir
 # L1Topo config file
 generateL1TopoMenu.py $menu >&! $logfiletopo
 cp L1Topoconfig_*.xml ${dest}
+rename _${release}.xml .xml L1Topoconfig_*.xml
+cp L1Topoconfig_*.xml ${dest}
 
 # L1 + HLT config file
 if [ -z "$TMXML_DEBUG" ]; then
@@ -86,6 +88,7 @@ fi
 if [[ -e outputLVL1config.xml ]]; then
     cp outputLVL1config.xml ${dest}/LVL1config_${menu}_${release}.xml
     cp outputHLTconfig.xml ${dest}/HLTconfig_${menu}_${release}.xml
+    cp outputLVL1config.xml ${dest}/LVL1config_${menu}.xml
 fi
 
 #this gives some more sensitivity to hidden problems
diff --git a/Trigger/TriggerRelease/share/runHLT_standalone.py b/Trigger/TriggerRelease/share/runHLT_standalone.py
index f400af1bf5080dddcf5176fe77c3741eafe25866..177a2440de667ba2b4c3935d0e47c1c821346378 100755
--- a/Trigger/TriggerRelease/share/runHLT_standalone.py
+++ b/Trigger/TriggerRelease/share/runHLT_standalone.py
@@ -332,7 +332,7 @@ TriggerFlags.triggerMenuSetup=setMenu
 
 def stripPrescales(menu):
     import re
-    m = re.match('(.*v\d).*', menu)
+    m = re.match('(.*v\d(?:_primaries)?).*', menu)
     return m.groups()[0] if m else menu
 
 # L1 Topo