diff --git a/Tests/Rivet/BFactory/BFactory-Upsilon4.in b/Tests/Rivet/BFactory/BFactory-Upsilon4.in
--- a/Tests/Rivet/BFactory/BFactory-Upsilon4.in
+++ b/Tests/Rivet/BFactory/BFactory-Upsilon4.in
@@ -1,37 +1,37 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
 set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
 set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
 # ARGUS pi,K, proton
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_S2653028
 # ARGUS K*, rho, omega
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_S2789213
 # various semileptonic decays
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2013_I1116411
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2015_I1334693
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2011_I878990
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2013_I1238273
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2015_I1397632
 # BELLE b->s gamma
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2015_I1330289
 # BES D -> K, pi semi-leptonic
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2015_I1391138
 # BES eta' dalitz
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2015_I1364494
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_VectorMeson_PseudoScalar_Fermions_Decay
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_PseudoScalarMeson_Vector_Fermions_Decay
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_OmegaPhi_3Pion_Decay
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_A1_3Pion_Decay
+# multiplicities
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_Upsilon_4S_HADRON_MULTIPLICITIES
+# MC analyses based on old internal ones
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Meson_Meson_Leptons_Decay
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_OmegaPhia1_3Pion_Decay
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_D_Dalitz
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Eta_Decay
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Onium_PiPi_Decay
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Semi_Leptonic_Decay
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_Upsilon_4S_HADRON_MULTIPLICITIES