diff --git a/benchmarks/clustering/scripts/gen_particles.py b/benchmarks/clustering/scripts/gen_particles.py
index 620bf0aafff171ab9c797192ee8df386960e610f..2dc506066048102441b3ec75d4c182f1c3274b03 100644
--- a/benchmarks/clustering/scripts/gen_particles.py
+++ b/benchmarks/clustering/scripts/gen_particles.py
@@ -21,7 +21,7 @@ PARTICLES = {
 
 
 def gen_event(p, theta, phi, pid, mass):
-    evt = hm.GenEvent(momentum_unit=hm.Units.MomentumUnit.GEV, length_unit=hm.Units.LengthUnit.MM)
+    evt = hm.GenEvent(hm.Units.MomentumUnit.GEV, hm.Units.LengthUnit.MM)
     # final state
     state = 1
     e0 = np.sqrt(p*p + mass*mass)
diff --git a/benchmarks/ecal/scripts/gen_particles.py b/benchmarks/ecal/scripts/gen_particles.py
index 620bf0aafff171ab9c797192ee8df386960e610f..2dc506066048102441b3ec75d4c182f1c3274b03 100644
--- a/benchmarks/ecal/scripts/gen_particles.py
+++ b/benchmarks/ecal/scripts/gen_particles.py
@@ -21,7 +21,7 @@ PARTICLES = {
 
 
 def gen_event(p, theta, phi, pid, mass):
-    evt = hm.GenEvent(momentum_unit=hm.Units.MomentumUnit.GEV, length_unit=hm.Units.LengthUnit.MM)
+    evt = hm.GenEvent(hm.Units.MomentumUnit.GEV, hm.Units.LengthUnit.MM)
     # final state
     state = 1
     e0 = np.sqrt(p*p + mass*mass)
diff --git a/benchmarks/imaging_ecal/scripts/gen_particles.py b/benchmarks/imaging_ecal/scripts/gen_particles.py
index a357b752ca227ece1103c193be3b334eb40f2e26..22b37a4d3f917a6ef6a82534e50cf327125ea5dd 100644
--- a/benchmarks/imaging_ecal/scripts/gen_particles.py
+++ b/benchmarks/imaging_ecal/scripts/gen_particles.py
@@ -22,7 +22,7 @@ PARTICLES = {
 
 # p in GeV, angle in degree, vertex in mm
 def gen_event(prange=(8, 100), arange=(0, 20), phrange=(0., 360.), parts=[(p, m) for p, m in PARTICLES.values()]):
-    evt = hm.GenEvent(momentum_unit=hm.Units.MomentumUnit.GEV, length_unit=hm.Units.LengthUnit.MM)
+    evt = hm.GenEvent(hm.Units.MomentumUnit.GEV, hm.Units.LengthUnit.MM)
     pid, mass = parts[np.random.randint(len(parts))]
 
     # final state
diff --git a/benchmarks/imaging_shower_ML/scripts/gen_particles.py b/benchmarks/imaging_shower_ML/scripts/gen_particles.py
index 372b2c829d61c4a35ce58810d43705f289bc7fd0..4e143a4010c2359bbaae971c7e7d3521a7644791 100644
--- a/benchmarks/imaging_shower_ML/scripts/gen_particles.py
+++ b/benchmarks/imaging_shower_ML/scripts/gen_particles.py
@@ -22,7 +22,7 @@ PARTICLES = {
 
 
 def gen_event(p, theta, phi, pid, mass):
-    evt = hm.GenEvent(momentum_unit=hm.Units.MomentumUnit.GEV, length_unit=hm.Units.LengthUnit.MM)
+    evt = hm.GenEvent(hm.Units.MomentumUnit.GEV, hm.Units.LengthUnit.MM)
     # final state
     state = 1
     e0 = np.sqrt(p*p + mass*mass)
diff --git a/benchmarks/rich/scripts/rich_data_gen.py b/benchmarks/rich/scripts/rich_data_gen.py
index c609a888d47631b3e1852da963fd3adc96876f7d..f3d48016a10f49f73f001119a0388dec5a26f376 100644
--- a/benchmarks/rich/scripts/rich_data_gen.py
+++ b/benchmarks/rich/scripts/rich_data_gen.py
@@ -20,7 +20,7 @@ PARTICLES = [
 
 # p in GeV, angle in degree, vertex in mm
 def gen_event(prange=(8, 100), arange=(0, 20)):
-    evt = hm.GenEvent(momentum_unit=hm.Units.MomentumUnit.GEV, length_unit=hm.Units.LengthUnit.MM)
+    evt = hm.GenEvent(hm.Units.MomentumUnit.GEV, hm.Units.LengthUnit.MM)
     pid, mass = PARTICLES[np.random.randint(len(PARTICLES))]
 
     # final state
diff --git a/benchmarks/tracking/scripts/gen_particles.py b/benchmarks/tracking/scripts/gen_particles.py
index 3b86efca20e3a6060cbd1848149c92f59ead5e3a..afdbb02aa21d4411b110912792e7997689a9f9d4 100644
--- a/benchmarks/tracking/scripts/gen_particles.py
+++ b/benchmarks/tracking/scripts/gen_particles.py
@@ -21,7 +21,7 @@ PARTICLES = {
 
 
 def gen_event(p, theta, phi, pid, mass):
-    evt = hm.GenEvent(momentum_unit=hm.Units.MomentumUnit.GEV, length_unit=hm.Units.LengthUnit.MM)
+    evt = hm.GenEvent(hm.Units.MomentumUnit.GEV, hm.Units.LengthUnit.MM)
     # final state
     state = 1
     e0 = np.sqrt(p*p + mass*mass)