diff --git a/benchmarks/b0_tracker/forward_protons.sh b/benchmarks/b0_tracker/forward_protons.sh
index 30e4968e..4afb58b8 100755
--- a/benchmarks/b0_tracker/forward_protons.sh
+++ b/benchmarks/b0_tracker/forward_protons.sh
@@ -23,7 +23,7 @@ if [[ "$?" -ne "0" ]] ; then
 fi
 
 # Run geant4 simulations
-ddsim --runType batch \
+npsim --runType batch \
       -v WARNING \
       --part.minimalKineticEnergy 0.5*GeV  \
       --filter.tracker edep0 \
diff --git a/benchmarks/backgrounds/Snakefile b/benchmarks/backgrounds/Snakefile
index dd9e3a38..69beed10 100644
--- a/benchmarks/backgrounds/Snakefile
+++ b/benchmarks/backgrounds/Snakefile
@@ -15,7 +15,7 @@ rule backgrounds_sim:
     shell:
         """
 set -m # monitor mode to prevent lingering processes
-exec ddsim \
+exec npsim \
   --runType batch \
   --part.minimalKineticEnergy 100*GeV  \
   --filter.tracker edep0 \
diff --git a/benchmarks/backwards_ecal/Snakefile b/benchmarks/backwards_ecal/Snakefile
index 6dabaa0f..f0bd6bb5 100644
--- a/benchmarks/backwards_ecal/Snakefile
+++ b/benchmarks/backwards_ecal/Snakefile
@@ -30,7 +30,7 @@ rule backwards_ecal_sim:
     shell:
         """
 set -m # monitor mode to prevent lingering processes
-exec ddsim \
+exec npsim \
   --runType batch \
   --enableGun \
   --steeringFile "{input.steering_file}" \
diff --git a/benchmarks/barrel_ecal/Snakefile b/benchmarks/barrel_ecal/Snakefile
index b7f363c3..f1f56f86 100644
--- a/benchmarks/barrel_ecal/Snakefile
+++ b/benchmarks/barrel_ecal/Snakefile
@@ -25,7 +25,7 @@ rule emcal_barrel_particles:
     shell:
         """
 set -m # monitor mode to prevent lingering processes
-exec ddsim \
+exec npsim \
    --runType batch \
    -v WARNING \
    --part.minimalKineticEnergy 0.5*GeV  \
diff --git a/benchmarks/calo_pid/Snakefile b/benchmarks/calo_pid/Snakefile
index ff4c6ce0..c24e39ca 100644
--- a/benchmarks/calo_pid/Snakefile
+++ b/benchmarks/calo_pid/Snakefile
@@ -31,7 +31,7 @@ rule calo_pid_sim:
     shell:
         """
 set -m # monitor mode to prevent lingering processes
-exec ddsim \
+exec npsim \
   --runType batch \
   --enableGun \
   --gun.momentumMin "{params.ENERGY_MIN}" \
diff --git a/benchmarks/ecal_gaps/Snakefile b/benchmarks/ecal_gaps/Snakefile
index 8ec07634..ea6a96a1 100644
--- a/benchmarks/ecal_gaps/Snakefile
+++ b/benchmarks/ecal_gaps/Snakefile
@@ -26,7 +26,7 @@ rule ecal_gaps_sim:
     shell:
         """
 set -m # monitor mode to prevent lingering processes
-exec ddsim \
+exec npsim \
   --runType batch \
   --enableGun \
   --steeringFile "{input.steering_file}" \
diff --git a/benchmarks/lfhcal/Snakefile b/benchmarks/lfhcal/Snakefile
index bd28f21a..3456a58e 100644
--- a/benchmarks/lfhcal/Snakefile
+++ b/benchmarks/lfhcal/Snakefile
@@ -22,7 +22,7 @@ rule lfhcal_sim:
         N_EVENTS=get_n_events,
     shell:
         """
-ddsim \
+npsim \
   --runType batch \
   --enableGun \
   --steeringFile "{input.steering_file}" \
diff --git a/benchmarks/nhcal_acceptance/Snakefile b/benchmarks/nhcal_acceptance/Snakefile
index 8ed93a1e..b2d1f743 100644
--- a/benchmarks/nhcal_acceptance/Snakefile
+++ b/benchmarks/nhcal_acceptance/Snakefile
@@ -14,7 +14,7 @@ rule nhcal_acceptance_simulate:
     cache: True
     shell:
         """
-exec ddsim \
+exec npsim \
     --compactFile {params.DETECTOR_PATH}/{params.DETECTOR_CONFIG}.xml \
     --numberOfEvents {params.N_EVENTS} \
     --random.seed {params.SEED} \
diff --git a/benchmarks/nhcal_basic_distribution/Snakefile b/benchmarks/nhcal_basic_distribution/Snakefile
index 27312667..d62662aa 100644
--- a/benchmarks/nhcal_basic_distribution/Snakefile
+++ b/benchmarks/nhcal_basic_distribution/Snakefile
@@ -14,7 +14,7 @@ rule nhcal_basic_distribution_simulate:
     cache: True
     shell:
         """
-exec ddsim \
+exec npsim \
     --compactFile {params.DETECTOR_PATH}/{params.DETECTOR_CONFIG}.xml \
     --numberOfEvents {params.N_EVENTS} \
     --random.seed {params.SEED} \
diff --git a/benchmarks/pid/config.yml b/benchmarks/pid/config.yml
index 759bfbc9..a77b3864 100644
--- a/benchmarks/pid/config.yml
+++ b/benchmarks/pid/config.yml
@@ -2,7 +2,7 @@ sim:backward:
   extends: .det_benchmark
   stage: simulate
   script:
-    - ddsim --runType batch --numberOfEvents 100 --filter.tracker edep0 --compactFile ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml --enableGun --gun.energy "5*GeV" --gun.particle "${PARTICLE}" --gun.thetaMin 130*deg --gun.thetaMax 177*deg --gun.distribution "cos(theta)" --outputFile sim_output/sim_pid_backward_${PARTICLE}_5GeV.edm4hep.root
+    - npsim --runType batch --numberOfEvents 100 --filter.tracker edep0 --compactFile ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml --enableGun --gun.energy "5*GeV" --gun.particle "${PARTICLE}" --gun.thetaMin 130*deg --gun.thetaMax 177*deg --gun.distribution "cos(theta)" --outputFile sim_output/sim_pid_backward_${PARTICLE}_5GeV.edm4hep.root
     - rootls -t sim_output/sim_pid_backward_${PARTICLE}_5GeV.edm4hep.root
   parallel:
     matrix:
@@ -12,7 +12,7 @@ sim:forward:
   extends: .det_benchmark
   stage: simulate
   script:
-    - ddsim --runType batch --numberOfEvents 100 --filter.tracker edep0 --compactFile ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml --enableGun --gun.energy "5*GeV" --gun.particle "${PARTICLE}" --gun.thetaMin 3*deg --gun.thetaMax 50*deg --gun.distribution "cos(theta)" --outputFile sim_output/sim_pid_forward_${PARTICLE}_5GeV.edm4hep.root
+    - npsim --runType batch --numberOfEvents 100 --filter.tracker edep0 --compactFile ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml --enableGun --gun.energy "5*GeV" --gun.particle "${PARTICLE}" --gun.thetaMin 3*deg --gun.thetaMax 50*deg --gun.distribution "cos(theta)" --outputFile sim_output/sim_pid_forward_${PARTICLE}_5GeV.edm4hep.root
     - rootls -t sim_output/sim_pid_forward_${PARTICLE}_5GeV.edm4hep.root
   parallel:
     matrix:
diff --git a/benchmarks/tracking_detectors/track_hits.sh b/benchmarks/tracking_detectors/track_hits.sh
index 89b0d8ca..1929635b 100644
--- a/benchmarks/tracking_detectors/track_hits.sh
+++ b/benchmarks/tracking_detectors/track_hits.sh
@@ -77,7 +77,7 @@ if [ -z "${ANALYSIS_ONLY}" ] ; then
 
   echo "Running geant4 simulation"
   ## run geant4 simulations
-  ddsim --runType batch \
+  npsim --runType batch \
     --part.minimalKineticEnergy 1000*GeV  \
     --filter.tracker edep0 \
     -v WARNING \
diff --git a/benchmarks/tracking_performances/Snakefile b/benchmarks/tracking_performances/Snakefile
index 20b9cc91..2dfa68c5 100644
--- a/benchmarks/tracking_performances/Snakefile
+++ b/benchmarks/tracking_performances/Snakefile
@@ -27,7 +27,7 @@ rule tracking_performance_sim:
     shell:
         """
 set -m # monitor mode to prevent lingering processes
-exec ddsim \
+exec npsim \
   --runType batch \
   --enableGun \
   --steeringFile "{input.steering_file}" \
diff --git a/benchmarks/tracking_performances_dis/Snakefile b/benchmarks/tracking_performances_dis/Snakefile
index 866c553a..412dc413 100644
--- a/benchmarks/tracking_performances_dis/Snakefile
+++ b/benchmarks/tracking_performances_dis/Snakefile
@@ -40,7 +40,7 @@ rule trk_dis_sim:
     cache: True
     shell:
         """
-ddsim \
+npsim \
   --runType batch \
   --part.minimalKineticEnergy 1000*GeV  \
   --random.seed {params.SEED} \
diff --git a/benchmarks/zdc/run_zdc_particles.sh b/benchmarks/zdc/run_zdc_particles.sh
index 1c3fab3f..3d2e8976 100755
--- a/benchmarks/zdc/run_zdc_particles.sh
+++ b/benchmarks/zdc/run_zdc_particles.sh
@@ -72,7 +72,7 @@ if [[ "$?" -ne "0" ]] ; then
 fi
 
 # Run geant4 simulations
-ddsim --runType batch \
+npsim --runType batch \
       -v WARNING \
       --part.minimalKineticEnergy 0.5*GeV  \
       --filter.tracker edep0 \