diff --git a/Tests/Rivet/LHC/LHC-7-UE.in b/Tests/Rivet/LHC/LHC-7-UE.in
--- a/Tests/Rivet/LHC/LHC-7-UE.in
+++ b/Tests/Rivet/LHC/LHC-7-UE.in
@@ -1,95 +1,95 @@
 ##################################################
 # select the analyses
 ##################################################
 # ATLAS jet shapes
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8924791
 # ATLAS jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8817804
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1082936
 # ATLAS UE
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_S8994773
 # ATLAS UE
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8894728
 # ATLAS fragmentation function
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_CONF_2010_049
 # ATLAS UE
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8918562
 # ALICE charged particles
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2010_S8625980
 # CMS particle spectra
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8978280
 # CMS charged particle multiplicity
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S8884919
 # CMS charged particle pT and rapidity
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2010_S8656010
 # CMS UE
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9120041
 # ATLAS track jet
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I919017
 # LHCB phi production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2011_I919315
 # ATLAS phi production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1282441
 # LHCB promt hadron productiom
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2012_I1119400
 # ATLAS rap gap
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1084540
 # CMS forward energy flow
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2011_S9215166
 # LHC K0s/Lambda
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2011_I917009
 # TOTEM at large rapidity
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TOTEM_2012_I1115294
 # ATLAS Azimuthal ordering of charged hadrons
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1091481
 # ALICE single/double diffractive and inelastic sigma
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2012_I1181770
 # ATLAS inelastic cross section
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2011_I894867
 # CMS inelastic cross section
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1193338
 # total transverse energy
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1183818
 # underlying event forward rapidities
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1218372
 # strange particles in underlying event
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_PAS_QCD_11_010
 # CMS central and forward jets
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1087342
 # CMS dijet
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_I1184941
 # ATLAS charged particle in min bias
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1125575
 # ATLAS two particle correlation
 #insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1094061
 # ATLAS correlations
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1093734
 # LHCB energy flow
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2013_I1208105
 # ATLAS charged particle event shapes
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1124167
 # CMS Jet/UE properties
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2013_I1261026
 # ATLAS leading jet UE
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2014_I1298811
 # LHCB charged particles in min bias
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2014_I1281685
 # ALICE identified particle spectra
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2015_I1357424
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2014_I1300380
 # LHCB min bias
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCB_2015_I1333223
 # ALICE pion and eta pT
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALICE_2012_I1116147
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_PAS_FSQ_12_020
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2012_PAS_FSQ_12_020
 # CMS charged particle rapidity
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_QCD_10_024
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2010_PAS_QCD_10_024
 # diffractive analyses
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCF_2012_I1115479
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CMS_2015_I1356998
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 TOTEM_2012_I1220862
 # atlas hadron ordering
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2017_I1624693
 # LHCF
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCF_2015_I1351909
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCF_2016_I1385877
\ No newline at end of file
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 LHCF_2016_I1385877