diff --git a/Makefile b/Makefile
index e69a57fdff0176c73fc42834ec27bacef8227ffc..666fdac78d116833b39ddb5e0c526848ea27e83e 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,7 @@ SRC  =  src/THcInterface.cxx src/THcParmList.cxx src/THcAnalyzer.cxx \
 	src/THcSpacePoint.cxx src/THcDCTrack.cxx \
 	src/THcShower.cxx src/THcShowerPlane.cxx \
 	src/THcShowerArray.cxx \
+	src/THcShowerHit.cxx \
 	src/THcRawShowerHit.cxx \
 	src/THcAerogel.cxx src/THcAerogelHit.cxx \
 	src/THcCherenkov.cxx src/THcCherenkovHit.cxx \
diff --git a/SConscript.py b/SConscript.py
index baae720eca6e59b2bb9787e1ddc8700d43c90ced..fa43727beb7376c8dfe3449b8f9a9db4a6d4cc11 100644
--- a/SConscript.py
+++ b/SConscript.py
@@ -17,7 +17,7 @@ hcheaders = Split("""
         src/THcDC.h src/THcDriftChamberPlane.h 
 	src/THcDriftChamber.h src/THcRawDCHit.h src/THcDCHit.h src/THcDCWire.h src/THcSpacePoint.h 
 	src/THcDCLookupTTDConv.h src/THcDCTimeToDistConv.h src/THcShower.h src/THcShowerPlane.h 
-        src/THcShowerArray.h src/THcShowerHitCluster.h
+        src/THcShowerArray.h src/THcShowerHit.h
 	src/THcRawShowerHit.h src/THcAerogel.h src/THcAerogelHit.h src/THcCherenkov.h src/THcCherenkovHit.h
         src/THcGlobals.h src/THcDCTrack.h src/THcFormula.h
         src/THcRaster.h src/THcRasteredBeam.h src/THcRasterRawHit.h src/THcScalerEvtHandler.h
diff --git a/src/HallC_LinkDef.h b/src/HallC_LinkDef.h
index d1efa4f0d05c4105343610f9729704099ba42eaf..25a875f665fc0104a0612967e123eb30e4044a55 100644
--- a/src/HallC_LinkDef.h
+++ b/src/HallC_LinkDef.h
@@ -44,6 +44,8 @@
 #pragma link C++ class THcShower+;
 #pragma link C++ class THcShowerPlane+;
 #pragma link C++ class THcShowerArray+;
+
+#pragma link C++ class THcShowerHit+;
 #pragma link C++ class THcRawShowerHit+;
 #pragma link C++ class THcAerogel+;
 #pragma link C++ class THcAerogelHit+;
diff --git a/src/SConscript.py b/src/SConscript.py
index 58134e924bc43ec5dff2880144afbf9d50f55def..d811643ddd219f57af6b62f6077b73acc94d830d 100644
--- a/src/SConscript.py
+++ b/src/SConscript.py
@@ -21,7 +21,7 @@ THcDCWire.cxx \
 THcSpacePoint.cxx THcDCTrack.cxx \
 THcDCLookupTTDConv.cxx THcDCTimeToDistConv.cxx \
 THcShower.cxx THcShowerPlane.cxx THcShowerArray.cxx \
-THcRawShowerHit.cxx THcShowerHitCluster.cxx
+THcRawShowerHit.cxx THcShowerHit.cxx
 THcAerogel.cxx THcAerogelHit.cxx \
 THcCherenkov.cxx THcCherenkovHit.cxx \
 THcFormula.cxx \
diff --git a/src/THcShower.h b/src/THcShower.h
index b1573e31c3676ab5689b6d6263cb064c48a3f985..185ee9b788cc3f113d8c33161dbd1c266ea55a5e 100644
--- a/src/THcShower.h
+++ b/src/THcShower.h
@@ -12,7 +12,7 @@
 #include "THcHitList.h"
 #include "THcShowerPlane.h"
 #include "THcShowerArray.h"
-#include "THcShowerHitCluster.h"
+#include "THcShowerHit.h"
 #include "TMath.h"
 
 class THcShower : public THaNonTrackingDetector, public THcHitList {
diff --git a/src/THcShowerArray.h b/src/THcShowerArray.h
index 0b9f81c1431eb39f93cd5f502c0885255d9f6c34..699793cd865c77d37be28c7198d9866e589125e9 100644
--- a/src/THcShowerArray.h
+++ b/src/THcShowerArray.h
@@ -19,7 +19,7 @@
 #include "THaSubDetector.h"
 #include "THaTrack.h"
 #include "TClonesArray.h"
-#include "THcShowerHitCluster.h"
+#include "THcShowerHit.h"
 
 #include <iostream>
 
diff --git a/src/THcShowerHitCluster.cxx b/src/THcShowerHit.cxx
similarity index 97%
rename from src/THcShowerHitCluster.cxx
rename to src/THcShowerHit.cxx
index f805f796e09a75400f3c2d6b4efe53149d5e1ea8..7d46f0553b37684e771ea5d20d1739bc5ef9aa9e 100644
--- a/src/THcShowerHitCluster.cxx
+++ b/src/THcShowerHit.cxx
@@ -1,4 +1,4 @@
-#include "THcShowerHitCluster.h"
+#include "THcShowerHit.h"
 
 //ClassImp(THcShowerHit)
 
diff --git a/src/THcShowerHitCluster.h b/src/THcShowerHit.h
similarity index 96%
rename from src/THcShowerHitCluster.h
rename to src/THcShowerHit.h
index 081aba7805e17679f0cb423ddf213e78e2c3ad63..4df3a7f7100d126986420abc6b1b24f971e64626 100644
--- a/src/THcShowerHitCluster.h
+++ b/src/THcShowerHit.h
@@ -1,5 +1,5 @@
-#ifndef ROOT_THcShowerHitCluster
-#define ROOT_THcShowerHitCluster
+#ifndef ROOT_THcShowerHit
+#define ROOT_THcShowerHit
 
 // HMS calorimeter hits, version 2