diff --git a/benchmarks/backgrounds/analysis/synchrotron_raw.cxx b/benchmarks/backgrounds/analysis/synchrotron_raw.cxx
index 3798cd86e4db39885aa8b3cb991cbc9b14065c6b..d68b46525c4b797ebe2c483cb505dd4ae97d1121 100644
--- a/benchmarks/backgrounds/analysis/synchrotron_raw.cxx
+++ b/benchmarks/backgrounds/analysis/synchrotron_raw.cxx
@@ -14,10 +14,10 @@ R__LOAD_LIBRARY(libfmt.so)
 #include "fmt/core.h"
 #include "fmt/color.h"
 
-R__LOAD_LIBRARY(libeicd.so)
+R__LOAD_LIBRARY(libedm4eic.so)
 R__LOAD_LIBRARY(libDD4pod.so)
 
-#include "eicd/ReconstructedParticleCollection.h"
+#include "edm4eic/ReconstructedParticleCollection.h"
 
 void synchrotron_raw(const char* fname = "rec_synchrotron.raw.root"){
 
diff --git a/benchmarks/backgrounds/analysis/synchrotron_sim.cxx b/benchmarks/backgrounds/analysis/synchrotron_sim.cxx
index 6020cd6fbeed2670fb5eeb630c3a21c5782de686..742de99a4feb3e439554f00179dea5a08afe188d 100644
--- a/benchmarks/backgrounds/analysis/synchrotron_sim.cxx
+++ b/benchmarks/backgrounds/analysis/synchrotron_sim.cxx
@@ -15,10 +15,10 @@ R__LOAD_LIBRARY(libfmt.so)
 #include "fmt/core.h"
 #include "fmt/color.h"
 
-R__LOAD_LIBRARY(libeicd.so)
+R__LOAD_LIBRARY(libedm4eic.so)
 R__LOAD_LIBRARY(libDD4pod.so)
 
-#include "eicd/ReconstructedParticleCollection.h"
+#include "edm4eic/ReconstructedParticleCollection.h"
 
 void synchrotron_sim(const char* fname = "sim_synchrotron.edm4hep.root"){
 
diff --git a/benchmarks/dis/analysis/dis_electrons.cxx b/benchmarks/dis/analysis/dis_electrons.cxx
index e2cfd474262bd96579afcc367a5993e627da301e..8b55c4ee4ab7a7532932ff9c8539fabe17a503fe 100644
--- a/benchmarks/dis/analysis/dis_electrons.cxx
+++ b/benchmarks/dis/analysis/dis_electrons.cxx
@@ -21,8 +21,8 @@
 #include "fmt/core.h"
 
 #include "nlohmann/json.hpp"
-#include "eicd/InclusiveKinematicsData.h"
-#include "eicd/ReconstructedParticleData.h"
+#include "edm4eic/InclusiveKinematicsData.h"
+#include "edm4eic/ReconstructedParticleData.h"
 
 int dis_electrons(const std::string& config_name)
 {
diff --git a/benchmarks/dis/analysis/rec_analysis_ecal.cxx b/benchmarks/dis/analysis/rec_analysis_ecal.cxx
index 3d0af430474e00bb53ee90ceb4ee4cd7dbbf2e5c..747bb0abf532bb119fa2e791155816c01c637602 100644
--- a/benchmarks/dis/analysis/rec_analysis_ecal.cxx
+++ b/benchmarks/dis/analysis/rec_analysis_ecal.cxx
@@ -21,8 +21,8 @@
 #include "fmt/core.h"
 
 #include "nlohmann/json.hpp"
-#include "eicd/CalorimeterHitData.h"
-#include "eicd/ClusterData.h"
+#include "edm4eic/CalorimeterHitData.h"
+#include "edm4eic/ClusterData.h"
 
 int rec_analysis_ecal(const std::string& config_name)
 {
diff --git a/benchmarks/dis/analysis/rec_analysis_hcal.cxx b/benchmarks/dis/analysis/rec_analysis_hcal.cxx
index 06641d3443dfeec35846c6394fee9907032df2cf..c2bf3b5cfe41317b4daa8c50caca13bfb583ddff 100644
--- a/benchmarks/dis/analysis/rec_analysis_hcal.cxx
+++ b/benchmarks/dis/analysis/rec_analysis_hcal.cxx
@@ -21,8 +21,8 @@
 #include "fmt/core.h"
 
 #include "nlohmann/json.hpp"
-#include "eicd/CalorimeterHitData.h"
-#include "eicd/ClusterData.h"
+#include "edm4eic/CalorimeterHitData.h"
+#include "edm4eic/ClusterData.h"
 
 int rec_analysis_hcal(const std::string& config_name)
 {
diff --git a/benchmarks/dis/analysis/rec_analysis_raw.cxx b/benchmarks/dis/analysis/rec_analysis_raw.cxx
index bbd43a8a31105d1afb217a1ebd8987683c245a78..98bd12e7667b8ee7f92119d45a03473573f5902f 100644
--- a/benchmarks/dis/analysis/rec_analysis_raw.cxx
+++ b/benchmarks/dis/analysis/rec_analysis_raw.cxx
@@ -21,7 +21,7 @@
 #include "fmt/core.h"
 
 #include "nlohmann/json.hpp"
-#include "eicd/RawCalorimeterHitData.h"
+#include "edm4eic/RawCalorimeterHitData.h"
 
 int rec_analysis_raw(const std::string& config_name)
 {
diff --git a/benchmarks/dvcs/analysis/dvcs_tests.cxx b/benchmarks/dvcs/analysis/dvcs_tests.cxx
index 43695195dc12a7b05058d4666d0a2d00b9292351..65e68bc30348645b9ec500fe33219e75eba55f20 100644
--- a/benchmarks/dvcs/analysis/dvcs_tests.cxx
+++ b/benchmarks/dvcs/analysis/dvcs_tests.cxx
@@ -14,11 +14,11 @@ R__LOAD_LIBRARY(libfmt.so)
 #include "fmt/core.h"
 #include "fmt/color.h"
 
-R__LOAD_LIBRARY(libeicd.so)
+R__LOAD_LIBRARY(libedm4eic.so)
 R__LOAD_LIBRARY(libDD4pod.so)
 
-#include "eicd/InclusiveKinematicsCollection.h"
-#include "eicd/ReconstructedParticleCollection.h"
+#include "edm4eic/InclusiveKinematicsCollection.h"
+#include "edm4eic/ReconstructedParticleCollection.h"
 
 void dvcs_tests(const char* fname = "rec_dvcs.root"){
 
diff --git a/benchmarks/dvmp/analysis/vm_invar.cxx b/benchmarks/dvmp/analysis/vm_invar.cxx
index efe21f14f61fdff3e596e51a463ca417cfe3f0e7..25c63ad554f0fc0f4329a26004e6faf45f08eea2 100644
--- a/benchmarks/dvmp/analysis/vm_invar.cxx
+++ b/benchmarks/dvmp/analysis/vm_invar.cxx
@@ -76,7 +76,7 @@ int vm_invar(const std::string& config_name)
   auto momenta_sort_sim = [vm_name, decay_name](const std::vector<edm4hep::MCParticleData>& parts){
     return util::momenta_sort_sim(parts, vm_name, decay_name);
   };
-  auto momenta_sort_rec = [vm_name, decay_name](const std::vector<eicd::ReconstructedParticleData>& parts){
+  auto momenta_sort_rec = [vm_name, decay_name](const std::vector<edm4eic::ReconstructedParticleData>& parts){
     return util::momenta_sort_rec(parts, vm_name, decay_name);
   };
   //====================================================================
diff --git a/benchmarks/dvmp/analysis/vm_mass.cxx b/benchmarks/dvmp/analysis/vm_mass.cxx
index be47f1fcbe39899900bacdbe7bfb170edd08f8cc..a4843bc816478a6eea1dd124b6587264b460626a 100644
--- a/benchmarks/dvmp/analysis/vm_mass.cxx
+++ b/benchmarks/dvmp/analysis/vm_mass.cxx
@@ -16,8 +16,8 @@
 #include "fmt/core.h"
 #include "nlohmann/json.hpp"
 
-#include "eicd/ReconstructedParticleCollection.h"
-#include "eicd/ReconstructedParticleData.h"
+#include "edm4eic/ReconstructedParticleCollection.h"
+#include "edm4eic/ReconstructedParticleData.h"
 
 // Run VM invariant-mass-based benchmarks on an input reconstruction file for
 // a desired vector meson (e.g. jpsi) and a desired decay particle (e.g. muon)
diff --git a/benchmarks/single/analysis/analyze.cxx b/benchmarks/single/analysis/analyze.cxx
index 04107a9fc989797f1b1bdec005d153ba7230cbee..4070868e5e475f4b33a38c8b163b2f201ca96d3b 100644
--- a/benchmarks/single/analysis/analyze.cxx
+++ b/benchmarks/single/analysis/analyze.cxx
@@ -3,7 +3,7 @@
 
 #include <ROOT/RDataFrame.hxx>
 
-#include <eicd/ReconstructedParticleData.h>
+#include <edm4eic/ReconstructedParticleData.h>
 
 int analyze(std::string file)
 {
@@ -17,7 +17,7 @@ int analyze(std::string file)
     return -1;
   }
 
-  auto n_tracks = [](const std::vector<eicd::ReconstructedParticleData> &p) { return (int) p.size(); };
+  auto n_tracks = [](const std::vector<edm4eic::ReconstructedParticleData> &p) { return (int) p.size(); };
 
   auto d = df
   .Define("n_tracks_gen", n_tracks, {"GeneratedParticles"})
diff --git a/benchmarks/tcs/analysis/tcs_tests.cxx b/benchmarks/tcs/analysis/tcs_tests.cxx
index 081e6b1c07c3809acd6b899a903fe8b397d9f1eb..2c48ee5cab1ed4fbc42b45e08e62191324713d2d 100644
--- a/benchmarks/tcs/analysis/tcs_tests.cxx
+++ b/benchmarks/tcs/analysis/tcs_tests.cxx
@@ -15,11 +15,11 @@ R__LOAD_LIBRARY(libfmt.so)
 #include "fmt/core.h"
 #include "fmt/color.h"
 
-R__LOAD_LIBRARY(libeicd.so)
+R__LOAD_LIBRARY(libedm4eic.so)
 R__LOAD_LIBRARY(libDD4pod.so)
 
-#include "eicd/InclusiveKinematicsCollection.h"
-#include "eicd/ReconstructedParticleCollection.h"
+#include "edm4eic/InclusiveKinematicsCollection.h"
+#include "edm4eic/ReconstructedParticleCollection.h"
 
 void tcs_tests(const char* fname = "rec_tcs.root"){
 
@@ -30,7 +30,7 @@ void tcs_tests(const char* fname = "rec_tcs.root"){
   ROOT::RDataFrame df("events", fname);
 
   auto ff_theta_mrad = [] (
-      const std::vector<eicd::ReconstructedParticleData>& v,
+      const std::vector<edm4eic::ReconstructedParticleData>& v,
       const int16_t type
   ) -> std::vector<float> {
     std::vector<float> theta;
@@ -45,10 +45,10 @@ void tcs_tests(const char* fname = "rec_tcs.root"){
   auto df0 = df.Define("n_parts", "ReconstructedParticles.size()")
                .Define("isQ2gt1", "InclusiveKinematicsTruth.Q2 > 1.0")
                .Define("n_Q2gt1", "isQ2gt1.size()")
-               .Define("ff_theta_mrad_B0", [&](const std::vector<eicd::ReconstructedParticleData>& v){return ff_theta_mrad(v,1);}, {"ReconstructedFFParticles"})
-               .Define("ff_theta_mrad_RP", [&](const std::vector<eicd::ReconstructedParticleData>& v){return ff_theta_mrad(v,2);}, {"ReconstructedFFParticles"})
-               .Define("ff_theta_mrad_OMD",[&](const std::vector<eicd::ReconstructedParticleData>& v){return ff_theta_mrad(v,3);}, {"ReconstructedFFParticles"})
-               .Define("ff_theta_mrad_ZDC",[&](const std::vector<eicd::ReconstructedParticleData>& v){return ff_theta_mrad(v,4);}, {"ReconstructedFFParticles"})
+               .Define("ff_theta_mrad_B0", [&](const std::vector<edm4eic::ReconstructedParticleData>& v){return ff_theta_mrad(v,1);}, {"ReconstructedFFParticles"})
+               .Define("ff_theta_mrad_RP", [&](const std::vector<edm4eic::ReconstructedParticleData>& v){return ff_theta_mrad(v,2);}, {"ReconstructedFFParticles"})
+               .Define("ff_theta_mrad_OMD",[&](const std::vector<edm4eic::ReconstructedParticleData>& v){return ff_theta_mrad(v,3);}, {"ReconstructedFFParticles"})
+               .Define("ff_theta_mrad_ZDC",[&](const std::vector<edm4eic::ReconstructedParticleData>& v){return ff_theta_mrad(v,4);}, {"ReconstructedFFParticles"})
                ;
 
   auto h_n_parts = df0.Histo1D({"h_n_parts", "; h_n_parts n", 10, 0, 10}, "n_parts");
diff --git a/benchmarks/u_omega/analysis/demo.cxx b/benchmarks/u_omega/analysis/demo.cxx
index af9f43301c596666d9b0d318fce5577352d6e558..d8eb7433348248c52bcd91dac3d8a34a176a6f1d 100644
--- a/benchmarks/u_omega/analysis/demo.cxx
+++ b/benchmarks/u_omega/analysis/demo.cxx
@@ -14,19 +14,19 @@ R__LOAD_LIBRARY(libfmt.so)
 #include "fmt/core.h"
 #include "fmt/color.h"
 
-R__LOAD_LIBRARY(libeicd.so)
+R__LOAD_LIBRARY(libedm4eic.so)
 R__LOAD_LIBRARY(libDD4pod.so)
 
 #include "dd4pod/Geant4ParticleCollection.h"
-#include "eicd/TrackParametersCollection.h"
-#include "eicd/ClusterCollection.h"
-#include "eicd/ReconstructedParticleCollection.h"
-#include "eicd/InclusiveKinematicsCollection.h"
+#include "edm4eic/TrackParametersCollection.h"
+#include "edm4eic/ClusterCollection.h"
+#include "edm4eic/ReconstructedParticleCollection.h"
+#include "edm4eic/InclusiveKinematicsCollection.h"
 
 using ROOT::RDataFrame;
 using namespace ROOT::VecOps;
 
-auto p_track = [](std::vector<eicd::TrackParametersData> const& in) {
+auto p_track = [](std::vector<edm4eic::TrackParametersData> const& in) {
   std::vector<double> result;
   for (size_t i = 0; i < in.size(); ++i) {
     result.push_back(std::abs(1.0/(in[i].qOverP)));
@@ -66,7 +66,7 @@ auto fourvec = [](ROOT::VecOps::RVec<dd4pod::Geant4ParticleData> const& in) {
   }
   return result;
 };
-auto recfourvec = [](ROOT::VecOps::RVec<eicd::ReconstructedParticleData> const& in) {
+auto recfourvec = [](ROOT::VecOps::RVec<edm4eic::ReconstructedParticleData> const& in) {
   std::vector<ROOT::Math::PxPyPzMVector> result;
   ROOT::Math::PxPyPzMVector lv;
   for (size_t i = 0; i < in.size(); ++i) {