diff --git a/src/THcAerogel.cxx b/src/THcAerogel.cxx
index 60f92df71cdd542ce9652b29b1cad7329a510012..8d5e47b6672a4693fe11cfb07256e0d4ae7fe2ca 100644
--- a/src/THcAerogel.cxx
+++ b/src/THcAerogel.cxx
@@ -80,7 +80,7 @@ THaAnalysisObject::EStatus THcAerogel::Init( const TDatime& date )
 
   // Should probably put this in ReadDatabase as we will know the
   // maximum number of hits after setting up the detector map
-  THcHitList::InitHitList(fDetMap, "THcAerogelHit", 100);
+  InitHitList(fDetMap, "THcAerogelHit", 100);
 
   EStatus status;
   if( (status = THaNonTrackingDetector::Init( date )) )
@@ -237,7 +237,7 @@ void THcAerogel::Clear(Option_t* opt)
 Int_t THcAerogel::Decode( const THaEvData& evdata )
 {
   // Get the Hall C style hitlist (fRawHitList) for this event
-  fNhits = THcHitList::DecodeToHitList(evdata);
+  fNhits = DecodeToHitList(evdata);
 
   if(gHaCuts->Result("Pedestal_event")) {
 
diff --git a/src/THcCherenkov.cxx b/src/THcCherenkov.cxx
index 2db648b6e83b1100106b6bcb58ce88916bf1188c..5587a54c3a50baaa1a4e345c350cea433e37cb35 100644
--- a/src/THcCherenkov.cxx
+++ b/src/THcCherenkov.cxx
@@ -95,7 +95,7 @@ THaAnalysisObject::EStatus THcCherenkov::Init( const TDatime& date )
 
   // Should probably put this in ReadDatabase as we will know the
   // maximum number of hits after setting up the detector map
-  THcHitList::InitHitList(fDetMap, "THcCherenkovHit", 100); // 100 is max hits
+  InitHitList(fDetMap, "THcCherenkovHit", 100); // 100 is max hits
 
   EStatus status;
   if( (status = THaNonTrackingDetector::Init( date )) )
@@ -206,7 +206,7 @@ void THcCherenkov::Clear(Option_t* opt)
 Int_t THcCherenkov::Decode( const THaEvData& evdata )
 {
   // Get the Hall C style hitlist (fRawHitList) for this event
-  fNhits = THcHitList::DecodeToHitList(evdata);
+  fNhits = DecodeToHitList(evdata);
 
   if(gHaCuts->Result("Pedestal_event")) {
 
diff --git a/src/THcDC.cxx b/src/THcDC.cxx
index 38315726ab6786836ff7ff0345e71249c0ea6ec8..63199d525b6b534a8fafb6e4f1531ff6931fdd15 100644
--- a/src/THcDC.cxx
+++ b/src/THcDC.cxx
@@ -170,7 +170,7 @@ THaAnalysisObject::EStatus THcDC::Init( const TDatime& date )
 
   // Should probably put this in ReadDatabase as we will know the
   // maximum number of hits after setting up the detector map
-  THcHitList::InitHitList(fDetMap, "THcRawDCHit", 1000);
+  InitHitList(fDetMap, "THcRawDCHit", 1000);
 
   EStatus status;
   // This triggers call of ReadDatabase and DefineVariables
@@ -427,7 +427,7 @@ Int_t THcDC::Decode( const THaEvData& evdata )
   Int_t num_event = evdata.GetEvNum();
   if (fdebugprintrawdc ||fdebugprintdecodeddc || fdebuglinkstubs || fdebugtrackprint) cout << " event num = " << num_event << endl;
   // Get the Hall C style hitlist (fRawHitList) for this event
-  fNhits = THcHitList::DecodeToHitList(evdata);
+  fNhits = DecodeToHitList(evdata);
 
   // Let each plane get its hits
   Int_t nexthit = 0;
diff --git a/src/THcHodoscope.cxx b/src/THcHodoscope.cxx
index a2c401064566f04d9b2771af18d799d2f856e1c0..202b97c3944f7c6b3c6e79efbc32c99f43c877bb 100644
--- a/src/THcHodoscope.cxx
+++ b/src/THcHodoscope.cxx
@@ -142,7 +142,7 @@ THaAnalysisObject::EStatus THcHodoscope::Init( const TDatime& date )
   // But it needs to happen before the sub detectors are initialized
   // so that they can get the pointer to the hitlist.
 
-  THcHitList::InitHitList(fDetMap, "THcHodoscopeHit", 100);
+  InitHitList(fDetMap, "THcHodoscopeHit", 100);
 
   EStatus status;
   // This triggers call of ReadDatabase and DefineVariables
@@ -596,7 +596,7 @@ Int_t THcHodoscope::Decode( const THaEvData& evdata )
 {
 
   // Get the Hall C style hitlist (fRawHitList) for this event
-  Int_t nhits = THcHitList::DecodeToHitList(evdata);
+  Int_t nhits = DecodeToHitList(evdata);
 
   if(gHaCuts->Result("Pedestal_event")) {
     Int_t nexthit = 0;
diff --git a/src/THcShower.cxx b/src/THcShower.cxx
index 67c2ca0ef61d301fdb93e5c0542957b4b7dcdc5a..2047500b70ba5a58635c99363448b27371a4cf89 100644
--- a/src/THcShower.cxx
+++ b/src/THcShower.cxx
@@ -111,7 +111,7 @@ THaAnalysisObject::EStatus THcShower::Init( const TDatime& date )
   // Should probably put this in ReadDatabase as we will know the
   // maximum number of hits after setting up the detector map
 
-  THcHitList::InitHitList(fDetMap, "THcRawShowerHit", 100);
+  InitHitList(fDetMap, "THcRawShowerHit", 100);
 
   EStatus status;
   if( (status = THaNonTrackingDetector::Init( date )) )
@@ -514,7 +514,7 @@ Int_t THcShower::Decode( const THaEvData& evdata )
   Clear();
 
   // Get the Hall C style hitlist (fRawHitList) for this event
-  Int_t nhits = THcHitList::DecodeToHitList(evdata);
+  Int_t nhits = DecodeToHitList(evdata);
 
   if(gHaCuts->Result("Pedestal_event")) {
     Int_t nexthit = 0;