diff --git a/Tests/Rivet/LHC/LHC-Z-e.in b/Tests/Rivet/LHC/LHC-Z-e.in
--- a/Tests/Rivet/LHC/LHC-Z-e.in
+++ b/Tests/Rivet/LHC/LHC-Z-e.in
@@ -1,38 +1,38 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # select the analyses
 ##################################################
 # General analysis
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_ZINC
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_ZJETS
 # ATLAS pT
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9131140
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1300647
 # ATLAS Z+jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I945498
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1230812
 # ATLAS phi*
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1204784
 # CMS Z + b-hadron
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1256943
 # CMS Z pt and y
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I941555
 # ATLAS Z + bjets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1306294
 # ATLAS Z
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I928289_Z
 # CMS Z AFB
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1122847
 # CMS Z+jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1310737
 # ATLAS event shapes in Z events
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1424838
 # ATLAS forwrd backward
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1351916_EL
 # ATLAS forward backward
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2013_I1234228
 # ATLAS Z inclusive cross section
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1502620:LMODE=ZEL
 # W/Z+ jets ratios
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1312627
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1312627_EL
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1312627:LMODE=EL
diff --git a/Tests/Rivet/LHC/LHC-Z-mu.in b/Tests/Rivet/LHC/LHC-Z-mu.in
--- a/Tests/Rivet/LHC/LHC-Z-mu.in
+++ b/Tests/Rivet/LHC/LHC-Z-mu.in
@@ -1,37 +1,37 @@
 # -*- ThePEG-repository -*-
 ##################################################
 # select the analyses
 ##################################################
 # ATLAS Z pt
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S9131140
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1300647
 # ATLAS Z+jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I945498
 # ATLAS phi*
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1204784
 # Z and real photon + jet
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1258128
 # CMS Z + b-hadron
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1256943
 # CMS Z pt and y
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I941555
 # ATLAS MPI in Z events
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1315949
 # ATLAS Z
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I928289_Z
 # CMS Z AFB
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1122847
 # CMS Z+jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1310737
 # ATLAS event shapes in Z events
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1424838
 # CMS photon radiation in Z decays
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1346843
 # ATLAS forwrd backward
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2015_I1351916_MU
 # LHCB forward Z+jet
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2014_I1262703 
 # ATLAS Z inclusive cross section
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2016_I1502620:LMODE=ZMU
 # ATLAS W/Z ratio
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1312627_MU
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1312627:LMODE=MU