diff --git a/evaluation/CMakeLists.txt b/evaluation/CMakeLists.txt
index ce5eced559b64ade7832273147a71a34285c7119..4e3eaee937aa494f4ccc6bc4febcd2766d4a73f2 100644
--- a/evaluation/CMakeLists.txt
+++ b/evaluation/CMakeLists.txt
@@ -23,7 +23,7 @@ SET( EVALUATION_SRC
 
 SET(EVALUATION_ROOTMAP ${CMAKE_CURRENT_BINARY_DIR}/lib${IRTEVAL_LIB}_rdict.pcm ${CMAKE_CURRENT_BINARY_DIR}/lib${IRTEVAL_LIB}.rootmap )
 
-ROOT_GENERATE_DICTIONARY(G__${IRTEVAL_LIB} eicd/CherenkovPdgHypothesis.h eicd/CherenkovThetaAngleMeasurement.h eicd/CherenkovParticleIDData.h dd4pod/PhotoMultiplierHitData.h dd4pod/Geant4ParticleData.h LINKDEF include/evaluationLinkDef.h)
+ROOT_GENERATE_DICTIONARY(G__${IRTEVAL_LIB} eicd/CherenkovPdgHypothesis.h eicd/CherenkovThetaAngleMeasurement.h eicd/CherenkovParticleIDData.h dd4pod/TrackerHitData.h dd4pod/Geant4ParticleData.h LINKDEF include/evaluationLinkDef.h)
 
 SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 ADD_EXECUTABLE( ${READER_EXE} ${READER_SRC} )
diff --git a/evaluation/include/evaluationLinkDef.h b/evaluation/include/evaluationLinkDef.h
index 41398b91f0b516ee7e138a943ed4953dc8a868cf..adb973bd2b9a96b41161f9cb03904dba3cc88e7e 100644
--- a/evaluation/include/evaluationLinkDef.h
+++ b/evaluation/include/evaluationLinkDef.h
@@ -9,6 +9,6 @@
 #pragma link C++ class std::vector<eic::CherenkovThetaAngleMeasurement>+;
 #pragma link C++ class std::vector<eic::CherenkovParticleIDData>+;
 #pragma link C++ class std::vector<dd4pod::Geant4ParticleData>+;
-#pragma link C++ class std::vector<dd4pod::PhotoMultiplierHitData>+;
+#pragma link C++ class std::vector<dd4pod::TrackerHitData>+;
 
 #endif
diff --git a/evaluation/source/reader.cc b/evaluation/source/reader.cc
index ec106046fd131dba2247536072ff5e3cc2ac055f..16158d2d18232e44d84c675efebc3a627e156a3f 100644
--- a/evaluation/source/reader.cc
+++ b/evaluation/source/reader.cc
@@ -8,7 +8,7 @@
 
 // NPdet
 #include "dd4pod/Geant4ParticleCollection.h"
-#include "dd4pod/PhotoMultiplierHitCollection.h"
+#include "dd4pod/TrackerHitCollection.h"
 
 // IRT
 #include <CherenkovEvent.h>
@@ -80,7 +80,7 @@ int main(int argc, char** argv)
   // Use MC truth particles, and deal with just pfRICH hits here; however the interface 
   // should work for combinations like pfRICH+DIRC, eventually; 
   std::vector<dd4pod::Geant4ParticleData>     *tracks = new std::vector<dd4pod::Geant4ParticleData>();
-  std::vector<dd4pod::PhotoMultiplierHitData> *hits   = new std::vector<dd4pod::PhotoMultiplierHitData>();
+  std::vector<dd4pod::TrackerHitData> *hits   = new std::vector<dd4pod::TrackerHitData>();
   t->SetBranchAddress("mcparticles", &tracks);
   {
     TString hname; hname.Form("%sHits", detector->GetName());
diff --git a/scripts/reader.C b/scripts/reader.C
index 8e7ae67abd0adcbcef674b8d0151da7820fd55c2..2a38bf7c912818beb773f68d9af9063b90a551cc 100644
--- a/scripts/reader.C
+++ b/scripts/reader.C
@@ -81,7 +81,7 @@ void reader(const char *dfname, const char *cfname, const char *dtname = 0)
   // Use MC truth particles, and deal with just pfRICH hits here; however the interface 
   // should work for combinations like pfRICH+DIRC, eventually; 
   std::vector<dd4pod::Geant4ParticleData>     *tracks = new std::vector<dd4pod::Geant4ParticleData>();
-  std::vector<dd4pod::PhotoMultiplierHitData> *hits   = new std::vector<dd4pod::PhotoMultiplierHitData>();
+  std::vector<dd4pod::TrackerHitData> *hits   = new std::vector<dd4pod::TrackerHitData>();
   t->SetBranchAddress("mcparticles", &tracks);
   {
     TString hname; hname.Form("%sHits", detector->GetName());