diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5534af8ba553e8f2c4d65f38a203c53bc5bbc00..4e47f29f1c1614c9b661a6d8c6fad1c0fec9a8c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,5 +15,5 @@ endif()
 
 gaudi_project(CEPCSW v0r1
               USE Gaudi v33r1 
-              USE K4FWCore v0r1
+              USE k4FWCore v0r1
 )
\ No newline at end of file
diff --git a/Detector/GeomSvc/CMakeLists.txt b/Detector/GeomSvc/CMakeLists.txt
index e9aefede2dcef02a72127f51e34c3164789ab291..58c69f7eaec67c8f136f0b002aa676dc5ed84fb1 100644
--- a/Detector/GeomSvc/CMakeLists.txt
+++ b/Detector/GeomSvc/CMakeLists.txt
@@ -7,7 +7,7 @@
 gaudi_subdir(GeomSvc v0r0)
 
 gaudi_depends_on_subdirs(
-    FWCore
+    k4FWCore
     Detector/DetInterface
 )
 
diff --git a/Digitisers/DCHDigi/CMakeLists.txt b/Digitisers/DCHDigi/CMakeLists.txt
index c777aa6ff3b4b2a5b344661505e245f7132bc759..fa9dc143874c99b4550a6f7f259e0a962507bae6 100644
--- a/Digitisers/DCHDigi/CMakeLists.txt
+++ b/Digitisers/DCHDigi/CMakeLists.txt
@@ -18,8 +18,8 @@ gaudi_depends_on_subdirs(
 )
 ## Modules
 gaudi_add_module(DCHDigi ${srcs}
-    INCLUDE_DIRS FWCore GaudiKernel GaudiAlgLib ${CLHEP_INCLUDE_DIR} DD4hep ROOT 
-    LINK_LIBRARIES FWCore GaudiKernel GaudiAlgLib ${CLHEP_LIBRARIES} DD4hep ${DD4hep_COMPONENT_LIBRARIES} DDRec ROOT DetSegmentation
+    INCLUDE_DIRS k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_INCLUDE_DIR} DD4hep ROOT 
+    LINK_LIBRARIES k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_LIBRARIES} DD4hep ${DD4hep_COMPONENT_LIBRARIES} DDRec ROOT DetSegmentation
     -Wl,--no-as-needed 
     EDM4HEP::edm4hep EDM4HEP::edm4hepDict
 )
diff --git a/Digitisers/DCHDigi/src/DCHDigiAlg.h b/Digitisers/DCHDigi/src/DCHDigiAlg.h
index 339f85baaa48970b241ae215b3256bc55955794e..e703998271af669f23c15a1e5482bd0d516199ad 100644
--- a/Digitisers/DCHDigi/src/DCHDigiAlg.h
+++ b/Digitisers/DCHDigi/src/DCHDigiAlg.h
@@ -1,7 +1,7 @@
 #ifndef DCH_DIGI_ALG_H
 #define DCH_DIGI_ALG_H
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiKernel/NTuple.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 #include "edm4hep/SimTrackerHitCollection.h"
diff --git a/Digitisers/G2CDArbor/CMakeLists.txt b/Digitisers/G2CDArbor/CMakeLists.txt
index d1895d1c6a2d45af08bec4cf6ea4854985974d2d..cbc70cd8ea041643734cd2e337dbb12516718e1b 100644
--- a/Digitisers/G2CDArbor/CMakeLists.txt
+++ b/Digitisers/G2CDArbor/CMakeLists.txt
@@ -7,7 +7,7 @@ find_package(GEAR REQUIRED)
 find_package(GSL REQUIRED ) 
 find_package(LCIO REQUIRED ) 
 find_package(podio REQUIRED ) 
-find_package(K4FWCore REQUIRED)
+find_package(k4FWCore REQUIRED)
 
 message("EDM4HEP_INCLUDE_DIRS: ${EDM4HEP_INCLUDE_DIR}")
 message("EDM4HEP_LIB: ${EDM4HEP_LIBRARIES}")
@@ -22,7 +22,7 @@ set(G2CDArbor_srcs src/*.cpp)
 
 # Modules
 gaudi_add_module(G2CDArbor ${G2CDArbor_srcs}
-    INCLUDE_DIRS K4FWCore GaudiKernel GaudiAlgLib ${CLHEP_INCLUDE_DIR} DD4hep gear ${GSL_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
-    LINK_LIBRARIES K4FWCore GaudiKernel GaudiAlgLib ${CLHEP_LIBRARIES} DD4hep ${GEAR_LIBRARIES} ${GSL_LIBRARIES} ${LCIO_LIBRARIES}
+    INCLUDE_DIRS k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_INCLUDE_DIR} DD4hep gear ${GSL_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
+    LINK_LIBRARIES k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_LIBRARIES} DD4hep ${GEAR_LIBRARIES} ${GSL_LIBRARIES} ${LCIO_LIBRARIES}
     EDM4HEP::edm4hep EDM4HEP::edm4hepDict
 )
diff --git a/Digitisers/G2CDArbor/src/G2CDArborAlg.h b/Digitisers/G2CDArbor/src/G2CDArborAlg.h
index 35658c8b01f3e837b61b11f72aa9b86aa6af5d99..28f436be017bec9a0f0beb7387c6a3aa0541f0e9 100644
--- a/Digitisers/G2CDArbor/src/G2CDArborAlg.h
+++ b/Digitisers/G2CDArbor/src/G2CDArborAlg.h
@@ -1,7 +1,7 @@
 #ifndef G2CDARBORALG_H
 #define G2CDARBORALG_H
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiKernel/Property.h"
 #include "edm4hep/EventHeader.h"
diff --git a/Digitisers/SimpleDigi/CMakeLists.txt b/Digitisers/SimpleDigi/CMakeLists.txt
index 39f60902538c88005ccca1d64f9e486e9db2c0f2..052a27dfcf36b9fbc09f222a46ae20f5afdf96f4 100644
--- a/Digitisers/SimpleDigi/CMakeLists.txt
+++ b/Digitisers/SimpleDigi/CMakeLists.txt
@@ -5,7 +5,7 @@ find_package(GEAR REQUIRED)
 find_package(GSL REQUIRED ) 
 find_package(LCIO REQUIRED ) 
 find_package(podio REQUIRED ) 
-find_package(K4FWCore REQUIRED)
+find_package(k4FWCore REQUIRED)
 find_package(EDM4HEP REQUIRED)
 
 gaudi_depends_on_subdirs(
@@ -19,6 +19,6 @@ set(SimpleDigi_srcs src/*.cpp)
 
 # Modules
 gaudi_add_module(SimpleDigi ${SimpleDigi_srcs}
-    INCLUDE_DIRS K4FWCore GaudiKernel GaudiAlgLib ${CLHEP_INCLUDE_DIR} gear ${GSL_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
-    LINK_LIBRARIES K4FWCore GaudiKernel GaudiAlgLib ${CLHEP_LIBRARIES} ${GEAR_LIBRARIES} ${GSL_LIBRARIES} ${LCIO_LIBRARIES} EDM4HEP::edm4hep EDM4HEP::edm4hepDict DataHelperLib
+    INCLUDE_DIRS k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_INCLUDE_DIR} gear ${GSL_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
+    LINK_LIBRARIES k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_LIBRARIES} ${GEAR_LIBRARIES} ${GSL_LIBRARIES} ${LCIO_LIBRARIES} EDM4HEP::edm4hep EDM4HEP::edm4hepDict DataHelperLib
 )
diff --git a/Digitisers/SimpleDigi/src/PlanarDigiAlg.h b/Digitisers/SimpleDigi/src/PlanarDigiAlg.h
index 30c2e091aaec8e2e986a38a77eb2e4bea4e56cb1..668333f29db62fadc13ed8619c212ef0c2ab9d0c 100644
--- a/Digitisers/SimpleDigi/src/PlanarDigiAlg.h
+++ b/Digitisers/SimpleDigi/src/PlanarDigiAlg.h
@@ -1,7 +1,7 @@
 #ifndef PLANAR_DIGI_ALG_H
 #define PLANAR_DIGI_ALG_H
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 #include <gsl/gsl_rng.h>
 #include "edm4hep/EventHeaderCollection.h"
diff --git a/Digitisers/SimpleDigi/src/TPCDigiAlg.h b/Digitisers/SimpleDigi/src/TPCDigiAlg.h
index a1dc6019602753a3b197a692413efe7b82f374f1..af0f6391f7ee9f5c4e2386221e8aa6f8dbde7151 100644
--- a/Digitisers/SimpleDigi/src/TPCDigiAlg.h
+++ b/Digitisers/SimpleDigi/src/TPCDigiAlg.h
@@ -20,7 +20,7 @@ Steve Aplin 26 June 2009 (DESY)
 #define TPCDigiAlg_h 1
 
 #include "GaudiAlg/GaudiAlgorithm.h"
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "edm4hep/EventHeaderCollection.h"
 #include "edm4hep/SimTrackerHitCollection.h"
 #include "edm4hep/TrackerHitCollection.h"
diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt
index 8a0ba74979b16bc41d1e26dee535ac00fd12f51f..e11457877fd94d615f12dcf8d5f7bd7388f91c24 100644
--- a/Examples/CMakeLists.txt
+++ b/Examples/CMakeLists.txt
@@ -5,7 +5,7 @@ find_package(podio REQUIRED)
 #find_package(plcio REQUIRED)
 find_package(LCIO REQUIRED)
 find_package(EDM4HEP REQUIRED)
-find_package(K4FWCore REQUIRED)
+find_package(k4FWCore REQUIRED)
 find_package(DD4hep COMPONENTS DDRec DDParsers REQUIRED)
 
 gaudi_depends_on_subdirs(
@@ -27,8 +27,8 @@ gaudi_install_headers(Examples)
 
 # Modules
 gaudi_add_module(Examples ${Examples_srcs}
-    INCLUDE_DIRS K4FWCore GaudiAlgLib GaudiKernel ${podio_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
-    LINK_LIBRARIES K4FWCore GaudiAlgLib GaudiKernel ${LCIO_LIBRARIES} 
+    INCLUDE_DIRS k4FWCore GaudiAlgLib GaudiKernel ${podio_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
+    LINK_LIBRARIES k4FWCore GaudiAlgLib GaudiKernel ${LCIO_LIBRARIES} 
       DD4hep ${DD4hep_COMPONENT_LIBRARIES}
       # Force loading the libraries.
       -Wl,--no-as-needed EDM4HEP::edm4hep EDM4HEP::edm4hepDict ${podio_LIBRARIES} podio::podioRootIO -Wl,--as-needed
diff --git a/Examples/src/DumpIDAlg/DumpIDAlg.h b/Examples/src/DumpIDAlg/DumpIDAlg.h
index 9680d2b2c989dad773e427d4a134957227646b26..8fe376d89083b3e2b48147a6f2ce6eedc871fe45 100644
--- a/Examples/src/DumpIDAlg/DumpIDAlg.h
+++ b/Examples/src/DumpIDAlg/DumpIDAlg.h
@@ -1,7 +1,7 @@
 #ifndef DumpIDAlg_h
 #define DumpIDAlg_h
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiKernel/NTuple.h"
 
diff --git a/Examples/src/Edm4hepTest/Edm4hepReadAlg.h b/Examples/src/Edm4hepTest/Edm4hepReadAlg.h
index 8a194a64f54c221ea47905dbc855f2048e24892a..bbf398b95ae5f88cfbdd190068b1311c309d6692 100644
--- a/Examples/src/Edm4hepTest/Edm4hepReadAlg.h
+++ b/Examples/src/Edm4hepTest/Edm4hepReadAlg.h
@@ -1,7 +1,7 @@
 #ifndef TEST_EDM4HEP_WRITE_ALG_H
 #define TEST_EDM4HEP_WRITE_ALG_H
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 
 namespace edm4hep {
diff --git a/Examples/src/Edm4hepTest/Edm4hepWriteAlg.h b/Examples/src/Edm4hepTest/Edm4hepWriteAlg.h
index 2d980885b538d77fa56e26c177dba78211e115d5..db303fb37713630172aca04e4164a70d0f1f443b 100644
--- a/Examples/src/Edm4hepTest/Edm4hepWriteAlg.h
+++ b/Examples/src/Edm4hepTest/Edm4hepWriteAlg.h
@@ -1,7 +1,7 @@
 #ifndef TEST_EDM4HEP_WRITE_ALG_H
 #define TEST_EDM4HEP_WRITE_ALG_H
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 
 namespace edm4hep {
diff --git a/Examples/src/PlcioTest/PlcioReadAlg.h b/Examples/src/PlcioTest/PlcioReadAlg.h
index f5aba7dc3f878d355eaa213b01e22620a057b678..94de007f8bdcd14c0150f83bb1a02d15b7a1b6dc 100644
--- a/Examples/src/PlcioTest/PlcioReadAlg.h
+++ b/Examples/src/PlcioTest/PlcioReadAlg.h
@@ -1,7 +1,7 @@
 #ifndef TEST_PLCIO_WRITE_ALG_H
 #define TEST_PLCIO_WRITE_ALG_H
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 
 namespace plcio {
diff --git a/Examples/src/PlcioTest/PlcioWriteAlg.h b/Examples/src/PlcioTest/PlcioWriteAlg.h
index 377173d09bbdd3616edfb89705ca490969a1d57f..47132382384ad91530e6916d5ed62d4fc1e36481 100644
--- a/Examples/src/PlcioTest/PlcioWriteAlg.h
+++ b/Examples/src/PlcioTest/PlcioWriteAlg.h
@@ -1,7 +1,7 @@
 #ifndef TEST_PLCIO_WRITE_ALG_H
 #define TEST_PLCIO_WRITE_ALG_H
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 
 namespace plcio {
diff --git a/Generator/CMakeLists.txt b/Generator/CMakeLists.txt
index 435b84d90f96b2da6d9a9d203ab4ed9204d4fd4d..7eb4c9ca590664ef22db4ec00c5834c3c804ced8 100644
--- a/Generator/CMakeLists.txt
+++ b/Generator/CMakeLists.txt
@@ -24,7 +24,7 @@ find_package(podio)
 find_package(EDM4HEP)
 find_package(HepMC)
 find_package(CLHEP REQUIRED;CONFIG)
-find_package(K4FWCore REQUIRED)
+find_package(k4FWCore REQUIRED)
 
 if(ROOT_FOUND)
     message("found ROOT: ${ROOT_INCLUDE_DIRS} ${ROOT_LIBRARIES}")
@@ -46,10 +46,10 @@ INCLUDE_DIRECTORIES(${GenAlgo_incs})
 
 gaudi_add_module(GenAlgo ${GenAlgo_srcs} 
   INCLUDE_DIRS 
-    K4FWCore
+    k4FWCore
   LINK_LIBRARIES 
     ROOT
-    K4FWCore 
+    k4FWCore 
     GaudiAlgLib GaudiKernel
     HepMC
     CLHEP
diff --git a/Generator/src/GenAlgo.h b/Generator/src/GenAlgo.h
index 47745aefec9c8ac7a90819bf88c9eecf91fc7ab8..cd26745385eae2dcc7270ceee205d65678da7372 100644
--- a/Generator/src/GenAlgo.h
+++ b/Generator/src/GenAlgo.h
@@ -7,7 +7,7 @@
 #include <GaudiKernel/ToolHandle.h>
 
 #include "GaudiAlg/GaudiAlgorithm.h"
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 
 #include "GenEvent.h"
 
diff --git a/Reconstruction/Digi_Calo/CMakeLists.txt b/Reconstruction/Digi_Calo/CMakeLists.txt
index b61ef2955926e93f309dad0324041656fc6cb827..179346ca39c4764bab67a382633635546a35e9a2 100644
--- a/Reconstruction/Digi_Calo/CMakeLists.txt
+++ b/Reconstruction/Digi_Calo/CMakeLists.txt
@@ -19,8 +19,8 @@ gaudi_depends_on_subdirs(
 )
 ## Modules
 gaudi_add_module(Digi_Calo ${srcs}
-    INCLUDE_DIRS FWCore GaudiKernel GaudiAlgLib ${CLHEP_INCLUDE_DIR} DD4hep 
-    LINK_LIBRARIES FWCore GaudiKernel GaudiAlgLib ${CLHEP_LIBRARIES} DD4hep ${DD4hep_COMPONENT_LIBRARIES} DDRec
+    INCLUDE_DIRS k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_INCLUDE_DIR} DD4hep 
+    LINK_LIBRARIES k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_LIBRARIES} DD4hep ${DD4hep_COMPONENT_LIBRARIES} DDRec
     -Wl,--no-as-needed 
     EDM4HEP::edm4hep EDM4HEP::edm4hepDict
 )
diff --git a/Reconstruction/Digi_Calo/src/CaloDigiAlg.h b/Reconstruction/Digi_Calo/src/CaloDigiAlg.h
index 2142018cf3a5138831de10b07f9eb9b7b3b41f93..9bfd5e3bfc7f2b919cf2d65a064e2d8a4a1e256d 100644
--- a/Reconstruction/Digi_Calo/src/CaloDigiAlg.h
+++ b/Reconstruction/Digi_Calo/src/CaloDigiAlg.h
@@ -1,7 +1,7 @@
 #ifndef Calo_DIGI_ALG_H
 #define Calo_DIGI_ALG_H
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 #include "edm4hep/SimCalorimeterHitConst.h"
 #include "edm4hep/SimCalorimeterHit.h"
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt b/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt
index c01c5ecfb917e6978d4d868e5a4d1b4d130bddf1..7b07fd673ed3592ae2e2200aa34960666cca55d9 100644
--- a/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt
+++ b/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt
@@ -39,8 +39,8 @@ set(dir_srcs
 set(dir_include include)
 # Modules
 gaudi_add_module(GaudiPandora ${dir_srcs}
-    INCLUDE_DIRS ${dir_include} GaudiKernel FWCore CLHEP  ${LCIO_INCLUDE_DIRS} ROOT gear DD4hep 
-    LINK_LIBRARIES GaudiKernel FWCore CLHEP ROOT ${LCIO_LIBRARIES} ${GEAR_LIBRARIES} DataHelperLib DD4hep ${DD4hep_COMPONENT_LIBRARIES} DDRec 
+    INCLUDE_DIRS ${dir_include} GaudiKernel k4FWCore CLHEP  ${LCIO_INCLUDE_DIRS} ROOT gear DD4hep 
+    LINK_LIBRARIES GaudiKernel k4FWCore CLHEP ROOT ${LCIO_LIBRARIES} ${GEAR_LIBRARIES} DataHelperLib DD4hep ${DD4hep_COMPONENT_LIBRARIES} DDRec 
       -Wl,--no-as-needed 
       EDM4HEP::edm4hep EDM4HEP::edm4hepDict
       -Wl,--as-needed 
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/include/PandoraPFAlg.h b/Reconstruction/PFA/Pandora/GaudiPandora/include/PandoraPFAlg.h
index 3f029fe3be8c8031d22eebc7eec3e237cfd747ed..1e9c40755fb797347758bcdc778c03b3b9f71337 100644
--- a/Reconstruction/PFA/Pandora/GaudiPandora/include/PandoraPFAlg.h
+++ b/Reconstruction/PFA/Pandora/GaudiPandora/include/PandoraPFAlg.h
@@ -1,7 +1,7 @@
 #ifndef PandoraPFAlg_H
 #define PandoraPFAlg_H
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 //#include <gsl/gsl_rng.h>
 #include "edm4hep/ClusterCollection.h"
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/include/PfoCreator.h b/Reconstruction/PFA/Pandora/GaudiPandora/include/PfoCreator.h
index 5b8942cef0fd3d7f6347f461257d8ce6ded8adfd..ed69d77817a5d5ead53263c0b7b93f11d0d46918 100644
--- a/Reconstruction/PFA/Pandora/GaudiPandora/include/PfoCreator.h
+++ b/Reconstruction/PFA/Pandora/GaudiPandora/include/PfoCreator.h
@@ -7,7 +7,7 @@
 #ifndef PFO_CREATOR_H
 #define PFO_CREATOR_H 1
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "edm4hep/Vector3f.h"
 #include "edm4hep/ClusterCollection.h"
 #include "edm4hep/Cluster.h"
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/CMakeLists.txt b/Reconstruction/PFA/Pandora/MatrixPandora/CMakeLists.txt
index c8a76314f563fa9d8a37bc7c65e106afa018d958..16cd82d27ec2a26c0860ea72fbde7170b28d7515 100644
--- a/Reconstruction/PFA/Pandora/MatrixPandora/CMakeLists.txt
+++ b/Reconstruction/PFA/Pandora/MatrixPandora/CMakeLists.txt
@@ -37,8 +37,8 @@ set(dir_srcs
 set(dir_include include)
 # Modules
 gaudi_add_module(MatrixPandora ${dir_srcs}
-    INCLUDE_DIRS ${dir_include} GaudiKernel FWCore ${CLHEP_INCLUDE_DIR}  ${LCIO_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} gear DD4hep  
-    LINK_LIBRARIES GaudiKernel FWCore ${CLHEP_LIBRARIES} ROOT ${LCIO_LIBRARIES} ${GEAR_LIBRARIES} DD4hep ${DD4hep_COMPONENT_LIBRARIES} DDRec DataHelperLib
+    INCLUDE_DIRS ${dir_include} GaudiKernel k4FWCore ${CLHEP_INCLUDE_DIR}  ${LCIO_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} gear DD4hep  
+    LINK_LIBRARIES GaudiKernel k4FWCore ${CLHEP_LIBRARIES} ROOT ${LCIO_LIBRARIES} ${GEAR_LIBRARIES} DD4hep ${DD4hep_COMPONENT_LIBRARIES} DDRec DataHelperLib
       -Wl,--no-as-needed 
       EDM4HEP::edm4hep EDM4HEP::edm4hepDict
       -Wl,--as-needed 
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/include/PandoraMatrixAlg.h b/Reconstruction/PFA/Pandora/MatrixPandora/include/PandoraMatrixAlg.h
index 41c0e809b64bc248134aac25c4479300fa82482c..1c1c96315c5bd36fb6b081b8a7f214dafb14618a 100644
--- a/Reconstruction/PFA/Pandora/MatrixPandora/include/PandoraMatrixAlg.h
+++ b/Reconstruction/PFA/Pandora/MatrixPandora/include/PandoraMatrixAlg.h
@@ -1,7 +1,7 @@
 #ifndef PandoraMatrixAlg_H
 #define PandoraMatrixAlg_H
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 #include <gsl/gsl_rng.h>
 #include "edm4hep/ClusterCollection.h"
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/include/PfoCreator.h b/Reconstruction/PFA/Pandora/MatrixPandora/include/PfoCreator.h
index 2cc8d6327e0a99f3782164346c992770d9fe0dd4..7739c1e1a4154530081ef29352818ace4138771f 100644
--- a/Reconstruction/PFA/Pandora/MatrixPandora/include/PfoCreator.h
+++ b/Reconstruction/PFA/Pandora/MatrixPandora/include/PfoCreator.h
@@ -8,7 +8,7 @@
 #ifndef PFO_CREATOR_H
 #define PFO_CREATOR_H 1
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "edm4hep/Vector3f.h"
 #include "edm4hep/ClusterCollection.h"
 #include "edm4hep/Cluster.h"
diff --git a/Reconstruction/SiliconTracking/CMakeLists.txt b/Reconstruction/SiliconTracking/CMakeLists.txt
index 025f3449e69af5d0552c1b78a0fc7238f3b8910b..32864bf2a894d7efb3525f3d92fd1871742a189e 100644
--- a/Reconstruction/SiliconTracking/CMakeLists.txt
+++ b/Reconstruction/SiliconTracking/CMakeLists.txt
@@ -18,6 +18,6 @@ set(SiliconTracking_srcs src/*.cpp)
 
 # Modules
 gaudi_add_module(SiliconTracking ${SiliconTracking_srcs}
-    INCLUDE_DIRS GaudiKernel FWCore gear ${GSL_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
-    LINK_LIBRARIES TrackSystemSvcLib DataHelperLib KiTrackLib GaudiKernel FWCore ${GEAR_LIBRARIES} ${GSL_LIBRARIES} ${LCIO_LIBRARIES} 
+    INCLUDE_DIRS GaudiKernel k4FWCore gear ${GSL_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
+    LINK_LIBRARIES TrackSystemSvcLib DataHelperLib KiTrackLib GaudiKernel k4FWCore ${GEAR_LIBRARIES} ${GSL_LIBRARIES} ${LCIO_LIBRARIES} 
 )
diff --git a/Reconstruction/SiliconTracking/src/ForwardTrackingAlg.h b/Reconstruction/SiliconTracking/src/ForwardTrackingAlg.h
index 8e9e2229f1296d99f12fb6ba88abe8753f13fad9..2accf4040a82c88870bb3acdf5903086d6567413 100644
--- a/Reconstruction/SiliconTracking/src/ForwardTrackingAlg.h
+++ b/Reconstruction/SiliconTracking/src/ForwardTrackingAlg.h
@@ -1,7 +1,7 @@
 #ifndef ForwardTracking_h
 #define ForwardTracking_h 1
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 #include "edm4hep/EventHeaderCollection.h"
 #include "edm4hep/MCParticleCollection.h"
diff --git a/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.h b/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.h
index 9f21225cb0f77399e8a8351a610673e07674fb68..cbf2c24bb816eac53287b9488a6eddb4235401f1 100644
--- a/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.h
+++ b/Reconstruction/SiliconTracking/src/SiliconTrackingAlg.h
@@ -3,7 +3,7 @@
 
 //#include "marlin/Processor.h"
 //#include <marlin/Global.h>
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 #include "edm4hep/EventHeaderCollection.h"
 #include "edm4hep/MCParticleCollection.h"
diff --git a/Reconstruction/SiliconTracking/src/SpacePointBuilderAlg.h b/Reconstruction/SiliconTracking/src/SpacePointBuilderAlg.h
index 6f731e62abecbbd9c1fba0c2cf9530801844ec83..e455527c7b088451ce1cafb3f3fe4f99e416fcca 100644
--- a/Reconstruction/SiliconTracking/src/SpacePointBuilderAlg.h
+++ b/Reconstruction/SiliconTracking/src/SpacePointBuilderAlg.h
@@ -1,7 +1,7 @@
 #ifndef SpacePointBuilder_h
 #define SpacePointBuilder_h 1
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 //#include "edm4hep/EventHeaderCollection.h"
 #include "edm4hep/MCParticleCollection.h"
diff --git a/Reconstruction/SiliconTracking/src/TrackSubsetAlg.h b/Reconstruction/SiliconTracking/src/TrackSubsetAlg.h
index 5676d977e038ead73ce3088922b618a04e8e7549..c6e59d81799a82a49936153a2d15d4d5778995b6 100644
--- a/Reconstruction/SiliconTracking/src/TrackSubsetAlg.h
+++ b/Reconstruction/SiliconTracking/src/TrackSubsetAlg.h
@@ -1,7 +1,7 @@
 #ifndef TrackSubsetAlg_h
 #define TrackSubsetAlg_h 1
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 
 #include "edm4hep/TrackCollection.h"
diff --git a/Reconstruction/Tracking/src/Clupatra/ClupatraAlg.h b/Reconstruction/Tracking/src/Clupatra/ClupatraAlg.h
index 7cdbb0f40f3c37dbc265729cef877fc958258dbc..fc680dc2f52d6cdf44ff126daaf7d6ae2f61a3bd 100644
--- a/Reconstruction/Tracking/src/Clupatra/ClupatraAlg.h
+++ b/Reconstruction/Tracking/src/Clupatra/ClupatraAlg.h
@@ -2,7 +2,7 @@
 #define ClupatraProcessor_h 1
 
 #include "assert.h"
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GearSvc/IGearSvc.h"
 #include "TrackSystemSvc/ITrackSystemSvc.h"
 
diff --git a/Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp b/Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp
index 0751a4d04d0f29b752195c9e6ce6948c4ab20b15..d4d58ade8da9f3751bce34baad2101d6b74e28fa 100644
--- a/Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp
+++ b/Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp
@@ -16,7 +16,7 @@
 #include "IMPL/TrackerHitImpl.h"
 #include "IMPL/TrackStateImpl.h"
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 #include "GearSvc/IGearSvc.h"
 using namespace MarlinTrk ;
diff --git a/Reconstruction/Tracking/src/FullLDCTracking/FullLDCTrackingAlg.h b/Reconstruction/Tracking/src/FullLDCTracking/FullLDCTrackingAlg.h
index 1053e327691fa4374f3c393392802e18edb3aa4e..cf3e174a81988133c63b645eff5b6c5b6d2ccffd 100755
--- a/Reconstruction/Tracking/src/FullLDCTracking/FullLDCTrackingAlg.h
+++ b/Reconstruction/Tracking/src/FullLDCTracking/FullLDCTrackingAlg.h
@@ -1,7 +1,7 @@
 #ifndef FULLLDCTRACKING_H
 #define FULLLDCTRACKING_H 1
 
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
 #include "GearSvc/IGearSvc.h"
 #include "TrackSystemSvc/ITrackSystemSvc.h"
diff --git a/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.h b/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.h
index 17a9d5182fe80f0bcbfefca5385362df2aa738a7..746c2a4b34a3395f5ee0d4e14ed3ea59c1eae38f 100644
--- a/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.h
+++ b/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.h
@@ -4,7 +4,7 @@
 #include <map>
 
 #include "GaudiKernel/AlgTool.h"
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "DetSimInterface/IAnaElemTool.h"
 
 #include "edm4hep/MCParticleCollection.h"
diff --git a/Simulation/DetSimAna/src/ExampleAnaElemTool.h b/Simulation/DetSimAna/src/ExampleAnaElemTool.h
index 6b885e3aac76c57744af7fb776946b18e3c432d6..cdf5e2b20a6042ba1af9d875b606370e3a037c48 100644
--- a/Simulation/DetSimAna/src/ExampleAnaElemTool.h
+++ b/Simulation/DetSimAna/src/ExampleAnaElemTool.h
@@ -2,7 +2,7 @@
 #define ExampleAnaElemTool_h
 
 #include "GaudiKernel/AlgTool.h"
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 #include "DetSimInterface/IAnaElemTool.h"
 
 #include "plcio/MCParticleCollection.h"
diff --git a/Simulation/DetSimCore/CMakeLists.txt b/Simulation/DetSimCore/CMakeLists.txt
index bf58dded63633952e51bc3400513d450366c60e6..49ee4777117113ebc52384e4c2f1c60d6c885cc3 100644
--- a/Simulation/DetSimCore/CMakeLists.txt
+++ b/Simulation/DetSimCore/CMakeLists.txt
@@ -2,7 +2,7 @@
 gaudi_subdir(DetSimCore v0r0)
 
 gaudi_depends_on_subdirs(
-    FWCore
+    k4FWCore
     Simulation/DetSimInterface
 )
 
diff --git a/Simulation/DetSimCore/src/G4PrimaryCnvTool.h b/Simulation/DetSimCore/src/G4PrimaryCnvTool.h
index ed0fd4b5ba5453ad229d9e0981eced6e6036c9d4..09f724ee5e6fa415524925256f3701a8650624bd 100644
--- a/Simulation/DetSimCore/src/G4PrimaryCnvTool.h
+++ b/Simulation/DetSimCore/src/G4PrimaryCnvTool.h
@@ -3,7 +3,7 @@
 
 #include "GaudiKernel/AlgTool.h"
 #include "DetSimInterface/IG4PrimaryCnvTool.h"
-#include "FWCore/DataHandle.h"
+#include "k4FWCore/DataHandle.h"
 
 #include "edm4hep/EventHeaderCollection.h"
 #include "edm4hep/MCParticleCollection.h"
diff --git a/Simulation/DetSimDedx/CMakeLists.txt b/Simulation/DetSimDedx/CMakeLists.txt
index 824c35b37314dc7b007227c1082b032ea631336b..69e83034f8d6224856e93a44fed8e9badc955c7c 100644
--- a/Simulation/DetSimDedx/CMakeLists.txt
+++ b/Simulation/DetSimDedx/CMakeLists.txt
@@ -1,7 +1,7 @@
 gaudi_subdir(DetSimDedx v0r0)
 
 gaudi_depends_on_subdirs(
-    FWCore
+    k4FWCore
     Simulation/DetSimInterface
 )
 
diff --git a/Simulation/DetSimSD/CMakeLists.txt b/Simulation/DetSimSD/CMakeLists.txt
index d917ecef05a6bb5253e4a1e1529472ab939e184b..1828c1e1123331776a305923b83876f4d8c14f7f 100644
--- a/Simulation/DetSimSD/CMakeLists.txt
+++ b/Simulation/DetSimSD/CMakeLists.txt
@@ -2,7 +2,7 @@
 gaudi_subdir(DetSimSD v0r0)
 
 gaudi_depends_on_subdirs(
-    FWCore
+    k4FWCore
     Detector/DetInterface
     Simulation/DetSimInterface
 )
@@ -24,13 +24,13 @@ set(DetSimSD_srcs
 gaudi_add_module(DetSimSD ${DetSimSD_srcs}
     INCLUDE_DIRS
       # DetSimInterface
-      # FWCore
+      # k4FWCore
       # DD4hep
       # GaudiKernel
       # Geant4 
     LINK_LIBRARIES
       # DetSimInterface
-      # FWCore
+      # k4FWCore
       DD4hep
       ${DD4hep_COMPONENT_LIBRARIES} 
       GaudiKernel
diff --git a/Utilities/DataHelper/DataHelper/Navigation.h b/Utilities/DataHelper/DataHelper/Navigation.h
index a4870ba959eac6331764597ed9010d443c9c0c5d..e3aadc88e52bf6bc7fad10051cecd0a25cc290e0 100644
--- a/Utilities/DataHelper/DataHelper/Navigation.h
+++ b/Utilities/DataHelper/DataHelper/Navigation.h
@@ -1,8 +1,6 @@
 #ifndef Navigation_h
 #define Navigation_h
 
-//#include "FWCore/DataHandle.h"
-//#include "podio/CollectionBase.h"
 #include "edm4hep/MCRecoTrackerAssociationCollection.h"
 #include "edm4hep/TrackerHitCollection.h"
 #include <map>