diff --git a/evaluation/include/evaluationLinkDef.h b/evaluation/include/evaluationLinkDef.h
index adb973bd2b9a96b41161f9cb03904dba3cc88e7e..5508929c79ded63541ae24b3abfd2e0b76a51e63 100644
--- a/evaluation/include/evaluationLinkDef.h
+++ b/evaluation/include/evaluationLinkDef.h
@@ -5,9 +5,9 @@
 #pragma link off all classes;
 #pragma link off all functions;
 
-#pragma link C++ class std::vector<eic::CherenkovPdgHypothesis>+;
-#pragma link C++ class std::vector<eic::CherenkovThetaAngleMeasurement>+;
-#pragma link C++ class std::vector<eic::CherenkovParticleIDData>+;
+#pragma link C++ class std::vector<eicd::CherenkovPdgHypothesis>+;
+#pragma link C++ class std::vector<eicd::CherenkovThetaAngleMeasurement>+;
+#pragma link C++ class std::vector<eicd::CherenkovParticleIDData>+;
 #pragma link C++ class std::vector<dd4pod::Geant4ParticleData>+;
 #pragma link C++ class std::vector<dd4pod::TrackerHitData>+;
 
diff --git a/evaluation/source/evaluation.cc b/evaluation/source/evaluation.cc
index 5a35e7b9844062c365bcc9967788b6316de38e10..e7fb01158ceeb0f1c6d75f050e044bd046e0250a 100644
--- a/evaluation/source/evaluation.cc
+++ b/evaluation/source/evaluation.cc
@@ -36,8 +36,8 @@ int main(int argc, char** argv)
 
   // Use MC truth particles for a "main" loop;
   auto mctracks   = new std::vector<dd4pod::Geant4ParticleData>();
-  auto rctracks   = new std::vector<eic::ReconstructedParticleData>();
-  auto cherenkov  = new std::vector<eic::CherenkovParticleIDData>();
+  auto rctracks   = new std::vector<eicd::ReconstructedParticleData>();
+  auto cherenkov  = new std::vector<eicd::CherenkovParticleIDData>();
   t->SetBranchAddress("mcparticles", &mctracks);
 
   // FIXME: or whatever the branches are called;
@@ -45,7 +45,7 @@ int main(int argc, char** argv)
   t->SetBranchAddress("rcparticles", &rctracks);
 #endif
   t->SetBranchAddress("PFRICHPID",   &cherenkov);
-  auto options = new std::vector<eic::CherenkovPdgHypothesis>();
+  auto options = new std::vector<eicd::CherenkovPdgHypothesis>();
   t->SetBranchAddress("PFRICHPID_0", &options);
 
   // Loop through all events;
@@ -55,14 +55,14 @@ int main(int argc, char** argv)
 
 #ifdef _USE_RECONSTRUCTED_TRACKS_
     // First populate the reconstructed-to-simulated particle mapping table;
-    std::map<eic::Index, const eic::ReconstructedParticleData*> mc2rc;
+    std::map<eic::Index, const eicd::ReconstructedParticleData*> mc2rc;
     for(const auto &rctrack: *rctracks) 
       mc2rc[rctrack.mcID] = &rctrack;
 #endif
     
     // Then the Cherenkov-to-reconstructed mapping; FIXME: may want to use Cherenkov-to-simulated 
     // mapping to start with, for the debugging purposes;
-    std::map<eic::Index, const eic::CherenkovParticleIDData*> rc2cherenkov;
+    std::map<eic::Index, const eicd::CherenkovParticleIDData*> rc2cherenkov;
     for(const auto &pid: *cherenkov) 
       rc2cherenkov[pid.recID] = &pid;
     
@@ -85,7 +85,7 @@ int main(int argc, char** argv)
 
       // Loop through all of the mass hypotheses available for this reconstructed track;
       {
-	const eic::CherenkovPdgHypothesis *best = 0;
+	const eicd::CherenkovPdgHypothesis *best = 0;
 
 	//printf("%d %d\n", cherenkov->options_begin, cherenkov->options_end);
 	for(unsigned iq=cherenkov->options_begin; iq<cherenkov->options_end; iq++) {
diff --git a/scripts/evaluation.C b/scripts/evaluation.C
index cfc7297889c9f5b080e67cda3ba6b743f732f703..ac206fe43bd32459f0241a1746d52a55545888d4 100644
--- a/scripts/evaluation.C
+++ b/scripts/evaluation.C
@@ -43,14 +43,14 @@ void evaluation(const char *ifname, const char *ofname = 0)
 
   // Use MC truth particles for a "main" loop;
   auto mctracks   = new std::vector<dd4pod::Geant4ParticleData>();
-  auto rctracks   = new std::vector<eic::ReconstructedParticleData>();
-  auto cherenkov  = new std::vector<eic::CherenkovParticleIDData>();
+  auto rctracks   = new std::vector<eicd::ReconstructedParticleData>();
+  auto cherenkov  = new std::vector<eicd::CherenkovParticleIDData>();
   it->SetBranchAddress("mcparticles", &mctracks);
 
   it->SetBranchAddress((TString(_DETECTOR_) + "PID").Data(),   &cherenkov);
-  auto options = new std::vector<eic::CherenkovPdgHypothesis>();
+  auto options = new std::vector<eicd::CherenkovPdgHypothesis>();
   it->SetBranchAddress((TString(_DETECTOR_) + "PID_0").Data(), &options);
-  auto angles  = new std::vector<eic::CherenkovThetaAngleMeasurement>();
+  auto angles  = new std::vector<eicd::CherenkovThetaAngleMeasurement>();
   it->SetBranchAddress((TString(_DETECTOR_) + "PID_1").Data(), &angles);
 
   // Loop through all events;
@@ -60,7 +60,7 @@ void evaluation(const char *ifname, const char *ofname = 0)
     
     // Then the Cherenkov-to-reconstructed mapping; FIXME: may want to use Cherenkov-to-simulated 
     // mapping to start with, for the debugging purposes;
-    std::map<eic::Index, const eic::CherenkovParticleIDData*> rc2cherenkov;
+    std::map<eic::Index, const eicd::CherenkovParticleIDData*> rc2cherenkov;
     for(const auto &pid: *cherenkov) 
       rc2cherenkov[pid.recID] = &pid;
     
@@ -78,7 +78,7 @@ void evaluation(const char *ifname, const char *ofname = 0)
 
       // Loop through all of the mass hypotheses available for this reconstructed track;
       {
-	const eic::CherenkovPdgHypothesis *best = 0;
+	const eicd::CherenkovPdgHypothesis *best = 0;
 
 	for(unsigned iq=cherenkov->options_begin; iq<cherenkov->options_end; iq++) {
 	  const auto &option = (*options)[iq];
diff --git a/scripts/evaluation.fig12.C b/scripts/evaluation.fig12.C
index 1412af00bbc3af4e709217d2d24f1903efddebc6..a867f7bc6bd29d3b6073fcea4947e019077d0bf8 100644
--- a/scripts/evaluation.fig12.C
+++ b/scripts/evaluation.fig12.C
@@ -47,8 +47,8 @@ void evaluation(const char *ifname, const char *ofname = 0)
 
   // Use MC truth particles for a "main" loop;
   auto mctracks   = new std::vector<dd4pod::Geant4ParticleData>();
-  auto rctracks   = new std::vector<eic::ReconstructedParticleData>();
-  auto cherenkov  = new std::vector<eic::CherenkovParticleIDData>();
+  auto rctracks   = new std::vector<eicd::ReconstructedParticleData>();
+  auto cherenkov  = new std::vector<eicd::CherenkovParticleIDData>();
   it->SetBranchAddress("mcparticles", &mctracks);
 
   // FIXME: or whatever the branches are called;
@@ -56,9 +56,9 @@ void evaluation(const char *ifname, const char *ofname = 0)
   it->SetBranchAddress("rcparticles", &rctracks);
 #endif
   it->SetBranchAddress((TString(_DETECTOR_) + "PID").Data(),   &cherenkov);
-  auto options = new std::vector<eic::CherenkovPdgHypothesis>();
+  auto options = new std::vector<eicd::CherenkovPdgHypothesis>();
   it->SetBranchAddress((TString(_DETECTOR_) + "PID_0").Data(), &options);
-  auto angles  = new std::vector<eic::CherenkovThetaAngleMeasurement>();
+  auto angles  = new std::vector<eicd::CherenkovThetaAngleMeasurement>();
   it->SetBranchAddress((TString(_DETECTOR_) + "PID_1").Data(), &angles);
 
   // Loop through all events;
@@ -68,14 +68,14 @@ void evaluation(const char *ifname, const char *ofname = 0)
 
 #ifdef _USE_RECONSTRUCTED_TRACKS_
     // First populate the reconstructed-to-simulated particle mapping table;
-    std::map<eic::Index, const eic::ReconstructedParticleData*> mc2rc;
+    std::map<eic::Index, const eicd::ReconstructedParticleData*> mc2rc;
     for(const auto &rctrack: *rctracks) 
       mc2rc[rctrack.mcID] = &rctrack;
 #endif
     
     // Then the Cherenkov-to-reconstructed mapping; FIXME: may want to use Cherenkov-to-simulated 
     // mapping to start with, for the debugging purposes;
-    std::map<eic::Index, const eic::CherenkovParticleIDData*> rc2cherenkov;
+    std::map<eic::Index, const eicd::CherenkovParticleIDData*> rc2cherenkov;
     for(const auto &pid: *cherenkov) 
       rc2cherenkov[pid.recID] = &pid;
     
@@ -109,7 +109,7 @@ void evaluation(const char *ifname, const char *ofname = 0)
 
       // Loop through all of the mass hypotheses available for this reconstructed track;
       {
-	const eic::CherenkovPdgHypothesis *best = 0;
+	const eicd::CherenkovPdgHypothesis *best = 0;
 
 	for(unsigned iq=cherenkov->options_begin; iq<cherenkov->options_end; iq++) {
 	  const auto &option = (*options)[iq];
diff --git a/scripts/rejection.C b/scripts/rejection.C
index f0e852c23a4fb1779d50ed92551bf61f5f728ea3..acc6cfbfcbfe379cbe87eb9abd915f0e80c2f828 100644
--- a/scripts/rejection.C
+++ b/scripts/rejection.C
@@ -48,8 +48,8 @@ void rejection(const char *ifname)//, const char *ofname = 0)
 
   // Use MC truth particles for a "main" loop;
   auto mctracks   = new std::vector<dd4pod::Geant4ParticleData>();
-  auto rctracks   = new std::vector<eic::ReconstructedParticleData>();
-  auto cherenkov  = new std::vector<eic::CherenkovParticleIDData>();
+  auto rctracks   = new std::vector<eicd::ReconstructedParticleData>();
+  auto cherenkov  = new std::vector<eicd::CherenkovParticleIDData>();
   it->SetBranchAddress("mcparticles", &mctracks);
 
   // FIXME: or whatever the branches are called;
@@ -57,9 +57,9 @@ void rejection(const char *ifname)//, const char *ofname = 0)
   it->SetBranchAddress("rcparticles", &rctracks);
 #endif
   it->SetBranchAddress((TString(_DETECTOR_) + "PID").Data(),   &cherenkov);
-  auto options = new std::vector<eic::CherenkovPdgHypothesis>();
+  auto options = new std::vector<eicd::CherenkovPdgHypothesis>();
   it->SetBranchAddress((TString(_DETECTOR_) + "PID_0").Data(), &options);
-  auto angles  = new std::vector<eic::CherenkovThetaAngleMeasurement>();
+  auto angles  = new std::vector<eicd::CherenkovThetaAngleMeasurement>();
   it->SetBranchAddress((TString(_DETECTOR_) + "PID_1").Data(), &angles);
 
   // Loop through all events;
@@ -69,14 +69,14 @@ void rejection(const char *ifname)//, const char *ofname = 0)
 
 #ifdef _USE_RECONSTRUCTED_TRACKS_
     // First populate the reconstructed-to-simulated particle mapping table;
-    std::map<eic::Index, const eic::ReconstructedParticleData*> mc2rc;
+    std::map<eic::Index, const eicd::ReconstructedParticleData*> mc2rc;
     for(const auto &rctrack: *rctracks) 
       mc2rc[rctrack.mcID] = &rctrack;
 #endif
     
     // Then the Cherenkov-to-reconstructed mapping; FIXME: may want to use Cherenkov-to-simulated 
     // mapping to start with, for the debugging purposes;
-    std::map<eic::Index, const eic::CherenkovParticleIDData*> rc2cherenkov;
+    std::map<eic::Index, const eicd::CherenkovParticleIDData*> rc2cherenkov;
     for(const auto &pid: *cherenkov) 
       rc2cherenkov[pid.recID] = &pid;
     
@@ -110,7 +110,7 @@ void rejection(const char *ifname)//, const char *ofname = 0)
 
       // Loop through all of the mass hypotheses available for this reconstructed track;
       {
-	const eic::CherenkovPdgHypothesis *best = 0;
+	const eicd::CherenkovPdgHypothesis *best = 0;
 
 	for(unsigned iq=cherenkov->options_begin; iq<cherenkov->options_end; iq++) {
 	  const auto &option = (*options)[iq];