diff --git a/ForwardDetectors/ForwardTransport/src/ForwardTransportModel.cxx b/ForwardDetectors/ForwardTransport/src/ForwardTransportModel.cxx
index 29772d4d788e4ca65e4de430d1d11acc27b4b604..ad59751e51725f9ed58810f9cccd5c3bd9f74940 100644
--- a/ForwardDetectors/ForwardTransport/src/ForwardTransportModel.cxx
+++ b/ForwardDetectors/ForwardTransport/src/ForwardTransportModel.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "ForwardTransportModel.h"
@@ -207,7 +207,7 @@ void ForwardTransportModel::DoIt(const G4FastTrack& fastTrack, G4FastStep& fastS
     abort(); // to keep Coverity happy
   }
   fastStep.ProposePrimaryTrackFinalPosition(postTransportPosition, false); // position in global coordinates
-  fastStep.SetPrimaryTrackFinalMomentum(postTransportMomentum, false);
+  fastStep.ProposePrimaryTrackFinalMomentumDirection(postTransportMomentum, false); // FIXME This only sets the normalised direction of the momentum - possible use ProposePrimaryTrackFinalKineticEnergyAndDirection instead?
   fastStep.KillPrimaryTrack();
 }
 
diff --git a/LArCalorimeter/LArG4/LArG4FastSimulation/src/LArFastShower.cxx b/LArCalorimeter/LArG4/LArG4FastSimulation/src/LArFastShower.cxx
index bee55bbec3dfb71fc6acb69cea91653090037652..29d018cbf9e4aeda6cb2e85178c85528ab1a5a6c 100644
--- a/LArCalorimeter/LArG4/LArG4FastSimulation/src/LArFastShower.cxx
+++ b/LArCalorimeter/LArG4/LArG4FastSimulation/src/LArFastShower.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "LArFastShower.h"
@@ -216,7 +216,7 @@ void LArFastShower::KillParticle(const G4FastTrack&, G4FastStep& fastStep)
 
   // Kill the particle
   fastStep.KillPrimaryTrack();
-  fastStep.SetPrimaryTrackPathLength(0.0);
+  fastStep.ProposePrimaryTrackPathLength(0.0);
 
   return;
 }
diff --git a/Simulation/G4Utilities/G4FastSimulation/src/DeadMaterialShower.cxx b/Simulation/G4Utilities/G4FastSimulation/src/DeadMaterialShower.cxx
index 95e056a56cf1d822c360cc0893de759d1a1af394..400066b94720378e882330ad9d76f3592aecbf0d 100644
--- a/Simulation/G4Utilities/G4FastSimulation/src/DeadMaterialShower.cxx
+++ b/Simulation/G4Utilities/G4FastSimulation/src/DeadMaterialShower.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "DeadMaterialShower.h"
@@ -68,5 +68,5 @@ G4bool DeadMaterialShower::ModelTrigger(const G4FastTrack& fastTrack)
 void DeadMaterialShower::DoIt(const G4FastTrack&, G4FastStep& fastStep)
 {
   fastStep.KillPrimaryTrack();
-  fastStep.SetPrimaryTrackPathLength(0.0);
+  fastStep.ProposePrimaryTrackPathLength(0.0);
 }
diff --git a/Simulation/G4Utilities/G4FastSimulation/src/FastCaloSim.cxx b/Simulation/G4Utilities/G4FastSimulation/src/FastCaloSim.cxx
index a7fbdbc5ea072ef1dae54dc26b88aae7f16484b6..f681ca2cb9771a7cc22f5b1c857221b0a196f9e6 100644
--- a/Simulation/G4Utilities/G4FastSimulation/src/FastCaloSim.cxx
+++ b/Simulation/G4Utilities/G4FastSimulation/src/FastCaloSim.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 // Header include
@@ -321,7 +321,7 @@ void FastCaloSim::DoIt(const G4FastTrack& fastTrack, G4FastStep& fastStep)
 
   // Finally kill the primary track after all simulation steps done
   fastStep.KillPrimaryTrack();
-  fastStep.SetPrimaryTrackPathLength(0.0);
+  fastStep.ProposePrimaryTrackPathLength(0.0);
 }
 
 CaloCellContainerSD * FastCaloSim::getCaloCellContainerSD(){
diff --git a/Simulation/G4Utilities/G4FastSimulation/src/SimpleFastKiller.cxx b/Simulation/G4Utilities/G4FastSimulation/src/SimpleFastKiller.cxx
index d4df9e7f535deec1ef0febee35b075eb45463e52..b1213aa5175079d2c81d5a03fcfdc854e87e42d2 100644
--- a/Simulation/G4Utilities/G4FastSimulation/src/SimpleFastKiller.cxx
+++ b/Simulation/G4Utilities/G4FastSimulation/src/SimpleFastKiller.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 // class header include
@@ -15,5 +15,5 @@ SimpleFastKiller::SimpleFastKiller(const std::string& name)
 void SimpleFastKiller::DoIt(const G4FastTrack&, G4FastStep& fastStep)
 {
   fastStep.KillPrimaryTrack();
-  fastStep.SetPrimaryTrackPathLength(0.0);
+  fastStep.ProposePrimaryTrackPathLength(0.0);
 }