diff --git a/src/THcAerogel.cxx b/src/THcAerogel.cxx
index 385f17b9e152ac3be04db60a1942425316e31117..af259a3c8790da16f1c2705809f3daca92587225 100644
--- a/src/THcAerogel.cxx
+++ b/src/THcAerogel.cxx
@@ -150,13 +150,12 @@ THaAnalysisObject::EStatus THcAerogel::Init( const TDatime& date )
   if( (status = THaNonTrackingDetector::Init( date )) )
     return fStatus=status;
 
-  // Will need to determine which apparatus it belongs to and use the
-  // appropriate detector ID in the FillMap call
-  if( gHcDetectorMap->FillMap(fDetMap, "HAERO") < 0 ) {
+  char EngineDID[] = "xAERO";
+  EngineDID[0] = toupper(GetApparatus()->GetName()[0]);
+  if( gHcDetectorMap->FillMap(fDetMap, EngineDID) < 0 ) {
     static const char* const here = "Init()";
-    Error( Here(here), "Error filling detectormap for %s.", 
-	     "HAERO");
-      return kInitError;
+    Error( Here(here), "Error filling detectormap for %s.", EngineDID );
+    return kInitError;
   }
 
   return fStatus = kOK;
diff --git a/src/THcCherenkov.cxx b/src/THcCherenkov.cxx
index b14ceca2d6ab91deee446f70323ca2bb87bc6123..44531d9aa529a6471f45f33d869451705ed766d1 100644
--- a/src/THcCherenkov.cxx
+++ b/src/THcCherenkov.cxx
@@ -123,12 +123,12 @@ THaAnalysisObject::EStatus THcCherenkov::Init( const TDatime& date )
   if( (status = THaNonTrackingDetector::Init( date )) )
     return fStatus=status;
 
-  // Will need to determine which apparatus it belongs to and use the
-  // appropriate detector ID in the FillMap call
-  if( gHcDetectorMap->FillMap(fDetMap, "HCER") < 0 ) {
-    Error( Here(here), "Error filling detectormap for %s.", 
-	     "HCER");
-      return kInitError;
+  char EngineDID[] = "xCER";
+  EngineDID[0] = toupper(GetApparatus()->GetName()[0]);
+  if( gHcDetectorMap->FillMap(fDetMap, EngineDID) < 0 ) {
+    static const char* const here = "Init()";
+    Error( Here(here), "Error filling detectormap for %s.", EngineDID );
+    return kInitError;
   }
 
   return fStatus = kOK;
diff --git a/src/THcDC.cxx b/src/THcDC.cxx
index 6a481fe3471aa718df37344c857a9c00a7f99339..3bdbda02b2345abe114ff98515d0c55387e97872 100644
--- a/src/THcDC.cxx
+++ b/src/THcDC.cxx
@@ -217,20 +217,12 @@ THaAnalysisObject::EStatus THcDC::Init( const TDatime& date )
   //  };
   //  memcpy( fDataDest, tmp, NDEST*sizeof(DataDest) );
 
-  // Will need to determine which apparatus it belongs to and use the
-  // appropriate detector ID in the FillMap call
-  char EngineDID[4];
-
+  char EngineDID[] = "xDC";
   EngineDID[0] = toupper(GetApparatus()->GetName()[0]);
-  EngineDID[1] = 'D';
-  EngineDID[2] = 'C';
-  EngineDID[3] = '\0';
-  
   if( gHcDetectorMap->FillMap(fDetMap, EngineDID) < 0 ) {
     static const char* const here = "Init()";
-    Error( Here(here), "Error filling detectormap for %s.", 
-	     EngineDID);
-      return kInitError;
+    Error( Here(here), "Error filling detectormap for %s.", EngineDID );
+    return kInitError;
   }
 
   return fStatus = kOK;
diff --git a/src/THcHodoscope.cxx b/src/THcHodoscope.cxx
index e9e571f51211d7de985b86758b7ed956d88ffc73..ed72787a6949fad63ed49e82c9d65f1932bdfd1b 100644
--- a/src/THcHodoscope.cxx
+++ b/src/THcHodoscope.cxx
@@ -199,13 +199,12 @@ THaAnalysisObject::EStatus THcHodoscope::Init( const TDatime& date )
   //  };
   //  memcpy( fDataDest, tmp, NDEST*sizeof(DataDest) );
 
-  char EngineDID[]="xSCIN";
+  char EngineDID[] = "xSCIN";
   EngineDID[0] = toupper(GetApparatus()->GetName()[0]);
   if( gHcDetectorMap->FillMap(fDetMap, EngineDID) < 0 ) {
     static const char* const here = "Init()";
-    Error( Here(here), "Error filling detectormap for %s.", 
-	     EngineDID);
-      return kInitError;
+    Error( Here(here), "Error filling detectormap for %s.", EngineDID );
+    return kInitError;
   }
 
   fNScinHits     = new Int_t [fNPlanes];
diff --git a/src/THcShower.cxx b/src/THcShower.cxx
index c62c2f57bdac03ad1c2cfb1cf3e9cb70f2237407..61cd8d2591e4f5cb0a55873439a5038684281e8b 100644
--- a/src/THcShower.cxx
+++ b/src/THcShower.cxx
@@ -150,14 +150,12 @@ THaAnalysisObject::EStatus THcShower::Init( const TDatime& date )
     }
   }
 
-  char EngineDID[] = " CAL";
+  char EngineDID[] = "xCAL";
   EngineDID[0] = toupper(GetApparatus()->GetName()[0]);
-
   if( gHcDetectorMap->FillMap(fDetMap, EngineDID) < 0 ) {
     static const char* const here = "Init()";
-    Error( Here(here), "Error filling detectormap for %s.", 
-	     EngineDID);
-      return kInitError;
+    Error( Here(here), "Error filling detectormap for %s.", EngineDID );
+    return kInitError;
   }
 
   if(fHasArray) {