diff --git a/Reconstruction/DiTauRec/src/components/DiTauRec_entries.cxx b/Reconstruction/DiTauRec/src/components/DiTauRec_entries.cxx
index 38e755e1fe72afeb47a49d4ddce6a3149927bcc3..81eef412391dfd8a14e7fd6146c9bebacec3ba89 100644
--- a/Reconstruction/DiTauRec/src/components/DiTauRec_entries.cxx
+++ b/Reconstruction/DiTauRec/src/components/DiTauRec_entries.cxx
@@ -8,12 +8,12 @@
#include "DiTauRec/CellFinder.h"
#include "DiTauRec/IDVarCalculator.h"
-DECLARE_ALGORITHM_FACTORY( DiTauBuilder )
-DECLARE_TOOL_FACTORY( SeedJetBuilder )
-DECLARE_TOOL_FACTORY( SubjetBuilder )
-DECLARE_TOOL_FACTORY( ElMuFinder )
-DECLARE_TOOL_FACTORY( VertexFinder )
-DECLARE_TOOL_FACTORY( DiTauTrackFinder )
-DECLARE_TOOL_FACTORY( CellFinder )
-DECLARE_TOOL_FACTORY( IDVarCalculator )
+DECLARE_COMPONENT( DiTauBuilder )
+DECLARE_COMPONENT( SeedJetBuilder )
+DECLARE_COMPONENT( SubjetBuilder )
+DECLARE_COMPONENT( ElMuFinder )
+DECLARE_COMPONENT( VertexFinder )
+DECLARE_COMPONENT( DiTauTrackFinder )
+DECLARE_COMPONENT( CellFinder )
+DECLARE_COMPONENT( IDVarCalculator )
diff --git a/Reconstruction/EventShapes/EventShapeTools/src/components/EventShapeTools_entries.cxx b/Reconstruction/EventShapes/EventShapeTools/src/components/EventShapeTools_entries.cxx
index 36ec2d26c17c84275343c8386fc259d4387be8e6..207a6f9dd6b5fc722732fdf292633e08fcd08577 100644
--- a/Reconstruction/EventShapes/EventShapeTools/src/components/EventShapeTools_entries.cxx
+++ b/Reconstruction/EventShapes/EventShapeTools/src/components/EventShapeTools_entries.cxx
@@ -2,7 +2,7 @@
#include "EventShapeTools/EventShapeCopier.h"
#include "../EventDensityAthAlg.h"
-DECLARE_TOOL_FACTORY( EventDensityTool )
-DECLARE_TOOL_FACTORY( EventShapeCopier )
-DECLARE_ALGORITHM_FACTORY( EventDensityAthAlg )
+DECLARE_COMPONENT( EventDensityTool )
+DECLARE_COMPONENT( EventShapeCopier )
+DECLARE_COMPONENT( EventDensityAthAlg )
diff --git a/Reconstruction/HeavyIonRec/HIGlobal/src/components/HIGlobal_entries.cxx b/Reconstruction/HeavyIonRec/HIGlobal/src/components/HIGlobal_entries.cxx
index ff8f9de90f0051ced4f2ffd57e71d48f38128f10..f9fa9bbf7083a67907d0c7ca8ded959afd8e68a6 100644
--- a/Reconstruction/HeavyIonRec/HIGlobal/src/components/HIGlobal_entries.cxx
+++ b/Reconstruction/HeavyIonRec/HIGlobal/src/components/HIGlobal_entries.cxx
@@ -1,6 +1,6 @@
#include "HIGlobal/HIEventShapeMaker.h"
#include "HIGlobal/HIEventShapeFillerTool.h"
-DECLARE_ALGORITHM_FACTORY( HIEventShapeMaker )
-DECLARE_TOOL_FACTORY (HIEventShapeFillerTool)
+DECLARE_COMPONENT( HIEventShapeMaker )
+DECLARE_COMPONENT( HIEventShapeFillerTool )
diff --git a/Reconstruction/HeavyIonRec/HIJetRec/src/components/HIJetRec_entries.cxx b/Reconstruction/HeavyIonRec/HIJetRec/src/components/HIJetRec_entries.cxx
index a78a2f772700804fcb9cf5acc28e7bade80b87a0..13c26e6a2f9caa660fc8b755b53e7b6c8f940b5b 100644
--- a/Reconstruction/HeavyIonRec/HIJetRec/src/components/HIJetRec_entries.cxx
+++ b/Reconstruction/HeavyIonRec/HIJetRec/src/components/HIJetRec_entries.cxx
@@ -16,20 +16,20 @@
#include "HIJetRec/HIClusterPseudoJetGetter.h"
#ifndef XAOD_ANALYSIS
-DECLARE_ALGORITHM_FACTORY( HIClusterMaker )
-DECLARE_TOOL_FACTORY(HIJetCellSubtractorTool)
-DECLARE_TOOL_FACTORY( HIClusterSubtraction )
-DECLARE_TOOL_FACTORY(HISubtractedCellMakerTool)
+DECLARE_COMPONENT( HIClusterMaker )
+DECLARE_COMPONENT( HIJetCellSubtractorTool )
+DECLARE_COMPONENT( HIClusterSubtraction )
+DECLARE_COMPONENT( HISubtractedCellMakerTool )
#endif
-DECLARE_TOOL_FACTORY( HIEventShapeJetIteration )
-DECLARE_TOOL_FACTORY(HIJetConstituentSubtractionTool)
-DECLARE_TOOL_FACTORY(HIJetClusterSubtractorTool)
-DECLARE_TOOL_FACTORY(HIJetDRAssociationTool)
-DECLARE_TOOL_FACTORY(HIJetMaxOverMeanTool)
-DECLARE_TOOL_FACTORY(HIJetDiscriminatorTool)
-DECLARE_TOOL_FACTORY(HIJetSignificanceTool)
-DECLARE_TOOL_FACTORY(HIUEModulatorTool)
-DECLARE_TOOL_FACTORY(HIClusterPseudoJetGetter)
+DECLARE_COMPONENT( HIEventShapeJetIteration )
+DECLARE_COMPONENT( HIJetConstituentSubtractionTool )
+DECLARE_COMPONENT( HIJetClusterSubtractorTool )
+DECLARE_COMPONENT( HIJetDRAssociationTool )
+DECLARE_COMPONENT( HIJetMaxOverMeanTool )
+DECLARE_COMPONENT( HIJetDiscriminatorTool )
+DECLARE_COMPONENT( HIJetSignificanceTool )
+DECLARE_COMPONENT( HIUEModulatorTool )
+DECLARE_COMPONENT( HIClusterPseudoJetGetter )
diff --git a/Reconstruction/HeavyIonRec/HIMonitoring/src/components/HIMonitoring_entries.cxx b/Reconstruction/HeavyIonRec/HIMonitoring/src/components/HIMonitoring_entries.cxx
index bd7476c3fe16b3b016d3aa88cb3d82909ec8febe..56cca9afa28bf3360b9af5550837bf6496e4352a 100644
--- a/Reconstruction/HeavyIonRec/HIMonitoring/src/components/HIMonitoring_entries.cxx
+++ b/Reconstruction/HeavyIonRec/HIMonitoring/src/components/HIMonitoring_entries.cxx
@@ -4,9 +4,9 @@
#include "HIMonitoring/HIMonitoringMuonsTool.h"
#include "HIMonitoring/HIMonitoringElectronsTool.h"
-DECLARE_TOOL_FACTORY(HIMonitoringEventShapeTool)
-DECLARE_TOOL_FACTORY(HIMonitoringPhotonsTool)
-DECLARE_TOOL_FACTORY(HIMonitoringZdcTool)
-DECLARE_TOOL_FACTORY(HIMonitoringMuonsTool)
-DECLARE_TOOL_FACTORY(HIMonitoringElectronsTool)
+DECLARE_COMPONENT( HIMonitoringEventShapeTool )
+DECLARE_COMPONENT( HIMonitoringPhotonsTool )
+DECLARE_COMPONENT( HIMonitoringZdcTool )
+DECLARE_COMPONENT( HIMonitoringMuonsTool )
+DECLARE_COMPONENT( HIMonitoringElectronsTool )
diff --git a/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/src/components/JetTileCorrection_entries.cxx b/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/src/components/JetTileCorrection_entries.cxx
index bbefff7fae5ef3948143c3e8b276e4b14ea7c156..d74f0ce145a8b3f5ad1440a34c3fc43a0da2e1b3 100644
--- a/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/src/components/JetTileCorrection_entries.cxx
+++ b/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/src/components/JetTileCorrection_entries.cxx
@@ -1,6 +1,6 @@
#include "JetTileCorrection/JetTileCorrectionTool.h"
#include "../JetTileCorrectionAlg.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( CP, JetTileCorrectionTool )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( CP, JetTileCorrectionAlg )
+DECLARE_COMPONENT( CP::JetTileCorrectionTool )
+DECLARE_COMPONENT( CP::JetTileCorrectionAlg )
diff --git a/Reconstruction/Jet/JetCalibTools/src/components/JetCalibTools_entries.cxx b/Reconstruction/Jet/JetCalibTools/src/components/JetCalibTools_entries.cxx
index 7bff9474d08e5edf3a6fe67053cdff00d67c94f3..90a4959633db1464426539d3f39304e441e85d90 100644
--- a/Reconstruction/Jet/JetCalibTools/src/components/JetCalibTools_entries.cxx
+++ b/Reconstruction/Jet/JetCalibTools/src/components/JetCalibTools_entries.cxx
@@ -5,9 +5,9 @@
#include "JetCalibTools/CalibrationMethods/EtaJESCorrection.h"
#include "JetCalibTools/CalibrationMethods/InsituDataCorrection.h"
-DECLARE_TOOL_FACTORY( JetCalibrationTool )
-DECLARE_TOOL_FACTORY( JetPileupCorrection )
-DECLARE_TOOL_FACTORY( ResidualOffsetCorrection )
-DECLARE_TOOL_FACTORY( EtaJESCorrection )
-DECLARE_TOOL_FACTORY( InsituDataCorrection )
+DECLARE_COMPONENT( JetCalibrationTool )
+DECLARE_COMPONENT( JetPileupCorrection )
+DECLARE_COMPONENT( ResidualOffsetCorrection )
+DECLARE_COMPONENT( EtaJESCorrection )
+DECLARE_COMPONENT( InsituDataCorrection )
diff --git a/Reconstruction/Jet/JetJvtEfficiency/src/components/JetJvtEfficiency_entries.cxx b/Reconstruction/Jet/JetJvtEfficiency/src/components/JetJvtEfficiency_entries.cxx
index eb75f29ff3d3e5bd93049598e277e288a4dab5b2..c7ab85f2b99c6571d766c190d956690cf1e5cbad 100644
--- a/Reconstruction/Jet/JetJvtEfficiency/src/components/JetJvtEfficiency_entries.cxx
+++ b/Reconstruction/Jet/JetJvtEfficiency/src/components/JetJvtEfficiency_entries.cxx
@@ -1,4 +1,4 @@
#include "JetJvtEfficiency/JetJvtEfficiency.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( CP, JetJvtEfficiency )
+DECLARE_COMPONENT( CP::JetJvtEfficiency )
diff --git a/Reconstruction/Jet/JetMomentTools/src/components/JetMomentTools_entries.cxx b/Reconstruction/Jet/JetMomentTools/src/components/JetMomentTools_entries.cxx
index 43bc525b70e6e4d8231bbf4c37bb81ad681502cb..c5f220232aaf8f632aba7a29d932764f457b5551 100644
--- a/Reconstruction/Jet/JetMomentTools/src/components/JetMomentTools_entries.cxx
+++ b/Reconstruction/Jet/JetMomentTools/src/components/JetMomentTools_entries.cxx
@@ -22,26 +22,26 @@
#include "../JetCaloCellQualityTool.h"
#endif
-DECLARE_TOOL_FACTORY(JetCaloEnergies)
-DECLARE_TOOL_FACTORY(JetCaloQualityTool)
-DECLARE_TOOL_FACTORY(JetWidthTool)
-DECLARE_TOOL_FACTORY(JetVertexFractionTool)
-DECLARE_TOOL_FACTORY(JetVertexTaggerTool)
-DECLARE_TOOL_FACTORY(JetForwardJvtTool)
-DECLARE_TOOL_FACTORY(JetTrackMomentsTool)
-DECLARE_TOOL_FACTORY(JetTrackSumMomentsTool)
-DECLARE_TOOL_FACTORY(JetClusterMomentsTool)
-DECLARE_TOOL_FACTORY(JetVoronoiMomentsTool)
-DECLARE_TOOL_FACTORY(JetMuonSegmentMomentsTool)
-DECLARE_TOOL_FACTORY(JetPtAssociationTool)
-DECLARE_TOOL_FACTORY(JetIsolationTool)
-DECLARE_TOOL_FACTORY(JetLArHVTool)
-DECLARE_TOOL_FACTORY(JetOriginCorrectionTool)
-DECLARE_TOOL_FACTORY(JetECPSFractionTool)
-DECLARE_TOOL_FACTORY(JetConstitFourMomTool)
+DECLARE_COMPONENT( JetCaloEnergies )
+DECLARE_COMPONENT( JetCaloQualityTool )
+DECLARE_COMPONENT( JetWidthTool )
+DECLARE_COMPONENT( JetVertexFractionTool )
+DECLARE_COMPONENT( JetVertexTaggerTool )
+DECLARE_COMPONENT( JetForwardJvtTool )
+DECLARE_COMPONENT( JetTrackMomentsTool )
+DECLARE_COMPONENT( JetTrackSumMomentsTool )
+DECLARE_COMPONENT( JetClusterMomentsTool )
+DECLARE_COMPONENT( JetVoronoiMomentsTool )
+DECLARE_COMPONENT( JetMuonSegmentMomentsTool )
+DECLARE_COMPONENT( JetPtAssociationTool )
+DECLARE_COMPONENT( JetIsolationTool )
+DECLARE_COMPONENT( JetLArHVTool )
+DECLARE_COMPONENT( JetOriginCorrectionTool )
+DECLARE_COMPONENT( JetECPSFractionTool )
+DECLARE_COMPONENT( JetConstitFourMomTool )
#ifndef XAOD_ANALYSIS
-DECLARE_TOOL_FACTORY(JetBadChanCorrTool)
-DECLARE_TOOL_FACTORY(JetCaloCellQualityTool)
+DECLARE_COMPONENT( JetBadChanCorrTool )
+DECLARE_COMPONENT( JetCaloCellQualityTool )
#endif
diff --git a/Reconstruction/Jet/JetMonitoring/src/components/JetMonitoring_entries.cxx b/Reconstruction/Jet/JetMonitoring/src/components/JetMonitoring_entries.cxx
index 3ea33e70bbba6414682e9a27d18140141baa048e..b96548479c1c19aa6cc8ebd020af8b179037cf30 100644
--- a/Reconstruction/Jet/JetMonitoring/src/components/JetMonitoring_entries.cxx
+++ b/Reconstruction/Jet/JetMonitoring/src/components/JetMonitoring_entries.cxx
@@ -11,18 +11,18 @@
#include "../JetMonitoringTool.h"
-DECLARE_TOOL_FACTORY( JetKinematicHistos )
-DECLARE_TOOL_FACTORY( JetMonitoringTool )
-DECLARE_TOOL_FACTORY( HistoDefinitionTool )
-DECLARE_TOOL_FACTORY( HistosForJetSelection )
-DECLARE_TOOL_FACTORY( LeadingJetsRelations )
-DECLARE_TOOL_FACTORY( EfficiencyResponseHistos )
-DECLARE_TOOL_FACTORY( HIEfficiencyResponseHistos )
-DECLARE_TOOL_FACTORY( JetContainerHistoFiller )
-DECLARE_TOOL_FACTORY( JetSelectorAttribute )
-DECLARE_TOOL_FACTORY( HIJetUEMonitoring )
-
-DECLARE_TOOL_FACTORY( JetAttributeHisto )
+DECLARE_COMPONENT( JetKinematicHistos )
+DECLARE_COMPONENT( JetMonitoringTool )
+DECLARE_COMPONENT( HistoDefinitionTool )
+DECLARE_COMPONENT( HistosForJetSelection )
+DECLARE_COMPONENT( LeadingJetsRelations )
+DECLARE_COMPONENT( EfficiencyResponseHistos )
+DECLARE_COMPONENT( HIEfficiencyResponseHistos )
+DECLARE_COMPONENT( JetContainerHistoFiller )
+DECLARE_COMPONENT( JetSelectorAttribute )
+DECLARE_COMPONENT( HIJetUEMonitoring )
+
+DECLARE_COMPONENT( JetAttributeHisto )
diff --git a/Reconstruction/Jet/JetRec/src/components/JetRec_entries.cxx b/Reconstruction/Jet/JetRec/src/components/JetRec_entries.cxx
index 2e1e44c5c75dcb316a94cbc7e9385887eac54b39..d44be594f4d7f15945243051448fc588b8b88e49 100644
--- a/Reconstruction/Jet/JetRec/src/components/JetRec_entries.cxx
+++ b/Reconstruction/Jet/JetRec/src/components/JetRec_entries.cxx
@@ -20,25 +20,25 @@
#include "JetRec/JetFilterTool.h"
#include "JetRec/JetConstitRemover.h"
-DECLARE_TOOL_FACTORY(JetToolRunner)
-DECLARE_TOOL_FACTORY(JetRecTool)
-DECLARE_TOOL_FACTORY(JetDumper)
-DECLARE_TOOL_FACTORY(PseudoJetGetter)
-DECLARE_TOOL_FACTORY(MuonSegmentPseudoJetGetter)
-DECLARE_TOOL_FACTORY(JetFromPseudojet)
-DECLARE_TOOL_FACTORY(JetFinder)
-DECLARE_TOOL_FACTORY(JetByVertexFinder)
-DECLARE_TOOL_FACTORY(JetSorter)
-DECLARE_TOOL_FACTORY(JetFilterTool)
-DECLARE_TOOL_FACTORY(JetSplitter)
-DECLARE_TOOL_FACTORY(JetTrimmer)
-DECLARE_TOOL_FACTORY(JetPruner)
-DECLARE_TOOL_FACTORY(JetReclusterer)
-DECLARE_TOOL_FACTORY(FastJetInterfaceTool)
-DECLARE_TOOL_FACTORY(JetPseudojetRetriever)
-DECLARE_TOOL_FACTORY(JetConstituentsRetriever)
-DECLARE_TOOL_FACTORY(JetPseudojetCopier)
-DECLARE_TOOL_FACTORY(JetConstitRemover)
+DECLARE_COMPONENT( JetToolRunner )
+DECLARE_COMPONENT( JetRecTool )
+DECLARE_COMPONENT( JetDumper )
+DECLARE_COMPONENT( PseudoJetGetter )
+DECLARE_COMPONENT( MuonSegmentPseudoJetGetter )
+DECLARE_COMPONENT( JetFromPseudojet )
+DECLARE_COMPONENT( JetFinder )
+DECLARE_COMPONENT( JetByVertexFinder )
+DECLARE_COMPONENT( JetSorter )
+DECLARE_COMPONENT( JetFilterTool )
+DECLARE_COMPONENT( JetSplitter )
+DECLARE_COMPONENT( JetTrimmer )
+DECLARE_COMPONENT( JetPruner )
+DECLARE_COMPONENT( JetReclusterer )
+DECLARE_COMPONENT( FastJetInterfaceTool )
+DECLARE_COMPONENT( JetPseudojetRetriever )
+DECLARE_COMPONENT( JetConstituentsRetriever )
+DECLARE_COMPONENT( JetPseudojetCopier )
+DECLARE_COMPONENT( JetConstitRemover )
-DECLARE_ALGORITHM_FACTORY(JetAlgorithm)
+DECLARE_COMPONENT( JetAlgorithm )
diff --git a/Reconstruction/Jet/JetRecCalo/src/components/JetRecCalo_entries.cxx b/Reconstruction/Jet/JetRecCalo/src/components/JetRecCalo_entries.cxx
index 8c8a55edd3fd362d28b65471d42a8cfa6b36880d..5daae16cd7b580eeaa63315aa9ad0824edc1d54a 100644
--- a/Reconstruction/Jet/JetRecCalo/src/components/JetRecCalo_entries.cxx
+++ b/Reconstruction/Jet/JetRecCalo/src/components/JetRecCalo_entries.cxx
@@ -1,4 +1,4 @@
#include "JetRecCalo/MissingCellListTool.h"
-DECLARE_TOOL_FACTORY(MissingCellListTool)
+DECLARE_COMPONENT( MissingCellListTool )
diff --git a/Reconstruction/Jet/JetRecTools/src/components/JetRecTools_entries.cxx b/Reconstruction/Jet/JetRecTools/src/components/JetRecTools_entries.cxx
index f24217bf94d9d02ff6afa33b5c09fb978221964e..d0ed852792174ff7833276f286342f40e72ce3cb 100644
--- a/Reconstruction/Jet/JetRecTools/src/components/JetRecTools_entries.cxx
+++ b/Reconstruction/Jet/JetRecTools/src/components/JetRecTools_entries.cxx
@@ -16,21 +16,21 @@
#include "JetRecTools/ChargedHadronSubtractionTool.h"
#include "JetRecTools/PuppiWeightTool.h"
-DECLARE_TOOL_FACTORY(JetTrackSelectionTool)
-DECLARE_TOOL_FACTORY(SimpleJetTrackSelectionTool)
-DECLARE_TOOL_FACTORY(TrackVertexAssociationTool)
-DECLARE_TOOL_FACTORY(TrackPseudoJetGetter)
-DECLARE_TOOL_FACTORY(PFlowPseudoJetGetter)
-DECLARE_TOOL_FACTORY(JetConstituentModSequence)
-DECLARE_TOOL_FACTORY(JetConstituentModifierBase)
-DECLARE_TOOL_FACTORY(CaloClusterConstituentsOrigin)
-DECLARE_TOOL_FACTORY(SoftKillerWeightTool)
-DECLARE_TOOL_FACTORY( VoronoiWeightTool )
-DECLARE_TOOL_FACTORY( ClusterAtEMScaleTool )
-DECLARE_TOOL_FACTORY( ConstitTimeCutTool )
-DECLARE_TOOL_FACTORY( ConstituentSubtractorTool )
-DECLARE_TOOL_FACTORY( JetInputElRemovalTool )
-DECLARE_TOOL_FACTORY( CorrectPFOTool )
-DECLARE_TOOL_FACTORY( ChargedHadronSubtractionTool )
-DECLARE_TOOL_FACTORY( PuppiWeightTool )
+DECLARE_COMPONENT( JetTrackSelectionTool )
+DECLARE_COMPONENT( SimpleJetTrackSelectionTool )
+DECLARE_COMPONENT( TrackVertexAssociationTool )
+DECLARE_COMPONENT( TrackPseudoJetGetter )
+DECLARE_COMPONENT( PFlowPseudoJetGetter )
+DECLARE_COMPONENT( JetConstituentModSequence )
+DECLARE_COMPONENT( JetConstituentModifierBase )
+DECLARE_COMPONENT( CaloClusterConstituentsOrigin )
+DECLARE_COMPONENT( SoftKillerWeightTool )
+DECLARE_COMPONENT( VoronoiWeightTool )
+DECLARE_COMPONENT( ClusterAtEMScaleTool )
+DECLARE_COMPONENT( ConstitTimeCutTool )
+DECLARE_COMPONENT( ConstituentSubtractorTool )
+DECLARE_COMPONENT( JetInputElRemovalTool )
+DECLARE_COMPONENT( CorrectPFOTool )
+DECLARE_COMPONENT( ChargedHadronSubtractionTool )
+DECLARE_COMPONENT( PuppiWeightTool )
diff --git a/Reconstruction/Jet/JetReclustering/src/components/JetReclustering_entries.cxx b/Reconstruction/Jet/JetReclustering/src/components/JetReclustering_entries.cxx
index e61f2f5cec81f0c221b2a983e4e6978f908b2a18..9a7dc816a4785a5083dfed3446a066405d8d6b28 100644
--- a/Reconstruction/Jet/JetReclustering/src/components/JetReclustering_entries.cxx
+++ b/Reconstruction/Jet/JetReclustering/src/components/JetReclustering_entries.cxx
@@ -1,10 +1,10 @@
#include "JetReclustering/JetReclusteringTool.h"
#include "JetReclustering/EffectiveRTool.h"
-DECLARE_TOOL_FACTORY( JetReclusteringTool )
-DECLARE_TOOL_FACTORY( EffectiveRTool )
+DECLARE_COMPONENT( JetReclusteringTool )
+DECLARE_COMPONENT( EffectiveRTool )
#include "../AthJetReclusteringAlgo.h"
-DECLARE_ALGORITHM_FACTORY( AthJetReclusteringAlgo )
+DECLARE_COMPONENT( AthJetReclusteringAlgo )
diff --git a/Reconstruction/Jet/JetResolution/src/components/JetResolution_entries.cxx b/Reconstruction/Jet/JetResolution/src/components/JetResolution_entries.cxx
index 5721367ed204855754740267862ab1097222fe4f..e69599f5f072b7c3f8c67adeb5dcd0546f48115d 100644
--- a/Reconstruction/Jet/JetResolution/src/components/JetResolution_entries.cxx
+++ b/Reconstruction/Jet/JetResolution/src/components/JetResolution_entries.cxx
@@ -2,7 +2,7 @@
#include "JetResolution/JERSmearingTool.h"
#include "../JERTestAlg.h"
-DECLARE_TOOL_FACTORY( JERTool )
-DECLARE_TOOL_FACTORY( JERSmearingTool )
-DECLARE_ALGORITHM_FACTORY( JERTestAlg )
+DECLARE_COMPONENT( JERTool )
+DECLARE_COMPONENT( JERSmearingTool )
+DECLARE_COMPONENT( JERTestAlg )
diff --git a/Reconstruction/Jet/JetSimTools/src/components/JetSimTools_entries.cxx b/Reconstruction/Jet/JetSimTools/src/components/JetSimTools_entries.cxx
index 6e9da7d757fd1a320c4501d2cfc7227f7a97d862..39ef3db22945110569edfd7221708d3b38cf7dfa 100644
--- a/Reconstruction/Jet/JetSimTools/src/components/JetSimTools_entries.cxx
+++ b/Reconstruction/Jet/JetSimTools/src/components/JetSimTools_entries.cxx
@@ -2,7 +2,7 @@
#include "JetSimTools/TruthPseudoJetGetter.h"
-DECLARE_TOOL_FACTORY( JetTruthParticleSelectorTool )
+DECLARE_COMPONENT( JetTruthParticleSelectorTool )
-DECLARE_TOOL_FACTORY( TruthPseudoJetGetter )
+DECLARE_COMPONENT( TruthPseudoJetGetter )
diff --git a/Reconstruction/Jet/JetSubStructureMomentTools/src/components/JetSubStructure_entries.cxx b/Reconstruction/Jet/JetSubStructureMomentTools/src/components/JetSubStructure_entries.cxx
index 2dc2795fa54112966ae31ef58a9f53592ff2e89a..62ccbeddd546d995a3cf4ee24fb0e206e85917b9 100644
--- a/Reconstruction/Jet/JetSubStructureMomentTools/src/components/JetSubStructure_entries.cxx
+++ b/Reconstruction/Jet/JetSubStructureMomentTools/src/components/JetSubStructure_entries.cxx
@@ -24,26 +24,26 @@
#include "JetSubStructureMomentTools/BoostedXbbTagTool.h"
-DECLARE_TOOL_FACTORY(KtDeltaRTool)
-DECLARE_TOOL_FACTORY(NSubjettinessTool)
-DECLARE_TOOL_FACTORY(NSubjettinessRatiosTool)
-DECLARE_TOOL_FACTORY(KTSplittingScaleTool)
-DECLARE_TOOL_FACTORY(DipolarityTool)
-DECLARE_TOOL_FACTORY(AngularityTool)
-DECLARE_TOOL_FACTORY(KtMassDropTool)
-DECLARE_TOOL_FACTORY(PlanarFlowTool)
-DECLARE_TOOL_FACTORY(CenterOfMassShapesTool)
-DECLARE_TOOL_FACTORY(EnergyCorrelatorTool)
-DECLARE_TOOL_FACTORY(EnergyCorrelatorRatiosTool)
-DECLARE_TOOL_FACTORY(JetPullTool)
-DECLARE_TOOL_FACTORY(JetChargeTool)
-DECLARE_TOOL_FACTORY(VolatilityTool)
-DECLARE_TOOL_FACTORY(ShowerDeconstructionTool)
-DECLARE_TOOL_FACTORY(SubjetMakerTool)
-DECLARE_TOOL_FACTORY(SubjetFinderTool)
-DECLARE_TOOL_FACTORY(SubjetRecorderTool)
-DECLARE_TOOL_FACTORY(BosonTagTool)
-DECLARE_TOOL_FACTORY(Validator)
-DECLARE_TOOL_FACTORY(QwTool)
-DECLARE_TOOL_FACTORY(BoostedXbbTagTool)
+DECLARE_COMPONENT( KtDeltaRTool )
+DECLARE_COMPONENT( NSubjettinessTool )
+DECLARE_COMPONENT( NSubjettinessRatiosTool )
+DECLARE_COMPONENT( KTSplittingScaleTool )
+DECLARE_COMPONENT( DipolarityTool )
+DECLARE_COMPONENT( AngularityTool )
+DECLARE_COMPONENT( KtMassDropTool )
+DECLARE_COMPONENT( PlanarFlowTool )
+DECLARE_COMPONENT( CenterOfMassShapesTool )
+DECLARE_COMPONENT( EnergyCorrelatorTool )
+DECLARE_COMPONENT( EnergyCorrelatorRatiosTool )
+DECLARE_COMPONENT( JetPullTool )
+DECLARE_COMPONENT( JetChargeTool )
+DECLARE_COMPONENT( VolatilityTool )
+DECLARE_COMPONENT( ShowerDeconstructionTool )
+DECLARE_COMPONENT( SubjetMakerTool )
+DECLARE_COMPONENT( SubjetFinderTool )
+DECLARE_COMPONENT( SubjetRecorderTool )
+DECLARE_COMPONENT( BosonTagTool )
+DECLARE_COMPONENT( Validator )
+DECLARE_COMPONENT( QwTool )
+DECLARE_COMPONENT( BoostedXbbTagTool )
diff --git a/Reconstruction/Jet/JetUncertainties/src/components/JetUncertainties_entries.cxx b/Reconstruction/Jet/JetUncertainties/src/components/JetUncertainties_entries.cxx
index c6ace4c1e68278053568b8c60d8c176d2d588f63..e7d8e834307cc731624cfe41b64b8393fb08ee02 100644
--- a/Reconstruction/Jet/JetUncertainties/src/components/JetUncertainties_entries.cxx
+++ b/Reconstruction/Jet/JetUncertainties/src/components/JetUncertainties_entries.cxx
@@ -1,4 +1,4 @@
#include "JetUncertainties/JetUncertaintiesTool.h"
-DECLARE_TOOL_FACTORY(JetUncertaintiesTool)
+DECLARE_COMPONENT( JetUncertaintiesTool )
diff --git a/Reconstruction/Jet/JetValidation/src/components/JetValidation_entries.cxx b/Reconstruction/Jet/JetValidation/src/components/JetValidation_entries.cxx
index 33295d37dbf1ebf843b0dd41a0fe70c0bca75821..626fb54a9d431b3d21a40632b606c50ab4bd39fa 100644
--- a/Reconstruction/Jet/JetValidation/src/components/JetValidation_entries.cxx
+++ b/Reconstruction/Jet/JetValidation/src/components/JetValidation_entries.cxx
@@ -2,11 +2,11 @@
//#include "JetValidation/JetCalibratorAthenaExample.h"
-//DECLARE_ALGORITHM_FACTORY( JetTests )
-//DECLARE_ALGORITHM_FACTORY( JetSkeletonAlg )
+//DECLARE_COMPONENT( JetTests )
+//DECLARE_COMPONENT( JetSkeletonAlg )
-//DECLARE_TOOL_FACTORY( JetCalibratorAthenaExample )
-//DECLARE_TOOL_FACTORY( JetCollectionTester )
+//DECLARE_COMPONENT( JetCalibratorAthenaExample )
+//DECLARE_COMPONENT( JetCollectionTester )
diff --git a/Reconstruction/MET/METReconstruction/src/components/METReconstruction_entries.cxx b/Reconstruction/MET/METReconstruction/src/components/METReconstruction_entries.cxx
index 4c985684fb80a19ec25da966c1fbd986187b15da..d2119fc5750e21288124f767a62e07c2b4783723 100644
--- a/Reconstruction/MET/METReconstruction/src/components/METReconstruction_entries.cxx
+++ b/Reconstruction/MET/METReconstruction/src/components/METReconstruction_entries.cxx
@@ -31,31 +31,31 @@
using namespace met;
-DECLARE_TOOL_FACTORY(METRecoTool)
-DECLARE_TOOL_FACTORY(METAssociationTool)
-DECLARE_TOOL_FACTORY(METElectronTool)
-DECLARE_TOOL_FACTORY(METPhotonTool)
-DECLARE_TOOL_FACTORY(METJetTool)
-DECLARE_TOOL_FACTORY(METTauTool)
-DECLARE_TOOL_FACTORY(METMuonTool)
-DECLARE_TOOL_FACTORY(METSoftTermsTool)
-DECLARE_TOOL_FACTORY(METElectronAssociator)
-DECLARE_TOOL_FACTORY(METPhotonAssociator)
-DECLARE_TOOL_FACTORY(METJetAssocTool)
-DECLARE_TOOL_FACTORY(METTauAssociator)
-DECLARE_TOOL_FACTORY(METMuonAssociator)
-DECLARE_TOOL_FACTORY(METSoftAssociator)
+DECLARE_COMPONENT( METRecoTool )
+DECLARE_COMPONENT( METAssociationTool )
+DECLARE_COMPONENT( METElectronTool )
+DECLARE_COMPONENT( METPhotonTool )
+DECLARE_COMPONENT( METJetTool )
+DECLARE_COMPONENT( METTauTool )
+DECLARE_COMPONENT( METMuonTool )
+DECLARE_COMPONENT( METSoftTermsTool )
+DECLARE_COMPONENT( METElectronAssociator )
+DECLARE_COMPONENT( METPhotonAssociator )
+DECLARE_COMPONENT( METJetAssocTool )
+DECLARE_COMPONENT( METTauAssociator )
+DECLARE_COMPONENT( METMuonAssociator )
+DECLARE_COMPONENT( METSoftAssociator )
//
-DECLARE_TOOL_FACTORY(METTruthTool)
-DECLARE_TOOL_FACTORY(METTruthAssociator)
-DECLARE_TOOL_FACTORY(METCaloRegionsTool)
+DECLARE_COMPONENT( METTruthTool )
+DECLARE_COMPONENT( METTruthAssociator )
+DECLARE_COMPONENT( METCaloRegionsTool )
//
-DECLARE_TOOL_FACTORY(METJetFilterTool)
-DECLARE_TOOL_FACTORY(METTrackFilterTool)
-DECLARE_TOOL_FACTORY(METMuonElossTool)
-DECLARE_TOOL_FACTORY(METRegionsTool)
+DECLARE_COMPONENT( METJetFilterTool )
+DECLARE_COMPONENT( METTrackFilterTool )
+DECLARE_COMPONENT( METMuonElossTool )
+DECLARE_COMPONENT( METRegionsTool )
//
-DECLARE_ALGORITHM_FACTORY(METRecoAlg)
-DECLARE_ALGORITHM_FACTORY(METReaderAlg)
-DECLARE_ALGORITHM_FACTORY(METAssocTestAlg)
+DECLARE_COMPONENT( METRecoAlg )
+DECLARE_COMPONENT( METReaderAlg )
+DECLARE_COMPONENT( METAssocTestAlg )
diff --git a/Reconstruction/MET/METUtilities/src/components/METUtilities_entries.cxx b/Reconstruction/MET/METUtilities/src/components/METUtilities_entries.cxx
index a50541533fa14a8117d257a92bc957a148a9199c..fe20a9a707eefa077c41a1d692af8b95c1910878 100644
--- a/Reconstruction/MET/METUtilities/src/components/METUtilities_entries.cxx
+++ b/Reconstruction/MET/METUtilities/src/components/METUtilities_entries.cxx
@@ -9,11 +9,11 @@
using namespace met;
-DECLARE_TOOL_FACTORY(METMaker)
-DECLARE_TOOL_FACTORY(METRebuilder)
-DECLARE_TOOL_FACTORY(METSystematicsTool)
-DECLARE_TOOL_FACTORY(METSignificance)
+DECLARE_COMPONENT( METMaker )
+DECLARE_COMPONENT( METRebuilder )
+DECLARE_COMPONENT( METSystematicsTool )
+DECLARE_COMPONENT( METSignificance )
-DECLARE_ALGORITHM_FACTORY(METUtilAlg)
-DECLARE_ALGORITHM_FACTORY(METMakerAlg)
+DECLARE_COMPONENT( METUtilAlg )
+DECLARE_COMPONENT( METMakerAlg )
diff --git a/Reconstruction/MissingETGoodness/src/components/MissingETGoodness_entries.cxx b/Reconstruction/MissingETGoodness/src/components/MissingETGoodness_entries.cxx
index f894fa88e67029eca9a427c24fc071da1b962b9b..5599e800b2c3dddf160e510d9e67f07cd73b4712 100644
--- a/Reconstruction/MissingETGoodness/src/components/MissingETGoodness_entries.cxx
+++ b/Reconstruction/MissingETGoodness/src/components/MissingETGoodness_entries.cxx
@@ -8,13 +8,13 @@
#include "MissingETGoodness/SkimDecisionFilter.h"
#include "MissingETGoodness/MuonGoodiesFiller.h"
-DECLARE_ALGORITHM_FACTORY( EtmissGoodnessSelectorAlg )
-DECLARE_ALGORITHM_FACTORY( EtmissGoodnessManagerAlg )
-DECLARE_ALGORITHM_FACTORY( JetGoodiesFiller )
-DECLARE_ALGORITHM_FACTORY( MetGoodiesFiller )
-DECLARE_ALGORITHM_FACTORY( METCollisionFilter )
-DECLARE_ALGORITHM_FACTORY( SkimDecisionFilter )
-DECLARE_ALGORITHM_FACTORY( MuonGoodiesFiller )
-DECLARE_TOOL_FACTORY( EtmissGoodnessManagerTool )
-DECLARE_TOOL_FACTORY( JetVarTool )
+DECLARE_COMPONENT( EtmissGoodnessSelectorAlg )
+DECLARE_COMPONENT( EtmissGoodnessManagerAlg )
+DECLARE_COMPONENT( JetGoodiesFiller )
+DECLARE_COMPONENT( MetGoodiesFiller )
+DECLARE_COMPONENT( METCollisionFilter )
+DECLARE_COMPONENT( SkimDecisionFilter )
+DECLARE_COMPONENT( MuonGoodiesFiller )
+DECLARE_COMPONENT( EtmissGoodnessManagerTool )
+DECLARE_COMPONENT( JetVarTool )
diff --git a/Reconstruction/MissingETMonitoring/src/components/MissingETMonitoring_entries.cxx b/Reconstruction/MissingETMonitoring/src/components/MissingETMonitoring_entries.cxx
index f752689c985583f8085c5f9dd277379659783fdf..7e0ca7043256745e3fe1318e5e25199e2d5fd6a7 100644
--- a/Reconstruction/MissingETMonitoring/src/components/MissingETMonitoring_entries.cxx
+++ b/Reconstruction/MissingETMonitoring/src/components/MissingETMonitoring_entries.cxx
@@ -1,5 +1,5 @@
#include "MissingETMonitoring/METMonTool.h"
-DECLARE_TOOL_FACTORY( METMonTool )
+DECLARE_COMPONENT( METMonTool )
diff --git a/Reconstruction/MissingETPerformance/src/components/MissingETPerformance_entries.cxx b/Reconstruction/MissingETPerformance/src/components/MissingETPerformance_entries.cxx
index 71edb2c6a4c0c0160258b356d003b668d7b9b91f..aab6ef4ceb49381b9398924e2a583abbaa5786fb 100644
--- a/Reconstruction/MissingETPerformance/src/components/MissingETPerformance_entries.cxx
+++ b/Reconstruction/MissingETPerformance/src/components/MissingETPerformance_entries.cxx
@@ -22,27 +22,27 @@
#include "MissingETPerformance/MissingETScaleTool.h"
-DECLARE_ALGORITHM_FACTORY( MissingETPerformance )
-DECLARE_ALGORITHM_FACTORY( ZeeSequencer )
-DECLARE_ALGORITHM_FACTORY( SplitElectronContainer )
+DECLARE_COMPONENT( MissingETPerformance )
+DECLARE_COMPONENT( ZeeSequencer )
+DECLARE_COMPONENT( SplitElectronContainer )
-DECLARE_TOOL_FACTORY( MissingETData )
-DECLARE_TOOL_FACTORY( MissingETMuonData )
-DECLARE_TOOL_FACTORY( MissingETEventSelector )
-DECLARE_TOOL_FACTORY( ResolutionTool )
-DECLARE_TOOL_FACTORY( BasicPlotsTool )
-DECLARE_TOOL_FACTORY( MissingETCompositionTool )
-DECLARE_TOOL_FACTORY( LinearityTool )
-DECLARE_TOOL_FACTORY( EtaRingsTool )
-DECLARE_TOOL_FACTORY( JetVariablesTool )
-DECLARE_TOOL_FACTORY( TopoClusterVariablesTool )
-DECLARE_TOOL_FACTORY( TrigMissingETTool )
-DECLARE_TOOL_FACTORY( TrigVsOfflineMissingETTool )
-DECLARE_TOOL_FACTORY( FakeMissingETTool )
-DECLARE_TOOL_FACTORY( ZMuMuTool )
-DECLARE_TOOL_FACTORY( ZeeTool )
-DECLARE_TOOL_FACTORY( MuonTool )
-DECLARE_TOOL_FACTORY( ContainerComparatorTool )
-DECLARE_TOOL_FACTORY( PileUpTool )
-DECLARE_TOOL_FACTORY( MissingETScaleTool )
+DECLARE_COMPONENT( MissingETData )
+DECLARE_COMPONENT( MissingETMuonData )
+DECLARE_COMPONENT( MissingETEventSelector )
+DECLARE_COMPONENT( ResolutionTool )
+DECLARE_COMPONENT( BasicPlotsTool )
+DECLARE_COMPONENT( MissingETCompositionTool )
+DECLARE_COMPONENT( LinearityTool )
+DECLARE_COMPONENT( EtaRingsTool )
+DECLARE_COMPONENT( JetVariablesTool )
+DECLARE_COMPONENT( TopoClusterVariablesTool )
+DECLARE_COMPONENT( TrigMissingETTool )
+DECLARE_COMPONENT( TrigVsOfflineMissingETTool )
+DECLARE_COMPONENT( FakeMissingETTool )
+DECLARE_COMPONENT( ZMuMuTool )
+DECLARE_COMPONENT( ZeeTool )
+DECLARE_COMPONENT( MuonTool )
+DECLARE_COMPONENT( ContainerComparatorTool )
+DECLARE_COMPONENT( PileUpTool )
+DECLARE_COMPONENT( MissingETScaleTool )
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/components/CaloTrkMuIdTools_entries.cxx b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/components/CaloTrkMuIdTools_entries.cxx
index 3476d912affccc850a74f3b397fe07bcdc65b487..6d46c86e9ddcd8349ea4f45d2b2ef71252f5d79e 100644
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/components/CaloTrkMuIdTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/components/CaloTrkMuIdTools_entries.cxx
@@ -3,8 +3,8 @@
#include "CaloTrkMuIdTools/TrackDepositInCaloTool.h"
#include "CaloTrkMuIdTools/CaloMuonLikelihoodTool.h"
-DECLARE_TOOL_FACTORY( CaloMuonTag )
-DECLARE_TOOL_FACTORY( TrackEnergyInCaloTool )
-DECLARE_TOOL_FACTORY( TrackDepositInCaloTool )
-DECLARE_TOOL_FACTORY( CaloMuonLikelihoodTool )
+DECLARE_COMPONENT( CaloMuonTag )
+DECLARE_COMPONENT( TrackEnergyInCaloTool )
+DECLARE_COMPONENT( TrackDepositInCaloTool )
+DECLARE_COMPONENT( CaloMuonLikelihoodTool )
diff --git a/Reconstruction/MuonIdentification/CombinedMuonRefit/src/components/CombinedMuonRefit_entries.cxx b/Reconstruction/MuonIdentification/CombinedMuonRefit/src/components/CombinedMuonRefit_entries.cxx
index 78038394b79735aa7906345931f3a6563dc7f052..1c75f8ad53362fa8b8a9ed27ac7dcea6be096695 100644
--- a/Reconstruction/MuonIdentification/CombinedMuonRefit/src/components/CombinedMuonRefit_entries.cxx
+++ b/Reconstruction/MuonIdentification/CombinedMuonRefit/src/components/CombinedMuonRefit_entries.cxx
@@ -1,6 +1,6 @@
#include "../ExtrapolateMuonToIP.h"
#include "../ExtrapolateMuonToIPTool.h"
-DECLARE_ALGORITHM_FACTORY( ExtrapolateMuonToIP )
-DECLARE_TOOL_FACTORY( ExtrapolateMuonToIPTool )
+DECLARE_COMPONENT( ExtrapolateMuonToIP )
+DECLARE_COMPONENT( ExtrapolateMuonToIPTool )
diff --git a/Reconstruction/MuonIdentification/MuGirl/src/components/MuGirl_entries.cxx b/Reconstruction/MuonIdentification/MuGirl/src/components/MuGirl_entries.cxx
index 2f6d5cee7a64fa37937c76e22172261e9493738c..00dd8110895c6dcff67f26aa8c80ca1956166789 100644
--- a/Reconstruction/MuonIdentification/MuGirl/src/components/MuGirl_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuGirl/src/components/MuGirl_entries.cxx
@@ -2,5 +2,5 @@
using namespace MuGirlNS;
-DECLARE_TOOL_FACTORY( MuGirlRecoTool )
+DECLARE_COMPONENT( MuGirlRecoTool )
diff --git a/Reconstruction/MuonIdentification/MuGirlCandidate/src/components/MuGirlCandidate_entries.cxx b/Reconstruction/MuonIdentification/MuGirlCandidate/src/components/MuGirlCandidate_entries.cxx
index ba6d10d9f48dcc282c9b1cf604757b1e92f7c42c..65668f4ae7cb79b9b2404697b29431a5ecfc02d8 100644
--- a/Reconstruction/MuonIdentification/MuGirlCandidate/src/components/MuGirlCandidate_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuGirlCandidate/src/components/MuGirlCandidate_entries.cxx
@@ -2,5 +2,5 @@
using namespace MuGirlNS;
-DECLARE_TOOL_FACTORY( CandidateTool )
+DECLARE_COMPONENT( CandidateTool )
diff --git a/Reconstruction/MuonIdentification/MuGirlGlobalFit/src/components/MuGirlGlobalFit_entries.cxx b/Reconstruction/MuonIdentification/MuGirlGlobalFit/src/components/MuGirlGlobalFit_entries.cxx
index 22bf5d0e3d55dbc92ab5cf3b86200abcd210129c..23e68e2b06be8951af1c5dd1eed7fff5bbc17765 100644
--- a/Reconstruction/MuonIdentification/MuGirlGlobalFit/src/components/MuGirlGlobalFit_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuGirlGlobalFit/src/components/MuGirlGlobalFit_entries.cxx
@@ -1,4 +1,4 @@
#include "MuGirlGlobalFit/GlobalFitTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( MuGirlNS, GlobalFitTool )
+DECLARE_COMPONENT( MuGirlNS::GlobalFitTool )
diff --git a/Reconstruction/MuonIdentification/MuGirlParticleCreatorTool/src/components/MuGirlParticleCreatorTool_entries.cxx b/Reconstruction/MuonIdentification/MuGirlParticleCreatorTool/src/components/MuGirlParticleCreatorTool_entries.cxx
index 0693a47285471b8624cdb409008f341319e02c54..1252efc28ce141fcf5d85ec1d2499a8e9bcee409 100644
--- a/Reconstruction/MuonIdentification/MuGirlParticleCreatorTool/src/components/MuGirlParticleCreatorTool_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuGirlParticleCreatorTool/src/components/MuGirlParticleCreatorTool_entries.cxx
@@ -1,4 +1,4 @@
#include "MuGirlParticleCreatorTool/MuGirlParticleCreatorTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( MuGirlNS, MuGirlParticleCreatorTool )
+DECLARE_COMPONENT( MuGirlNS::MuGirlParticleCreatorTool )
diff --git a/Reconstruction/MuonIdentification/MuGirlPerformanceTools/src/components/MuGirlPerformanceTools_entries.cxx b/Reconstruction/MuonIdentification/MuGirlPerformanceTools/src/components/MuGirlPerformanceTools_entries.cxx
index 766e6604d9e8f4a6a9894969203475f7b94ceea5..ac611ee85740dbb8de754d69b16914cc44fe3a55 100644
--- a/Reconstruction/MuonIdentification/MuGirlPerformanceTools/src/components/MuGirlPerformanceTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuGirlPerformanceTools/src/components/MuGirlPerformanceTools_entries.cxx
@@ -1,4 +1,4 @@
#include "MuGirlPerformanceTools/PerformanceTruthTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( MuGirlNS, PerformanceTruthTool )
+DECLARE_COMPONENT( MuGirlNS::PerformanceTruthTool )
diff --git a/Reconstruction/MuonIdentification/MuGirlSelection/src/components/MuGirlSelection_entries.cxx b/Reconstruction/MuonIdentification/MuGirlSelection/src/components/MuGirlSelection_entries.cxx
index 2020328e67ae3afdc7d1a3f129ceb71c5c759bbd..37b692b5259a3e16a4e693901fb6ba9272813137 100644
--- a/Reconstruction/MuonIdentification/MuGirlSelection/src/components/MuGirlSelection_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuGirlSelection/src/components/MuGirlSelection_entries.cxx
@@ -1,4 +1,4 @@
#include "MuGirlSelection/ANNSelectionTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( MuGirlNS, ANNSelectionTool )
+DECLARE_COMPONENT( MuGirlNS::ANNSelectionTool )
diff --git a/Reconstruction/MuonIdentification/MuGirlStau/src/components/MuGirlStau_entries.cxx b/Reconstruction/MuonIdentification/MuGirlStau/src/components/MuGirlStau_entries.cxx
index 41b159b4ff6adebc96bfd0d008281b2d6c7183f9..39504fe19cc4c21740a6b9a11a2fbd901176ecf5 100644
--- a/Reconstruction/MuonIdentification/MuGirlStau/src/components/MuGirlStau_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuGirlStau/src/components/MuGirlStau_entries.cxx
@@ -3,6 +3,6 @@
using namespace MuGirlNS;
-DECLARE_TOOL_FACTORY (StauTool)
-DECLARE_TOOL_FACTORY (StauBetaTofTool)
+DECLARE_COMPONENT( StauTool )
+DECLARE_COMPONENT( StauBetaTofTool )
diff --git a/Reconstruction/MuonIdentification/MuidCaloEnergyTools/src/components/MuidCaloEnergyTools_entries.cxx b/Reconstruction/MuonIdentification/MuidCaloEnergyTools/src/components/MuidCaloEnergyTools_entries.cxx
index 8cbc1c5302ce298de8502467b601b4cd0ed5cce2..383605c3c9f642359d1bc37b3f6420492d0dc24a 100644
--- a/Reconstruction/MuonIdentification/MuidCaloEnergyTools/src/components/MuidCaloEnergyTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuidCaloEnergyTools/src/components/MuidCaloEnergyTools_entries.cxx
@@ -2,7 +2,7 @@
#include "MuidCaloEnergyTools/MuidCaloEnergyMeas.h"
#include "MuidCaloEnergyTools/MuidCaloEnergyParam.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuidCaloEnergyTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuidCaloEnergyMeas )
-DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuidCaloEnergyParam )
+DECLARE_COMPONENT( Rec::MuidCaloEnergyTool )
+DECLARE_COMPONENT( Rec::MuidCaloEnergyMeas )
+DECLARE_COMPONENT( Rec::MuidCaloEnergyParam )
diff --git a/Reconstruction/MuonIdentification/MuidCaloIsolationTools/src/components/MuidCaloIsolationTools_entries.cxx b/Reconstruction/MuonIdentification/MuidCaloIsolationTools/src/components/MuidCaloIsolationTools_entries.cxx
index 34a632e8093de8dd55cfa19d555d4129e58c1e8e..350cc62f02827ac67b135c7a1540d9b2c6650483 100644
--- a/Reconstruction/MuonIdentification/MuidCaloIsolationTools/src/components/MuidCaloIsolationTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuidCaloIsolationTools/src/components/MuidCaloIsolationTools_entries.cxx
@@ -1,4 +1,4 @@
#include "MuidCaloIsolationTools/MuidTrackIsolation.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuidTrackIsolation )
+DECLARE_COMPONENT( Rec::MuidTrackIsolation )
diff --git a/Reconstruction/MuonIdentification/MuidCaloScatteringTools/src/components/MuidCaloScatteringTools_entries.cxx b/Reconstruction/MuonIdentification/MuidCaloScatteringTools/src/components/MuidCaloScatteringTools_entries.cxx
index b21dba9a805fdfabc79baa08b1d53eaef4e54a8c..5f9160130c7dec0d9dc94cdd424b589ce035f0b3 100644
--- a/Reconstruction/MuonIdentification/MuidCaloScatteringTools/src/components/MuidCaloScatteringTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuidCaloScatteringTools/src/components/MuidCaloScatteringTools_entries.cxx
@@ -2,7 +2,7 @@
#include "MuidCaloScatteringTools/MuidCaloTrackStateOnSurface.h"
#include "MuidCaloScatteringTools/MuidMaterialEffectsOnTrackProvider.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuidCaloMaterialParam )
-DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuidCaloTrackStateOnSurface )
-DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuidMaterialEffectsOnTrackProvider)
+DECLARE_COMPONENT( Rec::MuidCaloMaterialParam )
+DECLARE_COMPONENT( Rec::MuidCaloTrackStateOnSurface )
+DECLARE_COMPONENT( Rec::MuidMaterialEffectsOnTrackProvider )
diff --git a/Reconstruction/MuonIdentification/MuidCombinedTools/src/components/MuidCombinedTools_entries.cxx b/Reconstruction/MuonIdentification/MuidCombinedTools/src/components/MuidCombinedTools_entries.cxx
index d20873b3d1d33eada714047a15a3c80d366ea69e..f4883309c1915e80a60c3054537a64c3c3e86f2d 100644
--- a/Reconstruction/MuonIdentification/MuidCombinedTools/src/components/MuidCombinedTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuidCombinedTools/src/components/MuidCombinedTools_entries.cxx
@@ -2,9 +2,9 @@
#include "MuidCombinedTools/MuidVertexCombiner.h"
#include "MuidCombinedTools/MuidMatchMaker.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuidBackTracker )
-DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuidMatchMaker )
-DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuidVertexCombiner )
+DECLARE_COMPONENT( Rec::MuidBackTracker )
+DECLARE_COMPONENT( Rec::MuidMatchMaker )
+DECLARE_COMPONENT( Rec::MuidVertexCombiner )
diff --git a/Reconstruction/MuonIdentification/MuidTrackBuilder/src/components/MuidTrackBuilder_entries.cxx b/Reconstruction/MuonIdentification/MuidTrackBuilder/src/components/MuidTrackBuilder_entries.cxx
index 1e55981ff4692516b39eeb60938cbc549ec02cd2..674a88e9dd998f9ba244e175c65b3030e6b79c2d 100644
--- a/Reconstruction/MuonIdentification/MuidTrackBuilder/src/components/MuidTrackBuilder_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuidTrackBuilder/src/components/MuidTrackBuilder_entries.cxx
@@ -4,9 +4,9 @@
#include "MuidTrackBuilder/MuonTrackQuery.h"
#include "MuidTrackBuilder/OutwardsCombinedMuonTrackBuilder.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( Rec, CombinedMuonTrackBuilder )
-DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuidMuonRecovery )
-DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuonMatchQuality )
-DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuonTrackQuery )
-DECLARE_NAMESPACE_TOOL_FACTORY( Rec, OutwardsCombinedMuonTrackBuilder )
+DECLARE_COMPONENT( Rec::CombinedMuonTrackBuilder )
+DECLARE_COMPONENT( Rec::MuidMuonRecovery )
+DECLARE_COMPONENT( Rec::MuonMatchQuality )
+DECLARE_COMPONENT( Rec::MuonTrackQuery )
+DECLARE_COMPONENT( Rec::OutwardsCombinedMuonTrackBuilder )
diff --git a/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/components/MuonCombinedEventStoreAlgs_entries.cxx b/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/components/MuonCombinedEventStoreAlgs_entries.cxx
index 505c80c3e47c1f527759ea9444f6b081f805cc34..ebb69d1193504fba0c95d65fbdad40ce7b171e49 100644
--- a/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/components/MuonCombinedEventStoreAlgs_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/components/MuonCombinedEventStoreAlgs_entries.cxx
@@ -7,12 +7,12 @@
#include "../MuonToTrackConverterAlg.h"
#include "../MuonTrackSlimmer.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( Rec, FinalizeMuonContainers )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY ( Rec, InitializeMuonClusters )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY ( Rec, FinalizeMuonClusters )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY ( Rec, InitializeMuonCaloEnergy )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY ( Rec, MergeMuonCaloEnergyContainers )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY ( Rec, MergeMuonCaloClusterContainers )
-DECLARE_ALGORITHM_FACTORY ( MuonToTrackConverterAlg )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY ( Rec, MuonTrackSlimmer )
+DECLARE_COMPONENT( Rec::FinalizeMuonContainers )
+DECLARE_COMPONENT( Rec::InitializeMuonClusters )
+DECLARE_COMPONENT( Rec::FinalizeMuonClusters )
+DECLARE_COMPONENT( Rec::InitializeMuonCaloEnergy )
+DECLARE_COMPONENT( Rec::MergeMuonCaloEnergyContainers )
+DECLARE_COMPONENT( Rec::MergeMuonCaloClusterContainers )
+DECLARE_COMPONENT( MuonToTrackConverterAlg )
+DECLARE_COMPONENT( Rec::MuonTrackSlimmer )
diff --git a/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/components/MuonCombinedAlgs_entries.cxx b/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/components/MuonCombinedAlgs_entries.cxx
index 321a9106783409c289df7ba281f3f0e6d310d005..c8122c311c37641c98c00a7f1ba62567cef474d8 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/components/MuonCombinedAlgs_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/components/MuonCombinedAlgs_entries.cxx
@@ -5,10 +5,10 @@
#include "../MuonCombinedInDetExtensionAlg.h"
#include "../MuonSegmentTagAlg.h"
-DECLARE_ALGORITHM_FACTORY( MuonCombinedInDetCandidateAlg )
-DECLARE_ALGORITHM_FACTORY( MuonCombinedMuonCandidateAlg )
-DECLARE_ALGORITHM_FACTORY( MuonCombinedAlg )
-DECLARE_ALGORITHM_FACTORY( MuonCreatorAlg )
-DECLARE_ALGORITHM_FACTORY( MuonCombinedInDetExtensionAlg )
-DECLARE_ALGORITHM_FACTORY( MuonSegmentTagAlg )
+DECLARE_COMPONENT( MuonCombinedInDetCandidateAlg )
+DECLARE_COMPONENT( MuonCombinedMuonCandidateAlg )
+DECLARE_COMPONENT( MuonCombinedAlg )
+DECLARE_COMPONENT( MuonCreatorAlg )
+DECLARE_COMPONENT( MuonCombinedInDetExtensionAlg )
+DECLARE_COMPONENT( MuonSegmentTagAlg )
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/components/MuonCombinedBaseTools_entries.cxx b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/components/MuonCombinedBaseTools_entries.cxx
index 27ebeb448253af684719ecebb686682b1a673757..b4adb5f32907840c7a53ab08973da6e23c2d7a83 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/components/MuonCombinedBaseTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/components/MuonCombinedBaseTools_entries.cxx
@@ -13,16 +13,16 @@
using namespace MuonCombined;
using namespace Muon;
-DECLARE_TOOL_FACTORY( MuonCandidateTool )
-DECLARE_TOOL_FACTORY( InDetCandidateTool )
-DECLARE_TOOL_FACTORY( MuonCombinedTool )
-DECLARE_TOOL_FACTORY( MuonCombinedDebuggerTool )
-DECLARE_TOOL_FACTORY( MuonCreatorTool )
-DECLARE_TOOL_FACTORY( MuonDressingTool )
-DECLARE_TOOL_FACTORY( MuonCombinedStacoTagTool )
-DECLARE_TOOL_FACTORY( MuonCombinedFitTagTool )
-DECLARE_TOOL_FACTORY( MuonSegmentTagTool )
-DECLARE_TOOL_FACTORY( MuGirlTagTool )
-DECLARE_TOOL_FACTORY( MuonCaloTagTool )
-DECLARE_TOOL_FACTORY( TrackSegmentAssociationTool )
+DECLARE_COMPONENT( MuonCandidateTool )
+DECLARE_COMPONENT( InDetCandidateTool )
+DECLARE_COMPONENT( MuonCombinedTool )
+DECLARE_COMPONENT( MuonCombinedDebuggerTool )
+DECLARE_COMPONENT( MuonCreatorTool )
+DECLARE_COMPONENT( MuonDressingTool )
+DECLARE_COMPONENT( MuonCombinedStacoTagTool )
+DECLARE_COMPONENT( MuonCombinedFitTagTool )
+DECLARE_COMPONENT( MuonSegmentTagTool )
+DECLARE_COMPONENT( MuGirlTagTool )
+DECLARE_COMPONENT( MuonCaloTagTool )
+DECLARE_COMPONENT( TrackSegmentAssociationTool )
diff --git a/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/components/MuonCombinedEvaluationTools_entries.cxx b/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/components/MuonCombinedEvaluationTools_entries.cxx
index 4c5cb7d7abebc636483d2e82ed3d6c4c4ce43a30..0bfb1c5c77e993b3d9c110f91fe6e3653160c149 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/components/MuonCombinedEvaluationTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/components/MuonCombinedEvaluationTools_entries.cxx
@@ -5,8 +5,8 @@
using namespace Rec;
-DECLARE_TOOL_FACTORY( MuonPrintingTool )
-DECLARE_TOOL_FACTORY( MuonScatteringAngleSignificanceTool )
-DECLARE_TOOL_FACTORY( MuonMomentumBalanceSignificanceTool )
-DECLARE_TOOL_FACTORY( MuonMeanMDTdADCFillerTool )
+DECLARE_COMPONENT( MuonPrintingTool )
+DECLARE_COMPONENT( MuonScatteringAngleSignificanceTool )
+DECLARE_COMPONENT( MuonMomentumBalanceSignificanceTool )
+DECLARE_COMPONENT( MuonMeanMDTdADCFillerTool )
diff --git a/Reconstruction/MuonIdentification/MuonCombinedTestTools/src/components/MuonCombinedTestTools_entries.cxx b/Reconstruction/MuonIdentification/MuonCombinedTestTools/src/components/MuonCombinedTestTools_entries.cxx
index a19669aff3a26f4afff4b7eb9bfb0f2a332ea2bc..5d4a0198d0c08dc3f805d9278537617ac5f0d58d 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedTestTools/src/components/MuonCombinedTestTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedTestTools/src/components/MuonCombinedTestTools_entries.cxx
@@ -2,6 +2,6 @@
//using namespace MuonCombined;
-DECLARE_NAMESPACE_TOOL_FACTORY( MuonCombined, MuonTrackTagTestTool )
+DECLARE_COMPONENT( MuonCombined::MuonTrackTagTestTool )
diff --git a/Reconstruction/MuonIdentification/MuonCombinedTimingTools/src/components/MuonCombinedTimingTools_entries.cxx b/Reconstruction/MuonIdentification/MuonCombinedTimingTools/src/components/MuonCombinedTimingTools_entries.cxx
index c93e03bb6dd91e9a6f974e1ee6f53f04506df6b0..f78b76d8fa145a45038a9b7a29077e4f06119942 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedTimingTools/src/components/MuonCombinedTimingTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedTimingTools/src/components/MuonCombinedTimingTools_entries.cxx
@@ -1,4 +1,4 @@
#include "../MuonCombinedTimingTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuonCombinedTimingTool )
+DECLARE_COMPONENT( Rec::MuonCombinedTimingTool )
diff --git a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/components/MuonCombinedTrackFindingTools_entries.cxx b/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/components/MuonCombinedTrackFindingTools_entries.cxx
index d3ba135e0cbba2951e593716c80d6eb1976ff2de..b6433308cfb2eeb9ec8ede13107d6388f47ae2b5 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/components/MuonCombinedTrackFindingTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/components/MuonCombinedTrackFindingTools_entries.cxx
@@ -7,9 +7,9 @@
using namespace Muon;
using namespace MuonCombined;
-DECLARE_TOOL_FACTORY( MuonInsideOutRecoTool )
-DECLARE_TOOL_FACTORY( MuonStauRecoTool )
-DECLARE_TOOL_FACTORY( MuonLayerSegmentMatchingTool )
-DECLARE_TOOL_FACTORY( MuonLayerAmbiguitySolverTool )
-DECLARE_TOOL_FACTORY( MuonCandidateTrackBuilderTool )
+DECLARE_COMPONENT( MuonInsideOutRecoTool )
+DECLARE_COMPONENT( MuonStauRecoTool )
+DECLARE_COMPONENT( MuonLayerSegmentMatchingTool )
+DECLARE_COMPONENT( MuonLayerAmbiguitySolverTool )
+DECLARE_COMPONENT( MuonCandidateTrackBuilderTool )
diff --git a/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/components/MuonSegmentTaggerTools_entries.cxx b/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/components/MuonSegmentTaggerTools_entries.cxx
index 5cf1f1dcb24eb779712046965584c50c95b1a2bc..bb0880245fddce501bdf7fe19272bbb973000b13 100644
--- a/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/components/MuonSegmentTaggerTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/components/MuonSegmentTaggerTools_entries.cxx
@@ -2,6 +2,6 @@
#include "../MuTagAmbiguitySolverTool.h"
-DECLARE_TOOL_FACTORY ( MuTagMatchingTool)
-DECLARE_TOOL_FACTORY ( MuTagAmbiguitySolverTool)
+DECLARE_COMPONENT( MuTagMatchingTool )
+DECLARE_COMPONENT( MuTagAmbiguitySolverTool )
diff --git a/Reconstruction/MuonIdentification/MuonSpShowerBuilderAlgs/src/components/MuonSpShowerBuilderAlgs_entries.cxx b/Reconstruction/MuonIdentification/MuonSpShowerBuilderAlgs/src/components/MuonSpShowerBuilderAlgs_entries.cxx
index bcf7b31d22e45708611c3e500bcfd5d9d87decfc..995f212d933a1a4bdf735fcd3a4c1512848c8cdb 100644
--- a/Reconstruction/MuonIdentification/MuonSpShowerBuilderAlgs/src/components/MuonSpShowerBuilderAlgs_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuonSpShowerBuilderAlgs/src/components/MuonSpShowerBuilderAlgs_entries.cxx
@@ -1,5 +1,5 @@
#include "MuonSpShowerBuilderAlgs/MuonSpShowerBuilder.h"
-DECLARE_ALGORITHM_FACTORY( MuonSpShowerBuilder )
+DECLARE_COMPONENT( MuonSpShowerBuilder )
diff --git a/Reconstruction/PFlow/PFlowUtils/src/components/PFlowUtils_entries.cxx b/Reconstruction/PFlow/PFlowUtils/src/components/PFlowUtils_entries.cxx
index 3b062a1e6f0a065b5f8f3f092864d517d1c68a0b..52de5c889e0e6bbf2119fb2c50635dc6b21ace44 100644
--- a/Reconstruction/PFlow/PFlowUtils/src/components/PFlowUtils_entries.cxx
+++ b/Reconstruction/PFlow/PFlowUtils/src/components/PFlowUtils_entries.cxx
@@ -2,7 +2,7 @@
#include "PFlowUtils/WeightPFOTool.h"
#include "../ParticleFlowEventFilter_r207.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( CP, RetrievePFOTool)
-DECLARE_NAMESPACE_TOOL_FACTORY( CP, WeightPFOTool)
-DECLARE_ALGORITHM_FACTORY(ParticleFlowEventFilter_r207)
+DECLARE_COMPONENT( CP::RetrievePFOTool )
+DECLARE_COMPONENT( CP::WeightPFOTool )
+DECLARE_COMPONENT( ParticleFlowEventFilter_r207 )
diff --git a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/components/PFODQA_entries.cxx b/Reconstruction/PFlow/PFlowValidation/PFODQA/src/components/PFODQA_entries.cxx
index 5e091d85bca8ab54954f9d0f83d0678e3478affa..7c08e9e2dbfc5da86defab74387e9c7e3392dade 100644
--- a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/components/PFODQA_entries.cxx
+++ b/Reconstruction/PFlow/PFlowValidation/PFODQA/src/components/PFODQA_entries.cxx
@@ -1,6 +1,6 @@
#include "../PhysValPFO.h"
#include "../PhysValCluster.h"
-DECLARE_TOOL_FACTORY( PhysValPFO )
-DECLARE_TOOL_FACTORY( PhysValCluster )
+DECLARE_COMPONENT( PhysValPFO )
+DECLARE_COMPONENT( PhysValCluster )
diff --git a/Reconstruction/PanTau/PanTauAlgs/src/components/PanTauAlgs_entries.cxx b/Reconstruction/PanTau/PanTauAlgs/src/components/PanTauAlgs_entries.cxx
index 3385ba0b64a080a4ae0d23fbdb8a6f69f15cd6e1..79861ca17b778e5320efb57f8a5658e8af66f3ff 100644
--- a/Reconstruction/PanTau/PanTauAlgs/src/components/PanTauAlgs_entries.cxx
+++ b/Reconstruction/PanTau/PanTauAlgs/src/components/PanTauAlgs_entries.cxx
@@ -9,15 +9,15 @@
#include "PanTauAlgs/PanTauProcessor.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( PanTau, Tool_InformationStore )
-DECLARE_NAMESPACE_TOOL_FACTORY( PanTau, Tool_InputConverter )
-DECLARE_NAMESPACE_TOOL_FACTORY( PanTau, Tool_TauConstituentGetter )
-DECLARE_NAMESPACE_TOOL_FACTORY( PanTau, Tool_TauConstituentSelector )
-DECLARE_NAMESPACE_TOOL_FACTORY( PanTau, Tool_FeatureExtractor )
-DECLARE_NAMESPACE_TOOL_FACTORY( PanTau, Tool_ModeDiscriminator )
-DECLARE_NAMESPACE_TOOL_FACTORY( PanTau, Tool_DecayModeDeterminator )
-DECLARE_NAMESPACE_TOOL_FACTORY( PanTau, Tool_DetailsArranger )
+DECLARE_COMPONENT( PanTau::Tool_InformationStore )
+DECLARE_COMPONENT( PanTau::Tool_InputConverter )
+DECLARE_COMPONENT( PanTau::Tool_TauConstituentGetter )
+DECLARE_COMPONENT( PanTau::Tool_TauConstituentSelector )
+DECLARE_COMPONENT( PanTau::Tool_FeatureExtractor )
+DECLARE_COMPONENT( PanTau::Tool_ModeDiscriminator )
+DECLARE_COMPONENT( PanTau::Tool_DecayModeDeterminator )
+DECLARE_COMPONENT( PanTau::Tool_DetailsArranger )
-DECLARE_NAMESPACE_TOOL_FACTORY( PanTau, PanTauProcessor )
-//DECLARE_NAMESPACE_ALGORITHM_FACTORY( PanTau, PanTauProcessor )
+DECLARE_COMPONENT( PanTau::PanTauProcessor )
+//DECLARE_COMPONENT( PanTau::PanTauProcessor )
diff --git a/Reconstruction/RecAlgs/src/components/RecAlgs_entries.cxx b/Reconstruction/RecAlgs/src/components/RecAlgs_entries.cxx
index 5dedf77301ba8b40e7e8df60a66560e8832ada5a..2115958331855865c56bba5c9fb670c3ef62debc 100644
--- a/Reconstruction/RecAlgs/src/components/RecAlgs_entries.cxx
+++ b/Reconstruction/RecAlgs/src/components/RecAlgs_entries.cxx
@@ -3,8 +3,8 @@
#include "../JobInfo.h"
#include "../EventInfoUnlocker.h"
-DECLARE_ALGORITHM_FACTORY( TimingAlg )
-DECLARE_ALGORITHM_FACTORY( MemoryAlg )
-DECLARE_ALGORITHM_FACTORY( JobInfo )
-DECLARE_ALGORITHM_FACTORY( EventInfoUnlocker )
+DECLARE_COMPONENT( TimingAlg )
+DECLARE_COMPONENT( MemoryAlg )
+DECLARE_COMPONENT( JobInfo )
+DECLARE_COMPONENT( EventInfoUnlocker )
diff --git a/Reconstruction/RecBackground/RecBackgroundAlgs/src/components/RecBackgroundAlgs_entries.cxx b/Reconstruction/RecBackground/RecBackgroundAlgs/src/components/RecBackgroundAlgs_entries.cxx
index 999a7e45fc46ba273b52047644a6ef49b3c0860a..08b78892dbf55903b36f58d34d804958e839cf3a 100644
--- a/Reconstruction/RecBackground/RecBackgroundAlgs/src/components/RecBackgroundAlgs_entries.cxx
+++ b/Reconstruction/RecBackground/RecBackgroundAlgs/src/components/RecBackgroundAlgs_entries.cxx
@@ -2,7 +2,7 @@
#include "RecBackgroundAlgs/BackgroundWordTest.h"
#include "RecBackgroundAlgs/BeamBackgroundFiller.h"
-DECLARE_ALGORITHM_FACTORY( BackgroundWordFiller )
-DECLARE_ALGORITHM_FACTORY( BackgroundWordTest )
-DECLARE_ALGORITHM_FACTORY( BeamBackgroundFiller )
+DECLARE_COMPONENT( BackgroundWordFiller )
+DECLARE_COMPONENT( BackgroundWordTest )
+DECLARE_COMPONENT( BeamBackgroundFiller )
diff --git a/Reconstruction/RecExample/RecExAlgs/src/components/RecExAlgs_entries.cxx b/Reconstruction/RecExample/RecExAlgs/src/components/RecExAlgs_entries.cxx
index 9498dbc0f855ea93648a414d9b8233176d8d3168..b6a9beb481c90b5dfd19711f97fbd2ed79d2ccb7 100644
--- a/Reconstruction/RecExample/RecExAlgs/src/components/RecExAlgs_entries.cxx
+++ b/Reconstruction/RecExample/RecExAlgs/src/components/RecExAlgs_entries.cxx
@@ -2,6 +2,6 @@
#include "RecExAlgs/SimpleCookedObjMaker.h"
-DECLARE_ALGORITHM_FACTORY( SimpleRawObjMaker )
-DECLARE_ALGORITHM_FACTORY( SimpleCookedObjMaker )
+DECLARE_COMPONENT( SimpleRawObjMaker )
+DECLARE_COMPONENT( SimpleCookedObjMaker )
diff --git a/Reconstruction/RecJiveXML/src/components/RecJiveXML_entries.cxx b/Reconstruction/RecJiveXML/src/components/RecJiveXML_entries.cxx
index 534079e31b23788d1d973105ae1b511fe479d51f..606a7b758faf68dc84364b2513bfcbf0cafae193 100644
--- a/Reconstruction/RecJiveXML/src/components/RecJiveXML_entries.cxx
+++ b/Reconstruction/RecJiveXML/src/components/RecJiveXML_entries.cxx
@@ -3,6 +3,6 @@
using namespace JiveXML;
-DECLARE_TOOL_FACTORY(JetRecJetRetriever)
-DECLARE_TOOL_FACTORY(MissingETRetriever)
+DECLARE_COMPONENT( JetRecJetRetriever )
+DECLARE_COMPONENT( MissingETRetriever )
diff --git a/Reconstruction/RecoAlgs/CaloRingerAlgs/src/components/CaloRingerAlgs_entries.cxx b/Reconstruction/RecoAlgs/CaloRingerAlgs/src/components/CaloRingerAlgs_entries.cxx
index 4880b0b4e390fe428298be5e8013662ac7512271..fac95529c4bf34b6d8946e9200b0499b2955e611 100644
--- a/Reconstruction/RecoAlgs/CaloRingerAlgs/src/components/CaloRingerAlgs_entries.cxx
+++ b/Reconstruction/RecoAlgs/CaloRingerAlgs/src/components/CaloRingerAlgs_entries.cxx
@@ -3,6 +3,6 @@
using namespace Ringer;
-DECLARE_ALGORITHM_FACTORY( CaloRingerAlgorithm )
-DECLARE_ALGORITHM_FACTORY( xAODRingSetConfWriter )
+DECLARE_COMPONENT( CaloRingerAlgorithm )
+DECLARE_COMPONENT( xAODRingSetConfWriter )
diff --git a/Reconstruction/RecoAlgs/IsolationAlgs/src/components/IsolationAlgs_entries.cxx b/Reconstruction/RecoAlgs/IsolationAlgs/src/components/IsolationAlgs_entries.cxx
index aa1ad9f408d4b8ed0fb7f5f851980294d73c60e6..14c18206175f9acc948097a92ef83dd5a42cd253 100644
--- a/Reconstruction/RecoAlgs/IsolationAlgs/src/components/IsolationAlgs_entries.cxx
+++ b/Reconstruction/RecoAlgs/IsolationAlgs/src/components/IsolationAlgs_entries.cxx
@@ -1,4 +1,4 @@
#include "../IsolationBuilder.h"
-DECLARE_ALGORITHM_FACTORY( IsolationBuilder )
+DECLARE_COMPONENT( IsolationBuilder )
diff --git a/Reconstruction/RecoAlgs/TrackParticleAssociationAlgs/src/components/TrackParticleAssociationAlgs_entries.cxx b/Reconstruction/RecoAlgs/TrackParticleAssociationAlgs/src/components/TrackParticleAssociationAlgs_entries.cxx
index 2208c907e7fec4e152ceee55e2be2aa7d88a33be..2f22bca3b00030362be96d688064a803420300b7 100644
--- a/Reconstruction/RecoAlgs/TrackParticleAssociationAlgs/src/components/TrackParticleAssociationAlgs_entries.cxx
+++ b/Reconstruction/RecoAlgs/TrackParticleAssociationAlgs/src/components/TrackParticleAssociationAlgs_entries.cxx
@@ -1,6 +1,6 @@
#include "../TrackParticleCellAssociationAlg.h"
#include "../TrackParticleClusterAssociationAlg.h"
-DECLARE_ALGORITHM_FACTORY( TrackParticleCellAssociationAlg )
-DECLARE_ALGORITHM_FACTORY( TrackParticleClusterAssociationAlg )
+DECLARE_COMPONENT( TrackParticleCellAssociationAlg )
+DECLARE_COMPONENT( TrackParticleClusterAssociationAlg )
diff --git a/Reconstruction/RecoTools/CaloClusterMatching/src/components/CaloClusterMatching_entries.cxx b/Reconstruction/RecoTools/CaloClusterMatching/src/components/CaloClusterMatching_entries.cxx
index 1754f6ee613f693989c8b0051858b71e1b1cb5f8..37d964fa2a268f45a16ecc262c19dd78958ea7b1 100644
--- a/Reconstruction/RecoTools/CaloClusterMatching/src/components/CaloClusterMatching_entries.cxx
+++ b/Reconstruction/RecoTools/CaloClusterMatching/src/components/CaloClusterMatching_entries.cxx
@@ -3,7 +3,7 @@
using namespace ClusterMatching;
-DECLARE_TOOL_FACTORY(CaloClusterMatchingTool)
+DECLARE_COMPONENT( CaloClusterMatchingTool )
-DECLARE_ALGORITHM_FACTORY(CaloClusterMatchLinkAlg)
+DECLARE_COMPONENT( CaloClusterMatchLinkAlg )
diff --git a/Reconstruction/RecoTools/CaloRingerTools/src/components/CaloRingerTool_entries.cxx b/Reconstruction/RecoTools/CaloRingerTools/src/components/CaloRingerTool_entries.cxx
index bce0199d6dec55cc49c3df86ba32ae09d5c8e39a..5fac308554b9a15fffdd17513073a57481122c4e 100644
--- a/Reconstruction/RecoTools/CaloRingerTools/src/components/CaloRingerTool_entries.cxx
+++ b/Reconstruction/RecoTools/CaloRingerTools/src/components/CaloRingerTool_entries.cxx
@@ -6,9 +6,9 @@
using namespace Ringer;
-DECLARE_TOOL_FACTORY( CaloRingsBuilder )
-DECLARE_TOOL_FACTORY( CaloAsymRingsBuilder )
-DECLARE_TOOL_FACTORY( CaloRingerInputReader )
-DECLARE_TOOL_FACTORY( CaloRingerElectronsReader )
-DECLARE_TOOL_FACTORY( CaloRingerPhotonsReader )
+DECLARE_COMPONENT( CaloRingsBuilder )
+DECLARE_COMPONENT( CaloAsymRingsBuilder )
+DECLARE_COMPONENT( CaloRingerInputReader )
+DECLARE_COMPONENT( CaloRingerElectronsReader )
+DECLARE_COMPONENT( CaloRingerPhotonsReader )
diff --git a/Reconstruction/RecoTools/IsolationTool/src/components/IsolationTool_entries.cxx b/Reconstruction/RecoTools/IsolationTool/src/components/IsolationTool_entries.cxx
index 60b73387a7e0b9980abce2741457ac451256e104..532b87aaf221d717b4988995c0ac90d4d5cc0904 100644
--- a/Reconstruction/RecoTools/IsolationTool/src/components/IsolationTool_entries.cxx
+++ b/Reconstruction/RecoTools/IsolationTool/src/components/IsolationTool_entries.cxx
@@ -3,9 +3,9 @@
#include "IsolationTool/IsolationHelper.h"
#include "../IsolationTool_AthTest.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( xAOD, TrackIsolationTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( xAOD, CaloIsolationTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( CP, IsolationHelper )
+DECLARE_COMPONENT( xAOD::TrackIsolationTool )
+DECLARE_COMPONENT( xAOD::CaloIsolationTool )
+DECLARE_COMPONENT( CP::IsolationHelper )
-DECLARE_ALGORITHM_FACTORY( IsolationTool_AthTest )
+DECLARE_COMPONENT( IsolationTool_AthTest )
diff --git a/Reconstruction/RecoTools/ParticlesInConeTools/src/components/ParticlesInConeTools_entries.cxx b/Reconstruction/RecoTools/ParticlesInConeTools/src/components/ParticlesInConeTools_entries.cxx
index 4662477bb3f135347e2eb8905fd23d9e1f9232e2..6883afda90d5a09e71b44e2e098aff8387022682 100644
--- a/Reconstruction/RecoTools/ParticlesInConeTools/src/components/ParticlesInConeTools_entries.cxx
+++ b/Reconstruction/RecoTools/ParticlesInConeTools/src/components/ParticlesInConeTools_entries.cxx
@@ -5,8 +5,8 @@
using namespace xAOD;
-DECLARE_TOOL_FACTORY( TrackParticlesInConeTool )
-DECLARE_TOOL_FACTORY( TruthParticlesInConeTool )
-DECLARE_TOOL_FACTORY( CaloClustersInConeTool )
-DECLARE_TOOL_FACTORY( PFlowObjectsInConeTool )
+DECLARE_COMPONENT( TrackParticlesInConeTool )
+DECLARE_COMPONENT( TruthParticlesInConeTool )
+DECLARE_COMPONENT( CaloClustersInConeTool )
+DECLARE_COMPONENT( PFlowObjectsInConeTool )
diff --git a/Reconstruction/RecoTools/TrackToCalo/src/components/TrackToCalo_entries.cxx b/Reconstruction/RecoTools/TrackToCalo/src/components/TrackToCalo_entries.cxx
index 918c528c68bc9cb290285495e221448442155e3b..3a8d20540af299272acb63641ea11cb49695feee 100644
--- a/Reconstruction/RecoTools/TrackToCalo/src/components/TrackToCalo_entries.cxx
+++ b/Reconstruction/RecoTools/TrackToCalo/src/components/TrackToCalo_entries.cxx
@@ -6,9 +6,9 @@
using namespace Trk;
using namespace Rec;
-DECLARE_TOOL_FACTORY( ParticleCaloExtensionTool )
-DECLARE_TOOL_FACTORY( ParticleCaloCellAssociationTool )
-DECLARE_TOOL_FACTORY( ParticleCaloClusterAssociationTool )
-DECLARE_TOOL_FACTORY( MuonCaloEnergyTool )
-DECLARE_ALGORITHM_FACTORY( TrackParticleCaloExtensionAlg )
+DECLARE_COMPONENT( ParticleCaloExtensionTool )
+DECLARE_COMPONENT( ParticleCaloCellAssociationTool )
+DECLARE_COMPONENT( ParticleCaloClusterAssociationTool )
+DECLARE_COMPONENT( MuonCaloEnergyTool )
+DECLARE_COMPONENT( TrackParticleCaloExtensionAlg )
diff --git a/Reconstruction/RecoTools/TrackToVertex/src/components/TrackToVertex_entries.cxx b/Reconstruction/RecoTools/TrackToVertex/src/components/TrackToVertex_entries.cxx
index 6da30f6afdf9b4eafe632f22e656d1b1b21b8912..3ccfa2fd0c2971af3bb663168daaa778bec34efe 100644
--- a/Reconstruction/RecoTools/TrackToVertex/src/components/TrackToVertex_entries.cxx
+++ b/Reconstruction/RecoTools/TrackToVertex/src/components/TrackToVertex_entries.cxx
@@ -3,6 +3,6 @@
using namespace Reco;
-DECLARE_TOOL_FACTORY( TrackToVertex )
-DECLARE_TOOL_FACTORY( TrackToVertexAssociator )
+DECLARE_COMPONENT( TrackToVertex )
+DECLARE_COMPONENT( TrackToVertexAssociator )
diff --git a/Reconstruction/TRT_Rec/src/components/TRT_Rec_entries.cxx b/Reconstruction/TRT_Rec/src/components/TRT_Rec_entries.cxx
index 90d1cb106aa8b76ac60bfcfc92d756b8cb3bcb96..fd438896742a527b9761064a6117a3f6bfc0541c 100644
--- a/Reconstruction/TRT_Rec/src/components/TRT_Rec_entries.cxx
+++ b/Reconstruction/TRT_Rec/src/components/TRT_Rec_entries.cxx
@@ -3,8 +3,8 @@
#include "TRT_Rec/TRT_Predictor.h"
#include "TRT_Rec/TRT_Recon.h"
-DECLARE_TOOL_FACTORY( TRT_DataSelector )
-DECLARE_TOOL_FACTORY( TRT_Histogrammer )
-DECLARE_TOOL_FACTORY( TRT_Predictor )
-DECLARE_TOOL_FACTORY( TRT_Recon )
+DECLARE_COMPONENT( TRT_DataSelector )
+DECLARE_COMPONENT( TRT_Histogrammer )
+DECLARE_COMPONENT( TRT_Predictor )
+DECLARE_COMPONENT( TRT_Recon )
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/components/TrackCaloClusterRecAlgs_entries.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/components/TrackCaloClusterRecAlgs_entries.cxx
index 71e72f4970f2311a257de8ee809bcc8613c74cea..e73f0a474803f8963c5266b0729e2c839e9d4a81 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/components/TrackCaloClusterRecAlgs_entries.cxx
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/components/TrackCaloClusterRecAlgs_entries.cxx
@@ -1,6 +1,6 @@
#include "TrackCaloClusterRecAlgs/TrackCaloClusterRecAlg.h"
-DECLARE_ALGORITHM_FACTORY(TrackCaloClusterRecAlg)
+DECLARE_COMPONENT( TrackCaloClusterRecAlg )
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/components/ParticleToCaloExtrapolationTool_entries.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/components/ParticleToCaloExtrapolationTool_entries.cxx
index d1381461f254d0923835bf9ae4af58f6e351e8fb..c5a37e62da612d1fa7f6ac1063ba9d073f75923e 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/components/ParticleToCaloExtrapolationTool_entries.cxx
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/components/ParticleToCaloExtrapolationTool_entries.cxx
@@ -3,8 +3,8 @@
#include "TrackCaloClusterRecTools/TrackCaloClusterCreatorTool.h"
#include "TrackCaloClusterRecTools/ClusterFilterTool.h"
-DECLARE_TOOL_FACTORY(ParticleToCaloExtrapolationTool)
-DECLARE_TOOL_FACTORY(TrackCaloClusterWeightsTool)
-DECLARE_TOOL_FACTORY(TrackCaloClusterCreatorTool)
-DECLARE_TOOL_FACTORY(ClusterFilterTool)
+DECLARE_COMPONENT( ParticleToCaloExtrapolationTool )
+DECLARE_COMPONENT( TrackCaloClusterWeightsTool )
+DECLARE_COMPONENT( TrackCaloClusterCreatorTool )
+DECLARE_COMPONENT( ClusterFilterTool )
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/components/TrackCaloClusterRecValidation_entries.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/components/TrackCaloClusterRecValidation_entries.cxx
index fac62f203e1fe79a10ecee007b031f330b112f5b..b4fa76c4ece9880433184ad959164f47badc4fdd 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/components/TrackCaloClusterRecValidation_entries.cxx
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/components/TrackCaloClusterRecValidation_entries.cxx
@@ -1,6 +1,6 @@
#include "TrackCaloClusterRecValidation/TrackCaloClusterRecValidationTool.h"
#include "TrackCaloClusterRecValidation/CalibrationNtupleMakerTool.h"
-DECLARE_TOOL_FACTORY(TrackCaloClusterRecValidationTool)
-DECLARE_ALGORITHM_FACTORY(CalibrationNtupleMakerTool)
+DECLARE_COMPONENT( TrackCaloClusterRecValidationTool )
+DECLARE_COMPONENT( CalibrationNtupleMakerTool )
diff --git a/Reconstruction/VKalVrt/VrtSecInclusive/src/components/VrtSecInclusive_entries.cxx b/Reconstruction/VKalVrt/VrtSecInclusive/src/components/VrtSecInclusive_entries.cxx
index 10fa82576cd72d5b896560ed3fe08c19c108db18..7084ea842e59f47d690ff02acd4539a8aaf85aca 100644
--- a/Reconstruction/VKalVrt/VrtSecInclusive/src/components/VrtSecInclusive_entries.cxx
+++ b/Reconstruction/VKalVrt/VrtSecInclusive/src/components/VrtSecInclusive_entries.cxx
@@ -1,3 +1,3 @@
#include "VrtSecInclusive/VrtSecInclusive.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( VKalVrtAthena, VrtSecInclusive )
+DECLARE_COMPONENT( VKalVrtAthena::VrtSecInclusive )
diff --git a/Reconstruction/eflowRec/src/components/eflowRec_entries.cxx b/Reconstruction/eflowRec/src/components/eflowRec_entries.cxx
index 32ff4bc636410c25e694a860fd4179775446b5e3..da95b775780d6c36e329520a3e424d4edaac3c02 100644
--- a/Reconstruction/eflowRec/src/components/eflowRec_entries.cxx
+++ b/Reconstruction/eflowRec/src/components/eflowRec_entries.cxx
@@ -27,32 +27,32 @@
#include "eflowRec/PFOChargedCreatorAlgorithm.h"
#include "eflowRec/PFONeutralCreatorAlgorithm.h"
-DECLARE_ALGORITHM_FACTORY( eflowBuilder )
-DECLARE_ALGORITHM_FACTORY( eflowPreparation )
-DECLARE_ALGORITHM_FACTORY( eflowCaloObjectBuilder )
-DECLARE_ALGORITHM_FACTORY( eflowObjectBuilder )
-DECLARE_ALGORITHM_FACTORY( eflowOverlapRemoval )
-DECLARE_ALGORITHM_FACTORY( eflowVertexInformationSetter )
-DECLARE_ALGORITHM_FACTORY( PFLeptonSelector )
-DECLARE_ALGORITHM_FACTORY( PFClusterSelector )
-DECLARE_ALGORITHM_FACTORY( PFTrackSelector )
-DECLARE_ALGORITHM_FACTORY( PFAlgorithm )
-DECLARE_ALGORITHM_FACTORY( PFOChargedCreatorAlgorithm )
-DECLARE_ALGORITHM_FACTORY( PFONeutralCreatorAlgorithm )
-DECLARE_TOOL_FACTORY( PFCellLevelSubtractionTool )
-DECLARE_TOOL_FACTORY( PFRecoverSplitShowersTool )
-DECLARE_TOOL_FACTORY( PFMomentCalculatorTool )
-DECLARE_TOOL_FACTORY( PFClusterCollectionTool )
-DECLARE_TOOL_FACTORY( PFLCCalibTool )
-DECLARE_TOOL_FACTORY( eflowRecoverSplitShowersTool )
-DECLARE_TOOL_FACTORY( eflowCellLevelSubtractionTool )
-DECLARE_TOOL_FACTORY( eflowLCCalibTool )
-DECLARE_TOOL_FACTORY( eflowMomentCalculatorTool )
-DECLARE_TOOL_FACTORY( eflowClusterCollectionTool )
-DECLARE_TOOL_FACTORY( eflowTrackCaloExtensionTool )
-DECLARE_TOOL_FACTORY( eflowTrackCaloDummyExtensionTool )
-DECLARE_TOOL_FACTORY( PFTrackClusterMatchingTool )
-DECLARE_TOOL_FACTORY( eflowCellEOverPTool_mc12_JetETMiss)
-DECLARE_TOOL_FACTORY( eflowCellEOverPTool_mc12_LC)
-DECLARE_TOOL_FACTORY( eflowObjectCreatorTool )
+DECLARE_COMPONENT( eflowBuilder )
+DECLARE_COMPONENT( eflowPreparation )
+DECLARE_COMPONENT( eflowCaloObjectBuilder )
+DECLARE_COMPONENT( eflowObjectBuilder )
+DECLARE_COMPONENT( eflowOverlapRemoval )
+DECLARE_COMPONENT( eflowVertexInformationSetter )
+DECLARE_COMPONENT( PFLeptonSelector )
+DECLARE_COMPONENT( PFClusterSelector )
+DECLARE_COMPONENT( PFTrackSelector )
+DECLARE_COMPONENT( PFAlgorithm )
+DECLARE_COMPONENT( PFOChargedCreatorAlgorithm )
+DECLARE_COMPONENT( PFONeutralCreatorAlgorithm )
+DECLARE_COMPONENT( PFCellLevelSubtractionTool )
+DECLARE_COMPONENT( PFRecoverSplitShowersTool )
+DECLARE_COMPONENT( PFMomentCalculatorTool )
+DECLARE_COMPONENT( PFClusterCollectionTool )
+DECLARE_COMPONENT( PFLCCalibTool )
+DECLARE_COMPONENT( eflowRecoverSplitShowersTool )
+DECLARE_COMPONENT( eflowCellLevelSubtractionTool )
+DECLARE_COMPONENT( eflowLCCalibTool )
+DECLARE_COMPONENT( eflowMomentCalculatorTool )
+DECLARE_COMPONENT( eflowClusterCollectionTool )
+DECLARE_COMPONENT( eflowTrackCaloExtensionTool )
+DECLARE_COMPONENT( eflowTrackCaloDummyExtensionTool )
+DECLARE_COMPONENT( PFTrackClusterMatchingTool )
+DECLARE_COMPONENT( eflowCellEOverPTool_mc12_JetETMiss )
+DECLARE_COMPONENT( eflowCellEOverPTool_mc12_LC )
+DECLARE_COMPONENT( eflowObjectCreatorTool )
diff --git a/Reconstruction/egamma/EgammaPhysValMonitoring/src/components/EgammaPhysValMonitoring_entries.cxx b/Reconstruction/egamma/EgammaPhysValMonitoring/src/components/EgammaPhysValMonitoring_entries.cxx
index f328f4af5ed2f6b665c6520cedb6eea17bf26d10..5ee832ead4151c851397f89bbf5d39699efa6a3b 100644
--- a/Reconstruction/egamma/EgammaPhysValMonitoring/src/components/EgammaPhysValMonitoring_entries.cxx
+++ b/Reconstruction/egamma/EgammaPhysValMonitoring/src/components/EgammaPhysValMonitoring_entries.cxx
@@ -1,4 +1,4 @@
#include "../EgammaPhysValMonitoringTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( EgammaPhysValMonitoring, EgammaPhysValMonitoringTool )
+DECLARE_COMPONENT( EgammaPhysValMonitoring::EgammaPhysValMonitoringTool )
diff --git a/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_entries.cxx b/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_entries.cxx
index 4384d06c67576e2f2411566e7a64ec7b880f5fe3..c0b891b4fbcfd27b8380dd37891e8139ab2f1bec 100644
--- a/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_entries.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_entries.cxx
@@ -11,15 +11,15 @@
#include "../photonSuperClusterBuilder.h"
-DECLARE_ALGORITHM_FACTORY( egammaBuilder )
-DECLARE_ALGORITHM_FACTORY( egammaRecBuilder )
-DECLARE_ALGORITHM_FACTORY( topoEgammaBuilder )
-DECLARE_ALGORITHM_FACTORY( egammaForwardBuilder )
-DECLARE_ALGORITHM_FACTORY( egammaTruthAssociationAlg)
-DECLARE_ALGORITHM_FACTORY( egammaTrackSlimmer )
-DECLARE_ALGORITHM_FACTORY( EMBremCollectionBuilder )
-DECLARE_ALGORITHM_FACTORY( EMVertexBuilder )
-DECLARE_ALGORITHM_FACTORY( egammaTopoClusterCopier )
-DECLARE_ALGORITHM_FACTORY( electronSuperClusterBuilder )
-DECLARE_ALGORITHM_FACTORY( photonSuperClusterBuilder )
+DECLARE_COMPONENT( egammaBuilder )
+DECLARE_COMPONENT( egammaRecBuilder )
+DECLARE_COMPONENT( topoEgammaBuilder )
+DECLARE_COMPONENT( egammaForwardBuilder )
+DECLARE_COMPONENT( egammaTruthAssociationAlg )
+DECLARE_COMPONENT( egammaTrackSlimmer )
+DECLARE_COMPONENT( EMBremCollectionBuilder )
+DECLARE_COMPONENT( EMVertexBuilder )
+DECLARE_COMPONENT( egammaTopoClusterCopier )
+DECLARE_COMPONENT( electronSuperClusterBuilder )
+DECLARE_COMPONENT( photonSuperClusterBuilder )
diff --git a/Reconstruction/egamma/egammaCaloTools/src/components/egammaCaloTools_entries.cxx b/Reconstruction/egamma/egammaCaloTools/src/components/egammaCaloTools_entries.cxx
index 7b43e6f7d33b9fcb868a7d45fb40a6047ff7e0b7..8d8e2fc16ebcdc2a2592ac71e05e853140aaebe3 100644
--- a/Reconstruction/egamma/egammaCaloTools/src/components/egammaCaloTools_entries.cxx
+++ b/Reconstruction/egamma/egammaCaloTools/src/components/egammaCaloTools_entries.cxx
@@ -9,13 +9,13 @@
#include "../egammaqweta2c.h"
-DECLARE_TOOL_FACTORY ( egammaShowerShape )
-DECLARE_TOOL_FACTORY ( egammaEnergyPositionAllSamples )
-DECLARE_TOOL_FACTORY ( egammaPreSamplerShape )
-DECLARE_TOOL_FACTORY ( egammaStripsShape )
-DECLARE_TOOL_FACTORY ( egammaMiddleShape )
-DECLARE_TOOL_FACTORY ( egammaBackShape )
-DECLARE_TOOL_FACTORY ( egammaIso )
-DECLARE_TOOL_FACTORY ( egammaqweta1c )
-DECLARE_TOOL_FACTORY ( egammaqweta2c )
+DECLARE_COMPONENT( egammaShowerShape )
+DECLARE_COMPONENT( egammaEnergyPositionAllSamples )
+DECLARE_COMPONENT( egammaPreSamplerShape )
+DECLARE_COMPONENT( egammaStripsShape )
+DECLARE_COMPONENT( egammaMiddleShape )
+DECLARE_COMPONENT( egammaBackShape )
+DECLARE_COMPONENT( egammaIso )
+DECLARE_COMPONENT( egammaqweta1c )
+DECLARE_COMPONENT( egammaqweta2c )
diff --git a/Reconstruction/egamma/egammaMVACalib/src/components/egammaMVACalib_entries.cxx b/Reconstruction/egamma/egammaMVACalib/src/components/egammaMVACalib_entries.cxx
index b39dd0c377454cd860fdb56c651fecf9238ae057..37a5a6fa8cfb9003076cfb1214326957e96896d1 100644
--- a/Reconstruction/egamma/egammaMVACalib/src/components/egammaMVACalib_entries.cxx
+++ b/Reconstruction/egamma/egammaMVACalib/src/components/egammaMVACalib_entries.cxx
@@ -1,4 +1,4 @@
#include "egammaMVACalib/egammaMVATool.h"
-DECLARE_TOOL_FACTORY( egammaMVATool )
+DECLARE_COMPONENT( egammaMVATool )
diff --git a/Reconstruction/egamma/egammaPerformance/src/components/egammaPerformance_entries.cxx b/Reconstruction/egamma/egammaPerformance/src/components/egammaPerformance_entries.cxx
index e415f56e722658800f125b8b4a8cfbfa3dde8ab5..0b42e1e51369cd7c623626f2cdce38d88bc438a7 100644
--- a/Reconstruction/egamma/egammaPerformance/src/components/egammaPerformance_entries.cxx
+++ b/Reconstruction/egamma/egammaPerformance/src/components/egammaPerformance_entries.cxx
@@ -3,8 +3,8 @@
#include "egammaPerformance/forwardElectronMonTool.h"
#include "egammaPerformance/ZeeTaPMonTool.h"
-DECLARE_TOOL_FACTORY ( photonMonTool )
-DECLARE_TOOL_FACTORY ( electronMonTool )
-DECLARE_TOOL_FACTORY ( forwardElectronMonTool )
-DECLARE_TOOL_FACTORY ( ZeeTaPMonTool )
+DECLARE_COMPONENT( photonMonTool )
+DECLARE_COMPONENT( electronMonTool )
+DECLARE_COMPONENT( forwardElectronMonTool )
+DECLARE_COMPONENT( ZeeTaPMonTool )
diff --git a/Reconstruction/egamma/egammaTools/src/components/egammaTools_entries.cxx b/Reconstruction/egamma/egammaTools/src/components/egammaTools_entries.cxx
index 9e7e0e5d921b17a583e57ff255f350bbc64b51c5..63c91456775f5581bf57e97de1cc1a74808b8eb3 100644
--- a/Reconstruction/egamma/egammaTools/src/components/egammaTools_entries.cxx
+++ b/Reconstruction/egamma/egammaTools/src/components/egammaTools_entries.cxx
@@ -9,14 +9,14 @@
#include "../EMPIDBuilder.h"
#include "../egammaSwTool.h"
-DECLARE_TOOL_FACTORY ( EMClusterTool )
-DECLARE_TOOL_FACTORY ( EMConversionBuilder )
-DECLARE_TOOL_FACTORY ( EMFourMomBuilder )
-DECLARE_TOOL_FACTORY ( EMShowerBuilder )
-DECLARE_TOOL_FACTORY ( EMTrackMatchBuilder )
-DECLARE_TOOL_FACTORY ( FourMomCombiner )
-DECLARE_TOOL_FACTORY ( egammaCheckEnergyDepositTool )
-DECLARE_TOOL_FACTORY ( egammaOQFlagsBuilder )
-DECLARE_TOOL_FACTORY ( EMPIDBuilder )
-DECLARE_TOOL_FACTORY ( egammaSwTool )
+DECLARE_COMPONENT( EMClusterTool )
+DECLARE_COMPONENT( EMConversionBuilder )
+DECLARE_COMPONENT( EMFourMomBuilder )
+DECLARE_COMPONENT( EMShowerBuilder )
+DECLARE_COMPONENT( EMTrackMatchBuilder )
+DECLARE_COMPONENT( FourMomCombiner )
+DECLARE_COMPONENT( egammaCheckEnergyDepositTool )
+DECLARE_COMPONENT( egammaOQFlagsBuilder )
+DECLARE_COMPONENT( EMPIDBuilder )
+DECLARE_COMPONENT( egammaSwTool )
diff --git a/Reconstruction/egamma/egammaTrackTools/src/components/egammaTrackTools_entries.cxx b/Reconstruction/egamma/egammaTrackTools/src/components/egammaTrackTools_entries.cxx
index 554822c15277e3c062b1ad9578849eaffc842f98..1a6cf7bbb327b52f36732adeb231a95ce3c7cff4 100644
--- a/Reconstruction/egamma/egammaTrackTools/src/components/egammaTrackTools_entries.cxx
+++ b/Reconstruction/egamma/egammaTrackTools/src/components/egammaTrackTools_entries.cxx
@@ -3,7 +3,7 @@
#include "../CaloCluster_OnTrackBuilder.h"
-DECLARE_TOOL_FACTORY ( egammaTrkRefitterTool )
-DECLARE_TOOL_FACTORY ( EMExtrapolationTools )
-DECLARE_TOOL_FACTORY (CaloCluster_OnTrackBuilder)
+DECLARE_COMPONENT( egammaTrkRefitterTool )
+DECLARE_COMPONENT( EMExtrapolationTools )
+DECLARE_COMPONENT( CaloCluster_OnTrackBuilder )
diff --git a/Reconstruction/iPat/iPatGeometryTools/src/components/iPatGeometryTools_entries.cxx b/Reconstruction/iPat/iPatGeometryTools/src/components/iPatGeometryTools_entries.cxx
index 3105ff3f35226e4db765c05805f715bd7bc54db9..adebf499d0af24c92c0d1e306e4e6b0b8f2754be 100644
--- a/Reconstruction/iPat/iPatGeometryTools/src/components/iPatGeometryTools_entries.cxx
+++ b/Reconstruction/iPat/iPatGeometryTools/src/components/iPatGeometryTools_entries.cxx
@@ -3,8 +3,8 @@
#include "iPatGeometryTools/LayerNumberAllocator.h"
#include "iPatGeometryTools/SiDetectorLocator.h"
-DECLARE_TOOL_FACTORY( DetectorSelection )
-DECLARE_TOOL_FACTORY( LayerAllocator )
-DECLARE_TOOL_FACTORY( LayerNumberAllocator )
-DECLARE_TOOL_FACTORY( SiDetectorLocator )
+DECLARE_COMPONENT( DetectorSelection )
+DECLARE_COMPONENT( LayerAllocator )
+DECLARE_COMPONENT( LayerNumberAllocator )
+DECLARE_COMPONENT( SiDetectorLocator )
diff --git a/Reconstruction/iPat/iPatQuality/src/components/iPatQuality_entries.cxx b/Reconstruction/iPat/iPatQuality/src/components/iPatQuality_entries.cxx
index c07a229231197ca822d3a995f1bc4ea8fadd309b..b2fd1e1d83bafaa5d1d94e3ea1a0b3549bccdb10 100644
--- a/Reconstruction/iPat/iPatQuality/src/components/iPatQuality_entries.cxx
+++ b/Reconstruction/iPat/iPatQuality/src/components/iPatQuality_entries.cxx
@@ -1,4 +1,4 @@
#include "iPatQuality/TrackQuality.h"
-DECLARE_TOOL_FACTORY( TrackQuality )
+DECLARE_COMPONENT( TrackQuality )
diff --git a/Reconstruction/iPat/iPatRecAlgs/src/components/iPatRecAlgs_entries.cxx b/Reconstruction/iPat/iPatRecAlgs/src/components/iPatRecAlgs_entries.cxx
index 06f095c8895bc7a7af2c56ac51922960eda8201d..35688b677b8196f5a85b1b00422a66d9a76d5bd7 100644
--- a/Reconstruction/iPat/iPatRecAlgs/src/components/iPatRecAlgs_entries.cxx
+++ b/Reconstruction/iPat/iPatRecAlgs/src/components/iPatRecAlgs_entries.cxx
@@ -4,9 +4,9 @@
#include "iPatRecAlgs/iPatTrackTruthAssociator.h"
#include "iPatRecAlgs/IntersectorTest.h"
-DECLARE_ALGORITHM_FACTORY( iPatRec )
-DECLARE_ALGORITHM_FACTORY( iPatShortTracks )
-DECLARE_ALGORITHM_FACTORY( iPatStatistics )
-DECLARE_ALGORITHM_FACTORY( iPatTrackTruthAssociator )
-DECLARE_ALGORITHM_FACTORY( IntersectorTest )
+DECLARE_COMPONENT( iPatRec )
+DECLARE_COMPONENT( iPatShortTracks )
+DECLARE_COMPONENT( iPatStatistics )
+DECLARE_COMPONENT( iPatTrackTruthAssociator )
+DECLARE_COMPONENT( IntersectorTest )
diff --git a/Reconstruction/iPat/iPatTrackFinder/src/components/iPatTrackFinder_entries.cxx b/Reconstruction/iPat/iPatTrackFinder/src/components/iPatTrackFinder_entries.cxx
index 2b08339f7551888d789162865a4b3fd3609fdbe4..2cea4f9d611badd11fb7f336e0ba9ff5aa699ca8 100644
--- a/Reconstruction/iPat/iPatTrackFinder/src/components/iPatTrackFinder_entries.cxx
+++ b/Reconstruction/iPat/iPatTrackFinder/src/components/iPatTrackFinder_entries.cxx
@@ -6,11 +6,11 @@
#include "iPatTrackFinder/TrackFinder.h"
#include "iPatTrackFinder/TrackManager.h"
-DECLARE_TOOL_FACTORY( AssignedHits )
-DECLARE_TOOL_FACTORY( CandidateBuilder )
-DECLARE_TOOL_FACTORY( CombinationMaker )
-DECLARE_TOOL_FACTORY( FinderTolerances )
-DECLARE_TOOL_FACTORY( PointManager )
-DECLARE_TOOL_FACTORY( TrackFinder )
-DECLARE_TOOL_FACTORY( TrackManager )
+DECLARE_COMPONENT( AssignedHits )
+DECLARE_COMPONENT( CandidateBuilder )
+DECLARE_COMPONENT( CombinationMaker )
+DECLARE_COMPONENT( FinderTolerances )
+DECLARE_COMPONENT( PointManager )
+DECLARE_COMPONENT( TrackFinder )
+DECLARE_COMPONENT( TrackManager )
diff --git a/Reconstruction/iPat/iPatTrackFitter/src/components/iPatTrackFitter_entries.cxx b/Reconstruction/iPat/iPatTrackFitter/src/components/iPatTrackFitter_entries.cxx
index 19d6373c813165ac3b49778ad043811b1ea7bb06..d0f1848fb44f715cc599ea46d7bfd10098642db9 100644
--- a/Reconstruction/iPat/iPatTrackFitter/src/components/iPatTrackFitter_entries.cxx
+++ b/Reconstruction/iPat/iPatTrackFitter/src/components/iPatTrackFitter_entries.cxx
@@ -1,4 +1,4 @@
#include "iPatTrackFitter/TrackFitter.h"
-DECLARE_TOOL_FACTORY( TrackFitter )
+DECLARE_COMPONENT( TrackFitter )
diff --git a/Reconstruction/iPat/iPatTrackFollower/src/components/iPatTrackFollower_entries.cxx b/Reconstruction/iPat/iPatTrackFollower/src/components/iPatTrackFollower_entries.cxx
index d3c4cecdb5ad323913be24c8388550459175c954..89891aac33ebe664f7680ca3c7710e4015432f6d 100644
--- a/Reconstruction/iPat/iPatTrackFollower/src/components/iPatTrackFollower_entries.cxx
+++ b/Reconstruction/iPat/iPatTrackFollower/src/components/iPatTrackFollower_entries.cxx
@@ -3,8 +3,8 @@
#include "iPatTrackFollower/TrackBuilder.h"
#include "iPatTrackFollower/TrackFollower.h"
-DECLARE_TOOL_FACTORY( SiClusterProperties )
-DECLARE_TOOL_FACTORY( SiliconLayerAssociator )
-DECLARE_TOOL_FACTORY( TrackBuilder )
-DECLARE_TOOL_FACTORY( TrackFollower )
+DECLARE_COMPONENT( SiClusterProperties )
+DECLARE_COMPONENT( SiliconLayerAssociator )
+DECLARE_COMPONENT( TrackBuilder )
+DECLARE_COMPONENT( TrackFollower )
diff --git a/Reconstruction/iPat/iPatTruthTrajectory/src/components/iPatTruthTrajectory_entries.cxx b/Reconstruction/iPat/iPatTruthTrajectory/src/components/iPatTruthTrajectory_entries.cxx
index fe761fae69d5b047965d593c08c8e6867c3ca40f..0dfa54a7292924e17f2f6444507d6aad723b7d5b 100644
--- a/Reconstruction/iPat/iPatTruthTrajectory/src/components/iPatTruthTrajectory_entries.cxx
+++ b/Reconstruction/iPat/iPatTruthTrajectory/src/components/iPatTruthTrajectory_entries.cxx
@@ -1,4 +1,4 @@
#include "iPatTruthTrajectory/TruthParameters.h"
-DECLARE_TOOL_FACTORY( TruthParameters )
+DECLARE_COMPONENT( TruthParameters )
diff --git a/Reconstruction/tauMonitoring/src/components/tauMonitoring_entries.cxx b/Reconstruction/tauMonitoring/src/components/tauMonitoring_entries.cxx
index e0431672d36e7cc45b26b8a751b70bf6228a351a..6d4d47a983dffbe4ed7db3b7fc50bf8b1658512a 100644
--- a/Reconstruction/tauMonitoring/src/components/tauMonitoring_entries.cxx
+++ b/Reconstruction/tauMonitoring/src/components/tauMonitoring_entries.cxx
@@ -1,4 +1,4 @@
#include "tauMonitoring/tauMonTool.h"
-DECLARE_TOOL_FACTORY( tauMonTool )
+DECLARE_COMPONENT( tauMonTool )
diff --git a/Reconstruction/tauRec/src/components/tauRec_entries.cxx b/Reconstruction/tauRec/src/components/tauRec_entries.cxx
index cb95fbfe00e0e9c9e183f9ea7005549377880613..7aa7e52996bfeaa1d37fd1b0af099e08b7fb8532 100644
--- a/Reconstruction/tauRec/src/components/tauRec_entries.cxx
+++ b/Reconstruction/tauRec/src/components/tauRec_entries.cxx
@@ -4,8 +4,8 @@
#include "tauRec/TauTrackSlimmer.h"
-// DECLARE_ALGORITHM_FACTORY( TauBuilder )
-// DECLARE_ALGORITHM_FACTORY( TauProcessor )
-DECLARE_ALGORITHM_FACTORY( TauProcessorAlg )
-DECLARE_ALGORITHM_FACTORY( TauTrackSlimmer )
+// DECLARE_COMPONENT( TauBuilder )
+// DECLARE_COMPONENT( TauProcessor )
+DECLARE_COMPONENT( TauProcessorAlg )
+DECLARE_COMPONENT( TauTrackSlimmer )
diff --git a/Reconstruction/tauRecTools/src/components/tauRecTools_entries.cxx b/Reconstruction/tauRecTools/src/components/tauRecTools_entries.cxx
index 76ba69a8545438bca28443f2e1e56b04ce21e94d..a53f17b5c4beb86e2a30186e6f147ba0602b41fb 100644
--- a/Reconstruction/tauRecTools/src/components/tauRecTools_entries.cxx
+++ b/Reconstruction/tauRecTools/src/components/tauRecTools_entries.cxx
@@ -42,46 +42,46 @@
#ifndef XAOD_ANALYSIS
-DECLARE_TOOL_FACTORY( JetSeedBuilder )
-DECLARE_TOOL_FACTORY( LockTauContainers )
-DECLARE_TOOL_FACTORY( TauAxisSetter )
-DECLARE_TOOL_FACTORY( TauCalibrateEM )
-DECLARE_TOOL_FACTORY( TauCellVariables )
-DECLARE_TOOL_FACTORY( TauTrackFinder )
-DECLARE_TOOL_FACTORY( TauVertexFinder )
-DECLARE_TOOL_FACTORY( TauElectronVetoVariables )
-DECLARE_TOOL_FACTORY( TauShotFinder )
-DECLARE_TOOL_FACTORY( TauPi0ClusterCreator )
-DECLARE_TOOL_FACTORY( TauPi0CreateROI )
-DECLARE_TOOL_FACTORY( PhotonConversionPID )
-DECLARE_TOOL_FACTORY( PhotonConversionVertex )
-DECLARE_TOOL_FACTORY( TauConversionFinder )
-DECLARE_TOOL_FACTORY( TauConversionTagger )
-DECLARE_TOOL_FACTORY( TauVertexVariables )
-//DECLARE_TOOL_FACTORY( tauCalibrateWeightTool )
-DECLARE_TOOL_FACTORY( TauTestDump )
+DECLARE_COMPONENT( JetSeedBuilder )
+DECLARE_COMPONENT( LockTauContainers )
+DECLARE_COMPONENT( TauAxisSetter )
+DECLARE_COMPONENT( TauCalibrateEM )
+DECLARE_COMPONENT( TauCellVariables )
+DECLARE_COMPONENT( TauTrackFinder )
+DECLARE_COMPONENT( TauVertexFinder )
+DECLARE_COMPONENT( TauElectronVetoVariables )
+DECLARE_COMPONENT( TauShotFinder )
+DECLARE_COMPONENT( TauPi0ClusterCreator )
+DECLARE_COMPONENT( TauPi0CreateROI )
+DECLARE_COMPONENT( PhotonConversionPID )
+DECLARE_COMPONENT( PhotonConversionVertex )
+DECLARE_COMPONENT( TauConversionFinder )
+DECLARE_COMPONENT( TauConversionTagger )
+DECLARE_COMPONENT( TauVertexVariables )
+//DECLARE_COMPONENT( tauCalibrateWeightTool )
+DECLARE_COMPONENT( TauTestDump )
#endif
-DECLARE_TOOL_FACTORY( TauCalibrateLC )
-DECLARE_TOOL_FACTORY( TauIDPileupCorrection )
-DECLARE_TOOL_FACTORY( TauProcessorTool )
-DECLARE_TOOL_FACTORY( TauBuilderTool )
-DECLARE_TOOL_FACTORY( MvaTESVariableDecorator )
-DECLARE_TOOL_FACTORY( MvaTESEvaluator )
-DECLARE_NAMESPACE_TOOL_FACTORY( tauRecTools, TauTrackClassifier )
-DECLARE_NAMESPACE_TOOL_FACTORY( tauRecTools, TrackMVABDT )
-DECLARE_TOOL_FACTORY( CombinedP4FromRecoTaus )
-DECLARE_TOOL_FACTORY( TauTrackFilter )
-DECLARE_TOOL_FACTORY( TauGenericPi0Cone )
-DECLARE_TOOL_FACTORY( TauSubstructureVariables )
-DECLARE_TOOL_FACTORY( TauCommonCalcVars )
-DECLARE_TOOL_FACTORY( TauPi0ClusterScaler )
-DECLARE_TOOL_FACTORY( TauPi0ScoreCalculator )
-DECLARE_TOOL_FACTORY( TauPi0Selector )
-DECLARE_TOOL_FACTORY( TauWPDecorator )
-DECLARE_NAMESPACE_TOOL_FACTORY( tauRecTools, DiTauDiscriminantTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( tauRecTools, DiTauIDVarCalculator )
-DECLARE_TOOL_FACTORY( TauJetBDTEvaluator )
-DECLARE_TOOL_FACTORY( TauEleOLRDecorator )
-DECLARE_TOOL_FACTORY( TauIDVarCalculator )
+DECLARE_COMPONENT( TauCalibrateLC )
+DECLARE_COMPONENT( TauIDPileupCorrection )
+DECLARE_COMPONENT( TauProcessorTool )
+DECLARE_COMPONENT( TauBuilderTool )
+DECLARE_COMPONENT( MvaTESVariableDecorator )
+DECLARE_COMPONENT( MvaTESEvaluator )
+DECLARE_COMPONENT( tauRecTools::TauTrackClassifier )
+DECLARE_COMPONENT( tauRecTools::TrackMVABDT )
+DECLARE_COMPONENT( CombinedP4FromRecoTaus )
+DECLARE_COMPONENT( TauTrackFilter )
+DECLARE_COMPONENT( TauGenericPi0Cone )
+DECLARE_COMPONENT( TauSubstructureVariables )
+DECLARE_COMPONENT( TauCommonCalcVars )
+DECLARE_COMPONENT( TauPi0ClusterScaler )
+DECLARE_COMPONENT( TauPi0ScoreCalculator )
+DECLARE_COMPONENT( TauPi0Selector )
+DECLARE_COMPONENT( TauWPDecorator )
+DECLARE_COMPONENT( tauRecTools::DiTauDiscriminantTool )
+DECLARE_COMPONENT( tauRecTools::DiTauIDVarCalculator )
+DECLARE_COMPONENT( TauJetBDTEvaluator )
+DECLARE_COMPONENT( TauEleOLRDecorator )
+DECLARE_COMPONENT( TauIDVarCalculator )