diff --git a/Calorimeter/CaloBadChannelTool/src/components/CaloBadChannelTool_entries.cxx b/Calorimeter/CaloBadChannelTool/src/components/CaloBadChannelTool_entries.cxx
index 3bd9ca7cbe15e938741ef89d00ece7525ed43465..da1a94f2e872ec2f47a849932fbf78e20e1b3a9e 100644
--- a/Calorimeter/CaloBadChannelTool/src/components/CaloBadChannelTool_entries.cxx
+++ b/Calorimeter/CaloBadChannelTool/src/components/CaloBadChannelTool_entries.cxx
@@ -1,4 +1,4 @@
 #include "CaloBadChannelTool/CaloBadChanTool.h"
 
-DECLARE_TOOL_FACTORY( CaloBadChanTool )
+DECLARE_COMPONENT( CaloBadChanTool )
 
diff --git a/Calorimeter/CaloCalibHitRec/src/components/CaloCalibHitRec_entries.cxx b/Calorimeter/CaloCalibHitRec/src/components/CaloCalibHitRec_entries.cxx
index 7c071417242ef46edad9143471c54c7d768e0e17..415a926300c9c1e1f1b7c7d958cda31d1d973b46 100644
--- a/Calorimeter/CaloCalibHitRec/src/components/CaloCalibHitRec_entries.cxx
+++ b/Calorimeter/CaloCalibHitRec/src/components/CaloCalibHitRec_entries.cxx
@@ -4,9 +4,9 @@
 #include "CaloCalibHitRec/CaloCalibClusterMomentsMaker2.h"
 
 
-DECLARE_ALGORITHM_FACTORY( CalibHitToCaloCell )
-DECLARE_ALGORITHM_FACTORY( CalibHitIDCheck )
+DECLARE_COMPONENT( CalibHitToCaloCell )
+DECLARE_COMPONENT( CalibHitIDCheck )
 
-DECLARE_TOOL_FACTORY( CaloCalibClusterMomentsMaker )
-DECLARE_TOOL_FACTORY( CaloCalibClusterMomentsMaker2 )
+DECLARE_COMPONENT( CaloCalibClusterMomentsMaker )
+DECLARE_COMPONENT( CaloCalibClusterMomentsMaker2 )
 
diff --git a/Calorimeter/CaloCellCorrection/src/components/CaloCellCorrection_entries.cxx b/Calorimeter/CaloCellCorrection/src/components/CaloCellCorrection_entries.cxx
index 186ebb83b31dc033e4e22869954e32efc1df10c7..7fbf72ded7fdf222858cd92f392236f957a8eb09 100644
--- a/Calorimeter/CaloCellCorrection/src/components/CaloCellCorrection_entries.cxx
+++ b/Calorimeter/CaloCellCorrection/src/components/CaloCellCorrection_entries.cxx
@@ -7,11 +7,11 @@
 #include "CaloCellCorrection/CaloCellTimeCorrTool.h"
 
 
-DECLARE_TOOL_FACTORY( CaloCellPedestalCorr )
-DECLARE_TOOL_FACTORY( CaloCellMBAverageCorr )
-DECLARE_TOOL_FACTORY( CaloCellNeighborsAverageCorr )
-DECLARE_TOOL_FACTORY( CaloCellRandomizer )
-DECLARE_TOOL_FACTORY( CaloCellRescaler )
-DECLARE_TOOL_FACTORY( CaloCellEnergyRescaler )
-DECLARE_TOOL_FACTORY ( CaloCellTimeCorrTool )
+DECLARE_COMPONENT( CaloCellPedestalCorr )
+DECLARE_COMPONENT( CaloCellMBAverageCorr )
+DECLARE_COMPONENT( CaloCellNeighborsAverageCorr )
+DECLARE_COMPONENT( CaloCellRandomizer )
+DECLARE_COMPONENT( CaloCellRescaler )
+DECLARE_COMPONENT( CaloCellEnergyRescaler )
+DECLARE_COMPONENT( CaloCellTimeCorrTool )
 
diff --git a/Calorimeter/CaloClusterCorrection/src/components/CaloClusterCorrection_entries.cxx b/Calorimeter/CaloClusterCorrection/src/components/CaloClusterCorrection_entries.cxx
index 535397e351c0116865f8dbbb29e99f6187952ac7..6d94e932c2c52aa7cc1e09608f267d6ddfb7d52e 100644
--- a/Calorimeter/CaloClusterCorrection/src/components/CaloClusterCorrection_entries.cxx
+++ b/Calorimeter/CaloClusterCorrection/src/components/CaloClusterCorrection_entries.cxx
@@ -55,59 +55,59 @@
 #include "../CaloClusterTimeTool.h"
 
 
-DECLARE_TOOL_FACTORY( CaloClusterLocalCalibCone )
-DECLARE_TOOL_FACTORY( CaloClusterLocalCalib )
-DECLARE_TOOL_FACTORY( CaloClusterLogPos )
-DECLARE_TOOL_FACTORY( CaloFillRectangularCluster )
-DECLARE_TOOL_FACTORY( CaloClusterUpdate )
-DECLARE_TOOL_FACTORY( CaloTopoEMlayers )
-DECLARE_TOOL_FACTORY( CaloTopoEMphioff )
-DECLARE_TOOL_FACTORY( CaloTopoEMphimod )
-DECLARE_TOOL_FACTORY( CaloTopoEMsshape )
-DECLARE_TOOL_FACTORY( CaloTopoEMLongWeights )
-DECLARE_TOOL_FACTORY( CaloTopoEMGap )
-
-DECLARE_TOOL_FACTORY( CaloClusterCellWeightCalib )
-
-DECLARE_TOOL_FACTORY( CaloScaleCluster )
-DECLARE_TOOL_FACTORY( CaloSwApplyWgts_g3 )
-DECLARE_TOOL_FACTORY( CaloSwEtaoff_v2 )
-DECLARE_TOOL_FACTORY( CaloSwEtaoff_v3 )
-DECLARE_TOOL_FACTORY( CaloSwPhioff_v2 )
-DECLARE_TOOL_FACTORY( CaloSwEtamod_v2 )
-DECLARE_TOOL_FACTORY( CaloSwPhimod_v2 )
-DECLARE_TOOL_FACTORY( CaloSwGap_v2 )
-DECLARE_TOOL_FACTORY( CaloSwGap_v3 )
-DECLARE_TOOL_FACTORY( CaloSwClcon_v2 )
-DECLARE_TOOL_FACTORY( CaloSwLongWeights )
-DECLARE_TOOL_FACTORY( CaloSwEtamod_g3 )
-DECLARE_TOOL_FACTORY( CaloSwPhimod_g3 )
-DECLARE_TOOL_FACTORY( CaloSwEta1b_g3 )
-DECLARE_TOOL_FACTORY( CaloSwEta1e_g3 )
-DECLARE_TOOL_FACTORY( CaloSwEta2b_g3 )
-DECLARE_TOOL_FACTORY( CaloSwEta2e_g3 )
-DECLARE_TOOL_FACTORY( CaloSwClcon_g3 )
-DECLARE_TOOL_FACTORY( CaloSwGap_g3 )
-DECLARE_TOOL_FACTORY( CaloSwECcrack_g3 )
-DECLARE_TOOL_FACTORY( CaloComputeSWcellWeights )
-DECLARE_TOOL_FACTORY (CaloSwCalibHitsCalibration )
-DECLARE_TOOL_FACTORY (CaloSwDeadOTX_ps)
-DECLARE_TOOL_FACTORY (CaloSwDeadOTX_back)
+DECLARE_COMPONENT( CaloClusterLocalCalibCone )
+DECLARE_COMPONENT( CaloClusterLocalCalib )
+DECLARE_COMPONENT( CaloClusterLogPos )
+DECLARE_COMPONENT( CaloFillRectangularCluster )
+DECLARE_COMPONENT( CaloClusterUpdate )
+DECLARE_COMPONENT( CaloTopoEMlayers )
+DECLARE_COMPONENT( CaloTopoEMphioff )
+DECLARE_COMPONENT( CaloTopoEMphimod )
+DECLARE_COMPONENT( CaloTopoEMsshape )
+DECLARE_COMPONENT( CaloTopoEMLongWeights )
+DECLARE_COMPONENT( CaloTopoEMGap )
+
+DECLARE_COMPONENT( CaloClusterCellWeightCalib )
+
+DECLARE_COMPONENT( CaloScaleCluster )
+DECLARE_COMPONENT( CaloSwApplyWgts_g3 )
+DECLARE_COMPONENT( CaloSwEtaoff_v2 )
+DECLARE_COMPONENT( CaloSwEtaoff_v3 )
+DECLARE_COMPONENT( CaloSwPhioff_v2 )
+DECLARE_COMPONENT( CaloSwEtamod_v2 )
+DECLARE_COMPONENT( CaloSwPhimod_v2 )
+DECLARE_COMPONENT( CaloSwGap_v2 )
+DECLARE_COMPONENT( CaloSwGap_v3 )
+DECLARE_COMPONENT( CaloSwClcon_v2 )
+DECLARE_COMPONENT( CaloSwLongWeights )
+DECLARE_COMPONENT( CaloSwEtamod_g3 )
+DECLARE_COMPONENT( CaloSwPhimod_g3 )
+DECLARE_COMPONENT( CaloSwEta1b_g3 )
+DECLARE_COMPONENT( CaloSwEta1e_g3 )
+DECLARE_COMPONENT( CaloSwEta2b_g3 )
+DECLARE_COMPONENT( CaloSwEta2e_g3 )
+DECLARE_COMPONENT( CaloSwClcon_g3 )
+DECLARE_COMPONENT( CaloSwGap_g3 )
+DECLARE_COMPONENT( CaloSwECcrack_g3 )
+DECLARE_COMPONENT( CaloComputeSWcellWeights )
+DECLARE_COMPONENT( CaloSwCalibHitsCalibration )
+DECLARE_COMPONENT( CaloSwDeadOTX_ps )
+DECLARE_COMPONENT( CaloSwDeadOTX_back )
  
-DECLARE_TOOL_FACTORY (CaloSwTime )
-DECLARE_TOOL_FACTORY (CaloSwTransitionRegionsCorr )
+DECLARE_COMPONENT( CaloSwTime )
+DECLARE_COMPONENT( CaloSwTransitionRegionsCorr )
 
-DECLARE_TOOL_FACTORY( CaloLongWeights_v2 )
-DECLARE_TOOL_FACTORY( CaloPhiParabola )
+DECLARE_COMPONENT( CaloLongWeights_v2 )
+DECLARE_COMPONENT( CaloPhiParabola )
 
-DECLARE_TOOL_FACTORY (H1WeightToolCSC12Generic )
+DECLARE_COMPONENT( H1WeightToolCSC12Generic )
 
-DECLARE_TOOL_FACTORY (CaloClusterBadChannelList )
-DECLARE_TOOL_FACTORY (CaloClusterRemoveDuplicates )
-DECLARE_TOOL_FACTORY (CaloClusterRemoveBad )
+DECLARE_COMPONENT( CaloClusterBadChannelList )
+DECLARE_COMPONENT( CaloClusterRemoveDuplicates )
+DECLARE_COMPONENT( CaloClusterRemoveBad )
 
-DECLARE_TOOL_FACTORY (CaloRunClusterCorrections )
-DECLARE_TOOL_FACTORY (CaloDummyCorrection )
+DECLARE_COMPONENT( CaloRunClusterCorrections )
+DECLARE_COMPONENT( CaloDummyCorrection )
 
-DECLARE_TOOL_FACTORY (CaloClusterTimeTool )
+DECLARE_COMPONENT( CaloClusterTimeTool )
 
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloDetMgrDetDescrCnv_entries.cxx b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloDetMgrDetDescrCnv_entries.cxx
index 1389dba8d87be7d9c0b5b9725ff2f067b053a056..6a103c504b7af85ecc740150642f03c8bd08f0ab 100644
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloDetMgrDetDescrCnv_entries.cxx
+++ b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloDetMgrDetDescrCnv_entries.cxx
@@ -1,6 +1,6 @@
 #include "CaloDetMgrDetDescrCnv/CaloMgrDetDescrCnv.h"
 #include "CaloDetMgrDetDescrCnv/CaloSuperCellMgrDetDescrCnv.h"
 
-DECLARE_CONVERTER_FACTORY(CaloMgrDetDescrCnv)
-DECLARE_CONVERTER_FACTORY(CaloSuperCellMgrDetDescrCnv)
+DECLARE_CONVERTER_FACTORY( CaloMgrDetDescrCnv )
+DECLARE_CONVERTER_FACTORY( CaloSuperCellMgrDetDescrCnv )
 
diff --git a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx b/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx
index aa78272234f2cd7dc2a4279ad5881134184e0441..10ef73586c699389649c38ebea0e8dba9f17e08f 100644
--- a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx
+++ b/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx
@@ -15,20 +15,20 @@
 #include "CaloIdCnv/TileTBIDDetDescrCnv.h"
 #include "CaloIdCnv/TTOnlineIDDetDescrCnv.h"
 
-DECLARE_CONVERTER_FACTORY(CaloCell_IDDetDescrCnv)
-DECLARE_CONVERTER_FACTORY(CaloCell_SuperCell_IDDetDescrCnv)
-DECLARE_CONVERTER_FACTORY(CaloDM_IDDetDescrCnv)
-DECLARE_CONVERTER_FACTORY(CaloIdMgrDetDescrCnv)
-DECLARE_CONVERTER_FACTORY(CaloLVL1_IDDetDescrCnv)
-DECLARE_CONVERTER_FACTORY(LArEM_IDDetDescrCnv)
-DECLARE_CONVERTER_FACTORY(LArEM_SuperCell_IDDetDescrCnv)
-DECLARE_CONVERTER_FACTORY(LArFCAL_IDDetDescrCnv)
-DECLARE_CONVERTER_FACTORY(LArFCAL_SuperCell_IDDetDescrCnv)
-DECLARE_CONVERTER_FACTORY(LArMiniFCAL_IDDetDescrCnv)
-DECLARE_CONVERTER_FACTORY(LArHEC_IDDetDescrCnv)
-DECLARE_CONVERTER_FACTORY(LArHEC_SuperCell_IDDetDescrCnv)
-DECLARE_CONVERTER_FACTORY(TileIDDetDescrCnv)
-DECLARE_CONVERTER_FACTORY(Tile_SuperCell_IDDetDescrCnv)
-DECLARE_CONVERTER_FACTORY(TileTBIDDetDescrCnv)
-DECLARE_CONVERTER_FACTORY(TTOnlineIDDetDescrCnv)
+DECLARE_CONVERTER_FACTORY( CaloCell_IDDetDescrCnv )
+DECLARE_CONVERTER_FACTORY( CaloCell_SuperCell_IDDetDescrCnv )
+DECLARE_CONVERTER_FACTORY( CaloDM_IDDetDescrCnv )
+DECLARE_CONVERTER_FACTORY( CaloIdMgrDetDescrCnv )
+DECLARE_CONVERTER_FACTORY( CaloLVL1_IDDetDescrCnv )
+DECLARE_CONVERTER_FACTORY( LArEM_IDDetDescrCnv )
+DECLARE_CONVERTER_FACTORY( LArEM_SuperCell_IDDetDescrCnv )
+DECLARE_CONVERTER_FACTORY( LArFCAL_IDDetDescrCnv )
+DECLARE_CONVERTER_FACTORY( LArFCAL_SuperCell_IDDetDescrCnv )
+DECLARE_CONVERTER_FACTORY( LArMiniFCAL_IDDetDescrCnv )
+DECLARE_CONVERTER_FACTORY( LArHEC_IDDetDescrCnv )
+DECLARE_CONVERTER_FACTORY( LArHEC_SuperCell_IDDetDescrCnv )
+DECLARE_CONVERTER_FACTORY( TileIDDetDescrCnv )
+DECLARE_CONVERTER_FACTORY( Tile_SuperCell_IDDetDescrCnv )
+DECLARE_CONVERTER_FACTORY( TileTBIDDetDescrCnv )
+DECLARE_CONVERTER_FACTORY( TTOnlineIDDetDescrCnv )
 
diff --git a/Calorimeter/CaloCnv/CaloJiveXML/src/components/CaloJiveXML_entries.cxx b/Calorimeter/CaloCnv/CaloJiveXML/src/components/CaloJiveXML_entries.cxx
index c0b3925b324033ca90824ec1c5013e013347445b..654349b828fc33735d88ba739f6a0f617f73e603 100644
--- a/Calorimeter/CaloCnv/CaloJiveXML/src/components/CaloJiveXML_entries.cxx
+++ b/Calorimeter/CaloCnv/CaloJiveXML/src/components/CaloJiveXML_entries.cxx
@@ -10,13 +10,13 @@
 
 using namespace JiveXML;
 
-DECLARE_TOOL_FACTORY(CaloTileRetriever)
-DECLARE_TOOL_FACTORY(CaloMBTSRetriever)
-DECLARE_TOOL_FACTORY(CaloLArRetriever)
-DECLARE_TOOL_FACTORY(CaloFCalRetriever)
-DECLARE_TOOL_FACTORY(CaloHECRetriever)
-DECLARE_TOOL_FACTORY(CaloClusterRetriever)
-DECLARE_TOOL_FACTORY(LArDigitRetriever)
-DECLARE_TOOL_FACTORY(BadTileRetriever)
-DECLARE_TOOL_FACTORY(BadLArRetriever)
+DECLARE_COMPONENT( CaloTileRetriever )
+DECLARE_COMPONENT( CaloMBTSRetriever )
+DECLARE_COMPONENT( CaloLArRetriever )
+DECLARE_COMPONENT( CaloFCalRetriever )
+DECLARE_COMPONENT( CaloHECRetriever )
+DECLARE_COMPONENT( CaloClusterRetriever )
+DECLARE_COMPONENT( LArDigitRetriever )
+DECLARE_COMPONENT( BadTileRetriever )
+DECLARE_COMPONENT( BadLArRetriever )
 
diff --git a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_entries.cxx b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_entries.cxx
index 055edb867de2e2e8287884da0f6026ca814b93f9..1067f962f0e9b2b392aee6c8b0c83a4e52fe3f18 100644
--- a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_entries.cxx
+++ b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_entries.cxx
@@ -1,4 +1,4 @@
 #include "CaloTTMgrDetDescrCnv.h"
 
-DECLARE_CONVERTER_FACTORY(CaloTTMgrDetDescrCnv)
+DECLARE_CONVERTER_FACTORY( CaloTTMgrDetDescrCnv )
 
diff --git a/Calorimeter/CaloCondBlobAlgs/src/components/CaloCondBlobAlgs_entries.cxx b/Calorimeter/CaloCondBlobAlgs/src/components/CaloCondBlobAlgs_entries.cxx
index 9ebeaed90e9ebcc0de8282cb24327d16aa363677..2cd477e1b3a4c4cfd0bc43c79a23df3a404d2fcf 100644
--- a/Calorimeter/CaloCondBlobAlgs/src/components/CaloCondBlobAlgs_entries.cxx
+++ b/Calorimeter/CaloCondBlobAlgs/src/components/CaloCondBlobAlgs_entries.cxx
@@ -1,6 +1,6 @@
 #include "CaloCondBlobAlgs/CaloNoiseDbExample.h"
 #include "CaloCondBlobAlgs/CaloCoolIdTool.h"
 
-DECLARE_ALGORITHM_FACTORY( CaloNoiseDbExample )
-DECLARE_TOOL_FACTORY( CaloCoolIdTool )
+DECLARE_COMPONENT( CaloNoiseDbExample )
+DECLARE_COMPONENT( CaloCoolIdTool )
   
diff --git a/Calorimeter/CaloCondPhysAlgs/src/components/CaloCondPhysAlgs_entries.cxx b/Calorimeter/CaloCondPhysAlgs/src/components/CaloCondPhysAlgs_entries.cxx
index 8b9b6f535b5f66ac181a0cf9a22632de894094e0..243022a612b828613ce576dcda8c607e22828ce2 100644
--- a/Calorimeter/CaloCondPhysAlgs/src/components/CaloCondPhysAlgs_entries.cxx
+++ b/Calorimeter/CaloCondPhysAlgs/src/components/CaloCondPhysAlgs_entries.cxx
@@ -9,15 +9,15 @@
 #include "CaloCondPhysAlgs/CaloCellEnergyCorr2Ntuple.h"
 #include "CaloCondPhysAlgs/LArMinBiasAlg.h"
 
-DECLARE_ALGORITHM_FACTORY( CaloCellNoiseAlg )
-DECLARE_ALGORITHM_FACTORY( CaloNoise2Ntuple )
-DECLARE_ALGORITHM_FACTORY( CaloFillCellPositionShift )
-DECLARE_ALGORITHM_FACTORY( CaloCellPosition2Ntuple )
-DECLARE_ALGORITHM_FACTORY( CaloRescaleNoise )
-DECLARE_ALGORITHM_FACTORY( CaloAddCellPedShift )
-DECLARE_ALGORITHM_FACTORY( FCAL_HV_Energy_Rescale )
-DECLARE_ALGORITHM_FACTORY( CaloCellCalcEnergyCorr )
-DECLARE_ALGORITHM_FACTORY( CaloCellEnergyCorr2Ntuple )
-DECLARE_ALGORITHM_FACTORY( LArMinBiasAlg)
+DECLARE_COMPONENT( CaloCellNoiseAlg )
+DECLARE_COMPONENT( CaloNoise2Ntuple )
+DECLARE_COMPONENT( CaloFillCellPositionShift )
+DECLARE_COMPONENT( CaloCellPosition2Ntuple )
+DECLARE_COMPONENT( CaloRescaleNoise )
+DECLARE_COMPONENT( CaloAddCellPedShift )
+DECLARE_COMPONENT( FCAL_HV_Energy_Rescale )
+DECLARE_COMPONENT( CaloCellCalcEnergyCorr )
+DECLARE_COMPONENT( CaloCellEnergyCorr2Ntuple )
+DECLARE_COMPONENT( LArMinBiasAlg )
   
 
diff --git a/Calorimeter/CaloDetDescr/src/components/CaloDetDescr_entries.cxx b/Calorimeter/CaloDetDescr/src/components/CaloDetDescr_entries.cxx
index b74bcf7b671643df0f447615c00ed098fe16b8c6..a7b3e3c1ae4c45f3cedf8a863605c527353f18da 100644
--- a/Calorimeter/CaloDetDescr/src/components/CaloDetDescr_entries.cxx
+++ b/Calorimeter/CaloDetDescr/src/components/CaloDetDescr_entries.cxx
@@ -3,8 +3,8 @@
 #include "CaloDetDescr/CaloSuperCellAlignTool.h"
 #include "../CaloSuperCellIDTool.h"
 
-DECLARE_TOOL_FACTORY( CaloDepthTool )
-DECLARE_TOOL_FACTORY( CaloAlignTool )
-DECLARE_TOOL_FACTORY( CaloSuperCellAlignTool )
-DECLARE_TOOL_FACTORY( CaloSuperCellIDTool )
+DECLARE_COMPONENT( CaloDepthTool )
+DECLARE_COMPONENT( CaloAlignTool )
+DECLARE_COMPONENT( CaloSuperCellAlignTool )
+DECLARE_COMPONENT( CaloSuperCellIDTool )
 
diff --git a/Calorimeter/CaloExample/CaloTests/src/components/CaloTests_entries.cxx b/Calorimeter/CaloExample/CaloTests/src/components/CaloTests_entries.cxx
index 6c367cbc1388f1b455306dac9bfba6628a20763c..fcd1ff7b2e06b3094b6c83bcb3ec8683f807c7e9 100644
--- a/Calorimeter/CaloExample/CaloTests/src/components/CaloTests_entries.cxx
+++ b/Calorimeter/CaloExample/CaloTests/src/components/CaloTests_entries.cxx
@@ -2,6 +2,6 @@
 #include "CaloTests/AnalysisCal.h"
 
 
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( MyAnalysis, Analysis )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( MyAnalysisCal, AnalysisCal )
+DECLARE_COMPONENT( MyAnalysis::Analysis )
+DECLARE_COMPONENT( MyAnalysisCal::AnalysisCal )
 
diff --git a/Calorimeter/CaloG4Sim/src/components/CaloG4Sim_entries.cxx b/Calorimeter/CaloG4Sim/src/components/CaloG4Sim_entries.cxx
index 4be3f2af85be428e30828e7b819d252f17c08ad0..df00760725ce021316d4c50ef9edf0d0aba7de56 100644
--- a/Calorimeter/CaloG4Sim/src/components/CaloG4Sim_entries.cxx
+++ b/Calorimeter/CaloG4Sim/src/components/CaloG4Sim_entries.cxx
@@ -1,4 +1,4 @@
 #include "CaloG4Sim/CalibrationDefaultProcessingTool.h"
 
-DECLARE_TOOL_FACTORY( G4UA::CaloG4::CalibrationDefaultProcessingTool )
+DECLARE_COMPONENT( G4UA::CaloG4::CalibrationDefaultProcessingTool )
 
diff --git a/Calorimeter/CaloLocalHadCalib/src/components/CaloLocalHadCalib_entries.cxx b/Calorimeter/CaloLocalHadCalib/src/components/CaloLocalHadCalib_entries.cxx
index c8457159c99c791d3a205d2236789d6196676daa..07c47b22046d064fbd01eacaef1d2922b5d57fd1 100644
--- a/Calorimeter/CaloLocalHadCalib/src/components/CaloLocalHadCalib_entries.cxx
+++ b/Calorimeter/CaloLocalHadCalib/src/components/CaloLocalHadCalib_entries.cxx
@@ -8,14 +8,14 @@
 #include "CaloLocalHadCalib/CaloReadLCClassificationFile.h"
 #include "CaloLocalHadCalib/CaloReadLCOutOfClusterFile.h"
 #include "CaloLocalHadCalib/CaloReadLCJetEnergyScaleFile.h"
-DECLARE_ALGORITHM_FACTORY( GetLCClassification )
-DECLARE_ALGORITHM_FACTORY( GetLCWeights )
-DECLARE_ALGORITHM_FACTORY( GetLCOutOfCluster )
-DECLARE_ALGORITHM_FACTORY( GetLCDeadMaterial )
-DECLARE_ALGORITHM_FACTORY( GetLCDeadMaterialTree )
-DECLARE_ALGORITHM_FACTORY( GetLCSinglePionsPerf )
-DECLARE_ALGORITHM_FACTORY( CaloReadLCWeightsFile )
-DECLARE_ALGORITHM_FACTORY( CaloReadLCClassificationFile )
-DECLARE_ALGORITHM_FACTORY( CaloReadLCOutOfClusterFile )
-DECLARE_ALGORITHM_FACTORY( CaloReadLCJetEnergyScaleFile )
+DECLARE_COMPONENT( GetLCClassification )
+DECLARE_COMPONENT( GetLCWeights )
+DECLARE_COMPONENT( GetLCOutOfCluster )
+DECLARE_COMPONENT( GetLCDeadMaterial )
+DECLARE_COMPONENT( GetLCDeadMaterialTree )
+DECLARE_COMPONENT( GetLCSinglePionsPerf )
+DECLARE_COMPONENT( CaloReadLCWeightsFile )
+DECLARE_COMPONENT( CaloReadLCClassificationFile )
+DECLARE_COMPONENT( CaloReadLCOutOfClusterFile )
+DECLARE_COMPONENT( CaloReadLCJetEnergyScaleFile )
 
diff --git a/Calorimeter/CaloMonitoring/src/components/CaloMonitoring_entries.cxx b/Calorimeter/CaloMonitoring/src/components/CaloMonitoring_entries.cxx
index 2bd8dc2110398b242e4d8ef4e69a589d6f22277e..162d3fa01703051d880a9d4062fac0b053604f46 100644
--- a/Calorimeter/CaloMonitoring/src/components/CaloMonitoring_entries.cxx
+++ b/Calorimeter/CaloMonitoring/src/components/CaloMonitoring_entries.cxx
@@ -8,15 +8,15 @@
 //#include "CaloMonitoring/CaloCosmicsClusterMon.h"
 #include "CaloMonitoring/CaloTowerVecMon.h"
 #include "CaloMonitoring/CaloTransverseBalanceVecMon.h"
-//DECLARE_TOOL_FACTORY(CaloCellMonitoringTool )
-DECLARE_TOOL_FACTORY(CaloCellVecMon)
-//DECLARE_TOOL_FACTORY(CaloCellTimeMon)
-//DECLARE_TOOL_FACTORY(CaloClusterMon)
-DECLARE_TOOL_FACTORY(CaloClusterVecMon)
-  //DECLARE_TOOL_FACTORY(CaloClusterShwrMon)
-  //DECLARE_TOOL_FACTORY(CaloClusterTimeMon)
-//DECLARE_TOOL_FACTORY(CaloCosmicsClusterMon)
-DECLARE_TOOL_FACTORY(CaloTowerVecMon)
+//DECLARE_COMPONENT( CaloCellMonitoringTool )
+DECLARE_COMPONENT( CaloCellVecMon )
+//DECLARE_COMPONENT( CaloCellTimeMon )
+//DECLARE_COMPONENT( CaloClusterMon )
+DECLARE_COMPONENT( CaloClusterVecMon )
+  //DECLARE_COMPONENT( CaloClusterShwrMon )
+  //DECLARE_COMPONENT( CaloClusterTimeMon )
+//DECLARE_COMPONENT( CaloCosmicsClusterMon )
+DECLARE_COMPONENT( CaloTowerVecMon )
 
-DECLARE_TOOL_FACTORY(CaloTransverseBalanceVecMon)
+DECLARE_COMPONENT( CaloTransverseBalanceVecMon )
 
diff --git a/Calorimeter/CaloRec/src/components/CaloRec_entries.cxx b/Calorimeter/CaloRec/src/components/CaloRec_entries.cxx
index ae556e84c44a4f63381946776e30dc5e621c5889..82332349bf6c79bfa1dc792756e388022b2f5457 100644
--- a/Calorimeter/CaloRec/src/components/CaloRec_entries.cxx
+++ b/Calorimeter/CaloRec/src/components/CaloRec_entries.cxx
@@ -31,37 +31,37 @@
 
 
 
-DECLARE_ALGORITHM_FACTORY( CaloTowerMonitor )
-DECLARE_ALGORITHM_FACTORY( CaloTowerAlgorithm )
-DECLARE_ALGORITHM_FACTORY( CaloTopoTowerAlgorithm )
-DECLARE_ALGORITHM_FACTORY( CaloClusterMaker )
-DECLARE_ALGORITHM_FACTORY( CaloCell2ClusterMapper )
-DECLARE_ALGORITHM_FACTORY( CaloCellMaker )
-DECLARE_ALGORITHM_FACTORY( CaloConstCellMaker )
+DECLARE_COMPONENT( CaloTowerMonitor )
+DECLARE_COMPONENT( CaloTowerAlgorithm )
+DECLARE_COMPONENT( CaloTopoTowerAlgorithm )
+DECLARE_COMPONENT( CaloClusterMaker )
+DECLARE_COMPONENT( CaloCell2ClusterMapper )
+DECLARE_COMPONENT( CaloCellMaker )
+DECLARE_COMPONENT( CaloConstCellMaker )
 
-//DECLARE_ALGORITHM_FACTORY( CaloClusterCellSlimmer )
-DECLARE_ALGORITHM_FACTORY( CaloClusterCorrDBWriter )
-DECLARE_ALGORITHM_FACTORY( CaloClusterCorrDumper )
-DECLARE_ALGORITHM_FACTORY( CaloTopoTowerAlg )
-DECLARE_ALGORITHM_FACTORY( CaloCellOverwrite )
-DECLARE_ALGORITHM_FACTORY( CaloClusterCellLinksUpdater )
+//DECLARE_COMPONENT( CaloClusterCellSlimmer )
+DECLARE_COMPONENT( CaloClusterCorrDBWriter )
+DECLARE_COMPONENT( CaloClusterCorrDumper )
+DECLARE_COMPONENT( CaloTopoTowerAlg )
+DECLARE_COMPONENT( CaloCellOverwrite )
+DECLARE_COMPONENT( CaloClusterCellLinksUpdater )
 
-DECLARE_ALGORITHM_FACTORY( CaloTowerxAODFromCells )
-DECLARE_ALGORITHM_FACTORY( CaloTowerxAODFromClusters )
+DECLARE_COMPONENT( CaloTowerxAODFromCells )
+DECLARE_COMPONENT( CaloTowerxAODFromClusters )
 
-DECLARE_TOOL_FACTORY( CaloTopoClusterMaker )
-DECLARE_TOOL_FACTORY( CaloTopoClusterSplitter )
-DECLARE_TOOL_FACTORY( CaloClusterCopier )
-DECLARE_TOOL_FACTORY( CaloClusterBuilderSW )
-DECLARE_TOOL_FACTORY( CaloClusterMomentsMaker )
-DECLARE_TOOL_FACTORY( CaloCellContainerMergerTool )
-DECLARE_TOOL_FACTORY( CaloCellContainerCorrectorTool )
-DECLARE_TOOL_FACTORY( CaloCellContainerCheckerTool )
-DECLARE_TOOL_FACTORY( CaloCellContainerFinalizerTool )
-DECLARE_TOOL_FACTORY( CaloCellContainerFromClusterTool )
-//DECLARE_TOOL_FACTORY( CaloClusterPrinter )
-//DECLARE_TOOL_FACTORY( CaloClusterLockVars )
-DECLARE_TOOL_FACTORY ( Blob2ToolConstants )
-DECLARE_TOOL_FACTORY ( CaloCellFastCopyTool )
-DECLARE_TOOL_FACTORY ( CaloClusterSnapshot )
+DECLARE_COMPONENT( CaloTopoClusterMaker )
+DECLARE_COMPONENT( CaloTopoClusterSplitter )
+DECLARE_COMPONENT( CaloClusterCopier )
+DECLARE_COMPONENT( CaloClusterBuilderSW )
+DECLARE_COMPONENT( CaloClusterMomentsMaker )
+DECLARE_COMPONENT( CaloCellContainerMergerTool )
+DECLARE_COMPONENT( CaloCellContainerCorrectorTool )
+DECLARE_COMPONENT( CaloCellContainerCheckerTool )
+DECLARE_COMPONENT( CaloCellContainerFinalizerTool )
+DECLARE_COMPONENT( CaloCellContainerFromClusterTool )
+//DECLARE_COMPONENT( CaloClusterPrinter )
+//DECLARE_COMPONENT( CaloClusterLockVars )
+DECLARE_COMPONENT( Blob2ToolConstants )
+DECLARE_COMPONENT( CaloCellFastCopyTool )
+DECLARE_COMPONENT( CaloClusterSnapshot )
 
diff --git a/Calorimeter/CaloTools/src/components/CaloTools_entries.cxx b/Calorimeter/CaloTools/src/components/CaloTools_entries.cxx
index 934ebbdbe6625fabad6ee62d80ea97271b2364c4..3d33d9151b2877a687eb53c5e7029afb5e296024 100644
--- a/Calorimeter/CaloTools/src/components/CaloTools_entries.cxx
+++ b/Calorimeter/CaloTools/src/components/CaloTools_entries.cxx
@@ -6,11 +6,11 @@
 #include "CaloTools/CaloAffectedTool.h"
 #include "CaloTools/CaloLumiBCIDTool.h"
 
-DECLARE_TOOL_FACTORY( CaloNoiseTool )
-DECLARE_TOOL_FACTORY( CaloMBAverageTool )
-DECLARE_TOOL_FACTORY( CaloNoiseToolDB )
-DECLARE_TOOL_FACTORY( SimpleNoiseTool )
-DECLARE_TOOL_FACTORY( SimpleNoiseToolFromTextFile )
-DECLARE_TOOL_FACTORY( CaloAffectedTool )
-DECLARE_TOOL_FACTORY( CaloLumiBCIDTool )
+DECLARE_COMPONENT( CaloNoiseTool )
+DECLARE_COMPONENT( CaloMBAverageTool )
+DECLARE_COMPONENT( CaloNoiseToolDB )
+DECLARE_COMPONENT( SimpleNoiseTool )
+DECLARE_COMPONENT( SimpleNoiseToolFromTextFile )
+DECLARE_COMPONENT( CaloAffectedTool )
+DECLARE_COMPONENT( CaloLumiBCIDTool )
 
diff --git a/Calorimeter/CaloTrackUtils/src/components/CaloTrackUtils_entries.cxx b/Calorimeter/CaloTrackUtils/src/components/CaloTrackUtils_entries.cxx
index 969f8e395d70b2ba190560e993472c4212963819..639848ea6aace09b92e0c04ae53f68404e8f87bf 100644
--- a/Calorimeter/CaloTrackUtils/src/components/CaloTrackUtils_entries.cxx
+++ b/Calorimeter/CaloTrackUtils/src/components/CaloTrackUtils_entries.cxx
@@ -1,5 +1,5 @@
 #include "CaloTrackUtils/CaloClusterVertexFractionMaker.h"
 
 
-DECLARE_TOOL_FACTORY ( CaloClusterVertexFractionMaker )
+DECLARE_COMPONENT( CaloClusterVertexFractionMaker )
 
diff --git a/Calorimeter/CaloTrackingGeometry/src/components/CaloTrackingGeometry_entries.cxx b/Calorimeter/CaloTrackingGeometry/src/components/CaloTrackingGeometry_entries.cxx
index b9fdf1201da44b3eae0f38773e8ec6c3ee35642b..b3f13e36bc0ac0d4ff739664bca0f50786ec9798 100644
--- a/Calorimeter/CaloTrackingGeometry/src/components/CaloTrackingGeometry_entries.cxx
+++ b/Calorimeter/CaloTrackingGeometry/src/components/CaloTrackingGeometry_entries.cxx
@@ -4,7 +4,7 @@
 
 using namespace Calo;
 
-DECLARE_TOOL_FACTORY( CaloTrackingGeometryBuilder )
-DECLARE_TOOL_FACTORY( CaloSurfaceBuilder )
-DECLARE_TOOL_FACTORY( CaloSurfaceHelper )
+DECLARE_COMPONENT( CaloTrackingGeometryBuilder )
+DECLARE_COMPONENT( CaloSurfaceBuilder )
+DECLARE_COMPONENT( CaloSurfaceHelper )
 
diff --git a/Calorimeter/CaloTriggerTool/src/components/CaloTriggerTool_entries.cxx b/Calorimeter/CaloTriggerTool/src/components/CaloTriggerTool_entries.cxx
index f199cfcc53096d104f96f1f83a749440638995de..9fcfced1ff05c176b45ea9bb7979e16e8577ac5e 100644
--- a/Calorimeter/CaloTriggerTool/src/components/CaloTriggerTool_entries.cxx
+++ b/Calorimeter/CaloTriggerTool/src/components/CaloTriggerTool_entries.cxx
@@ -1,4 +1,4 @@
 #include "CaloTriggerTool/CaloTriggerTowerService.h"
 
-DECLARE_TOOL_FACTORY( CaloTriggerTowerService )
+DECLARE_COMPONENT( CaloTriggerTowerService )
 
diff --git a/Calorimeter/CaloUtils/src/components/CaloUtils_entries.cxx b/Calorimeter/CaloUtils/src/components/CaloUtils_entries.cxx
index 6f22796a7f8eadfcaebd789d28357295b800a721..c275736584f995ef9f0107e1dba5e148ad97720a 100644
--- a/Calorimeter/CaloUtils/src/components/CaloUtils_entries.cxx
+++ b/Calorimeter/CaloUtils/src/components/CaloUtils_entries.cxx
@@ -12,17 +12,17 @@
 #include "../CaloTowerBuilderToolTestAlg.h"
 
 
-DECLARE_TOOL_FACTORY( CaloCellWeightCorrection )
-DECLARE_TOOL_FACTORY( LocalNoiseSuppressionTool )
-DECLARE_TOOL_FACTORY( CaloLCClassificationTool )
-DECLARE_TOOL_FACTORY( EstimEMClusterClassificationTool )
-DECLARE_TOOL_FACTORY( CaloLCWeightTool )
-DECLARE_TOOL_FACTORY( CaloLCOutOfClusterTool )
-DECLARE_TOOL_FACTORY( CaloLCDeadMaterialTool )
-DECLARE_TOOL_FACTORY( CaloTopoTowerBuilderTool )
-DECLARE_TOOL_FACTORY( CaloTowerBuilderTool )
-DECLARE_TOOL_FACTORY( xAODClusterCompressor )
+DECLARE_COMPONENT( CaloCellWeightCorrection )
+DECLARE_COMPONENT( LocalNoiseSuppressionTool )
+DECLARE_COMPONENT( CaloLCClassificationTool )
+DECLARE_COMPONENT( EstimEMClusterClassificationTool )
+DECLARE_COMPONENT( CaloLCWeightTool )
+DECLARE_COMPONENT( CaloLCOutOfClusterTool )
+DECLARE_COMPONENT( CaloLCDeadMaterialTool )
+DECLARE_COMPONENT( CaloTopoTowerBuilderTool )
+DECLARE_COMPONENT( CaloTowerBuilderTool )
+DECLARE_COMPONENT( xAODClusterCompressor )
 
-DECLARE_ALGORITHM_FACTORY( CaloTowerStoreTestAlg )
-DECLARE_ALGORITHM_FACTORY( CaloTowerBuilderToolTestAlg )
+DECLARE_COMPONENT( CaloTowerStoreTestAlg )
+DECLARE_COMPONENT( CaloTowerBuilderToolTestAlg )
 
diff --git a/LArCalorimeter/LArAffectedRegion/src/components/LArAffectedRegionTool_entries.cxx b/LArCalorimeter/LArAffectedRegion/src/components/LArAffectedRegionTool_entries.cxx
index ae9607c7564a0db8c27375271641e2aaf3da65f7..17e4ed70bd7b38fa17c55d02e10820a0b3162161 100644
--- a/LArCalorimeter/LArAffectedRegion/src/components/LArAffectedRegionTool_entries.cxx
+++ b/LArCalorimeter/LArAffectedRegion/src/components/LArAffectedRegionTool_entries.cxx
@@ -1,5 +1,5 @@
 #include "LArAffectedRegion/LArAffectedRegionAlg.h"
 
 
-DECLARE_ALGORITHM_FACTORY( LArAffectedRegionAlg )
+DECLARE_COMPONENT( LArAffectedRegionAlg )
 
diff --git a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/components/LArAlignmentAlgs_entries.cxx b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/components/LArAlignmentAlgs_entries.cxx
index 0d65216554a30cd5ef1d505bfa89e17d88b43d79..2e192a505001ea4ad94f5ce36f911b592c4475ac 100644
--- a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/components/LArAlignmentAlgs_entries.cxx
+++ b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/components/LArAlignmentAlgs_entries.cxx
@@ -1,4 +1,4 @@
 #include "LArAlignmentAlgs/LArAlignDbAlg.h"
 
-DECLARE_ALGORITHM_FACTORY(LArAlignDbAlg)
+DECLARE_COMPONENT( LArAlignDbAlg )
 
diff --git a/LArCalorimeter/LArBadChannelTool/src/components/LArBadChannelTool_entries.cxx b/LArCalorimeter/LArBadChannelTool/src/components/LArBadChannelTool_entries.cxx
index e85c125742995056c6471c48dbc655d051e759d8..11d0ef512da639effc2788e060cbdb93f38d76eb 100644
--- a/LArCalorimeter/LArBadChannelTool/src/components/LArBadChannelTool_entries.cxx
+++ b/LArCalorimeter/LArBadChannelTool/src/components/LArBadChannelTool_entries.cxx
@@ -10,13 +10,13 @@
 #include "LArBadChannelTool/LArBadChannelCondAlg.h"
 #include "LArBadChannelTool/LArBadFebCondAlg.h"
 
-DECLARE_TOOL_FACTORY( LArBadChannelMasker )
-DECLARE_TOOL_FACTORY( LArBadChanTool )
-DECLARE_ALGORITHM_FACTORY( LArBadChannelToolTest )
-DECLARE_ALGORITHM_FACTORY( LArBadChannelDBAlg )
-DECLARE_ALGORITHM_FACTORY( LArBadChannelTimingAlg )
-DECLARE_ALGORITHM_FACTORY( LArBadChannel2Ascii )
-DECLARE_ALGORITHM_FACTORY( LArBadFeb2Ascii )
-DECLARE_ALGORITHM_FACTORY( LArBadChannelCondAlg )
-DECLARE_ALGORITHM_FACTORY( LArBadFebCondAlg )
+DECLARE_COMPONENT( LArBadChannelMasker )
+DECLARE_COMPONENT( LArBadChanTool )
+DECLARE_COMPONENT( LArBadChannelToolTest )
+DECLARE_COMPONENT( LArBadChannelDBAlg )
+DECLARE_COMPONENT( LArBadChannelTimingAlg )
+DECLARE_COMPONENT( LArBadChannel2Ascii )
+DECLARE_COMPONENT( LArBadFeb2Ascii )
+DECLARE_COMPONENT( LArBadChannelCondAlg )
+DECLARE_COMPONENT( LArBadFebCondAlg )
 
diff --git a/LArCalorimeter/LArCabling/src/components/LArCabling_entries.cxx b/LArCalorimeter/LArCabling/src/components/LArCabling_entries.cxx
index 545078c01a4d76e8cce6c0ca425f283073968c6a..97e96135dee849abb45c38857f5647a93895b49a 100644
--- a/LArCalorimeter/LArCabling/src/components/LArCabling_entries.cxx
+++ b/LArCalorimeter/LArCabling/src/components/LArCabling_entries.cxx
@@ -3,7 +3,7 @@
 #include "LArCabling/LArSuperCellCablingTool.h"
 
 
-DECLARE_TOOL_FACTORY( LArCablingService )
-DECLARE_TOOL_FACTORY( LArHVCablingTool )
-DECLARE_TOOL_FACTORY( LArSuperCellCablingTool )
+DECLARE_COMPONENT( LArCablingService )
+DECLARE_COMPONENT( LArHVCablingTool )
+DECLARE_COMPONENT( LArSuperCellCablingTool )
 
diff --git a/LArCalorimeter/LArCafJobs/src/components/LArCafJobs_entries.cxx b/LArCalorimeter/LArCafJobs/src/components/LArCafJobs_entries.cxx
index 8b11dafb8553f14913859ef5da0b406e53a55922..d9e1c86bff7ecdf01a9a82245f712d839336ebba 100644
--- a/LArCalorimeter/LArCafJobs/src/components/LArCafJobs_entries.cxx
+++ b/LArCalorimeter/LArCafJobs/src/components/LArCafJobs_entries.cxx
@@ -4,9 +4,9 @@
 #include "LArCafJobs/LArNoiseBursts.h"
 #include "LArCafJobs/LArHECNoise.h"
 
-DECLARE_ALGORITHM_FACTORY(LArShapeDumper)
-DECLARE_ALGORITHM_FACTORY(LArSimpleShapeDumper)
-DECLARE_ALGORITHM_FACTORY(LArNoiseBursts)
-DECLARE_ALGORITHM_FACTORY(LArHECNoise)
-DECLARE_TOOL_FACTORY(LArShapeDumperTool)
+DECLARE_COMPONENT( LArShapeDumper )
+DECLARE_COMPONENT( LArSimpleShapeDumper )
+DECLARE_COMPONENT( LArNoiseBursts )
+DECLARE_COMPONENT( LArHECNoise )
+DECLARE_COMPONENT( LArShapeDumperTool )
 
diff --git a/LArCalorimeter/LArCalibDataQuality/src/components/LArCalibDataQuality_entries.cxx b/LArCalorimeter/LArCalibDataQuality/src/components/LArCalibDataQuality_entries.cxx
index f9a723f4b36b4537a8fc9c2148423b27620273b1..a52160352082305392ce0e45aa57180f7bd036f6 100644
--- a/LArCalorimeter/LArCalibDataQuality/src/components/LArCalibDataQuality_entries.cxx
+++ b/LArCalorimeter/LArCalibDataQuality/src/components/LArCalibDataQuality_entries.cxx
@@ -7,10 +7,10 @@
 
 
 
-DECLARE_ALGORITHM_FACTORY( LArRampValidationAlg )
-DECLARE_ALGORITHM_FACTORY( LArPedestalValidationAlg )
-DECLARE_ALGORITHM_FACTORY( LArCaliWaveValidationAlg )
-DECLARE_ALGORITHM_FACTORY( LArAutoCorrValidationAlg )
-DECLARE_ALGORITHM_FACTORY( LArBadChannelHunter )
-DECLARE_ALGORITHM_FACTORY( LArBadEventCatcher )
+DECLARE_COMPONENT( LArRampValidationAlg )
+DECLARE_COMPONENT( LArPedestalValidationAlg )
+DECLARE_COMPONENT( LArCaliWaveValidationAlg )
+DECLARE_COMPONENT( LArAutoCorrValidationAlg )
+DECLARE_COMPONENT( LArBadChannelHunter )
+DECLARE_COMPONENT( LArBadEventCatcher )
 
diff --git a/LArCalorimeter/LArCalibTools/src/components/LArCalibTools_entries.cxx b/LArCalorimeter/LArCalibTools/src/components/LArCalibTools_entries.cxx
index e96aab27f91abb2c3539c4a29bb1aba27b98fd3f..2e9e26c690f5d5e6805d92482a9d6836d0817cca 100644
--- a/LArCalorimeter/LArCalibTools/src/components/LArCalibTools_entries.cxx
+++ b/LArCalorimeter/LArCalibTools/src/components/LArCalibTools_entries.cxx
@@ -54,56 +54,56 @@ typedef LArReadParamsFromFile<LArCableLengthComplete>       LArReadCableLength ;
 typedef LArReadParamsFromFile<LArCableAttenuationComplete>  LArReadCableAttenuation ;
 typedef LArReadParamsFromFile<LArCaliPulseParamsVsCalib>    LArReadCaliPulseParams_Calib ;
 
-DECLARE_ALGORITHM_FACTORY( LArAutoCorr2Ntuple )
-DECLARE_ALGORITHM_FACTORY( LArAverages2Ntuple )
-DECLARE_ALGORITHM_FACTORY( LArAccumulatedDigits2Ntuple )
-DECLARE_ALGORITHM_FACTORY( LArDigits2Ntuple )
-DECLARE_ALGORITHM_FACTORY( LArOFC2Ntuple )
-DECLARE_ALGORITHM_FACTORY( LArShape2Ntuple )
-DECLARE_ALGORITHM_FACTORY( LArPedestals2Ntuple )
-DECLARE_ALGORITHM_FACTORY( LArRamps2Ntuple )
-DECLARE_ALGORITHM_FACTORY( LArReadCaliPulseParams ) 
-DECLARE_ALGORITHM_FACTORY( LArReadCaliPulseParams_Calib ) 
-DECLARE_ALGORITHM_FACTORY( LArReadDetCellParams )
-DECLARE_ALGORITHM_FACTORY( LArReadPhysCaliTdiff )
-DECLARE_ALGORITHM_FACTORY( LArReadTdrift )
-DECLARE_ALGORITHM_FACTORY( LArReadMphysOverMcal )
-DECLARE_ALGORITHM_FACTORY( LArReadRinj )
-DECLARE_ALGORITHM_FACTORY( LArReadTshaper )
-DECLARE_ALGORITHM_FACTORY( LArReadEMEC_Cphi )
-DECLARE_ALGORITHM_FACTORY( LArReadEMEC_HValpha )
-DECLARE_ALGORITHM_FACTORY( LArReadEMEC_HVbeta )
-DECLARE_ALGORITHM_FACTORY( LArReadCableLength )
-DECLARE_ALGORITHM_FACTORY( LArReadCableAttenuation )
-DECLARE_ALGORITHM_FACTORY( LAruA2MeV2Ntuple )
-DECLARE_ALGORITHM_FACTORY( LArCaliWaves2Ntuple )
-DECLARE_ALGORITHM_FACTORY( LArPhysWaves2Ntuple )
-DECLARE_ALGORITHM_FACTORY( LArWFParams2Ntuple )
-DECLARE_ALGORITHM_FACTORY( LArParams2Ntuple )
-DECLARE_ALGORITHM_FACTORY( LArPhysWaveFromTuple )
-DECLARE_ALGORITHM_FACTORY( LArPhysWaveFromStdNtuple )
-DECLARE_ALGORITHM_FACTORY( LArShapeFromStdNtuple )
-DECLARE_ALGORITHM_FACTORY( LArAutoCorrFromStdNtuple )
-DECLARE_ALGORITHM_FACTORY( LArParamsFromStdNtuple )
-DECLARE_ALGORITHM_FACTORY( LArOFCBin_PhysCaliTdiffFromStdNtuple )
-DECLARE_ALGORITHM_FACTORY( LArMphysOverMcalFromTuple )
-DECLARE_ALGORITHM_FACTORY( LArMphysOverMcal2Ntuple )
-DECLARE_ALGORITHM_FACTORY( LArHVScaleCorr2Ntuple )
-DECLARE_ALGORITHM_FACTORY( LArBlockCorrections )
-DECLARE_ALGORITHM_FACTORY ( CaloCellGroup2Ntuple )
-DECLARE_ALGORITHM_FACTORY ( LArFEBTemp2Ntuple )
-DECLARE_ALGORITHM_FACTORY (ForceLoadCondObj )
-DECLARE_ALGORITHM_FACTORY( LArFebTimeOffset2Ntuple )
-DECLARE_ALGORITHM_FACTORY(LArGainThresholds2Ntuple)
-DECLARE_ALGORITHM_FACTORY(LArDSPThresholds2Ntuple)
-DECLARE_ALGORITHM_FACTORY( LArPhysCaliTDiffAlg )
-DECLARE_ALGORITHM_FACTORY( LArOFCBinAlg )
-DECLARE_ALGORITHM_FACTORY( CaloCondBlob2Ntuple )
-DECLARE_ALGORITHM_FACTORY( LArCompleteToFlat )
-DECLARE_ALGORITHM_FACTORY( LArNoise2Ntuple )
-DECLARE_ALGORITHM_FACTORY( LArfSampl2Ntuple )
-DECLARE_ALGORITHM_FACTORY( LArFillDSPConfig )
-DECLARE_ALGORITHM_FACTORY( LArDSPConfig2Ntuple )
-DECLARE_ALGORITHM_FACTORY( LArMinBias2Ntuple )
-//DECLARE_ALGORITHM_FACTORY( LArSFcalFromFcalFromStdNtuple )
+DECLARE_COMPONENT( LArAutoCorr2Ntuple )
+DECLARE_COMPONENT( LArAverages2Ntuple )
+DECLARE_COMPONENT( LArAccumulatedDigits2Ntuple )
+DECLARE_COMPONENT( LArDigits2Ntuple )
+DECLARE_COMPONENT( LArOFC2Ntuple )
+DECLARE_COMPONENT( LArShape2Ntuple )
+DECLARE_COMPONENT( LArPedestals2Ntuple )
+DECLARE_COMPONENT( LArRamps2Ntuple )
+DECLARE_COMPONENT( LArReadCaliPulseParams ) 
+DECLARE_COMPONENT( LArReadCaliPulseParams_Calib ) 
+DECLARE_COMPONENT( LArReadDetCellParams )
+DECLARE_COMPONENT( LArReadPhysCaliTdiff )
+DECLARE_COMPONENT( LArReadTdrift )
+DECLARE_COMPONENT( LArReadMphysOverMcal )
+DECLARE_COMPONENT( LArReadRinj )
+DECLARE_COMPONENT( LArReadTshaper )
+DECLARE_COMPONENT( LArReadEMEC_Cphi )
+DECLARE_COMPONENT( LArReadEMEC_HValpha )
+DECLARE_COMPONENT( LArReadEMEC_HVbeta )
+DECLARE_COMPONENT( LArReadCableLength )
+DECLARE_COMPONENT( LArReadCableAttenuation )
+DECLARE_COMPONENT( LAruA2MeV2Ntuple )
+DECLARE_COMPONENT( LArCaliWaves2Ntuple )
+DECLARE_COMPONENT( LArPhysWaves2Ntuple )
+DECLARE_COMPONENT( LArWFParams2Ntuple )
+DECLARE_COMPONENT( LArParams2Ntuple )
+DECLARE_COMPONENT( LArPhysWaveFromTuple )
+DECLARE_COMPONENT( LArPhysWaveFromStdNtuple )
+DECLARE_COMPONENT( LArShapeFromStdNtuple )
+DECLARE_COMPONENT( LArAutoCorrFromStdNtuple )
+DECLARE_COMPONENT( LArParamsFromStdNtuple )
+DECLARE_COMPONENT( LArOFCBin_PhysCaliTdiffFromStdNtuple )
+DECLARE_COMPONENT( LArMphysOverMcalFromTuple )
+DECLARE_COMPONENT( LArMphysOverMcal2Ntuple )
+DECLARE_COMPONENT( LArHVScaleCorr2Ntuple )
+DECLARE_COMPONENT( LArBlockCorrections )
+DECLARE_COMPONENT( CaloCellGroup2Ntuple )
+DECLARE_COMPONENT( LArFEBTemp2Ntuple )
+DECLARE_COMPONENT( ForceLoadCondObj )
+DECLARE_COMPONENT( LArFebTimeOffset2Ntuple )
+DECLARE_COMPONENT( LArGainThresholds2Ntuple )
+DECLARE_COMPONENT( LArDSPThresholds2Ntuple )
+DECLARE_COMPONENT( LArPhysCaliTDiffAlg )
+DECLARE_COMPONENT( LArOFCBinAlg )
+DECLARE_COMPONENT( CaloCondBlob2Ntuple )
+DECLARE_COMPONENT( LArCompleteToFlat )
+DECLARE_COMPONENT( LArNoise2Ntuple )
+DECLARE_COMPONENT( LArfSampl2Ntuple )
+DECLARE_COMPONENT( LArFillDSPConfig )
+DECLARE_COMPONENT( LArDSPConfig2Ntuple )
+DECLARE_COMPONENT( LArMinBias2Ntuple )
+//DECLARE_COMPONENT( LArSFcalFromFcalFromStdNtuple )
 
diff --git a/LArCalorimeter/LArCalibUtils/src/components/LArCalibUtils_entries.cxx b/LArCalorimeter/LArCalibUtils/src/components/LArCalibUtils_entries.cxx
index 659e72a4e62a7172c61aae66cd816fce14999b72..7a319e5df9d80c7a14a4ee39754fbdab2b28d09e 100644
--- a/LArCalorimeter/LArCalibUtils/src/components/LArCalibUtils_entries.cxx
+++ b/LArCalorimeter/LArCalibUtils/src/components/LArCalibUtils_entries.cxx
@@ -63,60 +63,60 @@ typedef LArCalibCopyAlg<LArDAC2uAMC> LArDAC2uAMCCopyAlg;
 typedef LArCalibCopyAlg<LArTdriftComplete> LArTdriftCompleteCopyAlg;
 
 
-DECLARE_ALGORITHM_FACTORY( LArAutoCorrMaker )
-DECLARE_ALGORITHM_FACTORY( LArAutoCorrExtrapolate )
-DECLARE_ALGORITHM_FACTORY( LArAutoCorrBuilder )
-DECLARE_ALGORITHM_FACTORY( LArCalibDigitMaker )
-DECLARE_ALGORITHM_FACTORY( LArCaliWaveAverage )
-DECLARE_ALGORITHM_FACTORY( LArCaliWaveBuilder )
-DECLARE_ALGORITHM_FACTORY( LArCaliWaveBuilderXtalk )
-DECLARE_ALGORITHM_FACTORY( LArCaliWaveMerger )
-DECLARE_ALGORITHM_FACTORY( LArCaliWaveSelector )
-DECLARE_ALGORITHM_FACTORY( LArDeltaRespPredictor )
-DECLARE_ALGORITHM_FACTORY( LArFill )
-DECLARE_ALGORITHM_FACTORY( LArMasterWaveBuilder )
-DECLARE_ALGORITHM_FACTORY( LArOFCAlg )
-DECLARE_ALGORITHM_FACTORY( LArPedestalInPhysicsMaker )
-DECLARE_ALGORITHM_FACTORY( LArPedestalMaker )
-DECLARE_ALGORITHM_FACTORY( LArPedestalBuilder )
-DECLARE_ALGORITHM_FACTORY( LArPedestalAutoCorrBuilder )
-DECLARE_ALGORITHM_FACTORY( LArPhysWaveBuilder )
-DECLARE_ALGORITHM_FACTORY( LArPhysWaveShifter )
-DECLARE_ALGORITHM_FACTORY( LArRampBuilder )
-DECLARE_ALGORITHM_FACTORY( LArRTMParamExtractor )
-DECLARE_ALGORITHM_FACTORY( LArTCMPhysWavePredictor )
-DECLARE_ALGORITHM_FACTORY( LArStripsCrossTalkCorrector )
-DECLARE_ALGORITHM_FACTORY( LArPhysWavePredictor )
-DECLARE_ALGORITHM_FACTORY( LArTimeTuning )
-DECLARE_ALGORITHM_FACTORY( LArTimeTuningNtuple )
-DECLARE_ALGORITHM_FACTORY( LArDumpShapes )
-DECLARE_ALGORITHM_FACTORY( LArRampCorr )
-DECLARE_ALGORITHM_FACTORY( LArAccumulatedCalibDigitContSplitter )
-DECLARE_ALGORITHM_FACTORY( LArRampPatcher )
-DECLARE_ALGORITHM_FACTORY( LArCaliWavePatcher )
-DECLARE_ALGORITHM_FACTORY( LArOFPhaseFill )
-DECLARE_ALGORITHM_FACTORY( LArOFPhasePicker )
-DECLARE_ALGORITHM_FACTORY( LArHVCorrMaker )
-DECLARE_ALGORITHM_FACTORY( LArCalibShortCorrector )
-DECLARE_ALGORITHM_FACTORY( LArTimePhysPrediction )
-DECLARE_ALGORITHM_FACTORY( LArRampAdHocPatchingAlg )
-//DECLARE_ALGORITHM_FACTORY( LArPedestalCopyAlg )
-DECLARE_ALGORITHM_FACTORY( LArPhysWaveCopyAlg )
-DECLARE_ALGORITHM_FACTORY( LArDAC2uAMCCopyAlg )
-DECLARE_ALGORITHM_FACTORY( LArTdriftCompleteCopyAlg )
-DECLARE_ALGORITHM_FACTORY( LArShapeCorrector )
-DECLARE_ALGORITHM_FACTORY( LArAutoCorrToolToDB )
-DECLARE_ALGORITHM_FACTORY( LArDuplicateConstants )
+DECLARE_COMPONENT( LArAutoCorrMaker )
+DECLARE_COMPONENT( LArAutoCorrExtrapolate )
+DECLARE_COMPONENT( LArAutoCorrBuilder )
+DECLARE_COMPONENT( LArCalibDigitMaker )
+DECLARE_COMPONENT( LArCaliWaveAverage )
+DECLARE_COMPONENT( LArCaliWaveBuilder )
+DECLARE_COMPONENT( LArCaliWaveBuilderXtalk )
+DECLARE_COMPONENT( LArCaliWaveMerger )
+DECLARE_COMPONENT( LArCaliWaveSelector )
+DECLARE_COMPONENT( LArDeltaRespPredictor )
+DECLARE_COMPONENT( LArFill )
+DECLARE_COMPONENT( LArMasterWaveBuilder )
+DECLARE_COMPONENT( LArOFCAlg )
+DECLARE_COMPONENT( LArPedestalInPhysicsMaker )
+DECLARE_COMPONENT( LArPedestalMaker )
+DECLARE_COMPONENT( LArPedestalBuilder )
+DECLARE_COMPONENT( LArPedestalAutoCorrBuilder )
+DECLARE_COMPONENT( LArPhysWaveBuilder )
+DECLARE_COMPONENT( LArPhysWaveShifter )
+DECLARE_COMPONENT( LArRampBuilder )
+DECLARE_COMPONENT( LArRTMParamExtractor )
+DECLARE_COMPONENT( LArTCMPhysWavePredictor )
+DECLARE_COMPONENT( LArStripsCrossTalkCorrector )
+DECLARE_COMPONENT( LArPhysWavePredictor )
+DECLARE_COMPONENT( LArTimeTuning )
+DECLARE_COMPONENT( LArTimeTuningNtuple )
+DECLARE_COMPONENT( LArDumpShapes )
+DECLARE_COMPONENT( LArRampCorr )
+DECLARE_COMPONENT( LArAccumulatedCalibDigitContSplitter )
+DECLARE_COMPONENT( LArRampPatcher )
+DECLARE_COMPONENT( LArCaliWavePatcher )
+DECLARE_COMPONENT( LArOFPhaseFill )
+DECLARE_COMPONENT( LArOFPhasePicker )
+DECLARE_COMPONENT( LArHVCorrMaker )
+DECLARE_COMPONENT( LArCalibShortCorrector )
+DECLARE_COMPONENT( LArTimePhysPrediction )
+DECLARE_COMPONENT( LArRampAdHocPatchingAlg )
+//DECLARE_COMPONENT( LArPedestalCopyAlg )
+DECLARE_COMPONENT( LArPhysWaveCopyAlg )
+DECLARE_COMPONENT( LArDAC2uAMCCopyAlg )
+DECLARE_COMPONENT( LArTdriftCompleteCopyAlg )
+DECLARE_COMPONENT( LArShapeCorrector )
+DECLARE_COMPONENT( LArAutoCorrToolToDB )
+DECLARE_COMPONENT( LArDuplicateConstants )
 
-  //DECLARE_ALGORITHM_FACTORY (LArOFCPatcher)
-DECLARE_TOOL_FACTORY( LArAutoCorrDecoderTool )
-DECLARE_TOOL_FACTORY( LArDigitOscillationCorrTool )
-DECLARE_TOOL_FACTORY( LArDeltaRespTool )
-DECLARE_TOOL_FACTORY( LArPhysWaveTool )
-DECLARE_TOOL_FACTORY( LArPhysWaveHECTool )
-DECLARE_TOOL_FACTORY( LArTCMFitterTool )
-DECLARE_TOOL_FACTORY( LArWFParamTool )
-DECLARE_TOOL_FACTORY( LArPhaseToolConst )
-DECLARE_TOOL_FACTORY( LArPhaseToolMC )
-DECLARE_TOOL_FACTORY( LArPhaseToolTB )
+  //DECLARE_COMPONENT( LArOFCPatcher )
+DECLARE_COMPONENT( LArAutoCorrDecoderTool )
+DECLARE_COMPONENT( LArDigitOscillationCorrTool )
+DECLARE_COMPONENT( LArDeltaRespTool )
+DECLARE_COMPONENT( LArPhysWaveTool )
+DECLARE_COMPONENT( LArPhysWaveHECTool )
+DECLARE_COMPONENT( LArTCMFitterTool )
+DECLARE_COMPONENT( LArWFParamTool )
+DECLARE_COMPONENT( LArPhaseToolConst )
+DECLARE_COMPONENT( LArPhaseToolMC )
+DECLARE_COMPONENT( LArPhaseToolTB )
 
diff --git a/LArCalorimeter/LArCellRec/src/components/LArCellRec_entries.cxx b/LArCalorimeter/LArCellRec/src/components/LArCellRec_entries.cxx
index b56be310e8209bccf9eaa69ec773d73fae5166dd..f9c98e8bfb38b5f229a559bcde758f6ebe6a8ee8 100644
--- a/LArCalorimeter/LArCellRec/src/components/LArCellRec_entries.cxx
+++ b/LArCalorimeter/LArCellRec/src/components/LArCellRec_entries.cxx
@@ -19,23 +19,23 @@
 #include "LArCellRec/LArTimeVetoAlg.h"
 
 
-DECLARE_ALGORITHM_FACTORY( LArNoisyROAlg )
-DECLARE_TOOL_FACTORY( LArG3Escale )
-DECLARE_TOOL_FACTORY( LArG3Escale_TDR )
-DECLARE_TOOL_FACTORY( LArNonLinearity )
-DECLARE_TOOL_FACTORY( LArCellBuilderFromLArHitTool )
-DECLARE_TOOL_FACTORY( LArCellBuilderFromLArRawChannelTool )
-DECLARE_TOOL_FACTORY (LArCellEmMiscalib)
-DECLARE_TOOL_FACTORY (LArCellRescaler)
-DECLARE_TOOL_FACTORY (LArCellMaskingTool)
-DECLARE_TOOL_FACTORY (LArCellHVCorr)
-DECLARE_TOOL_FACTORY (LArCellRecalibration)
-DECLARE_TOOL_FACTORY (LArCellNoiseMaskingTool)
-DECLARE_TOOL_FACTORY (LArBadFebMaskingTool)
-DECLARE_TOOL_FACTORY (LArCellGainPathology)
-DECLARE_TOOL_FACTORY (LArCellMerger)
-DECLARE_TOOL_FACTORY (LArCellDeadOTXCorr)
-DECLARE_TOOL_FACTORY (LArNoisyROTool)
-DECLARE_ALGORITHM_FACTORY ( LArCollisionTimeAlg )
-DECLARE_ALGORITHM_FACTORY ( LArTimeVetoAlg )
+DECLARE_COMPONENT( LArNoisyROAlg )
+DECLARE_COMPONENT( LArG3Escale )
+DECLARE_COMPONENT( LArG3Escale_TDR )
+DECLARE_COMPONENT( LArNonLinearity )
+DECLARE_COMPONENT( LArCellBuilderFromLArHitTool )
+DECLARE_COMPONENT( LArCellBuilderFromLArRawChannelTool )
+DECLARE_COMPONENT( LArCellEmMiscalib )
+DECLARE_COMPONENT( LArCellRescaler )
+DECLARE_COMPONENT( LArCellMaskingTool )
+DECLARE_COMPONENT( LArCellHVCorr )
+DECLARE_COMPONENT( LArCellRecalibration )
+DECLARE_COMPONENT( LArCellNoiseMaskingTool )
+DECLARE_COMPONENT( LArBadFebMaskingTool )
+DECLARE_COMPONENT( LArCellGainPathology )
+DECLARE_COMPONENT( LArCellMerger )
+DECLARE_COMPONENT( LArCellDeadOTXCorr )
+DECLARE_COMPONENT( LArNoisyROTool )
+DECLARE_COMPONENT( LArCollisionTimeAlg )
+DECLARE_COMPONENT( LArTimeVetoAlg )
 
diff --git a/LArCalorimeter/LArClusterRec/src/components/LArClusterRec_entries.cxx b/LArCalorimeter/LArClusterRec/src/components/LArClusterRec_entries.cxx
index c62bdb8e1ca518d13c718155e23dc246a4ef6e41..abc9700a0e032cf530c3b56112f1b7bb8f1c0603 100644
--- a/LArCalorimeter/LArClusterRec/src/components/LArClusterRec_entries.cxx
+++ b/LArCalorimeter/LArClusterRec/src/components/LArClusterRec_entries.cxx
@@ -3,7 +3,7 @@
 #include "LArClusterRec/LArClusterCollisionTimeAlg.h"
 
 
-DECLARE_TOOL_FACTORY( LArTBClusterBuilder )
-DECLARE_ALGORITHM_FACTORY( LArDigitThinnerFromEMClust )
-DECLARE_ALGORITHM_FACTORY( LArClusterCollisionTimeAlg )
+DECLARE_COMPONENT( LArTBClusterBuilder )
+DECLARE_COMPONENT( LArDigitThinnerFromEMClust )
+DECLARE_COMPONENT( LArClusterCollisionTimeAlg )
 
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/components/LArByteStream_entries.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/components/LArByteStream_entries.cxx
index 503b07543a18aa8f9ec3ad5fddf02c01e605d38d..0c9bffbe29115f7fb5ab93bf50a69d78c0634365 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/components/LArByteStream_entries.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/components/LArByteStream_entries.cxx
@@ -10,8 +10,8 @@
 //#include "LArByteStream/LArRawChannelCollByteStreamTool.h"
 
 // Containers 
-DECLARE_TOOL_FACTORY( LArRawDataContByteStreamTool )
-DECLARE_TOOL_FACTORY( LArRodDecoder )
+DECLARE_COMPONENT( LArRawDataContByteStreamTool )
+DECLARE_COMPONENT( LArRodDecoder )
 DECLARE_CONVERTER_FACTORY( LArRawChannelContByteStreamCnv )
 DECLARE_CONVERTER_FACTORY( LArDigitContByteStreamCnv )
 DECLARE_CONVERTER_FACTORY( LArCalibDigitContByteStreamCnv )
@@ -25,6 +25,6 @@ DECLARE_CONVERTER_FACTORY( LArFebHeaderContByteStreamCnv )
 //typedef LArRawChannelCollByteStreamTool<ROBData,LArCellCollection>
 //							 LARCELLTOOL;
 //typedef CollectionByteStreamCnv<LARCELLTOOL> LArCellCollByteStreamCnv ;
-//DECLARE_TOOL_FACTORY( LARCELLTOOL)  
+//DECLARE_COMPONENT( LARCELLTOOL )  
 //DECLARE_CONVERTER_FACTORY( LArCellCollByteStreamCnv )
 
diff --git a/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_entries.cxx b/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_entries.cxx
index 1f7e1fd20775342d21be0ed24b694abcc2319e01..1605dcef6110179da5cb2b72632cd2af5adeb6f5 100644
--- a/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_entries.cxx
+++ b/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_entries.cxx
@@ -4,9 +4,9 @@
 #include "LArIdCnv/LArHVLineIDDetDescrCnv.h"
 #include "LArIdCnv/LArElectrodeIDDetDescrCnv.h"
 
-DECLARE_CONVERTER_FACTORY(LArElectrodeIDDetDescrCnv)
-DECLARE_CONVERTER_FACTORY(LArHVLineIDDetDescrCnv)
-DECLARE_CONVERTER_FACTORY(LArIdMgrDetDescrCnv)
-DECLARE_CONVERTER_FACTORY(LArOnlineIDDetDescrCnv)
-DECLARE_CONVERTER_FACTORY(LArOnline_SuperCellIDDetDescrCnv)
+DECLARE_CONVERTER_FACTORY( LArElectrodeIDDetDescrCnv )
+DECLARE_CONVERTER_FACTORY( LArHVLineIDDetDescrCnv )
+DECLARE_CONVERTER_FACTORY( LArIdMgrDetDescrCnv )
+DECLARE_CONVERTER_FACTORY( LArOnlineIDDetDescrCnv )
+DECLARE_CONVERTER_FACTORY( LArOnline_SuperCellIDDetDescrCnv )
 
diff --git a/LArCalorimeter/LArCondUtils/src/components/LArCondUtils_entries.cxx b/LArCalorimeter/LArCondUtils/src/components/LArCondUtils_entries.cxx
index ead55cd544d93d321b2e476ae6a63fb47f6d9843..5beb332ac58a582ae93e5912597501520bec9a97 100644
--- a/LArCalorimeter/LArCondUtils/src/components/LArCondUtils_entries.cxx
+++ b/LArCalorimeter/LArCondUtils/src/components/LArCondUtils_entries.cxx
@@ -7,10 +7,10 @@
 
 
 
-DECLARE_TOOL_FACTORY( LArFecLvTempDcsTool )
-DECLARE_TOOL_FACTORY( LArHVToolMC )
-DECLARE_TOOL_FACTORY( LArHVToolDB )
-DECLARE_TOOL_FACTORY( LArFEBTempTool )
-DECLARE_ALGORITHM_FACTORY( LArHVPathologyDbAlg )
-DECLARE_ALGORITHM_FACTORY( LArHV2Ntuple )
+DECLARE_COMPONENT( LArFecLvTempDcsTool )
+DECLARE_COMPONENT( LArHVToolMC )
+DECLARE_COMPONENT( LArHVToolDB )
+DECLARE_COMPONENT( LArFEBTempTool )
+DECLARE_COMPONENT( LArHVPathologyDbAlg )
+DECLARE_COMPONENT( LArHV2Ntuple )
 
diff --git a/LArCalorimeter/LArDetDescr/src/components/LArDetDescr_entries.cxx b/LArCalorimeter/LArDetDescr/src/components/LArDetDescr_entries.cxx
index 3dfe9bcc45df936e82ab90413c15a0d089cabfe2..eb4a129b1e0653c7cd6fdf32a5b647d689be3cf1 100644
--- a/LArCalorimeter/LArDetDescr/src/components/LArDetDescr_entries.cxx
+++ b/LArCalorimeter/LArDetDescr/src/components/LArDetDescr_entries.cxx
@@ -1,6 +1,6 @@
 #include "LArDetDescr/LArRecoMaterialTool.h"
 #include "LArDetDescr/LArRecoSimpleGeomTool.h"
 
-DECLARE_TOOL_FACTORY( LArRecoMaterialTool )
-DECLARE_TOOL_FACTORY( LArRecoSimpleGeomTool )
+DECLARE_COMPONENT( LArRecoMaterialTool )
+DECLARE_COMPONENT( LArRecoSimpleGeomTool )
 
diff --git a/LArCalorimeter/LArDigitization/src/components/LArDigitization_entries.cxx b/LArCalorimeter/LArDigitization/src/components/LArDigitization_entries.cxx
index a5c3f9362112fb3cfa7f20740c2296641e3902cf..39111289aa8abcff4c91c712685adfacb4d8f8cd 100644
--- a/LArCalorimeter/LArDigitization/src/components/LArDigitization_entries.cxx
+++ b/LArCalorimeter/LArDigitization/src/components/LArDigitization_entries.cxx
@@ -3,8 +3,8 @@
 #include "LArDigitization/LArHitFilter.h"
 #include "LArDigitization/LArPileUpTool.h"
 
-DECLARE_ALGORITHM_FACTORY( LArDigitMaker )
-DECLARE_ALGORITHM_FACTORY( LArHitMerger )
-DECLARE_ALGORITHM_FACTORY( LArHitFilter )
-DECLARE_TOOL_FACTORY( LArPileUpTool )
+DECLARE_COMPONENT( LArDigitMaker )
+DECLARE_COMPONENT( LArHitMerger )
+DECLARE_COMPONENT( LArHitFilter )
+DECLARE_COMPONENT( LArPileUpTool )
 
diff --git a/LArCalorimeter/LArExample/TestLArDetDescr/src/components/TestLArDetDescr_entries.cxx b/LArCalorimeter/LArExample/TestLArDetDescr/src/components/TestLArDetDescr_entries.cxx
index 53260ef8d7ec504c9f12d844ddab751e22e707fa..2bc683dceefc5d3958e2e76de6654ff986fa7d27 100644
--- a/LArCalorimeter/LArExample/TestLArDetDescr/src/components/TestLArDetDescr_entries.cxx
+++ b/LArCalorimeter/LArExample/TestLArDetDescr/src/components/TestLArDetDescr_entries.cxx
@@ -3,8 +3,8 @@
 #include "TestLArDetDescr/TestLArTT.h"
 #include "TestLArDetDescr/TestLArMaterial.h"
 
-DECLARE_ALGORITHM_FACTORY( TestCaloDDE )
-DECLARE_ALGORITHM_FACTORY( TestCaloGeom )
-DECLARE_ALGORITHM_FACTORY( TestLArTT )
-DECLARE_ALGORITHM_FACTORY( TestLArMaterial )
+DECLARE_COMPONENT( TestCaloDDE )
+DECLARE_COMPONENT( TestCaloGeom )
+DECLARE_COMPONENT( TestLArTT )
+DECLARE_COMPONENT( TestLArMaterial )
 
diff --git a/LArCalorimeter/LArExample/TestLArHardwareID/src/components/TestLArHardwareID_entries.cxx b/LArCalorimeter/LArExample/TestLArHardwareID/src/components/TestLArHardwareID_entries.cxx
index 982c2462251b54f38edc32cbfccb3040baea4139..62756210be97733731a12fd1f75aa6e08ce04583 100644
--- a/LArCalorimeter/LArExample/TestLArHardwareID/src/components/TestLArHardwareID_entries.cxx
+++ b/LArCalorimeter/LArExample/TestLArHardwareID/src/components/TestLArHardwareID_entries.cxx
@@ -5,9 +5,9 @@
 #include "TestLArHardwareID/updateTTMap_Algo.h"
 
 
-DECLARE_ALGORITHM_FACTORY( TestLArHWID_Algo ) 
-DECLARE_ALGORITHM_FACTORY( initTTMap_Algo ) 
-DECLARE_ALGORITHM_FACTORY( reinitTTMap_Algo ) 
-DECLARE_ALGORITHM_FACTORY( testTTMap_Algo ) 
-DECLARE_ALGORITHM_FACTORY( updateTTMap_Algo ) 
+DECLARE_COMPONENT( TestLArHWID_Algo ) 
+DECLARE_COMPONENT( initTTMap_Algo ) 
+DECLARE_COMPONENT( reinitTTMap_Algo ) 
+DECLARE_COMPONENT( testTTMap_Algo ) 
+DECLARE_COMPONENT( updateTTMap_Algo ) 
 
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/components/LArG4Barrel_entries.cxx b/LArCalorimeter/LArG4/LArG4Barrel/src/components/LArG4Barrel_entries.cxx
index 577e484990cc768630f3f335582816cea3ad69ea..0886ba3eecde0879f676f51db9f31069935ee10b 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/components/LArG4Barrel_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/components/LArG4Barrel_entries.cxx
@@ -9,14 +9,14 @@
 #include "../LArBarrelGeometry.h"
 #include "../LArBarrelPresamplerGeometry.h"
 
-DECLARE_SERVICE_FACTORY(LArG4::BarrelCryostat::CalibrationCalculator)
-DECLARE_SERVICE_FACTORY(LArG4::BarrelCryostat::CalibrationMixedCalculator)
-DECLARE_SERVICE_FACTORY(LArBarrelCalculator)
-DECLARE_SERVICE_FACTORY(LArBarrelPresamplerCalculator)
-DECLARE_SERVICE_FACTORY(LArG4::BarrelCryostat::CalibrationLArCalculator)
-DECLARE_SERVICE_FACTORY(LArG4::DM::CalibrationCalculator)
-DECLARE_SERVICE_FACTORY(LArG4::Barrel::CalibrationCalculator)
-DECLARE_SERVICE_FACTORY(LArG4::BarrelPresampler::CalibrationCalculator)
-DECLARE_SERVICE_FACTORY(LArG4::Barrel::Geometry)
-DECLARE_SERVICE_FACTORY(LArG4::BarrelPresampler::Geometry)
+DECLARE_COMPONENT( LArG4::BarrelCryostat::CalibrationCalculator )
+DECLARE_COMPONENT( LArG4::BarrelCryostat::CalibrationMixedCalculator )
+DECLARE_COMPONENT( LArBarrelCalculator )
+DECLARE_COMPONENT( LArBarrelPresamplerCalculator )
+DECLARE_COMPONENT( LArG4::BarrelCryostat::CalibrationLArCalculator )
+DECLARE_COMPONENT( LArG4::DM::CalibrationCalculator )
+DECLARE_COMPONENT( LArG4::Barrel::CalibrationCalculator )
+DECLARE_COMPONENT( LArG4::BarrelPresampler::CalibrationCalculator )
+DECLARE_COMPONENT( LArG4::Barrel::Geometry )
+DECLARE_COMPONENT( LArG4::BarrelPresampler::Geometry )
 
diff --git a/LArCalorimeter/LArG4/LArG4EC/src/components/LArG4EC_entries.cxx b/LArCalorimeter/LArG4/LArG4EC/src/components/LArG4EC_entries.cxx
index b60195cd07cbe0a6081874a59c70921e7fdac469..bac3d3762584bfad6e0d8d33c69ba00a4aa1a02d 100644
--- a/LArCalorimeter/LArG4/LArG4EC/src/components/LArG4EC_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4EC/src/components/LArG4EC_entries.cxx
@@ -7,12 +7,12 @@
 #include "../EnergyCalculator.h"
 #include "../PresamplerCalibrationCalculator.h"
 
-DECLARE_SERVICE_FACTORY(LArG4::EC::CalibrationCalculator)
-DECLARE_SERVICE_FACTORY(LArG4::EMECSupportCalibrationCalculator)
-DECLARE_SERVICE_FACTORY(LArEndcapPresamplerCalculator)
-DECLARE_SERVICE_FACTORY(LArG4::EndcapCryostat::CalibrationLArCalculator)
-DECLARE_SERVICE_FACTORY(LArG4::EndcapCryostat::CalibrationCalculator)
-DECLARE_SERVICE_FACTORY(LArG4::EndcapCryostat::CalibrationMixedCalculator)
-DECLARE_SERVICE_FACTORY(LArG4::EC::EnergyCalculator)
-DECLARE_SERVICE_FACTORY(LArG4::EC::PresamplerCalibrationCalculator)
+DECLARE_COMPONENT( LArG4::EC::CalibrationCalculator )
+DECLARE_COMPONENT( LArG4::EMECSupportCalibrationCalculator )
+DECLARE_COMPONENT( LArEndcapPresamplerCalculator )
+DECLARE_COMPONENT( LArG4::EndcapCryostat::CalibrationLArCalculator )
+DECLARE_COMPONENT( LArG4::EndcapCryostat::CalibrationCalculator )
+DECLARE_COMPONENT( LArG4::EndcapCryostat::CalibrationMixedCalculator )
+DECLARE_COMPONENT( LArG4::EC::EnergyCalculator )
+DECLARE_COMPONENT( LArG4::EC::PresamplerCalibrationCalculator )
 
diff --git a/LArCalorimeter/LArG4/LArG4FCAL/src/components/LArG4FCAL_entries.cxx b/LArCalorimeter/LArG4/LArG4FCAL/src/components/LArG4FCAL_entries.cxx
index 994da9325f7288839cb4949e8279baf82959720a..8f4670bac3cac9f4f2318af8634f59818649ac91 100644
--- a/LArCalorimeter/LArG4/LArG4FCAL/src/components/LArG4FCAL_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4FCAL/src/components/LArG4FCAL_entries.cxx
@@ -1,6 +1,6 @@
 #include "../LArFCALCalculatorBase.h"
 #include "../LArFCALCalibCalculatorBase.h"
 
-DECLARE_SERVICE_FACTORY(LArG4::FCAL::LArFCALCalibCalculatorBase)
-DECLARE_SERVICE_FACTORY(LArFCALCalculatorBase)
+DECLARE_COMPONENT( LArG4::FCAL::LArFCALCalibCalculatorBase )
+DECLARE_COMPONENT( LArFCALCalculatorBase )
 
diff --git a/LArCalorimeter/LArG4/LArG4FastSimSvc/LArG4FastSimSvc/LArG4FastSimSvc.h b/LArCalorimeter/LArG4/LArG4FastSimSvc/LArG4FastSimSvc/LArG4FastSimSvc.h
index 50c799c5e3b31fbc1e810f05a57207391c688e6e..b61d1b46a3a88d6e0951314196fc6360d39e21a2 100644
--- a/LArCalorimeter/LArG4/LArG4FastSimSvc/LArG4FastSimSvc/LArG4FastSimSvc.h
+++ b/LArCalorimeter/LArG4/LArG4FastSimSvc/LArG4FastSimSvc/LArG4FastSimSvc.h
@@ -66,8 +66,6 @@ class LArG4FastSimSvc : public AthService, virtual public ILArG4FastSimSvc {
 
   inline virtual int DetectorTag() const;
 
- protected:
-
   friend class SvcFactory<LArG4FastSimSvc>;
 
   /// Standard Constructor
diff --git a/LArCalorimeter/LArG4/LArG4FastSimSvc/src/components/LArG4FastSimSvc_entries.cxx b/LArCalorimeter/LArG4/LArG4FastSimSvc/src/components/LArG4FastSimSvc_entries.cxx
index 35f7113bf70ef8c81bbb1a7eaa62a0c0bfdc1dda..2f49f133088c42457e55ff21b59ce4ab5b9da31a 100644
--- a/LArCalorimeter/LArG4/LArG4FastSimSvc/src/components/LArG4FastSimSvc_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4FastSimSvc/src/components/LArG4FastSimSvc_entries.cxx
@@ -1,4 +1,4 @@
 #include "LArG4FastSimSvc/LArG4FastSimSvc.h"
 
-DECLARE_SERVICE_FACTORY(LArG4FastSimSvc)
+DECLARE_COMPONENT( LArG4FastSimSvc )
 
diff --git a/LArCalorimeter/LArG4/LArG4FastSimulation/src/components/LArG4FastSimulation_entries.cxx b/LArCalorimeter/LArG4/LArG4FastSimulation/src/components/LArG4FastSimulation_entries.cxx
index 99465018711cf1536fb8820d42a4ad130f6a50f9..924d65c0dc4f8f71e90a9f510aca0efbef91eefd 100644
--- a/LArCalorimeter/LArG4/LArG4FastSimulation/src/components/LArG4FastSimulation_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4FastSimulation/src/components/LArG4FastSimulation_entries.cxx
@@ -1,6 +1,6 @@
 // #include "../DeadMaterialShower.h"
 #include "../LArFastShowerTool.h"
 
-// DECLARE_TOOL_FACTORY( DeadMaterialShower )
-DECLARE_TOOL_FACTORY( LArFastShowerTool )
+// DECLARE_COMPONENT( DeadMaterialShower )
+DECLARE_COMPONENT( LArFastShowerTool )
 
diff --git a/LArCalorimeter/LArG4/LArG4GenShowerLib/src/components/LArG4GenShowerLib_entries.cxx b/LArCalorimeter/LArG4/LArG4GenShowerLib/src/components/LArG4GenShowerLib_entries.cxx
index dff151066c81267574d9590839a8a69dc8ad4321..49972f658b4d6ae8dec6e92cdee80f859c75c7d1 100644
--- a/LArCalorimeter/LArG4/LArG4GenShowerLib/src/components/LArG4GenShowerLib_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4GenShowerLib/src/components/LArG4GenShowerLib_entries.cxx
@@ -1,6 +1,6 @@
 #include "LArG4GenShowerLib/LArG4GenShowerLib.h"
 #include "LArG4GenShowerLib/TestActionShowerLibTool.h"
 
-DECLARE_ALGORITHM_FACTORY( LArG4GenShowerLib )
-DECLARE_TOOL_FACTORY( G4UA::TestActionShowerLibTool )
+DECLARE_COMPONENT( LArG4GenShowerLib )
+DECLARE_COMPONENT( G4UA::TestActionShowerLibTool )
 
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/components/LArG4H6SDTools_entries.cxx b/LArCalorimeter/LArG4/LArG4H6SD/src/components/LArG4H6SDTools_entries.cxx
index d1f891607e7f62b5d3216e18df06b8327e35407c..a56a875256cd20d9a6018b30d8f6c2fdb2aa16c6 100644
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/components/LArG4H6SDTools_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4H6SD/src/components/LArG4H6SDTools_entries.cxx
@@ -35,39 +35,39 @@
 
 
 // UA tools
-DECLARE_TOOL_FACTORY( LArTBH6TriggerTimeTool )
-DECLARE_TOOL_FACTORY( G4UA::LArGeoH62004EventActionTool )
-DECLARE_TOOL_FACTORY( G4UA::LArGeoH62004SteppingActionTool )
-DECLARE_TOOL_FACTORY( G4UA::RadLenNtupleTool )
+DECLARE_COMPONENT( LArTBH6TriggerTimeTool )
+DECLARE_COMPONENT( G4UA::LArGeoH62004EventActionTool )
+DECLARE_COMPONENT( G4UA::LArGeoH62004SteppingActionTool )
+DECLARE_COMPONENT( G4UA::RadLenNtupleTool )
 
 // SD tools
-DECLARE_TOOL_FACTORY( LArG4::H62004EMECSDTool )
-DECLARE_TOOL_FACTORY( LArG4::H62004FCALSDTool )
-DECLARE_TOOL_FACTORY( LArG4::H62004HECSDTool )
-DECLARE_TOOL_FACTORY( LArG4::H62004ActiveSDTool )
-DECLARE_TOOL_FACTORY( LArG4::H62004DeadSDTool )
-DECLARE_TOOL_FACTORY( LArG4::H62004InactiveSDTool )
+DECLARE_COMPONENT( LArG4::H62004EMECSDTool )
+DECLARE_COMPONENT( LArG4::H62004FCALSDTool )
+DECLARE_COMPONENT( LArG4::H62004HECSDTool )
+DECLARE_COMPONENT( LArG4::H62004ActiveSDTool )
+DECLARE_COMPONENT( LArG4::H62004DeadSDTool )
+DECLARE_COMPONENT( LArG4::H62004InactiveSDTool )
 
-DECLARE_TOOL_FACTORY( LArG4H62004ActiveSDTool )
-DECLARE_TOOL_FACTORY( LArG4H62004DeadSDTool )
-DECLARE_TOOL_FACTORY( LArG4H62004EMECSDTool )
-DECLARE_TOOL_FACTORY( LArG4H62004FCALSDTool )
-DECLARE_TOOL_FACTORY( LArG4H62004HECSDTool )
-DECLARE_TOOL_FACTORY( LArG4H62004InactiveSDTool )
-DECLARE_TOOL_FACTORY( LArG4H6BeamSDTool )
-DECLARE_TOOL_FACTORY( LArG4H6WarmTCSDTool )
-DECLARE_TOOL_FACTORY( LArG4TBECBeamChSDTool )
-DECLARE_TOOL_FACTORY( TBECBackOuterBarretteTool )
-DECLARE_TOOL_FACTORY( TBECInnerModuleTool )
-DECLARE_TOOL_FACTORY( TBECOuterModuleTool )
+DECLARE_COMPONENT( LArG4H62004ActiveSDTool )
+DECLARE_COMPONENT( LArG4H62004DeadSDTool )
+DECLARE_COMPONENT( LArG4H62004EMECSDTool )
+DECLARE_COMPONENT( LArG4H62004FCALSDTool )
+DECLARE_COMPONENT( LArG4H62004HECSDTool )
+DECLARE_COMPONENT( LArG4H62004InactiveSDTool )
+DECLARE_COMPONENT( LArG4H6BeamSDTool )
+DECLARE_COMPONENT( LArG4H6WarmTCSDTool )
+DECLARE_COMPONENT( LArG4TBECBeamChSDTool )
+DECLARE_COMPONENT( TBECBackOuterBarretteTool )
+DECLARE_COMPONENT( TBECInnerModuleTool )
+DECLARE_COMPONENT( TBECOuterModuleTool )
 
-DECLARE_ALGORITHM_FACTORY(LArTBH6BeamInfo)
+DECLARE_COMPONENT( LArTBH6BeamInfo )
 
 //Calculators
 
-DECLARE_SERVICE_FACTORY(LArFCALH62004CalibCalculatorBase)
-DECLARE_SERVICE_FACTORY(LArG4H6COLDTCMod0Calculator)
-DECLARE_SERVICE_FACTORY(LArG4H6WarmTCCalculator)
-DECLARE_SERVICE_FACTORY(LArG4H62004DeadCalibrationCalculator)
-DECLARE_SERVICE_FACTORY(LArG4H6COLDTCMod0CalibCalculator)
+DECLARE_COMPONENT( LArFCALH62004CalibCalculatorBase )
+DECLARE_COMPONENT( LArG4H6COLDTCMod0Calculator )
+DECLARE_COMPONENT( LArG4H6WarmTCCalculator )
+DECLARE_COMPONENT( LArG4H62004DeadCalibrationCalculator )
+DECLARE_COMPONENT( LArG4H6COLDTCMod0CalibCalculator )
 
diff --git a/LArCalorimeter/LArG4/LArG4H8SD/src/components/LArG4H8SD_entries.cxx b/LArCalorimeter/LArG4/LArG4H8SD/src/components/LArG4H8SD_entries.cxx
index b3cd32c26ffcb09f594a80c5715bf5720f035888..689df4bd93a59e6b11e0578bd68d1a4f532f4274 100644
--- a/LArCalorimeter/LArG4/LArG4H8SD/src/components/LArG4H8SD_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4H8SD/src/components/LArG4H8SD_entries.cxx
@@ -4,9 +4,9 @@
 #include "../LArTBCryostatCalibrationCalculator.h"
 #include "../H8CalibrationDefaultCalculator.h"
 
-DECLARE_TOOL_FACTORY( LArG4::H8CalibSDTool )
-DECLARE_TOOL_FACTORY( LArG4H8CalibSDTool )
+DECLARE_COMPONENT( LArG4::H8CalibSDTool )
+DECLARE_COMPONENT( LArG4H8CalibSDTool )
 
-DECLARE_SERVICE_FACTORY(LArTBCryostatCalibrationCalculator)
-DECLARE_SERVICE_FACTORY(H8CalibrationDefaultCalculator)
+DECLARE_COMPONENT( LArTBCryostatCalibrationCalculator )
+DECLARE_COMPONENT( H8CalibrationDefaultCalculator )
 
diff --git a/LArCalorimeter/LArG4/LArG4HEC/src/components/LArG4HEC_entries.cxx b/LArCalorimeter/LArG4/LArG4HEC/src/components/LArG4HEC_entries.cxx
index c069b69c9bf57035ad9e6f1980f09bc664f3ce2c..41d40575cd20c14b83ba86c6e0fa675d7e27d9ec 100644
--- a/LArCalorimeter/LArG4/LArG4HEC/src/components/LArG4HEC_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4HEC/src/components/LArG4HEC_entries.cxx
@@ -5,10 +5,10 @@
 #include "../LArHECCalibrationWheelCalculator.h"
 #include "LArG4HEC/HECGeometry.h"
 
-DECLARE_SERVICE_FACTORY(LArHECLocalCalculator)
-DECLARE_SERVICE_FACTORY(LArG4::HEC::LocalCalibrationCalculator)
-DECLARE_SERVICE_FACTORY(LArG4::HEC::LocalGeometry)
-DECLARE_SERVICE_FACTORY(LArHECWheelCalculator)
-DECLARE_SERVICE_FACTORY(LArG4::HEC::LArHECCalibrationWheelCalculator)
-DECLARE_SERVICE_FACTORY(LArG4::HEC::HECGeometry)
+DECLARE_COMPONENT( LArHECLocalCalculator )
+DECLARE_COMPONENT( LArG4::HEC::LocalCalibrationCalculator )
+DECLARE_COMPONENT( LArG4::HEC::LocalGeometry )
+DECLARE_COMPONENT( LArHECWheelCalculator )
+DECLARE_COMPONENT( LArG4::HEC::LArHECCalibrationWheelCalculator )
+DECLARE_COMPONENT( LArG4::HEC::HECGeometry )
 
diff --git a/LArCalorimeter/LArG4/LArG4MiniFCAL/src/components/LArG4MiniFCAL_entries.cxx b/LArCalorimeter/LArG4/LArG4MiniFCAL/src/components/LArG4MiniFCAL_entries.cxx
index 85d6c3ef28315fef0cf1903235ec6ab6ae2ff28f..004c1e42a8651ac4d0d42b52ecb353cbbae9acd8 100644
--- a/LArCalorimeter/LArG4/LArG4MiniFCAL/src/components/LArG4MiniFCAL_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4MiniFCAL/src/components/LArG4MiniFCAL_entries.cxx
@@ -1,6 +1,6 @@
 #include "../MiniFCALCalculator.h"
 #include "../MiniFCALCalibrationCalculator.h"
 
-DECLARE_SERVICE_FACTORY(LArG4::MiniFCAL::MiniFCALCalibrationCalculator)
-DECLARE_SERVICE_FACTORY(MiniFCALCalculator)
+DECLARE_COMPONENT( LArG4::MiniFCAL::MiniFCALCalibrationCalculator )
+DECLARE_COMPONENT( MiniFCALCalculator )
 
diff --git a/LArCalorimeter/LArG4/LArG4SD/src/components/LArG4SD_entries.cxx b/LArCalorimeter/LArG4/LArG4SD/src/components/LArG4SD_entries.cxx
index 6924739efce88702ac7e7d13a36892e7c232251e..f139ae9711804631f270c3ee71155cc5da4e9c11 100644
--- a/LArCalorimeter/LArG4/LArG4SD/src/components/LArG4SD_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4SD/src/components/LArG4SD_entries.cxx
@@ -10,14 +10,14 @@
 
 #include "../CalibrationDefaultCalculator.h"
 
-DECLARE_TOOL_FACTORY( LArG4::EMBSDTool )
-DECLARE_TOOL_FACTORY( LArG4::EMECSDTool )
-DECLARE_TOOL_FACTORY( LArG4::HECSDTool )
-DECLARE_TOOL_FACTORY( LArG4::FCALSDTool )
-DECLARE_TOOL_FACTORY( LArG4::MiniFCALSDTool )
-DECLARE_TOOL_FACTORY( LArG4::ActiveSDTool )
-DECLARE_TOOL_FACTORY( LArG4::InactiveSDTool )
-DECLARE_TOOL_FACTORY( LArG4::DeadSDTool )
+DECLARE_COMPONENT( LArG4::EMBSDTool )
+DECLARE_COMPONENT( LArG4::EMECSDTool )
+DECLARE_COMPONENT( LArG4::HECSDTool )
+DECLARE_COMPONENT( LArG4::FCALSDTool )
+DECLARE_COMPONENT( LArG4::MiniFCALSDTool )
+DECLARE_COMPONENT( LArG4::ActiveSDTool )
+DECLARE_COMPONENT( LArG4::InactiveSDTool )
+DECLARE_COMPONENT( LArG4::DeadSDTool )
 
-DECLARE_SERVICE_FACTORY( LArG4::CalibrationDefaultCalculator )
+DECLARE_COMPONENT( LArG4::CalibrationDefaultCalculator )
 
diff --git a/LArCalorimeter/LArG4/LArG4ShowerLibSvc/LArG4ShowerLibSvc/LArG4ShowerLibSvc.h b/LArCalorimeter/LArG4/LArG4ShowerLibSvc/LArG4ShowerLibSvc/LArG4ShowerLibSvc.h
index 1d9c9536eaff73bf52df6a185433627fd4765b27..4e29ee6e46222d9fc31ef8e840d92f2c7a806beb 100755
--- a/LArCalorimeter/LArG4/LArG4ShowerLibSvc/LArG4ShowerLibSvc/LArG4ShowerLibSvc.h
+++ b/LArCalorimeter/LArG4/LArG4ShowerLibSvc/LArG4ShowerLibSvc/LArG4ShowerLibSvc.h
@@ -70,8 +70,6 @@ public:
     virtual double                  getContainmentZ(const G4FastTrack& track, int detectorTag);
     virtual double                  getContainmentR(const G4FastTrack& track, int detectorTag);
 
-protected:
-
     friend class SvcFactory<LArG4ShowerLibSvc>;
 
     LArG4ShowerLibSvc(const std::string& name, ISvcLocator* svc);
diff --git a/LArCalorimeter/LArG4/LArG4ShowerLibSvc/src/components/LArG4ShowerLibSvc_entries.cxx b/LArCalorimeter/LArG4/LArG4ShowerLibSvc/src/components/LArG4ShowerLibSvc_entries.cxx
index 1fc72223dd72e9a9890c3a1f107dc474e8e7bfec..0c14286a6d40b143481951fe3a576c92ba4d69b4 100644
--- a/LArCalorimeter/LArG4/LArG4ShowerLibSvc/src/components/LArG4ShowerLibSvc_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4ShowerLibSvc/src/components/LArG4ShowerLibSvc_entries.cxx
@@ -1,7 +1,7 @@
 #include "LArG4ShowerLibSvc/LArG4ShowerLibSvcTest.h"
 #include "LArG4ShowerLibSvc/LArG4ShowerLibSvc.h"
 
-DECLARE_ALGORITHM_FACTORY ( LArG4ShowerLibSvcTest )
+DECLARE_COMPONENT( LArG4ShowerLibSvcTest )
 
-DECLARE_SERVICE_FACTORY   ( LArG4ShowerLibSvc )
+DECLARE_COMPONENT( LArG4ShowerLibSvc )
 
diff --git a/LArCalorimeter/LArG4/LArG4Validation/src/components/LArG4Validation_entries.cxx b/LArCalorimeter/LArG4/LArG4Validation/src/components/LArG4Validation_entries.cxx
index da93092ff6b90f12d841ed333d78b8235d9e15fe..c253d6abc0c76dfe5608df14f3cd2a3b015a312c 100644
--- a/LArCalorimeter/LArG4/LArG4Validation/src/components/LArG4Validation_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4Validation/src/components/LArG4Validation_entries.cxx
@@ -2,6 +2,6 @@
 #include "LArG4Validation/AODReader.h"
 
 
-DECLARE_ALGORITHM_FACTORY( SingleTrackValidation )
-DECLARE_ALGORITHM_FACTORY( AODReader )
+DECLARE_COMPONENT( SingleTrackValidation )
+DECLARE_COMPONENT( AODReader )
 
diff --git a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/components/LArGeoAlgs_entries.cxx b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/components/LArGeoAlgs_entries.cxx
index 76e4335f668ed98bdc43b865a6fba2c4b33d7ce8..3b2a2df35da1919575bb8d3fcbefa13de3e60bd6 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/components/LArGeoAlgs_entries.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/components/LArGeoAlgs_entries.cxx
@@ -1,4 +1,4 @@
 #include "../LArDetectorToolNV.h"
 
-DECLARE_TOOL_FACTORY(LArDetectorToolNV)
+DECLARE_COMPONENT( LArDetectorToolNV )
 
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/components/LArGeoH62002Alg_entries.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/components/LArGeoH62002Alg_entries.cxx
index bf8f3932e55b6fbe3ef54563793cce6a5c9e1cb9..df385a21b40412ae784063af51b4578597c44074 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/components/LArGeoH62002Alg_entries.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/components/LArGeoH62002Alg_entries.cxx
@@ -1,4 +1,4 @@
 #include "../LArDetectorToolH62002.h"
 
-DECLARE_TOOL_FACTORY(LArDetectorToolH62002)
+DECLARE_COMPONENT( LArDetectorToolH62002 )
 
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/src/components/LArGeoAlgs_entries.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/src/components/LArGeoAlgs_entries.cxx
index 917f4d3a4b38f5f082a38d6ee45831896ed238ae..3c2378a19398d621f6779243445ee81aee3f434a 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/src/components/LArGeoAlgs_entries.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/src/components/LArGeoAlgs_entries.cxx
@@ -1,4 +1,4 @@
 #include "../LArDetectorToolH62003.h"
 
-DECLARE_TOOL_FACTORY(LArDetectorToolH62003)
+DECLARE_COMPONENT( LArDetectorToolH62003 )
 
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/components/LArGeoH62004Alg_entries.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/components/LArGeoH62004Alg_entries.cxx
index 637732580e09ccedaebe3531e93f090f380a7c01..41008299b147e286a7a5b6fd4569e5d7aa67e429 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/components/LArGeoH62004Alg_entries.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/components/LArGeoH62004Alg_entries.cxx
@@ -1,4 +1,4 @@
 #include "../LArDetectorToolH62004.h"
 
-DECLARE_TOOL_FACTORY(LArDetectorToolH62004)
+DECLARE_COMPONENT( LArDetectorToolH62004 )
 
diff --git a/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/components/LArGeoAlgs_entries.cxx b/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/components/LArGeoAlgs_entries.cxx
index 6969fc68d072825f83538a14cdd43736297594aa..0dfa1d0e39d6f24d4471cbcc7dd7a1ca1ab85343 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/components/LArGeoAlgs_entries.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/components/LArGeoAlgs_entries.cxx
@@ -1,4 +1,4 @@
 #include "../LArDetectorToolTBEC.h"
 
-DECLARE_TOOL_FACTORY(LArDetectorToolTBEC)
+DECLARE_COMPONENT( LArDetectorToolTBEC )
 
diff --git a/LArCalorimeter/LArL1Sim/src/components/LArL1Sim_entries.cxx b/LArCalorimeter/LArL1Sim/src/components/LArL1Sim_entries.cxx
index cd2d5e1dffe61acbaa2927265a5f86b417b7bc7b..711039601b1d1f7a597412816d8d1f5ee047d5be 100644
--- a/LArCalorimeter/LArL1Sim/src/components/LArL1Sim_entries.cxx
+++ b/LArCalorimeter/LArL1Sim/src/components/LArL1Sim_entries.cxx
@@ -3,8 +3,8 @@
 #include "LArL1Sim/LArTTL1Calib.h"
 #include "LArL1Sim/LArSCSimpleMaker.h"
 
-DECLARE_ALGORITHM_FACTORY( LArTTL1Maker )
-DECLARE_ALGORITHM_FACTORY( LArSCL1Maker )
-DECLARE_ALGORITHM_FACTORY( LArTTL1Calib )
-DECLARE_ALGORITHM_FACTORY( LArSCSimpleMaker )
+DECLARE_COMPONENT( LArTTL1Maker )
+DECLARE_COMPONENT( LArSCL1Maker )
+DECLARE_COMPONENT( LArTTL1Calib )
+DECLARE_COMPONENT( LArSCSimpleMaker )
 
diff --git a/LArCalorimeter/LArMonTools/src/components/LArMonTools_entries.cxx b/LArCalorimeter/LArMonTools/src/components/LArMonTools_entries.cxx
index c6780f60b55530f7c9a6e01b2e0190493d963aae..6072ae41616e786dff09c0e564e6d893e7b79edf 100644
--- a/LArCalorimeter/LArMonTools/src/components/LArMonTools_entries.cxx
+++ b/LArCalorimeter/LArMonTools/src/components/LArMonTools_entries.cxx
@@ -10,14 +10,14 @@
 #include "LArMonTools/LArNoisyROMon.h"
 
 
-DECLARE_TOOL_FACTORY(LArFEBMon)
-DECLARE_TOOL_FACTORY(LArRawChannelMonTool)
-DECLARE_TOOL_FACTORY(LArCollisionTimeMonTool)
-  DECLARE_TOOL_FACTORY(LArCosmicsMonTool)
-DECLARE_TOOL_FACTORY(LArCoverage)
-DECLARE_TOOL_FACTORY(LArDigitMon)
-DECLARE_TOOL_FACTORY(LArRODMonTool)
-DECLARE_TOOL_FACTORY(LArAffectedRegions)
-DECLARE_TOOL_FACTORY(LArHVCorrectionMonTool)
-DECLARE_TOOL_FACTORY(LArNoisyROMon)
+DECLARE_COMPONENT( LArFEBMon )
+DECLARE_COMPONENT( LArRawChannelMonTool )
+DECLARE_COMPONENT( LArCollisionTimeMonTool )
+  DECLARE_COMPONENT( LArCosmicsMonTool )
+DECLARE_COMPONENT( LArCoverage )
+DECLARE_COMPONENT( LArDigitMon )
+DECLARE_COMPONENT( LArRODMonTool )
+DECLARE_COMPONENT( LArAffectedRegions )
+DECLARE_COMPONENT( LArHVCorrectionMonTool )
+DECLARE_COMPONENT( LArNoisyROMon )
 
diff --git a/LArCalorimeter/LArOnlDbPrep/src/components/LArOnlDbPrep_entries.cxx b/LArCalorimeter/LArOnlDbPrep/src/components/LArOnlDbPrep_entries.cxx
index 5d3b2fddef82636da68f15843150cbd81c6c5078..9c25b787d9b37b9b8775cf6e2dc2cabd86f10149 100644
--- a/LArCalorimeter/LArOnlDbPrep/src/components/LArOnlDbPrep_entries.cxx
+++ b/LArCalorimeter/LArOnlDbPrep/src/components/LArOnlDbPrep_entries.cxx
@@ -1,6 +1,6 @@
 #include "LArOnlDbPrep/LArDSPThresholdFillInline.h"
 #include "LArOnlDbPrep/LArGeoWeightsFill.h"
 
-DECLARE_ALGORITHM_FACTORY ( LArDSPThresholdFillInline )
-DECLARE_ALGORITHM_FACTORY ( LArGeoWeightsFill )
+DECLARE_COMPONENT( LArDSPThresholdFillInline )
+DECLARE_COMPONENT( LArGeoWeightsFill )
 
diff --git a/LArCalorimeter/LArROD/src/components/LArROD_entries.cxx b/LArCalorimeter/LArROD/src/components/LArROD_entries.cxx
index 421507de8320887538bdef47fc0acae265faeb08..43f469fce04de37c1dd9423480ed12dbf6f9b9b8 100644
--- a/LArCalorimeter/LArROD/src/components/LArROD_entries.cxx
+++ b/LArCalorimeter/LArROD/src/components/LArROD_entries.cxx
@@ -31,35 +31,35 @@ typedef LArDigitPreProcessor<TBLArDigitContainer> TBLArDigProcessor;
 
 typedef LArCalibDigitPreProcessor<TBLArCalibDigitContainer> TBLArCalDigProcessor;
 
-DECLARE_ALGORITHM_FACTORY(LArRawChannelBuilder )
-DECLARE_ALGORITHM_FACTORY(ReadLArRaw )
-DECLARE_ALGORITHM_FACTORY(ReadLArDigits )
-DECLARE_ALGORITHM_FACTORY(LArDigProcessor )
-DECLARE_ALGORITHM_FACTORY(TBLArDigProcessor )
-DECLARE_ALGORITHM_FACTORY(TBLArCalDigProcessor )
-DECLARE_ALGORITHM_FACTORY(LArRawChannelSimpleBuilder )
-DECLARE_ALGORITHM_FACTORY(LArTimeChecker )
-DECLARE_ALGORITHM_FACTORY(LArCalibDigitsAccumulator)
-DECLARE_ALGORITHM_FACTORY(LArDigitsAccumulator)
-DECLARE_ALGORITHM_FACTORY(LArRawChannelBuilderDriver)
-DECLARE_ALGORITHM_FACTORY(LArDigitThinner)
-DECLARE_ALGORITHM_FACTORY(LArFebErrorSummaryMaker)
-DECLARE_ALGORITHM_FACTORY(LArCalibDigitsAccumulatorFreeGain)
-DECLARE_ALGORITHM_FACTORY( LArSuperCellBuilderDriver)
-DECLARE_TOOL_FACTORY( LArCellBuilderDriver)
-DECLARE_TOOL_FACTORY( LArRawChannelBuilderToolOFC )
-DECLARE_TOOL_FACTORY( LArRawChannelBuilderToolOFCIter )
-DECLARE_TOOL_FACTORY( LArRawChannelBuilderToolParabola )
-DECLARE_TOOL_FACTORY( LArRawChannelBuilderToolCubic )
-DECLARE_TOOL_FACTORY( LArRawChannelBuilderToolAverage )
-DECLARE_TOOL_FACTORY( LArRawChannelBuilderToolBadChannelTool )
-DECLARE_TOOL_FACTORY( LArRawChannelBuilderADC2EDataBase )
-DECLARE_TOOL_FACTORY( LArRawChannelBuilderADC2EConstants )
-DECLARE_TOOL_FACTORY( LArRawChannelBuilderPedestalDataBase )
-DECLARE_TOOL_FACTORY( LArRawChannelBuilderPedestalSampleZero )
-DECLARE_TOOL_FACTORY( LArRawChannelBuilderToolTileInfo )
+DECLARE_COMPONENT( LArRawChannelBuilder )
+DECLARE_COMPONENT( ReadLArRaw )
+DECLARE_COMPONENT( ReadLArDigits )
+DECLARE_COMPONENT( LArDigProcessor )
+DECLARE_COMPONENT( TBLArDigProcessor )
+DECLARE_COMPONENT( TBLArCalDigProcessor )
+DECLARE_COMPONENT( LArRawChannelSimpleBuilder )
+DECLARE_COMPONENT( LArTimeChecker )
+DECLARE_COMPONENT( LArCalibDigitsAccumulator )
+DECLARE_COMPONENT( LArDigitsAccumulator )
+DECLARE_COMPONENT( LArRawChannelBuilderDriver )
+DECLARE_COMPONENT( LArDigitThinner )
+DECLARE_COMPONENT( LArFebErrorSummaryMaker )
+DECLARE_COMPONENT( LArCalibDigitsAccumulatorFreeGain )
+DECLARE_COMPONENT( LArSuperCellBuilderDriver )
+DECLARE_COMPONENT( LArCellBuilderDriver )
+DECLARE_COMPONENT( LArRawChannelBuilderToolOFC )
+DECLARE_COMPONENT( LArRawChannelBuilderToolOFCIter )
+DECLARE_COMPONENT( LArRawChannelBuilderToolParabola )
+DECLARE_COMPONENT( LArRawChannelBuilderToolCubic )
+DECLARE_COMPONENT( LArRawChannelBuilderToolAverage )
+DECLARE_COMPONENT( LArRawChannelBuilderToolBadChannelTool )
+DECLARE_COMPONENT( LArRawChannelBuilderADC2EDataBase )
+DECLARE_COMPONENT( LArRawChannelBuilderADC2EConstants )
+DECLARE_COMPONENT( LArRawChannelBuilderPedestalDataBase )
+DECLARE_COMPONENT( LArRawChannelBuilderPedestalSampleZero )
+DECLARE_COMPONENT( LArRawChannelBuilderToolTileInfo )
 
 
 #include "../tests/SuperCellVsCaloCellTestAlg.h"
-DECLARE_ALGORITHM_FACTORY( SuperCellVsCaloCellTestAlg )
+DECLARE_COMPONENT( SuperCellVsCaloCellTestAlg )
 
diff --git a/LArCalorimeter/LArRawUtils/src/components/LArRawUtils_entries.cxx b/LArCalorimeter/LArRawUtils/src/components/LArRawUtils_entries.cxx
index 4aa7c2cbdbba7e044510a766a51ef7501725074f..ebf08b565759a03f453566b957b5069e4a063576 100644
--- a/LArCalorimeter/LArRawUtils/src/components/LArRawUtils_entries.cxx
+++ b/LArCalorimeter/LArRawUtils/src/components/LArRawUtils_entries.cxx
@@ -1,4 +1,4 @@
 #include "LArRawUtils/LArRoI_Map.h"
 
-DECLARE_TOOL_FACTORY( LArRoI_Map )
+DECLARE_COMPONENT( LArRoI_Map )
 
diff --git a/LArCalorimeter/LArRecUtils/src/components/LArRecUtils_entries.cxx b/LArCalorimeter/LArRecUtils/src/components/LArRecUtils_entries.cxx
index a66b46b3695702054b44413f6f077ce232d011e6..2fe300d5ba3b523d58fd49932845a037497b946d 100644
--- a/LArCalorimeter/LArRecUtils/src/components/LArRecUtils_entries.cxx
+++ b/LArCalorimeter/LArRecUtils/src/components/LArRecUtils_entries.cxx
@@ -22,51 +22,51 @@
 #include "../LArSymConditionsAlg.h"
 #include "../LArMCSymCondAlg.h"
 
-DECLARE_TOOL_FACTORY( LArADC2MeVTool )
-DECLARE_TOOL_FACTORY( LArAutoCorrNoiseTool )
-DECLARE_TOOL_FACTORY( LArAutoCorrTotalTool )
-DECLARE_TOOL_FACTORY( LArCellFakeProbElectronics )
-//DECLARE_TOOL_FACTORY( LArCellFakeProbHV )
-DECLARE_TOOL_FACTORY( LArHVCorrTool )
-//DECLARE_TOOL_FACTORY( LArHVGeometryTool )
-DECLARE_TOOL_FACTORY( LArOFCTool )
-DECLARE_TOOL_FACTORY( LArOFPeakRecoTool )
-DECLARE_TOOL_FACTORY( LArParabolaPeakRecoTool )
-DECLARE_TOOL_FACTORY( LArShapePeakRecoTool )
-DECLARE_TOOL_FACTORY( LArTowerBuilderTool )
-DECLARE_TOOL_FACTORY( LArFCalTowerBuilderTool )
-DECLARE_TOOL_FACTORY( LArFEBConfigReader )
-DECLARE_SERVICE_FACTORY( LArFlatConditionSvc)
-DECLARE_ALGORITHM_FACTORY( LArFCalTowerBuilderToolTestAlg )
-DECLARE_TOOL_FACTORY( LArHVScaleRetriever )
-DECLARE_ALGORITHM_FACTORY( LArCondAlgAutoCorrSC)
-DECLARE_ALGORITHM_FACTORY( LArCondAlgDAC2uAFlat)
-DECLARE_ALGORITHM_FACTORY( LArCondAlgDAC2uASC)
-DECLARE_ALGORITHM_FACTORY( LArCondAlgHVScaleCorrFlat)
-DECLARE_ALGORITHM_FACTORY( LArCondAlgHVScaleCorrSC)
-DECLARE_ALGORITHM_FACTORY( LArCondAlgMinBiasSC)
-DECLARE_ALGORITHM_FACTORY( LArCondAlgMphysOverMcalFlat)
-DECLARE_ALGORITHM_FACTORY( LArCondAlgMphysOverMcalSC)
-DECLARE_ALGORITHM_FACTORY( LArCondAlgNoiseSC)
-DECLARE_ALGORITHM_FACTORY( LArCondAlgOFCFlat)
-DECLARE_ALGORITHM_FACTORY( LArCondAlgPedestalFlat)
-DECLARE_ALGORITHM_FACTORY( LArCondAlgPedestalSC)
-DECLARE_ALGORITHM_FACTORY( LArCondAlgRampFlat)
-DECLARE_ALGORITHM_FACTORY( LArCondAlgRampSC)
-DECLARE_ALGORITHM_FACTORY( LArCondAlgShapeFlat)
-DECLARE_ALGORITHM_FACTORY( LArCondAlgShapeSC)
-DECLARE_ALGORITHM_FACTORY( LArCondAlgfSamplSC)
-DECLARE_ALGORITHM_FACTORY( LArCondAlguA2MeVFlat)
-DECLARE_ALGORITHM_FACTORY( LArCondAlguA2MeVSC)
-DECLARE_ALGORITHM_FACTORY( LArOnOffMappingAlg)
-DECLARE_ALGORITHM_FACTORY( LArCalibLineMappingAlg)
-DECLARE_ALGORITHM_FACTORY( LArFebRodMappingAlg)
-DECLARE_ALGORITHM_FACTORY( LArMCSymCondAlg)
+DECLARE_COMPONENT( LArADC2MeVTool )
+DECLARE_COMPONENT( LArAutoCorrNoiseTool )
+DECLARE_COMPONENT( LArAutoCorrTotalTool )
+DECLARE_COMPONENT( LArCellFakeProbElectronics )
+//DECLARE_COMPONENT( LArCellFakeProbHV )
+DECLARE_COMPONENT( LArHVCorrTool )
+//DECLARE_COMPONENT( LArHVGeometryTool )
+DECLARE_COMPONENT( LArOFCTool )
+DECLARE_COMPONENT( LArOFPeakRecoTool )
+DECLARE_COMPONENT( LArParabolaPeakRecoTool )
+DECLARE_COMPONENT( LArShapePeakRecoTool )
+DECLARE_COMPONENT( LArTowerBuilderTool )
+DECLARE_COMPONENT( LArFCalTowerBuilderTool )
+DECLARE_COMPONENT( LArFEBConfigReader )
+DECLARE_COMPONENT( LArFlatConditionSvc )
+DECLARE_COMPONENT( LArFCalTowerBuilderToolTestAlg )
+DECLARE_COMPONENT( LArHVScaleRetriever )
+DECLARE_COMPONENT( LArCondAlgAutoCorrSC )
+DECLARE_COMPONENT( LArCondAlgDAC2uAFlat )
+DECLARE_COMPONENT( LArCondAlgDAC2uASC )
+DECLARE_COMPONENT( LArCondAlgHVScaleCorrFlat )
+DECLARE_COMPONENT( LArCondAlgHVScaleCorrSC )
+DECLARE_COMPONENT( LArCondAlgMinBiasSC )
+DECLARE_COMPONENT( LArCondAlgMphysOverMcalFlat )
+DECLARE_COMPONENT( LArCondAlgMphysOverMcalSC )
+DECLARE_COMPONENT( LArCondAlgNoiseSC )
+DECLARE_COMPONENT( LArCondAlgOFCFlat )
+DECLARE_COMPONENT( LArCondAlgPedestalFlat )
+DECLARE_COMPONENT( LArCondAlgPedestalSC )
+DECLARE_COMPONENT( LArCondAlgRampFlat )
+DECLARE_COMPONENT( LArCondAlgRampSC )
+DECLARE_COMPONENT( LArCondAlgShapeFlat )
+DECLARE_COMPONENT( LArCondAlgShapeSC )
+DECLARE_COMPONENT( LArCondAlgfSamplSC )
+DECLARE_COMPONENT( LArCondAlguA2MeVFlat )
+DECLARE_COMPONENT( LArCondAlguA2MeVSC )
+DECLARE_COMPONENT( LArOnOffMappingAlg )
+DECLARE_COMPONENT( LArCalibLineMappingAlg )
+DECLARE_COMPONENT( LArFebRodMappingAlg )
+DECLARE_COMPONENT( LArMCSymCondAlg )
 
-DECLARE_ALGORITHM_FACTORY( LArRampSymCondAlg )
-DECLARE_ALGORITHM_FACTORY( LAruA2MeVSymCondAlg )
-DECLARE_ALGORITHM_FACTORY( LArDAC2uASymCondAlg )
-DECLARE_ALGORITHM_FACTORY( LArfSamplSymCondAlg )
-DECLARE_ALGORITHM_FACTORY( LArMinBiasSymCondAlg )
-DECLARE_ALGORITHM_FACTORY( LArNoiseSymCondAlg )
+DECLARE_COMPONENT( LArRampSymCondAlg )
+DECLARE_COMPONENT( LAruA2MeVSymCondAlg )
+DECLARE_COMPONENT( LArDAC2uASymCondAlg )
+DECLARE_COMPONENT( LArfSamplSymCondAlg )
+DECLARE_COMPONENT( LArMinBiasSymCondAlg )
+DECLARE_COMPONENT( LArNoiseSymCondAlg )
 
diff --git a/LArCalorimeter/LArRegionSelector/src/components/LArRegionSelector_entries.cxx b/LArCalorimeter/LArRegionSelector/src/components/LArRegionSelector_entries.cxx
index 86a5463b46521ec3f251fa956dd4bbf0258c082e..23b61ff577ec6321e7045aeec16ccd8767584061 100644
--- a/LArCalorimeter/LArRegionSelector/src/components/LArRegionSelector_entries.cxx
+++ b/LArCalorimeter/LArRegionSelector/src/components/LArRegionSelector_entries.cxx
@@ -1,6 +1,6 @@
 #include "LArRegionSelector/LArRegionSelectorTable.h"
 #include "LArRegionSelector/LArRegionSelectorCheckOL.h"
 
-DECLARE_TOOL_FACTORY( LArRegionSelectorTable )
-DECLARE_ALGORITHM_FACTORY( LArRegionSelectorCheckOL )
+DECLARE_COMPONENT( LArRegionSelectorTable )
+DECLARE_COMPONENT( LArRegionSelectorCheckOL )
 
diff --git a/LArCalorimeter/LArSim/src/components/LArSim_entries.cxx b/LArCalorimeter/LArSim/src/components/LArSim_entries.cxx
index 5a81bde3910d91fe1d09cb5cbabca7b93cc04be1..5581d2393468d657cf80c7cc06a9026d70b7e7a3 100644
--- a/LArCalorimeter/LArSim/src/components/LArSim_entries.cxx
+++ b/LArCalorimeter/LArSim/src/components/LArSim_entries.cxx
@@ -3,8 +3,8 @@
 #include "LArSim/LArFakeHitProducer.h"
 #include "LArSim/LArHitReader.h"
 
-DECLARE_ALGORITHM_FACTORY( LArHitMaker )
-DECLARE_ALGORITHM_FACTORY( LArHitReader )
-DECLARE_ALGORITHM_FACTORY( LArFakeClusterProducer )
-DECLARE_ALGORITHM_FACTORY( LArFakeHitProducer )
+DECLARE_COMPONENT( LArHitMaker )
+DECLARE_COMPONENT( LArHitReader )
+DECLARE_COMPONENT( LArFakeClusterProducer )
+DECLARE_COMPONENT( LArFakeHitProducer )
 
diff --git a/LArCalorimeter/LArTest/LArCalibTest/src/components/LArCalibTest_entries.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/components/LArCalibTest_entries.cxx
index 5ddd61ff577412a69a58629883d5497c7ae2d61e..2658ad2cfcaa3f4d3317c67d79f4cbe0e6d584bf 100644
--- a/LArCalorimeter/LArTest/LArCalibTest/src/components/LArCalibTest_entries.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/components/LArCalibTest_entries.cxx
@@ -6,9 +6,9 @@
 
 
 
-DECLARE_ALGORITHM_FACTORY( LArCablingChecker )
-DECLARE_ALGORITHM_FACTORY( LArReadHadDMCoeffFile )
-DECLARE_ALGORITHM_FACTORY( LArReadHadDMCoeffFile2 )
-DECLARE_ALGORITHM_FACTORY( LArFakeCellFactor )
-DECLARE_ALGORITHM_FACTORY( DumpCaloBadChannels )
+DECLARE_COMPONENT( LArCablingChecker )
+DECLARE_COMPONENT( LArReadHadDMCoeffFile )
+DECLARE_COMPONENT( LArReadHadDMCoeffFile2 )
+DECLARE_COMPONENT( LArFakeCellFactor )
+DECLARE_COMPONENT( DumpCaloBadChannels )
 
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx b/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx
index 51e1fb112229ad53f2620eb83702ffcb5b40fed7..d60ae9cb1dd8d4e82bd6d748d83a514bb1f7a068 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx
+++ b/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx
@@ -10,15 +10,15 @@
 #include "LArConditionsTest/LArShapeToSCShape.h"
 #include "LArConditionsTest/LArOFCtoOFC.h"
 
-DECLARE_ALGORITHM_FACTORY( LArConditionsTestAlg )
-DECLARE_ALGORITHM_FACTORY( LArCondDataTest )
-//DECLARE_ALGORITHM_FACTORY( FixLArIdMap )
-DECLARE_ALGORITHM_FACTORY( LArFecLvTempDcsTest )
-DECLARE_ALGORITHM_FACTORY( FixLArElecCalib )
-DECLARE_ALGORITHM_FACTORY( TestLArConditionsTools ) 
-DECLARE_ALGORITHM_FACTORY ( LArCablingTest )
-DECLARE_ALGORITHM_FACTORY ( LArIdMapConvert )
-DECLARE_ALGORITHM_FACTORY ( LArFebRodMapConvert )
-DECLARE_ALGORITHM_FACTORY ( LArShapeToSCShape )
-DECLARE_ALGORITHM_FACTORY ( LArOFCtoOFC )
+DECLARE_COMPONENT( LArConditionsTestAlg )
+DECLARE_COMPONENT( LArCondDataTest )
+//DECLARE_COMPONENT( FixLArIdMap )
+DECLARE_COMPONENT( LArFecLvTempDcsTest )
+DECLARE_COMPONENT( FixLArElecCalib )
+DECLARE_COMPONENT( TestLArConditionsTools ) 
+DECLARE_COMPONENT( LArCablingTest )
+DECLARE_COMPONENT( LArIdMapConvert )
+DECLARE_COMPONENT( LArFebRodMapConvert )
+DECLARE_COMPONENT( LArShapeToSCShape )
+DECLARE_COMPONENT( LArOFCtoOFC )
 
diff --git a/LArCalorimeter/LArTest/LArEventTest/src/components/LArEventTest_entries.cxx b/LArCalorimeter/LArTest/LArEventTest/src/components/LArEventTest_entries.cxx
index aea734f66e0b8d29a1a568b99650085c9b20119e..43781cae26e7c474dbf9c951bbee38e0c2901f61 100644
--- a/LArCalorimeter/LArTest/LArEventTest/src/components/LArEventTest_entries.cxx
+++ b/LArCalorimeter/LArTest/LArEventTest/src/components/LArEventTest_entries.cxx
@@ -11,13 +11,13 @@
 
 
 
-DECLARE_ALGORITHM_FACTORY( CheckLArFebHeader )
-DECLARE_ALGORITHM_FACTORY( DumpLArDigits )
-DECLARE_ALGORITHM_FACTORY( DumpLArRawChannels )
-DECLARE_ALGORITHM_FACTORY( FakeLArOFCs )
-DECLARE_ALGORITHM_FACTORY( FakeLArTimeOffset )
-DECLARE_ALGORITHM_FACTORY( FakeTBPhase )
-DECLARE_ALGORITHM_FACTORY( LArDigitsToNtuple )
-DECLARE_ALGORITHM_FACTORY( CaloClusterNavTest )
-DECLARE_ALGORITHM_FACTORY(FindDuplicatedLArDigits)
+DECLARE_COMPONENT( CheckLArFebHeader )
+DECLARE_COMPONENT( DumpLArDigits )
+DECLARE_COMPONENT( DumpLArRawChannels )
+DECLARE_COMPONENT( FakeLArOFCs )
+DECLARE_COMPONENT( FakeLArTimeOffset )
+DECLARE_COMPONENT( FakeTBPhase )
+DECLARE_COMPONENT( LArDigitsToNtuple )
+DECLARE_COMPONENT( CaloClusterNavTest )
+DECLARE_COMPONENT( FindDuplicatedLArDigits )
 
diff --git a/LArCalorimeter/LArTools/src/components/LArTools_entries.cxx b/LArCalorimeter/LArTools/src/components/LArTools_entries.cxx
index 0b5bb3b374c29ad1ebe3a73a3b1c551a118bc7e7..0806164118dec1e55df5bbb8125d911b5a48c5c1 100644
--- a/LArCalorimeter/LArTools/src/components/LArTools_entries.cxx
+++ b/LArCalorimeter/LArTools/src/components/LArTools_entries.cxx
@@ -2,6 +2,6 @@
 #include "LArTools/LArHVPathologyDbTool.h"
 
 
-DECLARE_TOOL_FACTORY( LArMCSymTool )
-DECLARE_TOOL_FACTORY( LArHVPathologyDbTool )
+DECLARE_COMPONENT( LArMCSymTool )
+DECLARE_COMPONENT( LArHVPathologyDbTool )
 
diff --git a/LArCalorimeter/LArTrackingGeometry/src/components/LArTrackingGeometry_entries.cxx b/LArCalorimeter/LArTrackingGeometry/src/components/LArTrackingGeometry_entries.cxx
index 26d99796ad6ba2e0b2bf75b5f4ab8890786234c5..7b59a63d29b8851ea24edd2b41f2eb75a2f45e96 100644
--- a/LArCalorimeter/LArTrackingGeometry/src/components/LArTrackingGeometry_entries.cxx
+++ b/LArCalorimeter/LArTrackingGeometry/src/components/LArTrackingGeometry_entries.cxx
@@ -2,5 +2,5 @@
 
 using namespace LAr;
 
-DECLARE_TOOL_FACTORY( LArVolumeBuilder )
+DECLARE_COMPONENT( LArVolumeBuilder )
 
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/components/TileCalibAlgs_entries.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/components/TileCalibAlgs_entries.cxx
index 6457414b249b6c85179320cc7e7de1fe6d607840..95ae21883d7821be285cbdaab09af20267963c8a 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/components/TileCalibAlgs_entries.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/components/TileCalibAlgs_entries.cxx
@@ -13,19 +13,19 @@
 #include "TileCalibAlgs/TileInfoDump.h"
 #include "TileCalibAlgs/TileExpertDump.h"
 
-DECLARE_ALGORITHM_FACTORY( TileTopCalibAlg )
-DECLARE_ALGORITHM_FACTORY( TileLaserCalibAlg )
-DECLARE_ALGORITHM_FACTORY( TileDigiNoiseCalibAlg )
-DECLARE_ALGORITHM_FACTORY( TileRawChNoiseCalibAlg )
-DECLARE_ALGORITHM_FACTORY( TileOFC2DBAlg )
-DECLARE_ALGORITHM_FACTORY( TileMuId2DBAlg )
-DECLARE_ALGORITHM_FACTORY( TileInfoDump )
-DECLARE_ALGORITHM_FACTORY( TileExpertDump )
+DECLARE_COMPONENT( TileTopCalibAlg )
+DECLARE_COMPONENT( TileLaserCalibAlg )
+DECLARE_COMPONENT( TileDigiNoiseCalibAlg )
+DECLARE_COMPONENT( TileRawChNoiseCalibAlg )
+DECLARE_COMPONENT( TileOFC2DBAlg )
+DECLARE_COMPONENT( TileMuId2DBAlg )
+DECLARE_COMPONENT( TileInfoDump )
+DECLARE_COMPONENT( TileExpertDump )
 
-DECLARE_TOOL_FACTORY( TileLaserDefaultCalibTool )
-DECLARE_TOOL_FACTORY( TileLaserLinearityCalibTool )
-DECLARE_TOOL_FACTORY( TileCisDefaultCalibTool )
-DECLARE_TOOL_FACTORY( TileTriggerDefaultCalibTool )
-DECLARE_TOOL_FACTORY( TileTOFTool )
-DECLARE_TOOL_FACTORY( TileLaserTimingTool )
+DECLARE_COMPONENT( TileLaserDefaultCalibTool )
+DECLARE_COMPONENT( TileLaserLinearityCalibTool )
+DECLARE_COMPONENT( TileCisDefaultCalibTool )
+DECLARE_COMPONENT( TileTriggerDefaultCalibTool )
+DECLARE_COMPONENT( TileTOFTool )
+DECLARE_COMPONENT( TileLaserTimingTool )
 
diff --git a/TileCalorimeter/TileConditions/src/components/TileConditions_entries.cxx b/TileCalorimeter/TileConditions/src/components/TileConditions_entries.cxx
index c1eea08bb5a44439839ee202be184c453c837aeb..fd506b58522128e869c62457db04ef4e9a09102b 100644
--- a/TileCalorimeter/TileConditions/src/components/TileConditions_entries.cxx
+++ b/TileCalorimeter/TileConditions/src/components/TileConditions_entries.cxx
@@ -21,28 +21,28 @@
 #include "TileConditions/TileCondToolDspThreshold.h"
 
 
-DECLARE_SERVICE_FACTORY( TileInfoLoader )
-DECLARE_SERVICE_FACTORY( TileCablingSvc )
-DECLARE_SERVICE_FACTORY( TileDCSSvc )
-DECLARE_TOOL_FACTORY( TileCondIdTransforms )
-DECLARE_TOOL_FACTORY( TileBadChanTool )
-DECLARE_TOOL_FACTORY( TileCondToolOfc )
-DECLARE_TOOL_FACTORY( TileCondToolOfcCool )
-DECLARE_TOOL_FACTORY( TileCellNoiseTool )
-DECLARE_TOOL_FACTORY( TileCondToolEmscale )
-DECLARE_TOOL_FACTORY( TileExpertToolEmscale )
-DECLARE_TOOL_FACTORY( TileCondToolIntegrator)
-DECLARE_TOOL_FACTORY( TileCondToolMuID)
-DECLARE_TOOL_FACTORY( TileCondToolTiming )
-DECLARE_TOOL_FACTORY( TileCondToolPulseShape )
-DECLARE_TOOL_FACTORY( TileCondToolNoiseSample )
-DECLARE_TOOL_FACTORY( TileCondToolAutoCr )
-DECLARE_TOOL_FACTORY( TileCondToolNoiseRawChn )
-DECLARE_TOOL_FACTORY( TileCondToolTMDB )
-DECLARE_TOOL_FACTORY( TileCondToolDspThreshold )
-DECLARE_TOOL_FACTORY( TileCondProxyCoolFlt )
-DECLARE_TOOL_FACTORY( TileCondProxyCoolBch )
-DECLARE_TOOL_FACTORY( TileCondProxyCoolOfc )
-DECLARE_TOOL_FACTORY( TileCondProxyFileFlt )
-DECLARE_TOOL_FACTORY( TileCondProxyFileBch )
+DECLARE_COMPONENT( TileInfoLoader )
+DECLARE_COMPONENT( TileCablingSvc )
+DECLARE_COMPONENT( TileDCSSvc )
+DECLARE_COMPONENT( TileCondIdTransforms )
+DECLARE_COMPONENT( TileBadChanTool )
+DECLARE_COMPONENT( TileCondToolOfc )
+DECLARE_COMPONENT( TileCondToolOfcCool )
+DECLARE_COMPONENT( TileCellNoiseTool )
+DECLARE_COMPONENT( TileCondToolEmscale )
+DECLARE_COMPONENT( TileExpertToolEmscale )
+DECLARE_COMPONENT( TileCondToolIntegrator )
+DECLARE_COMPONENT( TileCondToolMuID )
+DECLARE_COMPONENT( TileCondToolTiming )
+DECLARE_COMPONENT( TileCondToolPulseShape )
+DECLARE_COMPONENT( TileCondToolNoiseSample )
+DECLARE_COMPONENT( TileCondToolAutoCr )
+DECLARE_COMPONENT( TileCondToolNoiseRawChn )
+DECLARE_COMPONENT( TileCondToolTMDB )
+DECLARE_COMPONENT( TileCondToolDspThreshold )
+DECLARE_COMPONENT( TileCondProxyCoolFlt )
+DECLARE_COMPONENT( TileCondProxyCoolBch )
+DECLARE_COMPONENT( TileCondProxyCoolOfc )
+DECLARE_COMPONENT( TileCondProxyFileFlt )
+DECLARE_COMPONENT( TileCondProxyFileBch )
 
diff --git a/TileCalorimeter/TileCosmicAlgs/src/components/TileCosmicAlgs_entries.cxx b/TileCalorimeter/TileCosmicAlgs/src/components/TileCosmicAlgs_entries.cxx
index a42ce616d812e8a6912e6ae0bd3405db119b6116..89ac73827015c21e468cf22a56b5763b9673ef02 100644
--- a/TileCalorimeter/TileCosmicAlgs/src/components/TileCosmicAlgs_entries.cxx
+++ b/TileCalorimeter/TileCosmicAlgs/src/components/TileCosmicAlgs_entries.cxx
@@ -1,6 +1,6 @@
 #include "TileCosmicAlgs/TileMuonFitter.h"
 #include "TileCosmicAlgs/TileCosmicsTrigger.h"
 
-DECLARE_ALGORITHM_FACTORY( TileMuonFitter )
-DECLARE_ALGORITHM_FACTORY( TileCosmicsTrigger )
+DECLARE_COMPONENT( TileMuonFitter )
+DECLARE_COMPONENT( TileCosmicsTrigger )
 
diff --git a/TileCalorimeter/TileFastCaloSim/src/components/TileFastCaloSim_entries.cxx b/TileCalorimeter/TileFastCaloSim/src/components/TileFastCaloSim_entries.cxx
index 4151b3996f12e99cd3f23416501ecde90f809407..56507bf6b55457a2d8830d5746a05e42b48fa3f4 100644
--- a/TileCalorimeter/TileFastCaloSim/src/components/TileFastCaloSim_entries.cxx
+++ b/TileCalorimeter/TileFastCaloSim/src/components/TileFastCaloSim_entries.cxx
@@ -1,4 +1,4 @@
 #include "../TileFCSmStepToTileHitVec.h"
 
-DECLARE_ALGORITHM_FACTORY( TileFCSmStepToTileHitVec )
+DECLARE_COMPONENT( TileFCSmStepToTileHitVec )
 
diff --git a/TileCalorimeter/TileG4/TileAncillary/CombinedScintillator/src/components/CombinedScintillator_entries.cxx b/TileCalorimeter/TileG4/TileAncillary/CombinedScintillator/src/components/CombinedScintillator_entries.cxx
index 54ab3c6d4693f761a2e459e649f2f9622304a8be..ab4c5729984d525514b02f539dbecda086549a5d 100644
--- a/TileCalorimeter/TileG4/TileAncillary/CombinedScintillator/src/components/CombinedScintillator_entries.cxx
+++ b/TileCalorimeter/TileG4/TileAncillary/CombinedScintillator/src/components/CombinedScintillator_entries.cxx
@@ -1,6 +1,6 @@
 #include "../CombinedScintillatorSDTool.hh"
 #include "../CombinedScintillatorTool.hh"
 
-DECLARE_TOOL_FACTORY( CombinedScintillatorSDTool )
-DECLARE_TOOL_FACTORY( CombinedScintillatorTool )
+DECLARE_COMPONENT( CombinedScintillatorSDTool )
+DECLARE_COMPONENT( CombinedScintillatorTool )
 
diff --git a/TileCalorimeter/TileG4/TileAncillary/DeadMaterial/src/components/DeadMaterial_entries.cxx b/TileCalorimeter/TileG4/TileAncillary/DeadMaterial/src/components/DeadMaterial_entries.cxx
index 531442dff8a041277416129e89132576afe8ba63..d355061f226b06d31e12d2520c87b1727319284f 100644
--- a/TileCalorimeter/TileG4/TileAncillary/DeadMaterial/src/components/DeadMaterial_entries.cxx
+++ b/TileCalorimeter/TileG4/TileAncillary/DeadMaterial/src/components/DeadMaterial_entries.cxx
@@ -1,4 +1,4 @@
 #include "../DeadMaterialTool.h"
 
-DECLARE_TOOL_FACTORY( DeadMaterialTool )
+DECLARE_COMPONENT( DeadMaterialTool )
 
diff --git a/TileCalorimeter/TileG4/TileAncillary/LarCrate/src/components/LarCrate_entries.cxx b/TileCalorimeter/TileG4/TileAncillary/LarCrate/src/components/LarCrate_entries.cxx
index 31ebe9e23699503735fe767cabab9f51a1df9eb5..9a8f38ae265100222e0dfacdfe5a8ee256526429 100644
--- a/TileCalorimeter/TileG4/TileAncillary/LarCrate/src/components/LarCrate_entries.cxx
+++ b/TileCalorimeter/TileG4/TileAncillary/LarCrate/src/components/LarCrate_entries.cxx
@@ -1,3 +1,3 @@
 #include "../LArCrateTool.h"
-DECLARE_TOOL_FACTORY( LArCrateTool )
+DECLARE_COMPONENT( LArCrateTool )
 
diff --git a/TileCalorimeter/TileG4/TileAncillary/MinBiasScintillator/src/components/MinBiasScintillator_entries.cxx b/TileCalorimeter/TileG4/TileAncillary/MinBiasScintillator/src/components/MinBiasScintillator_entries.cxx
index 80ba7d176ff888105b40e891b353a6cbd96511e3..41b7db58cc47255711c63815704ae0aa9d526e23 100644
--- a/TileCalorimeter/TileG4/TileAncillary/MinBiasScintillator/src/components/MinBiasScintillator_entries.cxx
+++ b/TileCalorimeter/TileG4/TileAncillary/MinBiasScintillator/src/components/MinBiasScintillator_entries.cxx
@@ -1,4 +1,4 @@
 #include "../MinBiasScintillatorSDTool.h"
 
-DECLARE_TOOL_FACTORY( MinBiasScintillatorSDTool )
+DECLARE_COMPONENT( MinBiasScintillatorSDTool )
 
diff --git a/TileCalorimeter/TileG4/TileAncillary/MuonWall/src/components/MuonWall_entries.cxx b/TileCalorimeter/TileG4/TileAncillary/MuonWall/src/components/MuonWall_entries.cxx
index 1a230adf9006acfb1fbba8afd732d529ccf36a65..482d907e06b06eaa61ab8b118e853188b28a3b3b 100644
--- a/TileCalorimeter/TileG4/TileAncillary/MuonWall/src/components/MuonWall_entries.cxx
+++ b/TileCalorimeter/TileG4/TileAncillary/MuonWall/src/components/MuonWall_entries.cxx
@@ -1,6 +1,6 @@
 #include "../MuonWallSDTool.h"
 #include "../MuonWallTool.h"
 
-DECLARE_TOOL_FACTORY( MuonWallSDTool )
-DECLARE_TOOL_FACTORY( MuonWallTool )
+DECLARE_COMPONENT( MuonWallSDTool )
+DECLARE_COMPONENT( MuonWallTool )
 
diff --git a/TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter/src/components/PhantomCalorimeter_entries.cxx b/TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter/src/components/PhantomCalorimeter_entries.cxx
index 3970185dc3ec977d9ab5f2e1282a19b252b73236..17e2712311f0d8f64ac451cb138756a19fd8049e 100644
--- a/TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter/src/components/PhantomCalorimeter_entries.cxx
+++ b/TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter/src/components/PhantomCalorimeter_entries.cxx
@@ -1,6 +1,6 @@
 #include "../PhantomBarrelSDTool.hh"
 #include "../PhantomBarrelTool.hh"
 
-DECLARE_TOOL_FACTORY( PhantomBarrelSDTool )
-DECLARE_TOOL_FACTORY( PhantomBarrelTool )
+DECLARE_COMPONENT( PhantomBarrelSDTool )
+DECLARE_COMPONENT( PhantomBarrelTool )
 
diff --git a/TileCalorimeter/TileG4/TileGeoG4Calib/src/components/TileGeoG4Calib_entries.cxx b/TileCalorimeter/TileG4/TileGeoG4Calib/src/components/TileGeoG4Calib_entries.cxx
index 531d65287ab549d43861af06821468b4a64ea1a6..698851cf7dca181d992aaa9484b5e31df549ed8f 100644
--- a/TileCalorimeter/TileG4/TileGeoG4Calib/src/components/TileGeoG4Calib_entries.cxx
+++ b/TileCalorimeter/TileG4/TileGeoG4Calib/src/components/TileGeoG4Calib_entries.cxx
@@ -1,4 +1,4 @@
 #include "../TileGeoG4CalibSDTool.h"
 
-DECLARE_TOOL_FACTORY( TileGeoG4CalibSDTool )
+DECLARE_COMPONENT( TileGeoG4CalibSDTool )
 
diff --git a/TileCalorimeter/TileG4/TileGeoG4SD/src/components/TileGeoG4SD_entries.cxx b/TileCalorimeter/TileG4/TileGeoG4SD/src/components/TileGeoG4SD_entries.cxx
index 55250b66fcfb05aadf9429c0e559f72770d7de23..87a2e535d1680fa2099c03c0f59afb22e51f16da 100644
--- a/TileCalorimeter/TileG4/TileGeoG4SD/src/components/TileGeoG4SD_entries.cxx
+++ b/TileCalorimeter/TileG4/TileGeoG4SD/src/components/TileGeoG4SD_entries.cxx
@@ -1,6 +1,6 @@
 #include "../TileGeoG4SDTool.h"
 #include "../TileGeoG4SDCalc.hh"
 
-DECLARE_TOOL_FACTORY( TileGeoG4SDTool )
-DECLARE_SERVICE_FACTORY( TileGeoG4SDCalc )
+DECLARE_COMPONENT( TileGeoG4SDTool )
+DECLARE_COMPONENT( TileGeoG4SDCalc )
 
diff --git a/TileCalorimeter/TileGeoModel/src/components/TileGeoModel_entries.cxx b/TileCalorimeter/TileGeoModel/src/components/TileGeoModel_entries.cxx
index 646e9c85a4ca183b89689ff28eb128719960448c..7613198f51bda7b3aa9fa54ee749636c247ce080 100644
--- a/TileCalorimeter/TileGeoModel/src/components/TileGeoModel_entries.cxx
+++ b/TileCalorimeter/TileGeoModel/src/components/TileGeoModel_entries.cxx
@@ -1,4 +1,4 @@
 #include "TileGeoModel/TileDetectorTool.h"
 
-DECLARE_TOOL_FACTORY(TileDetectorTool)
+DECLARE_COMPONENT( TileDetectorTool )
 
diff --git a/TileCalorimeter/TileL2Algs/src/components/TileL2Algs_entries.cxx b/TileCalorimeter/TileL2Algs/src/components/TileL2Algs_entries.cxx
index 6ad6fca61ebd4e709a9092fe5da73cf88f1602bc..a1fc96a20e17c99f246c0a16f5b14528fe0d396b 100644
--- a/TileCalorimeter/TileL2Algs/src/components/TileL2Algs_entries.cxx
+++ b/TileCalorimeter/TileL2Algs/src/components/TileL2Algs_entries.cxx
@@ -2,7 +2,7 @@
 #include "TileL2Algs/TileMuRODToNtuple.h"
 #include "TileL2Algs/TileL2Builder.h"
 
-DECLARE_ALGORITHM_FACTORY( TileRawChannelToL2 )
-DECLARE_ALGORITHM_FACTORY( TileMuRODToNtuple )
-DECLARE_TOOL_FACTORY( TileL2Builder )
+DECLARE_COMPONENT( TileRawChannelToL2 )
+DECLARE_COMPONENT( TileMuRODToNtuple )
+DECLARE_COMPONENT( TileL2Builder )
 
diff --git a/TileCalorimeter/TileMonitoring/src/components/TileMonitoring_entries.cxx b/TileCalorimeter/TileMonitoring/src/components/TileMonitoring_entries.cxx
index 8a45664b10cecb75549ef60d3bf6237213bd3ed8..b9951b659034397bc07a997b10f391440bde59f4 100644
--- a/TileCalorimeter/TileMonitoring/src/components/TileMonitoring_entries.cxx
+++ b/TileCalorimeter/TileMonitoring/src/components/TileMonitoring_entries.cxx
@@ -23,28 +23,28 @@
 #include "TileMonitoring/TileTBMonTool.h"
 #include "TileMonitoring/TileTBCellMonTool.h"
 
-DECLARE_TOOL_FACTORY(TileFatherMonTool )
-DECLARE_TOOL_FACTORY(TilePaterMonTool )
-DECLARE_TOOL_FACTORY(TileCellMonTool )
-DECLARE_TOOL_FACTORY(TileTowerMonTool )
-DECLARE_TOOL_FACTORY(TileClusterMonTool )
-DECLARE_TOOL_FACTORY(TileMuIdMonTool )
-DECLARE_TOOL_FACTORY(TileL2MonTool )
-DECLARE_TOOL_FACTORY(TileMuonFitMonTool )
-DECLARE_TOOL_FACTORY(TileDigitsMonTool )
-DECLARE_TOOL_FACTORY(TileRawChannelMonTool )
-DECLARE_TOOL_FACTORY(TileMBTSMonTool )
-DECLARE_TOOL_FACTORY(TileDQFragMonTool )
-DECLARE_TOOL_FACTORY(TileDQFragLWMonTool )
-DECLARE_TOOL_FACTORY(TileRODMonTool )
-DECLARE_TOOL_FACTORY(TileJetMonTool )
-DECLARE_TOOL_FACTORY(TileDigiNoiseMonTool )
-DECLARE_TOOL_FACTORY(TileTMDBDigitsMonTool )
-DECLARE_TOOL_FACTORY(TileTMDBRawChannelMonTool )
-DECLARE_TOOL_FACTORY(TileCellNoiseMonTool )
-DECLARE_TOOL_FACTORY(TileRawChannelTimeMonTool )
-DECLARE_TOOL_FACTORY(TileRawChannelNoiseMonTool )
-DECLARE_TOOL_FACTORY(TileTBBeamMonTool )
-DECLARE_TOOL_FACTORY(TileTBMonTool )
-DECLARE_TOOL_FACTORY(TileTBCellMonTool )
+DECLARE_COMPONENT( TileFatherMonTool )
+DECLARE_COMPONENT( TilePaterMonTool )
+DECLARE_COMPONENT( TileCellMonTool )
+DECLARE_COMPONENT( TileTowerMonTool )
+DECLARE_COMPONENT( TileClusterMonTool )
+DECLARE_COMPONENT( TileMuIdMonTool )
+DECLARE_COMPONENT( TileL2MonTool )
+DECLARE_COMPONENT( TileMuonFitMonTool )
+DECLARE_COMPONENT( TileDigitsMonTool )
+DECLARE_COMPONENT( TileRawChannelMonTool )
+DECLARE_COMPONENT( TileMBTSMonTool )
+DECLARE_COMPONENT( TileDQFragMonTool )
+DECLARE_COMPONENT( TileDQFragLWMonTool )
+DECLARE_COMPONENT( TileRODMonTool )
+DECLARE_COMPONENT( TileJetMonTool )
+DECLARE_COMPONENT( TileDigiNoiseMonTool )
+DECLARE_COMPONENT( TileTMDBDigitsMonTool )
+DECLARE_COMPONENT( TileTMDBRawChannelMonTool )
+DECLARE_COMPONENT( TileCellNoiseMonTool )
+DECLARE_COMPONENT( TileRawChannelTimeMonTool )
+DECLARE_COMPONENT( TileRawChannelNoiseMonTool )
+DECLARE_COMPONENT( TileTBBeamMonTool )
+DECLARE_COMPONENT( TileTBMonTool )
+DECLARE_COMPONENT( TileTBCellMonTool )
 
diff --git a/TileCalorimeter/TileMuId/src/components/TileMuId_entries.cxx b/TileCalorimeter/TileMuId/src/components/TileMuId_entries.cxx
index 6a2492c65b043cbf0766a181b15711edf1d2ce2c..f5ae255eb5b4cd9af17a5338c8728970a9dcde3c 100644
--- a/TileCalorimeter/TileMuId/src/components/TileMuId_entries.cxx
+++ b/TileCalorimeter/TileMuId/src/components/TileMuId_entries.cxx
@@ -1,6 +1,6 @@
 #include "TileMuId/TileLookForMuAlg.h"
 #include "TileMuId/TileMuToNtuple.h"
 
-DECLARE_ALGORITHM_FACTORY( TileLookForMuAlg )
-DECLARE_ALGORITHM_FACTORY( TileMuToNtuple )
+DECLARE_COMPONENT( TileLookForMuAlg )
+DECLARE_COMPONENT( TileMuToNtuple )
 
diff --git a/TileCalorimeter/TileRawUtils/src/components/TileRawUtils_entries.cxx b/TileCalorimeter/TileRawUtils/src/components/TileRawUtils_entries.cxx
index 1bcf2cd363ed532ba1ade59e1e3c0cea22638aa6..c18d6e3e8b4369197c825dca2b83f2bc4361dff0 100644
--- a/TileCalorimeter/TileRawUtils/src/components/TileRawUtils_entries.cxx
+++ b/TileCalorimeter/TileRawUtils/src/components/TileRawUtils_entries.cxx
@@ -1,6 +1,6 @@
 #include "TileRawUtils/TileRoI_Map.h" 
 #include "TileRawUtils/TileRegionSelectorTable.h"
 
-DECLARE_TOOL_FACTORY( TileRoI_Map )
-DECLARE_TOOL_FACTORY( TileRegionSelectorTable )
+DECLARE_COMPONENT( TileRoI_Map )
+DECLARE_COMPONENT( TileRegionSelectorTable )
 
diff --git a/TileCalorimeter/TileRec/src/components/TileRec_entries.cxx b/TileCalorimeter/TileRec/src/components/TileRec_entries.cxx
index e18b993b213a79684487e64af0a98e499c79b8e6..9f5e71b9a3281ff9bc37c012d7d72d0c7fcf5a1d 100644
--- a/TileCalorimeter/TileRec/src/components/TileRec_entries.cxx
+++ b/TileCalorimeter/TileRec/src/components/TileRec_entries.cxx
@@ -10,15 +10,15 @@
 #include "TileRec/TileEventFilter.h"
 #include "TileRec/TileMuonReceiverDecisionToNtuple.h"
 
-DECLARE_ALGORITHM_FACTORY( TileAANtuple )
-DECLARE_ALGORITHM_FACTORY( TileRawChannelToNtuple )
-DECLARE_ALGORITHM_FACTORY( TileCellIDCToNtuple )
-DECLARE_ALGORITHM_FACTORY( TileCellToNtuple )
-DECLARE_ALGORITHM_FACTORY( TileHitToNtuple )
-DECLARE_ALGORITHM_FACTORY( TileTBHitToNtuple )
-DECLARE_ALGORITHM_FACTORY( TileHitVecToNtuple )
-DECLARE_ALGORITHM_FACTORY( TileDigitsToNtuple )
-DECLARE_ALGORITHM_FACTORY( TileTTL1ToNtuple )
-DECLARE_ALGORITHM_FACTORY( TileEventFilter )
-DECLARE_ALGORITHM_FACTORY( TileMuonReceiverDecisionToNtuple )
+DECLARE_COMPONENT( TileAANtuple )
+DECLARE_COMPONENT( TileRawChannelToNtuple )
+DECLARE_COMPONENT( TileCellIDCToNtuple )
+DECLARE_COMPONENT( TileCellToNtuple )
+DECLARE_COMPONENT( TileHitToNtuple )
+DECLARE_COMPONENT( TileTBHitToNtuple )
+DECLARE_COMPONENT( TileHitVecToNtuple )
+DECLARE_COMPONENT( TileDigitsToNtuple )
+DECLARE_COMPONENT( TileTTL1ToNtuple )
+DECLARE_COMPONENT( TileEventFilter )
+DECLARE_COMPONENT( TileMuonReceiverDecisionToNtuple )
 
diff --git a/TileCalorimeter/TileRecAlgs/src/components/TileRecAlgs_entries.cxx b/TileCalorimeter/TileRecAlgs/src/components/TileRecAlgs_entries.cxx
index 70cafee934db88e16b6f81e459c927e7099f33a3..04a9c9125d1504472c518d8eb900b63c3ecec36d 100644
--- a/TileCalorimeter/TileRecAlgs/src/components/TileRecAlgs_entries.cxx
+++ b/TileCalorimeter/TileRecAlgs/src/components/TileRecAlgs_entries.cxx
@@ -16,17 +16,17 @@
 #include "TileRecAlgs/MBTSTimeDiffEventInfoAlg.h"
 #include "TileRecAlgs/TileMuonReceiverReadCnt.h"
 
-DECLARE_SERVICE_FACTORY( TileCellCorrection )
-DECLARE_ALGORITHM_FACTORY( TileCellSelector )
-DECLARE_ALGORITHM_FACTORY( TileCellIDCToCell )
-DECLARE_ALGORITHM_FACTORY( TileCellVerify )
-DECLARE_ALGORITHM_FACTORY( TileBeamElemToCell )
-DECLARE_ALGORITHM_FACTORY( TileRawChannelToTTL1 )
-DECLARE_ALGORITHM_FACTORY( TileDigitsToTTL1 )
-DECLARE_ALGORITHM_FACTORY( TileRawChannelToHit )
-DECLARE_ALGORITHM_FACTORY( TileDigitsFilter )
-DECLARE_ALGORITHM_FACTORY( TileDigitsThresholdFilter )
-DECLARE_ALGORITHM_FACTORY( TileCellToTTL1 )
-DECLARE_ALGORITHM_FACTORY( MBTSTimeDiffEventInfoAlg )
-DECLARE_ALGORITHM_FACTORY( TileMuonReceiverReadCnt )
+DECLARE_COMPONENT( TileCellCorrection )
+DECLARE_COMPONENT( TileCellSelector )
+DECLARE_COMPONENT( TileCellIDCToCell )
+DECLARE_COMPONENT( TileCellVerify )
+DECLARE_COMPONENT( TileBeamElemToCell )
+DECLARE_COMPONENT( TileRawChannelToTTL1 )
+DECLARE_COMPONENT( TileDigitsToTTL1 )
+DECLARE_COMPONENT( TileRawChannelToHit )
+DECLARE_COMPONENT( TileDigitsFilter )
+DECLARE_COMPONENT( TileDigitsThresholdFilter )
+DECLARE_COMPONENT( TileCellToTTL1 )
+DECLARE_COMPONENT( MBTSTimeDiffEventInfoAlg )
+DECLARE_COMPONENT( TileMuonReceiverReadCnt )
 
diff --git a/TileCalorimeter/TileRecUtils/src/components/TileRecUtils_entries.cxx b/TileCalorimeter/TileRecUtils/src/components/TileRecUtils_entries.cxx
index da463b361e76344b1a93bcee783d10d1c128b08e..08703e0837a5df8366edec069e29580637995687 100644
--- a/TileCalorimeter/TileRecUtils/src/components/TileRecUtils_entries.cxx
+++ b/TileCalorimeter/TileRecUtils/src/components/TileRecUtils_entries.cxx
@@ -19,24 +19,24 @@
 #include "TileRecUtils/TileRawChannelNoiseFilter.h"
 #include "TileRecUtils/TileRawChannelOF1Corrector.h"
 
-DECLARE_TOOL_FACTORY( TileRawChannelBuilderFlatFilter )
-DECLARE_TOOL_FACTORY( TileRawChannelBuilderFitFilter )
-DECLARE_TOOL_FACTORY( TileRawChannelBuilderFitFilterCool )
-DECLARE_TOOL_FACTORY( TileRawChannelBuilderOptFilter )
-DECLARE_TOOL_FACTORY( TileRawChannelBuilderOpt2Filter )
-DECLARE_TOOL_FACTORY( TileRawChannelBuilderQIEFilter )
-DECLARE_TOOL_FACTORY( TileRawChannelBuilderManyAmps )
-DECLARE_TOOL_FACTORY( TileRawChannelBuilderMF )
-DECLARE_TOOL_FACTORY( TileBeamInfoProvider )
-DECLARE_TOOL_FACTORY( TileCellBuilder )
-DECLARE_TOOL_FACTORY( TileCellBuilderFromHit )
-DECLARE_TOOL_FACTORY( TileCellFakeProb )
-DECLARE_TOOL_FACTORY( TileCellMaskingTool )
-DECLARE_TOOL_FACTORY( TileTowerBuilderTool )
-DECLARE_TOOL_FACTORY( TileCellNoiseFilter )
-DECLARE_TOOL_FACTORY( TileRawChannelNoiseFilter )
-DECLARE_TOOL_FACTORY( TileRawChannelOF1Corrector )
-DECLARE_ALGORITHM_FACTORY( TileRawChannelMaker )
-DECLARE_ALGORITHM_FACTORY( TileRawChannelVerify )
-DECLARE_ALGORITHM_FACTORY( TileRawCorrelatedNoise )
+DECLARE_COMPONENT( TileRawChannelBuilderFlatFilter )
+DECLARE_COMPONENT( TileRawChannelBuilderFitFilter )
+DECLARE_COMPONENT( TileRawChannelBuilderFitFilterCool )
+DECLARE_COMPONENT( TileRawChannelBuilderOptFilter )
+DECLARE_COMPONENT( TileRawChannelBuilderOpt2Filter )
+DECLARE_COMPONENT( TileRawChannelBuilderQIEFilter )
+DECLARE_COMPONENT( TileRawChannelBuilderManyAmps )
+DECLARE_COMPONENT( TileRawChannelBuilderMF )
+DECLARE_COMPONENT( TileBeamInfoProvider )
+DECLARE_COMPONENT( TileCellBuilder )
+DECLARE_COMPONENT( TileCellBuilderFromHit )
+DECLARE_COMPONENT( TileCellFakeProb )
+DECLARE_COMPONENT( TileCellMaskingTool )
+DECLARE_COMPONENT( TileTowerBuilderTool )
+DECLARE_COMPONENT( TileCellNoiseFilter )
+DECLARE_COMPONENT( TileRawChannelNoiseFilter )
+DECLARE_COMPONENT( TileRawChannelOF1Corrector )
+DECLARE_COMPONENT( TileRawChannelMaker )
+DECLARE_COMPONENT( TileRawChannelVerify )
+DECLARE_COMPONENT( TileRawCorrelatedNoise )
 
diff --git a/TileCalorimeter/TileSimAlgs/src/components/TileSimAlgs_entries.cxx b/TileCalorimeter/TileSimAlgs/src/components/TileSimAlgs_entries.cxx
index e8bf20517d56446098f403ff6eb57025323b8534..ef78c27810337d1e905cc811926393bfb2608261 100644
--- a/TileCalorimeter/TileSimAlgs/src/components/TileSimAlgs_entries.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/components/TileSimAlgs_entries.cxx
@@ -9,14 +9,14 @@
 #include "TileSimAlgs/TilePulseForTileMuonReceiver.h"
 #include "TileSimAlgs/TileMuonReceiverDecision.h"
 
-DECLARE_ALGORITHM_FACTORY( TileHitVecToCnt )
-DECLARE_TOOL_FACTORY( TileHitVecToCntTool )
-DECLARE_ALGORITHM_FACTORY( TileHitToRawChannel )
-DECLARE_ALGORITHM_FACTORY( TileHitToCell )
-DECLARE_ALGORITHM_FACTORY( TileHitToTTL1 )
-DECLARE_ALGORITHM_FACTORY( TileTBHitToBeamElem )
-DECLARE_ALGORITHM_FACTORY( TileDigitsMaker )
-DECLARE_ALGORITHM_FACTORY( TileDigitsFromPulse )
-DECLARE_ALGORITHM_FACTORY( TilePulseForTileMuonReceiver )
-DECLARE_ALGORITHM_FACTORY( TileMuonReceiverDecision )
+DECLARE_COMPONENT( TileHitVecToCnt )
+DECLARE_COMPONENT( TileHitVecToCntTool )
+DECLARE_COMPONENT( TileHitToRawChannel )
+DECLARE_COMPONENT( TileHitToCell )
+DECLARE_COMPONENT( TileHitToTTL1 )
+DECLARE_COMPONENT( TileTBHitToBeamElem )
+DECLARE_COMPONENT( TileDigitsMaker )
+DECLARE_COMPONENT( TileDigitsFromPulse )
+DECLARE_COMPONENT( TilePulseForTileMuonReceiver )
+DECLARE_COMPONENT( TileMuonReceiverDecision )
 
diff --git a/TileCalorimeter/TileSimUtils/src/components/TileSimUtils_entries.cxx b/TileCalorimeter/TileSimUtils/src/components/TileSimUtils_entries.cxx
index 98d475ea85890bd635a8f59ca1504f8130401eeb..02e7ac5bf2cde0d9eac8adc18de515a928497641 100644
--- a/TileCalorimeter/TileSimUtils/src/components/TileSimUtils_entries.cxx
+++ b/TileCalorimeter/TileSimUtils/src/components/TileSimUtils_entries.cxx
@@ -1,6 +1,6 @@
 #include "TileSimUtils/TileCalibHitNtuple.h"
 #include "TileSimUtils/TileCalibHitCntNtup.h"
 
-DECLARE_TOOL_FACTORY( TileCalibHitNtuple )
-DECLARE_TOOL_FACTORY( TileCalibHitCntNtup )
+DECLARE_COMPONENT( TileCalibHitNtuple )
+DECLARE_COMPONENT( TileCalibHitCntNtup )
 
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_entries.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_entries.cxx
index 34b85c68b976f4c506913d0343b1561ebf4a2dff..65b2a7ccb6999dda36a9b35bf4a184d78f782679 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_entries.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_entries.cxx
@@ -12,12 +12,12 @@
 #include "TileByteStream/TileLaserObjByteStreamTool.h"
 #include "TileByteStream/TileMuRcvContByteStreamTool.h"
 
-DECLARE_TOOL_FACTORY( TileDigitsContByteStreamTool )
-DECLARE_TOOL_FACTORY( TileRawChannelContByteStreamTool )
-DECLARE_TOOL_FACTORY( TileL2ContByteStreamTool )
-DECLARE_TOOL_FACTORY( TileLaserObjByteStreamTool )
-DECLARE_TOOL_FACTORY( TileMuRcvContByteStreamTool )
-DECLARE_TOOL_FACTORY( TileROD_Decoder )
+DECLARE_COMPONENT( TileDigitsContByteStreamTool )
+DECLARE_COMPONENT( TileRawChannelContByteStreamTool )
+DECLARE_COMPONENT( TileL2ContByteStreamTool )
+DECLARE_COMPONENT( TileLaserObjByteStreamTool )
+DECLARE_COMPONENT( TileMuRcvContByteStreamTool )
+DECLARE_COMPONENT( TileROD_Decoder )
 DECLARE_CONVERTER_FACTORY( TileRawChannelContByteStreamCnv )
 DECLARE_CONVERTER_FACTORY( TileBeamElemContByteStreamCnv )
 DECLARE_CONVERTER_FACTORY( TileDigitsContByteStreamCnv )
diff --git a/TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_entries.cxx b/TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_entries.cxx
index bc2644e4b5dd3d2c81122cfa880d2fd57d26a395..7320794e2bd9ad68bd1867ebcc9e17d8d3504164 100644
--- a/TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_entries.cxx
+++ b/TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_entries.cxx
@@ -1,4 +1,4 @@
 #include "TileIdCnv/TileHWIDDetDescrCnv.h"
 
-DECLARE_CONVERTER_FACTORY(TileHWIDDetDescrCnv)
+DECLARE_CONVERTER_FACTORY( TileHWIDDetDescrCnv )
 
diff --git a/TileCalorimeter/TileTBRec/src/components/TileTBRec_entries.cxx b/TileCalorimeter/TileTBRec/src/components/TileTBRec_entries.cxx
index 1ce51e114044e084ac39815949f273354acc2462..297c38bb95f5a7ce42139548005fa5faaf46bb3a 100644
--- a/TileCalorimeter/TileTBRec/src/components/TileTBRec_entries.cxx
+++ b/TileCalorimeter/TileTBRec/src/components/TileTBRec_entries.cxx
@@ -7,11 +7,11 @@
 #include "TileTBRec/TileDigitsGainFilter.h"
 
 
-DECLARE_ALGORITHM_FACTORY( TileTBNtuple )
-DECLARE_ALGORITHM_FACTORY( TileTBAANtuple )
-DECLARE_ALGORITHM_FACTORY( TileTBStat )
-DECLARE_ALGORITHM_FACTORY( TileTBDump )
-DECLARE_ALGORITHM_FACTORY( TileTBOldNtupleRead )
-DECLARE_ALGORITHM_FACTORY( TileTBOldNtupleWrite )
-DECLARE_ALGORITHM_FACTORY( TileDigitsGainFilter )
+DECLARE_COMPONENT( TileTBNtuple )
+DECLARE_COMPONENT( TileTBAANtuple )
+DECLARE_COMPONENT( TileTBStat )
+DECLARE_COMPONENT( TileTBDump )
+DECLARE_COMPONENT( TileTBOldNtupleRead )
+DECLARE_COMPONENT( TileTBOldNtupleWrite )
+DECLARE_COMPONENT( TileDigitsGainFilter )
 
diff --git a/TileCalorimeter/TileTrackingGeometry/src/components/TileTrackingGeometry_entries.cxx b/TileCalorimeter/TileTrackingGeometry/src/components/TileTrackingGeometry_entries.cxx
index 40ea57c560cafa4429788e561e45a8d1955b7b9b..460f9724285fde6f24649826b42626cb816692b1 100644
--- a/TileCalorimeter/TileTrackingGeometry/src/components/TileTrackingGeometry_entries.cxx
+++ b/TileCalorimeter/TileTrackingGeometry/src/components/TileTrackingGeometry_entries.cxx
@@ -2,5 +2,5 @@
 
 using namespace Tile;
 
-DECLARE_TOOL_FACTORY( TileVolumeBuilder )
+DECLARE_COMPONENT( TileVolumeBuilder )