diff --git a/421xxx/421001/mc.Sherpa_Example1.py b/421xxx/421001/mc.Sh_Example1.py
similarity index 89%
rename from 421xxx/421001/mc.Sherpa_Example1.py
rename to 421xxx/421001/mc.Sh_Example1.py
index 18bc9b0e426552e0e4a2217dabd78ae9ebd20c16..86ff608c9501eaace5f16106ccca9b06a332f0c6 100644
--- a/421xxx/421001/mc.Sherpa_Example1.py
+++ b/421xxx/421001/mc.Sh_Example1.py
@@ -1,4 +1,5 @@
-include("Sherpa_i/2.2.7_NNPDF30NNLO.py")
+include("Sherpa_i/Base_Fragment.py")
+include("Sherpa_i/NNPDF30NNLO.py")
 
 evgenConfig.description = "Sherpa 2.2.x example JO, Z+0,1-jet production."
 evgenConfig.keywords = [ "2lepton" ]
diff --git a/421xxx/421003/mc.Sherpa_Example3.py b/421xxx/421003/mc.Sh_Example3.py
similarity index 89%
rename from 421xxx/421003/mc.Sherpa_Example3.py
rename to 421xxx/421003/mc.Sh_Example3.py
index 18bc9b0e426552e0e4a2217dabd78ae9ebd20c16..86ff608c9501eaace5f16106ccca9b06a332f0c6 100644
--- a/421xxx/421003/mc.Sherpa_Example3.py
+++ b/421xxx/421003/mc.Sh_Example3.py
@@ -1,4 +1,5 @@
-include("Sherpa_i/2.2.7_NNPDF30NNLO.py")
+include("Sherpa_i/Base_Fragment.py")
+include("Sherpa_i/NNPDF30NNLO.py")
 
 evgenConfig.description = "Sherpa 2.2.x example JO, Z+0,1-jet production."
 evgenConfig.keywords = [ "2lepton" ]
diff --git a/421xxx/421109/mc.aMcH7EG_MEN30NLO_ttbar_incl_LHE.py b/421xxx/421109/mc.aMCH7EG_MEN30NLO_ttbar_incl_LHE.py
similarity index 100%
rename from 421xxx/421109/mc.aMcH7EG_MEN30NLO_ttbar_incl_LHE.py
rename to 421xxx/421109/mc.aMCH7EG_MEN30NLO_ttbar_incl_LHE.py
diff --git a/common/GeneratorList.txt b/common/GeneratorList.txt
index b4e1c78bdd2139a755fa8dff83f67a4a2613bbb3..d9b4a5e25dc5322449834533b19f2fdbd05a44b3 100644
--- a/common/GeneratorList.txt
+++ b/common/GeneratorList.txt
@@ -29,8 +29,8 @@ PowHel               PH
 Powheg               Ph
 ProtosLHEF           ProtosLHEF
 Pyquen               Pyquen
+Pythia8B             Py8B
 Pythia8              Py8
-Pythia8B             Pythia8B
 QBH                  QBH
 QGSJet               QGSJet
 Reldis               Reldis