diff --git a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticleContainer.h b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticleContainer.h
index cd8ff514d6eb1bd595f006e96efb6cd92f3d74df..353e0dc7636b0288260cc8b987a741e14d127cf4 100644
--- a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticleContainer.h
+++ b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticleContainer.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -11,6 +11,7 @@
 
 // STL includes
 #include <list>
+#include <vector>
 
 // forward declarations
 namespace ISF {
@@ -21,6 +22,9 @@ namespace ISF {
   /** generic ISFParticle container (not necessarily a std::list!) */
   typedef std::list<ISF::ISFParticle*>                ISFParticleContainer;
   typedef std::list<const ISF::ISFParticle*>          ConstISFParticleContainer;
+  /** ISFParticle vector */
+  typedef std::vector<ISF::ISFParticle *>             ISFParticleVector;
+  typedef std::vector<const ISF::ISFParticle *>       ConstISFParticleVector;
 }
 
 #endif // ISF_EVENT_ISFPARTICLECONTAINER_H
diff --git a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticleOrderedQueue.h b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticleOrderedQueue.h
index 5f795156b313590a2add3b262fb42d2265916ada..4410dfa011533bba011dc70289c1acc518cc5797 100644
--- a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticleOrderedQueue.h
+++ b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticleOrderedQueue.h
@@ -14,7 +14,7 @@
 
 // ISF includes
 #include "ISF_Event/ISFParticle.h"
-#include "ISF_Event/ISFParticleVector.h"
+#include "ISF_Event/ISFParticleContainer.h"
 
 /** ISFParticleOrderedQueue */
 
diff --git a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticlePriorityQueue.h b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticlePriorityQueue.h
index 5f795156b313590a2add3b262fb42d2265916ada..4410dfa011533bba011dc70289c1acc518cc5797 100644
--- a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticlePriorityQueue.h
+++ b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticlePriorityQueue.h
@@ -14,7 +14,7 @@
 
 // ISF includes
 #include "ISF_Event/ISFParticle.h"
-#include "ISF_Event/ISFParticleVector.h"
+#include "ISF_Event/ISFParticleContainer.h"
 
 /** ISFParticleOrderedQueue */
 
diff --git a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticleVector.h b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticleVector.h
deleted file mode 100644
index a62660b6575c8881a792a07df07fd18479f64c4a..0000000000000000000000000000000000000000
--- a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticleVector.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-///////////////////////////////////////////////////////////////////
-// ISFParticleVector.h, (c) ATLAS Detector software
-///////////////////////////////////////////////////////////////////
-//
-#ifndef ISF_EVENT_ISFPARTICLEVECTOR_H
-#define ISF_EVENT_ISFPARTICLEVECTOR_H
-
-// STL includes
-#include <vector>
-
-// forward declarations
-namespace ISF {
-  class ISFParticle;
-}
-
-namespace ISF {
-  /** ISFParticle vector */
-  typedef std::vector<ISF::ISFParticle *>             ISFParticleVector;
-  typedef std::vector<const ISF::ISFParticle *>       ConstISFParticleVector;
-}
-
-#endif // ISF_EVENT_ISFPARTICLEVECTOR_H
-
diff --git a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFTruthIncident.h b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFTruthIncident.h
index 47b240cf900fdaf17a5e5eba3f714727b63a1bfc..a1c2fc3b48958b1061e24706d7de0a262b013d21 100644
--- a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFTruthIncident.h
+++ b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFTruthIncident.h
@@ -17,7 +17,7 @@
 
 // ISF includes
 #include "ISF_Event/ISFParticle.h"
-#include "ISF_Event/ISFParticleVector.h"
+#include "ISF_Event/ISFParticleContainer.h"
 #include "ISF_Event/ITruthIncident.h"
 // DetectorDescription
 #include "AtlasDetDescr/AtlasRegion.h"
diff --git a/Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/ISimulationSvc.h b/Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/ISimulationSvc.h
index 314c61c8ae584bfeeed0857c1e114219c5fc07a7..82d7429d52573eb56a3441f87950e91b0199d49a 100644
--- a/Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/ISimulationSvc.h
+++ b/Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/ISimulationSvc.h
@@ -14,7 +14,7 @@
 #include "AthenaKernel/IOVSvcDefs.h"
 
 // ISF includes
-#include "ISF_Event/ISFParticleVector.h"
+#include "ISF_Event/ISFParticleContainer.h"
 #include "ISF_Event/SimSvcID.h"
 
 class McEventCollection;
diff --git a/Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/ISimulatorTool.h b/Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/ISimulatorTool.h
index b18b25947e6934fb20e9b7b39a204386251d9243..f65506728aeb7e08924466f1e7b088ca65e60b26 100644
--- a/Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/ISimulatorTool.h
+++ b/Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/ISimulatorTool.h
@@ -15,7 +15,7 @@
 
 #include "ISF_Event/ISFParticle.h"
 #include "ISF_Event/ISFParticleContainer.h"
-#include "ISF_Event/ISFParticleVector.h"
+#include "ISF_Event/ISFParticleContainer.h"
 
 class McEventCollection;
 
diff --git a/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.cxx b/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.cxx
index d4bf592820b855282eb8d0aa1f0a173463cd9ba0..b3b141eb9e7bc7f91bdfeadb0a7e5495e40830f7 100644
--- a/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.cxx
@@ -24,7 +24,7 @@
 // ISF_Event include
 #include "ISF_Event/ISFParticle.h"
 #include "ISF_Event/ISFParticleContainer.h"
-#include "ISF_Event/ISFParticleVector.h"
+#include "ISF_Event/ISFParticleContainer.h"
 #include "ISF_Event/ParticleUserInformation.h"
 // MCTruth includes
 #include "MCTruth/PrimaryParticleInformation.h"
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimInterfaces/ISF_FastCaloSimInterfaces/IPunchThroughTool.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimInterfaces/ISF_FastCaloSimInterfaces/IPunchThroughTool.h
index 565f4ad2f43ad352a27682dd194c1727cc53556d..41211af5398cb515a0fc08a11e5c66b63bddd77e 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimInterfaces/ISF_FastCaloSimInterfaces/IPunchThroughTool.h
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimInterfaces/ISF_FastCaloSimInterfaces/IPunchThroughTool.h
@@ -10,7 +10,7 @@
 
 // ISF includes
 #include "ISF_Event/ISFParticle.h"
-#include "ISF_Event/ISFParticleVector.h"
+#include "ISF_Event/ISFParticleContainer.h"
 
 namespace Trk{
   class Track;
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvcPU.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvcPU.cxx
index 84537e6959b3af6e5e2c7d35283f6b6e70d29668..ddba138274a8d90df6118105e9db99d29625845a 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvcPU.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvcPU.cxx
@@ -11,7 +11,7 @@
 
 // ISF includes
 #include "ISF_Event/ISFParticle.h"
-#include "ISF_Event/ISFParticleVector.h"
+#include "ISF_Event/ISFParticleContainer.h"
 #include "ISF_Event/ISFTruthIncident.h"
 
 // HepMC include needed for FastCaloSim
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.h b/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.h
index 2aac4123749ddd6c063142f6cf1721fff6e1d21b..d3512652645376b58470d1effb31b4c1d8d22782 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.h
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.h
@@ -26,7 +26,7 @@
 #include "BarcodeEvent/PhysicsProcessCode.h"
 #include "GeoPrimitives/GeoPrimitives.h"
 
-#include "ISF_Event/ISFParticleVector.h"
+#include "ISF_Event/ISFParticleContainer.h"
 
 #include "AtlasHepMC/GenEvent_fwd.h"
 
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IHadronicInteractionProcessor.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IHadronicInteractionProcessor.h
index bb239bc05936912d6ac924eb8bf335cf2b4bcde8..ba63020c1f9fa4f761837d1d23fa1ebc5ec9c30a 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IHadronicInteractionProcessor.h
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IHadronicInteractionProcessor.h
@@ -15,7 +15,7 @@
 #include "TrkEventPrimitives/ParticleHypothesis.h"
 #include "TrkParameters/TrackParameters.h"
 // ISF
-#include "ISF_Event/ISFParticleVector.h"
+#include "ISF_Event/ISFParticleContainer.h"
 
 namespace Trk {
   class Material;
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IPhotonConversionTool.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IPhotonConversionTool.h
index 085ed432d4532ffa6705cfd9222b8ed1ac042b5c..d08938723b02b17fb841f32af877497a6523f86f 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IPhotonConversionTool.h
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IPhotonConversionTool.h
@@ -15,7 +15,7 @@
 #include "TrkEventPrimitives/ParticleHypothesis.h"
 #include "TrkNeutralParameters/NeutralParameters.h"
 // ISF
-#include "ISF_Event/ISFParticleVector.h"
+#include "ISF_Event/ISFParticleContainer.h"
 
 namespace Trk {
   class MaterialProperties;
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IPhysicsValidationTool.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IPhysicsValidationTool.h
index 2e7865a4cf82eac98e3093ee55ec30f822bdcb84..17e09bc4ee185df1d888f59b3511451fcc5b05dd 100755
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IPhysicsValidationTool.h
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IPhysicsValidationTool.h
@@ -12,7 +12,7 @@
 // Gaudi
 #include "GaudiKernel/IAlgTool.h"
 // ISF
-#include "ISF_Event/ISFParticleVector.h"
+#include "ISF_Event/ISFParticleContainer.h"
 // Trk
 #include "TrkParameters/TrackParameters.h"
 #include "TrkNeutralParameters/NeutralParameters.h"
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IProcessSamplingTool.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IProcessSamplingTool.h
index 62be54ca82bdc4e847dd47af70a2107b0e7c501c..369ce94b25710f95d0a03eab76e2ade174c50d0f 100755
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IProcessSamplingTool.h
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IProcessSamplingTool.h
@@ -13,7 +13,7 @@
 #include "GaudiKernel/IAlgTool.h"
 #include "TrkExUtils/ExtrapolationCell.h"
 #include "TrkExUtils/TargetSurfaces.h"
-#include "ISF_Event/ISFParticleVector.h"
+#include "ISF_Event/ISFParticleContainer.h"
 
 namespace Trk{
   class Track;
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/HadIntProcessorParametric.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/HadIntProcessorParametric.h
index 15fdba6effc95e4997705895499cacaade8bba49..103770ecf142fe218c156156e3d70e02792dccaf 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/HadIntProcessorParametric.h
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/HadIntProcessorParametric.h
@@ -23,7 +23,7 @@
 
 // ISF
 #include "ISF_Event/ITruthIncident.h"
-#include "ISF_Event/ISFParticleVector.h"
+#include "ISF_Event/ISFParticleContainer.h"
 
 // Barcode
 #include "BarcodeEvent/PhysicsProcessCode.h"
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/McMaterialEffectsEngine.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/McMaterialEffectsEngine.h
index 019208a961e18aeea945d6cbdf270660dda676c5..c919ae1e3f2d6ef800841d74f99ccfbe0aec9ada 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/McMaterialEffectsEngine.h
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/McMaterialEffectsEngine.h
@@ -27,7 +27,7 @@
 
 // ISF
 #include "ISF_Event/ITruthIncident.h"
-#include "ISF_Event/ISFParticleVector.h"
+#include "ISF_Event/ISFParticleContainer.h"
 
 // Barcode
 #include "BarcodeEvent/PhysicsProcessCode.h"
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/McMaterialEffectsUpdator.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/McMaterialEffectsUpdator.h
index 36abdedbcc04582c1891fe32275c74cff0a0e744..f645419066c6b1a1179cdc597aefa0f68067f7af 100755
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/McMaterialEffectsUpdator.h
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/McMaterialEffectsUpdator.h
@@ -24,7 +24,7 @@
 #include "TrkParameters/TrackParameters.h"
 
 // ISF
-#include "ISF_Event/ISFParticleVector.h"
+#include "ISF_Event/ISFParticleContainer.h"
 #include "ISF_Event/ITruthIncident.h"
 
 // Barcode
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/PhotonConversionTool.cxx b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/PhotonConversionTool.cxx
index 7c861b8815fbb68838f0364ca251ae13e30ee3f8..909f9f0e40d3c7c5942e2b972eb3d3633f361b92 100755
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/PhotonConversionTool.cxx
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/PhotonConversionTool.cxx
@@ -16,7 +16,7 @@
 #include "StoreGate/StoreGateSvc.h"
 // ISF includes
 #include "ISF_Event/ISFParticle.h"
-#include "ISF_Event/ISFParticleVector.h"
+#include "ISF_Event/ISFParticleContainer.h"
 #include "ISF_Event/ParticleClipboard.h"
 #include "ISF_Event/ParticleUserInformation.h"
 #include "ISF_Interfaces/IParticleBroker.h"
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/test/PhotonConversionTool_test.cxx b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/test/PhotonConversionTool_test.cxx
index cffd868129c03d7cb4d1efc122740a020e7ed046..37fca65e37acc3c110d786c731cf97057845c389 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/test/PhotonConversionTool_test.cxx
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/test/PhotonConversionTool_test.cxx
@@ -5,7 +5,7 @@
 #include "ISF_Interfaces/ITruthSvc.h"
 #include "ISF_Event/ISFParticleContainer.h"
 #include "ISF_Interfaces/ISimulationSelector.h"
-#include "ISF_Event/ISFParticleVector.h"
+#include "ISF_Event/ISFParticleContainer.h"
 #include "AthenaBaseComps/AthService.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "GaudiKernel/ServiceHandle.h"
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/ISF_FatrasToolsG4/G4HadIntProcessor.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/ISF_FatrasToolsG4/G4HadIntProcessor.h
index ebfa3b51ffed7829939decdded8143f54e4f5472..1c9fd162f1f28af2f5bc682f33b06758e6281b08 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/ISF_FatrasToolsG4/G4HadIntProcessor.h
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/ISF_FatrasToolsG4/G4HadIntProcessor.h
@@ -28,7 +28,7 @@
 
 // ISF
 #include "ISF_Event/ITruthIncident.h"
-#include "ISF_Event/ISFParticleVector.h"
+#include "ISF_Event/ISFParticleContainer.h"
 
 // Forward Declarations
 class TTree;
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/ISF_FatrasToolsG4/G4ParticleDecayHelper.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/ISF_FatrasToolsG4/G4ParticleDecayHelper.h
index 770847f1163134899b3a93661b74a5a5292f1522..b21750d32e8ece1173ac1b76e06da1e8f737b661 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/ISF_FatrasToolsG4/G4ParticleDecayHelper.h
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/ISF_FatrasToolsG4/G4ParticleDecayHelper.h
@@ -16,7 +16,7 @@
 #include "AthenaKernel/IAtRndmGenSvc.h"
 // ISF
 #include "ISF_Event/ITruthIncident.h"
-#include "ISF_Event/ISFParticleVector.h"
+#include "ISF_Event/ISFParticleContainer.h"
 // iFatras
 #include "ISF_FatrasInterfaces/IParticleDecayHelper.h"
 // STD
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/src/G4HadIntProcessor.cxx b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/src/G4HadIntProcessor.cxx
index 07715f8d271dee46752bcfbc7b0ce606c628504d..8d23e74a9a312ff85ecf7a072d02a18850d763bb 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/src/G4HadIntProcessor.cxx
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/src/G4HadIntProcessor.cxx
@@ -14,7 +14,7 @@
 
 // ISF
 #include "ISF_Event/ISFParticle.h"
-#include "ISF_Event/ISFParticleVector.h"
+#include "ISF_Event/ISFParticleContainer.h"
 #include "ISF_Event/ParticleClipboard.h"
 #include "ISF_Event/ParticleUserInformation.h"
 #include "ISF_Interfaces/IParticleBroker.h"
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4LegacyTransportTool.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4LegacyTransportTool.cxx
index 8eeef22d61be5dc83e53780a7bd2619be4ec45f9..0de53582df39a10a5dee89e5ece3afada6a5759b 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4LegacyTransportTool.cxx
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4LegacyTransportTool.cxx
@@ -14,7 +14,7 @@
 
 // ISF classes
 #include "ISF_Event/ISFParticle.h"
-#include "ISF_Event/ISFParticleVector.h"
+#include "ISF_Event/ISFParticleContainer.h"
 
 // Athena classes
 #include "GeneratorObjects/McEventCollection.h"
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.cxx
index 5dc9ae819696b3faf02daade04d00b7ee8a3fd09..c8a20da81ee0d48fa27b358b0fba0d0e2eb22ed4 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.cxx
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.cxx
@@ -17,7 +17,7 @@
 
 // ISF classes
 #include "ISF_Event/ISFParticle.h"
-#include "ISF_Event/ISFParticleVector.h"
+#include "ISF_Event/ISFParticleContainer.h"
 
 // Athena classes
 #include "GeneratorObjects/McEventCollection.h"