diff --git a/benchmarks/dis/analysis/dis_analysis_ecal.cxx b/benchmarks/dis/analysis/dis_analysis_ecal.cxx
index 1d28bdbafc86a52e617eb878103c1f9512ee7d31..877d9c2a37704423ca4c3d25057d0bb5372dc6b3 100644
--- a/benchmarks/dis/analysis/dis_analysis_ecal.cxx
+++ b/benchmarks/dis/analysis/dis_analysis_ecal.cxx
@@ -21,7 +21,8 @@
 #include "fmt/core.h"
 
 #include "nlohmann/json.hpp"
-#include "eicd/RawCalorimeterHit.h"
+#include "eicd/CalorimeterHitData.h"
+#include "eicd/ClusterData.h"
 
 int dis_electrons_ecal(const std::string& config_name)
 {
diff --git a/benchmarks/dis/analysis/dis_analysis_hcal.cxx b/benchmarks/dis/analysis/dis_analysis_hcal.cxx
index 486df32af33d3c688c32d5c4bb5290920a6dd2f9..566e4bfbea4960d8427bd2ed1b686423256d8892 100644
--- a/benchmarks/dis/analysis/dis_analysis_hcal.cxx
+++ b/benchmarks/dis/analysis/dis_analysis_hcal.cxx
@@ -21,7 +21,8 @@
 #include "fmt/core.h"
 
 #include "nlohmann/json.hpp"
-#include "eicd/RawCalorimeterHit.h"
+#include "eicd/CalorimeterHitData.h"
+#include "eicd/ClusterData.h"
 
 int dis_electrons_hcal(const std::string& config_name)
 {
@@ -57,4 +58,4 @@ int dis_electrons_hcal(const std::string& config_name)
   ROOT::RDataFrame d("events", rec_file);
 
   return 0;
-}
\ No newline at end of file
+}
diff --git a/benchmarks/dis/analysis/dis_analysis_raw.cxx b/benchmarks/dis/analysis/dis_analysis_raw.cxx
index 4d856a3fe51935cced3630732ed580c3485714a4..4b020fe8f5195d99a6aa1b96b8061434b31627f2 100644
--- a/benchmarks/dis/analysis/dis_analysis_raw.cxx
+++ b/benchmarks/dis/analysis/dis_analysis_raw.cxx
@@ -21,7 +21,7 @@
 #include "fmt/core.h"
 
 #include "nlohmann/json.hpp"
-#include "eicd/RawCalorimeterHit.h"
+#include "eicd/RawCalorimeterHitData.h"
 
 int dis_electrons_raw(const std::string& config_name)
 {