diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/components/AnalysisExamples_entries.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/components/AnalysisExamples_entries.cxx
index 1d477872409ff162b30e6f241bf453d245b16ad0..45622f1f8a07ca861b9a801a91a7d95ae0691418 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/components/AnalysisExamples_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/components/AnalysisExamples_entries.cxx
@@ -11,15 +11,15 @@
#include "../AthExReadD3pdNtuple.h"
-DECLARE_ALGORITHM_FACTORY( MiscellaneousExamples )
-DECLARE_ALGORITHM_FACTORY( WriteTruthParticles )
-DECLARE_ALGORITHM_FACTORY( ReadTruthParticles )
-DECLARE_ALGORITHM_FACTORY( TrackExample )
-DECLARE_ALGORITHM_FACTORY( ZeeOnESD )
-DECLARE_ALGORITHM_FACTORY( VFitZmmOnAOD )
-DECLARE_ALGORITHM_FACTORY( JetTagAna )
-DECLARE_ALGORITHM_FACTORY( PileUpTruthExample )
-DECLARE_ALGORITHM_FACTORY( TrigAnalysisExample )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( AthEx, ReadD3pdNtuple )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( AthEx, ReadD3pdEvtStore )
+DECLARE_COMPONENT( MiscellaneousExamples )
+DECLARE_COMPONENT( WriteTruthParticles )
+DECLARE_COMPONENT( ReadTruthParticles )
+DECLARE_COMPONENT( TrackExample )
+DECLARE_COMPONENT( ZeeOnESD )
+DECLARE_COMPONENT( VFitZmmOnAOD )
+DECLARE_COMPONENT( JetTagAna )
+DECLARE_COMPONENT( PileUpTruthExample )
+DECLARE_COMPONENT( TrigAnalysisExample )
+DECLARE_COMPONENT( AthEx::ReadD3pdNtuple )
+DECLARE_COMPONENT( AthEx::ReadD3pdEvtStore )
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/components/AnalysisTest_entries.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/components/AnalysisTest_entries.cxx
index 20cbadc1e83573b6eb5dbd1d88a64a2021d943b1..09822a9addba3bffdfa69e892ad9a0a754acfcf1 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/components/AnalysisTest_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/components/AnalysisTest_entries.cxx
@@ -13,17 +13,17 @@
#include "AnalysisTest/ReadINav4MomAssocs.h"
-DECLARE_ALGORITHM_FACTORY ( ReadMuon )
-DECLARE_ALGORITHM_FACTORY ( ReadElectron )
-DECLARE_ALGORITHM_FACTORY ( ReadPhoton )
-DECLARE_ALGORITHM_FACTORY ( ReadTauJet )
-DECLARE_ALGORITHM_FACTORY ( ReadTruthParticle )
-DECLARE_ALGORITHM_FACTORY ( ReadTrigger )
-DECLARE_ALGORITHM_FACTORY ( Readegamma )
-DECLARE_ALGORITHM_FACTORY ( ReadVxContainer )
-DECLARE_ALGORITHM_FACTORY ( ReadTrackParticle )
-DECLARE_ALGORITHM_FACTORY ( NavTest )
+DECLARE_COMPONENT( ReadMuon )
+DECLARE_COMPONENT( ReadElectron )
+DECLARE_COMPONENT( ReadPhoton )
+DECLARE_COMPONENT( ReadTauJet )
+DECLARE_COMPONENT( ReadTruthParticle )
+DECLARE_COMPONENT( ReadTrigger )
+DECLARE_COMPONENT( Readegamma )
+DECLARE_COMPONENT( ReadVxContainer )
+DECLARE_COMPONENT( ReadTrackParticle )
+DECLARE_COMPONENT( NavTest )
-DECLARE_ALGORITHM_FACTORY ( WriteINav4MomAssocs )
-DECLARE_ALGORITHM_FACTORY ( ReadINav4MomAssocs )
+DECLARE_COMPONENT( WriteINav4MomAssocs )
+DECLARE_COMPONENT( ReadINav4MomAssocs )
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/components/AnalysisTools_entries.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/components/AnalysisTools_entries.cxx
index 0a082cce9f694ca1605bb390c5aa91f6b32cd88a..633ee48361321dfc25933c04a3de01bbd67f84b4 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/components/AnalysisTools_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/components/AnalysisTools_entries.cxx
@@ -3,7 +3,7 @@
#include "AnalysisTools/AANTEventSelector.h"
#include "AnalysisTools/AnalysisTools.h"
-DECLARE_TOOL_FACTORY( AnalysisTools )
-DECLARE_SERVICE_FACTORY( AANTEventSelector )
-DECLARE_ALGORITHM_FACTORY( AANTupleStream )
+DECLARE_COMPONENT( AnalysisTools )
+DECLARE_COMPONENT( AANTEventSelector )
+DECLARE_COMPONENT( AANTupleStream )
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/src/components/AnalysisUtils_entries.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/src/components/AnalysisUtils_entries.cxx
index f4514fa6d2750c5af6bd910fc463f64dd7974586..9e1493a54b46856dc91b4f4e9e610c3d97a4f7a0 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/src/components/AnalysisUtils_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/src/components/AnalysisUtils_entries.cxx
@@ -5,10 +5,10 @@
#include "AnalysisUtils/ParticleBaseSelector.h"
#include "AnalysisUtils/IParticleSelector.h"
-DECLARE_TOOL_FACTORY( KinematicSelector )
-DECLARE_TOOL_FACTORY( ElectronIDSelector )
-DECLARE_TOOL_FACTORY( ISelector )
-DECLARE_TOOL_FACTORY( ContainerFilter )
-DECLARE_ALGORITHM_FACTORY( ParticleBaseSelector )
-DECLARE_ALGORITHM_FACTORY( IParticleSelector )
+DECLARE_COMPONENT( KinematicSelector )
+DECLARE_COMPONENT( ElectronIDSelector )
+DECLARE_COMPONENT( ISelector )
+DECLARE_COMPONENT( ContainerFilter )
+DECLARE_COMPONENT( ParticleBaseSelector )
+DECLARE_COMPONENT( IParticleSelector )
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/components/AssociationUtils_entries.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/components/AssociationUtils_entries.cxx
index b1332e59369ba493eea77cb4adaf82becf182948..6fc57ca08f7cbcab74aa808822b2a84fbea39069 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/components/AssociationUtils_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/components/AssociationUtils_entries.cxx
@@ -16,23 +16,23 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-DECLARE_TOOL_FACTORY( OverlapRemovalTool )
+DECLARE_COMPONENT( OverlapRemovalTool )
#pragma GCC diagnostic pop
-DECLARE_TOOL_FACTORY( ORUtils::OverlapRemovalTool )
-DECLARE_TOOL_FACTORY( ORUtils::DeltaROverlapTool )
-DECLARE_TOOL_FACTORY( ORUtils::EleEleOverlapTool )
-DECLARE_TOOL_FACTORY( ORUtils::EleJetOverlapTool )
-DECLARE_TOOL_FACTORY( ORUtils::EleMuSharedTrkOverlapTool )
-DECLARE_TOOL_FACTORY( ORUtils::MuJetOverlapTool )
-DECLARE_TOOL_FACTORY( ORUtils::AltMuJetOverlapTool )
-DECLARE_TOOL_FACTORY( ORUtils::ObjLinkOverlapTool )
-DECLARE_TOOL_FACTORY( ORUtils::TauLooseEleOverlapTool )
-DECLARE_TOOL_FACTORY( ORUtils::TauLooseMuOverlapTool )
-DECLARE_TOOL_FACTORY( ORUtils::TauJetOverlapTool )
-DECLARE_TOOL_FACTORY( ORUtils::TauAntiTauJetOverlapTool )
+DECLARE_COMPONENT( ORUtils::OverlapRemovalTool )
+DECLARE_COMPONENT( ORUtils::DeltaROverlapTool )
+DECLARE_COMPONENT( ORUtils::EleEleOverlapTool )
+DECLARE_COMPONENT( ORUtils::EleJetOverlapTool )
+DECLARE_COMPONENT( ORUtils::EleMuSharedTrkOverlapTool )
+DECLARE_COMPONENT( ORUtils::MuJetOverlapTool )
+DECLARE_COMPONENT( ORUtils::AltMuJetOverlapTool )
+DECLARE_COMPONENT( ORUtils::ObjLinkOverlapTool )
+DECLARE_COMPONENT( ORUtils::TauLooseEleOverlapTool )
+DECLARE_COMPONENT( ORUtils::TauLooseMuOverlapTool )
+DECLARE_COMPONENT( ORUtils::TauJetOverlapTool )
+DECLARE_COMPONENT( ORUtils::TauAntiTauJetOverlapTool )
-DECLARE_ALGORITHM_FACTORY( OverlapRemovalTestAlg )
-DECLARE_ALGORITHM_FACTORY( ORToolBoxTestAlg )
+DECLARE_COMPONENT( OverlapRemovalTestAlg )
+DECLARE_COMPONENT( ORToolBoxTestAlg )
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
diff --git a/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/src/components/CPAnalysisExamples_entries.cxx b/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/src/components/CPAnalysisExamples_entries.cxx
index eff6908b5cfe1b10296dee9d54875d28b94252fc..e3b441200b5d59ae5457e0e2a2088dfcb83b3b6c 100644
--- a/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/src/components/CPAnalysisExamples_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/src/components/CPAnalysisExamples_entries.cxx
@@ -5,28 +5,28 @@
#include "../ToolTester.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( CP, MuonEfficiencyToolExample )
-DECLARE_NAMESPACE_TOOL_FACTORY( CP, MuonSmearingToolExample )
-DECLARE_NAMESPACE_TOOL_FACTORY( CP, MuonSelectionToolExample )
-DECLARE_NAMESPACE_TOOL_FACTORY( CP, JetCalibrationToolExample )
+DECLARE_COMPONENT( CP::MuonEfficiencyToolExample )
+DECLARE_COMPONENT( CP::MuonSmearingToolExample )
+DECLARE_COMPONENT( CP::MuonSelectionToolExample )
+DECLARE_COMPONENT( CP::JetCalibrationToolExample )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( CP, ToolTester )
+DECLARE_COMPONENT( CP::ToolTester )
#include "CPAnalysisExamples/xAthExample.h"
-DECLARE_ALGORITHM_FACTORY( xAthExample )
+DECLARE_COMPONENT( xAthExample )
#include "../Test__TrackLinkTest.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( Test, TrackLinkTest )
+DECLARE_COMPONENT( Test::TrackLinkTest )
#include "CPAnalysisExamples/ToolExamplesAlg.h"
-DECLARE_ALGORITHM_FACTORY( ToolExamplesAlg )
+DECLARE_COMPONENT( ToolExamplesAlg )
#include "../Test__EgammaCalibrationAndSmearingTool.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( Test, EgammaCalibrationAndSmearingTool )
+DECLARE_COMPONENT( Test::EgammaCalibrationAndSmearingTool )
#include "CPAnalysisExamples/MetadataToolExample.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( CP, MetadataToolExample )
+DECLARE_COMPONENT( CP::MetadataToolExample )
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/components/EventUtils_entries.cxx b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/components/EventUtils_entries.cxx
index db1d360177775a0b8f0127bfb2263df8f7023875..fc82b6c1fde364232b6585bd9577ac5a8deca9b3 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/components/EventUtils_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/components/EventUtils_entries.cxx
@@ -13,18 +13,18 @@
#include "../TriggerSelectionAlg.h"
#include "../EventDecisionAlg.h"
-DECLARE_TOOL_FACTORY( ParticleSortingTool )
-DECLARE_ALGORITHM_FACTORY( ParticleSortingAlg )
-DECLARE_TOOL_FACTORY( AddVarTool )
-DECLARE_ALGORITHM_FACTORY( AddVarAlg )
-DECLARE_TOOL_FACTORY( CutTool )
-DECLARE_ALGORITHM_FACTORY( CutAlg )
-DECLARE_TOOL_FACTORY( ParticleSelectionTool )
-DECLARE_ALGORITHM_FACTORY( ParticleSelectionAlg )
-DECLARE_TOOL_FACTORY( ParticleCombinerTool )
-DECLARE_ALGORITHM_FACTORY( ParticleCombinerAlg )
-DECLARE_ALGORITHM_FACTORY( EventQualityFilterAlg )
-DECLARE_ALGORITHM_FACTORY( ParticleRemoverAlg )
-DECLARE_ALGORITHM_FACTORY( TriggerSelectionAlg )
-DECLARE_ALGORITHM_FACTORY( EventDecisionAlg )
+DECLARE_COMPONENT( ParticleSortingTool )
+DECLARE_COMPONENT( ParticleSortingAlg )
+DECLARE_COMPONENT( AddVarTool )
+DECLARE_COMPONENT( AddVarAlg )
+DECLARE_COMPONENT( CutTool )
+DECLARE_COMPONENT( CutAlg )
+DECLARE_COMPONENT( ParticleSelectionTool )
+DECLARE_COMPONENT( ParticleSelectionAlg )
+DECLARE_COMPONENT( ParticleCombinerTool )
+DECLARE_COMPONENT( ParticleCombinerAlg )
+DECLARE_COMPONENT( EventQualityFilterAlg )
+DECLARE_COMPONENT( ParticleRemoverAlg )
+DECLARE_COMPONENT( TriggerSelectionAlg )
+DECLARE_COMPONENT( EventDecisionAlg )
diff --git a/PhysicsAnalysis/AnalysisCommon/FsrUtils/src/components/FsrUtils_entries.cxx b/PhysicsAnalysis/AnalysisCommon/FsrUtils/src/components/FsrUtils_entries.cxx
index 686d2f0fb40ec126ac62d2a055222aea0359588f..93701c9dcc43ee960addffd35b6c4ae2908d2d02 100644
--- a/PhysicsAnalysis/AnalysisCommon/FsrUtils/src/components/FsrUtils_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/FsrUtils/src/components/FsrUtils_entries.cxx
@@ -2,7 +2,7 @@
#include "../ToolTester.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( FSR, FsrPhotonTool)
+DECLARE_COMPONENT( FSR::FsrPhotonTool )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( FSR, ToolTester )
+DECLARE_COMPONENT( FSR::ToolTester )
diff --git a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/components/HistogramUtils_entries.cxx b/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/components/HistogramUtils_entries.cxx
index d0721f3b6013ae3b3230fdfa1c14894fb0250742..2548d9e2ad4abd87c8f85e7151a6b340c456e285 100644
--- a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/components/HistogramUtils_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/components/HistogramUtils_entries.cxx
@@ -3,9 +3,9 @@
using namespace HistogramUtils;
-DECLARE_TOOL_FACTORY( HistogramToolTH1 )
-DECLARE_TOOL_FACTORY( HistogramToolTH2 )
-DECLARE_TOOL_FACTORY( HistogramToolTH3 )
+DECLARE_COMPONENT( HistogramToolTH1 )
+DECLARE_COMPONENT( HistogramToolTH2 )
+DECLARE_COMPONENT( HistogramToolTH3 )
-DECLARE_ALGORITHM_FACTORY( HistAlg )
+DECLARE_COMPONENT( HistAlg )
diff --git a/PhysicsAnalysis/AnalysisCommon/IsolationSelection/src/components/IsolationSelection_entries.cxx b/PhysicsAnalysis/AnalysisCommon/IsolationSelection/src/components/IsolationSelection_entries.cxx
index b8563e1da05c33e1a46816ab02927a09e0722c1a..6a83230f36b59361e97c12448d9b0d82e718d17b 100644
--- a/PhysicsAnalysis/AnalysisCommon/IsolationSelection/src/components/IsolationSelection_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/IsolationSelection/src/components/IsolationSelection_entries.cxx
@@ -6,9 +6,9 @@
using namespace xAOD;
-DECLARE_NAMESPACE_TOOL_FACTORY(CP, IsolationSelectionTool)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(CP, TestIsolationAthenaAlg)
+DECLARE_COMPONENT( CP::IsolationSelectionTool )
+DECLARE_COMPONENT( CP::TestIsolationAthenaAlg )
-DECLARE_NAMESPACE_TOOL_FACTORY(CP, IsolationCloseByCorrectionTool)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(CP, TestIsolationCloseByCorrAthenaAlg)
+DECLARE_COMPONENT( CP::IsolationCloseByCorrectionTool )
+DECLARE_COMPONENT( CP::TestIsolationCloseByCorrAthenaAlg )
diff --git a/PhysicsAnalysis/AnalysisCommon/PMGOverlapRemovalTools/HFORTools/src/components/HFORTools_entries.cxx b/PhysicsAnalysis/AnalysisCommon/PMGOverlapRemovalTools/HFORTools/src/components/HFORTools_entries.cxx
index 09bd8a33ea42e345acd8edd5b882d9379b1d5472..0c1001dd5d7adb8f7dd0585d06b3b7aa4ace600e 100644
--- a/PhysicsAnalysis/AnalysisCommon/PMGOverlapRemovalTools/HFORTools/src/components/HFORTools_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/PMGOverlapRemovalTools/HFORTools/src/components/HFORTools_entries.cxx
@@ -1,7 +1,7 @@
#include "HFORTools/HFORSelectionTool.h"
#include "../HFORSelectionAlg.h"
-DECLARE_ALGORITHM_FACTORY( HFORSelectionAlg )
+DECLARE_COMPONENT( HFORSelectionAlg )
-DECLARE_TOOL_FACTORY( HFORSelectionTool )
+DECLARE_COMPONENT( HFORSelectionTool )
diff --git a/PhysicsAnalysis/AnalysisCommon/PMGTools/src/components/PMGTools_entries.cxx b/PhysicsAnalysis/AnalysisCommon/PMGTools/src/components/PMGTools_entries.cxx
index ba06a734bef486af49ebaaab1694a3cefdc3cbcb..11d64b3b214502c0077ce62006ec844809e3dda0 100644
--- a/PhysicsAnalysis/AnalysisCommon/PMGTools/src/components/PMGTools_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/PMGTools/src/components/PMGTools_entries.cxx
@@ -4,7 +4,7 @@
using namespace PMGTools;
-DECLARE_TOOL_FACTORY( PMGSherpa22VJetsWeightTool )
-DECLARE_TOOL_FACTORY( PMGSherpaVjetsSysTool )
-DECLARE_TOOL_FACTORY( PMGCrossSectionTool )
+DECLARE_COMPONENT( PMGSherpa22VJetsWeightTool )
+DECLARE_COMPONENT( PMGSherpaVjetsSysTool )
+DECLARE_COMPONENT( PMGCrossSectionTool )
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/src/components/ParticleJetTools_entries.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/src/components/ParticleJetTools_entries.cxx
index 437e5dedf0596e7628df9ac55e67d85cc8c7a88c..16d43fb1cad34b27f9b91a7dfc825a8e0ea6a3ef 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/src/components/ParticleJetTools_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/src/components/ParticleJetTools_entries.cxx
@@ -16,20 +16,20 @@
using namespace Analysis;
-/* DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, JetTrackTruthMatching ) */
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, JetQuarkLabel )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, JetConeLabeling )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, JetPartonTruthLabel )
-/* DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, JetQGPartonLabel ) */
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, ParticleToJetAssociator )
-/* DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, FindLeptonTruth ) */
+/* DECLARE_COMPONENT( Analysis::JetTrackTruthMatching ) */
+DECLARE_COMPONENT( Analysis::JetQuarkLabel )
+DECLARE_COMPONENT( Analysis::JetConeLabeling )
+DECLARE_COMPONENT( Analysis::JetPartonTruthLabel )
+/* DECLARE_COMPONENT( Analysis::JetQGPartonLabel ) */
+DECLARE_COMPONENT( Analysis::ParticleToJetAssociator )
+/* DECLARE_COMPONENT( Analysis::FindLeptonTruth ) */
/// @todo Convert to namespace, tool, etc?
-DECLARE_TOOL_FACTORY( CopyFlavorLabelTruthParticles )
-DECLARE_TOOL_FACTORY( CopyBosonTopLabelTruthParticles )
-DECLARE_TOOL_FACTORY( CopyTruthPartons )
-DECLARE_TOOL_FACTORY( CopyTruthJetParticles )
-DECLARE_TOOL_FACTORY( ParticleJetDeltaRLabelTool )
-DECLARE_TOOL_FACTORY( JetParticleShrinkingConeAssociation )
-DECLARE_TOOL_FACTORY( JetParticleCenterOfMassAssociation )
-DECLARE_ALGORITHM_FACTORY( JetParticleAssociationAlg )
+DECLARE_COMPONENT( CopyFlavorLabelTruthParticles )
+DECLARE_COMPONENT( CopyBosonTopLabelTruthParticles )
+DECLARE_COMPONENT( CopyTruthPartons )
+DECLARE_COMPONENT( CopyTruthJetParticles )
+DECLARE_COMPONENT( ParticleJetDeltaRLabelTool )
+DECLARE_COMPONENT( JetParticleShrinkingConeAssociation )
+DECLARE_COMPONENT( JetParticleCenterOfMassAssociation )
+DECLARE_COMPONENT( JetParticleAssociationAlg )
diff --git a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/src/components/PileupReweighting_entries.cxx b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/src/components/PileupReweighting_entries.cxx
index 728933e92fe47e1e3565d4f238d8c3bea2c4337b..2ac50dc3632a8b72bcd98deadbe17bc94b3d8bd1 100644
--- a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/src/components/PileupReweighting_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/src/components/PileupReweighting_entries.cxx
@@ -2,6 +2,6 @@
#include "../PileupReweightingProvider.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( CP, PileupReweightingTool )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( CP, PileupReweightingProvider )
+DECLARE_COMPONENT( CP::PileupReweightingTool )
+DECLARE_COMPONENT( CP::PileupReweightingProvider )
diff --git a/PhysicsAnalysis/AnalysisCommon/ReweightUtils/src/components/ReweightUtils_entries.cxx b/PhysicsAnalysis/AnalysisCommon/ReweightUtils/src/components/ReweightUtils_entries.cxx
index 13852849aad23dea6e0c2654fed26649d107e5e7..867115b8c2a496369d6b52717307a8cdb3d38715 100644
--- a/PhysicsAnalysis/AnalysisCommon/ReweightUtils/src/components/ReweightUtils_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ReweightUtils/src/components/ReweightUtils_entries.cxx
@@ -5,12 +5,12 @@
#include "../SumOfWeightsAlg.h"
-DECLARE_TOOL_FACTORY( McEventWeight )
-DECLARE_TOOL_FACTORY( PDFWeight )
-DECLARE_TOOL_FACTORY( WeightsAgregator )
-DECLARE_ALGORITHM_FACTORY( SumOfWeightsAlg )
+DECLARE_COMPONENT( McEventWeight )
+DECLARE_COMPONENT( PDFWeight )
+DECLARE_COMPONENT( WeightsAgregator )
+DECLARE_COMPONENT( SumOfWeightsAlg )
#include "ReweightUtils/ParticleScaleFactorTool.h"
-DECLARE_TOOL_FACTORY( ParticleScaleFactorTool )
+DECLARE_COMPONENT( ParticleScaleFactorTool )
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/components/ThinningUtils_entries.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/components/ThinningUtils_entries.cxx
index 1bd4a07a61ffb737c75071b809eafaed6aeaf6f3..5c7362fd1530d5fabf20a5d519f8f4a04b3046d7 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/components/ThinningUtils_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/components/ThinningUtils_entries.cxx
@@ -15,20 +15,20 @@
#include "../ThinTrackParticlesAlg.h"
#include "../ThinTrackParticlesTool.h"
-DECLARE_ALGORITHM_FACTORY( ThinGeantTruthAlg )
-DECLARE_ALGORITHM_FACTORY( ThinNegativeEnergyCaloClustersAlg )
-DECLARE_ALGORITHM_FACTORY( ThinNegativeEnergyNeutralPFOsAlg )
-DECLARE_ALGORITHM_FACTORY( ReducePileUpEventInfoAlg )
-DECLARE_ALGORITHM_FACTORY( ThinIParticlesAlg )
-DECLARE_TOOL_FACTORY( ThinIParticlesTool )
-DECLARE_ALGORITHM_FACTORY( ThinCaloCellsAlg )
+DECLARE_COMPONENT( ThinGeantTruthAlg )
+DECLARE_COMPONENT( ThinNegativeEnergyCaloClustersAlg )
+DECLARE_COMPONENT( ThinNegativeEnergyNeutralPFOsAlg )
+DECLARE_COMPONENT( ReducePileUpEventInfoAlg )
+DECLARE_COMPONENT( ThinIParticlesAlg )
+DECLARE_COMPONENT( ThinIParticlesTool )
+DECLARE_COMPONENT( ThinCaloCellsAlg )
// AthAnalysisBase doesn't know about calo cells (geometry would be needed)
#ifndef XAOD_ANALYSIS
-DECLARE_TOOL_FACTORY( ThinCaloCellsTool )
-DECLARE_ALGORITHM_FACTORY( ThinTrkTrackAlg )
+DECLARE_COMPONENT( ThinCaloCellsTool )
+DECLARE_COMPONENT( ThinTrkTrackAlg )
#endif
-DECLARE_ALGORITHM_FACTORY( ThinCaloClustersAlg )
-DECLARE_TOOL_FACTORY( ThinCaloClustersTool )
-DECLARE_ALGORITHM_FACTORY( ThinTrackParticlesAlg )
-DECLARE_TOOL_FACTORY( ThinTrackParticlesTool )
+DECLARE_COMPONENT( ThinCaloClustersAlg )
+DECLARE_COMPONENT( ThinCaloClustersTool )
+DECLARE_COMPONENT( ThinTrackParticlesAlg )
+DECLARE_COMPONENT( ThinTrackParticlesTool )
diff --git a/PhysicsAnalysis/AnalysisCommon/UserAnalysis/src/components/UserAnalysis_entries.cxx b/PhysicsAnalysis/AnalysisCommon/UserAnalysis/src/components/UserAnalysis_entries.cxx
index 6ec77f5ec949cd8e766fba8fbb505a81433544ab..cd03c0c28cbc9e4aafd74c51ee91982a07c7b962 100644
--- a/PhysicsAnalysis/AnalysisCommon/UserAnalysis/src/components/UserAnalysis_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/UserAnalysis/src/components/UserAnalysis_entries.cxx
@@ -1,5 +1,5 @@
#include "UserAnalysis/AnalysisSkeleton.h"
-DECLARE_ALGORITHM_FACTORY( AnalysisSkeleton )
+DECLARE_COMPONENT( AnalysisSkeleton )
diff --git a/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/components/UserAnalysisUtils_entries.cxx b/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/components/UserAnalysisUtils_entries.cxx
index 72feb904bcb3d6e257baf93a38a43262a0f3b6e0..4bff409d3ad5392a28918a78ffc079b0e4a1c498 100644
--- a/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/components/UserAnalysisUtils_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/components/UserAnalysisUtils_entries.cxx
@@ -6,10 +6,10 @@
#include "UserAnalysisUtils/UserAnalysisOverlapRemovalTool.h"
-//DECLARE_TOOL_FACTORY( UserMuonTool )
+//DECLARE_COMPONENT( UserMuonTool )
-DECLARE_TOOL_FACTORY( UserAnalysisPreparationTool )
-DECLARE_TOOL_FACTORY( UserAnalysisSelectionTool )
-DECLARE_TOOL_FACTORY( UserAnalysisOverlapCheckingTool )
-DECLARE_TOOL_FACTORY( UserAnalysisOverlapRemovalTool )
+DECLARE_COMPONENT( UserAnalysisPreparationTool )
+DECLARE_COMPONENT( UserAnalysisSelectionTool )
+DECLARE_COMPONENT( UserAnalysisOverlapCheckingTool )
+DECLARE_COMPONENT( UserAnalysisOverlapRemovalTool )
diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/components/AnalysisJiveXML_entries.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/components/AnalysisJiveXML_entries.cxx
index 27a06c55026a889787ca1b914dc78561780f9d25..c99a9ee0f4d24ceea7b7f25d3d403da18ff1dcdb 100644
--- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/components/AnalysisJiveXML_entries.cxx
+++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/components/AnalysisJiveXML_entries.cxx
@@ -13,15 +13,15 @@
using namespace JiveXML;
-DECLARE_TOOL_FACTORY(BJetRetriever)
-DECLARE_TOOL_FACTORY(ElectronRetriever)
-DECLARE_TOOL_FACTORY(MuonRetriever)
-DECLARE_TOOL_FACTORY(AODJetRetriever)
-DECLARE_TOOL_FACTORY(PhotonRetriever)
-DECLARE_TOOL_FACTORY(TauJetRetriever)
-DECLARE_TOOL_FACTORY(TrackParticleRetriever)
-DECLARE_TOOL_FACTORY(AODCaloClusterRetriever)
-DECLARE_TOOL_FACTORY(CompositeParticleRetriever)
-DECLARE_TOOL_FACTORY(TruthParticleRetriever)
-DECLARE_TOOL_FACTORY(TrigEMClusterRetriever)
+DECLARE_COMPONENT( BJetRetriever )
+DECLARE_COMPONENT( ElectronRetriever )
+DECLARE_COMPONENT( MuonRetriever )
+DECLARE_COMPONENT( AODJetRetriever )
+DECLARE_COMPONENT( PhotonRetriever )
+DECLARE_COMPONENT( TauJetRetriever )
+DECLARE_COMPONENT( TrackParticleRetriever )
+DECLARE_COMPONENT( AODCaloClusterRetriever )
+DECLARE_COMPONENT( CompositeParticleRetriever )
+DECLARE_COMPONENT( TruthParticleRetriever )
+DECLARE_COMPONENT( TrigEMClusterRetriever )
diff --git a/PhysicsAnalysis/AnalysisEventDisplay/xAODJiveXML/src/components/xAODJiveXML_entries.cxx b/PhysicsAnalysis/AnalysisEventDisplay/xAODJiveXML/src/components/xAODJiveXML_entries.cxx
index 97f6f06a7cd1bb73205cfa28561a63f988a0c743..b63c020e9c13518786a9bfdbba32666264f54ad4 100644
--- a/PhysicsAnalysis/AnalysisEventDisplay/xAODJiveXML/src/components/xAODJiveXML_entries.cxx
+++ b/PhysicsAnalysis/AnalysisEventDisplay/xAODJiveXML/src/components/xAODJiveXML_entries.cxx
@@ -11,13 +11,13 @@
using namespace JiveXML;
-DECLARE_TOOL_FACTORY(xAODCaloClusterRetriever)
-DECLARE_TOOL_FACTORY(xAODElectronRetriever)
-DECLARE_TOOL_FACTORY(xAODMissingETRetriever)
-DECLARE_TOOL_FACTORY(xAODMuonRetriever)
-DECLARE_TOOL_FACTORY(xAODPhotonRetriever)
-DECLARE_TOOL_FACTORY(xAODJetRetriever)
-DECLARE_TOOL_FACTORY(xAODTauRetriever)
-DECLARE_TOOL_FACTORY(xAODTrackParticleRetriever)
-DECLARE_TOOL_FACTORY(xAODVertexRetriever)
+DECLARE_COMPONENT( xAODCaloClusterRetriever )
+DECLARE_COMPONENT( xAODElectronRetriever )
+DECLARE_COMPONENT( xAODMissingETRetriever )
+DECLARE_COMPONENT( xAODMuonRetriever )
+DECLARE_COMPONENT( xAODPhotonRetriever )
+DECLARE_COMPONENT( xAODJetRetriever )
+DECLARE_COMPONENT( xAODTauRetriever )
+DECLARE_COMPONENT( xAODTrackParticleRetriever )
+DECLARE_COMPONENT( xAODVertexRetriever )
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/components/AnalysisTriggerAlgs_entries.cxx b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/components/AnalysisTriggerAlgs_entries.cxx
index 085ef9a60aef281da78b20f740436445b820b14f..83d1c97000d26a74e3041a1af185ecf43e9320d7 100644
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/components/AnalysisTriggerAlgs_entries.cxx
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/components/AnalysisTriggerAlgs_entries.cxx
@@ -2,7 +2,7 @@
#include "../RoIBResultToxAOD.h"
#include "../MuCTPI_RDOToRoIBResult.h"
-DECLARE_ALGORITHM_FACTORY( RoIBResultToxAOD )
-DECLARE_ALGORITHM_FACTORY( RoIBResultToAOD )
-DECLARE_ALGORITHM_FACTORY( MuCTPI_RDOToRoIBResult )
+DECLARE_COMPONENT( RoIBResultToxAOD )
+DECLARE_COMPONENT( RoIBResultToAOD )
+DECLARE_COMPONENT( MuCTPI_RDOToRoIBResult )
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerTools/src/components/AnalysisTriggerTools_entries.cxx b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerTools/src/components/AnalysisTriggerTools_entries.cxx
index 11e251922d0334a30e020f9acc8ca981500d797e..f5940de7236d5f1bea3e50bb9dc7b9db1026819d 100644
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerTools/src/components/AnalysisTriggerTools_entries.cxx
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerTools/src/components/AnalysisTriggerTools_entries.cxx
@@ -1,4 +1,4 @@
#include "AnalysisTriggerTools/MuonTriggerAnalysisTool.h"
-DECLARE_TOOL_FACTORY(MuonTriggerAnalysisTool)
+DECLARE_COMPONENT( MuonTriggerAnalysisTool )
diff --git a/PhysicsAnalysis/AraToolExample/src/components/AraToolExample_entries.cxx b/PhysicsAnalysis/AraToolExample/src/components/AraToolExample_entries.cxx
index a0b5816b27fec8a42ee3037b5e0f2ce39387ccf6..5f7928d5e2937abe37b4026c25244435f0d4647c 100644
--- a/PhysicsAnalysis/AraToolExample/src/components/AraToolExample_entries.cxx
+++ b/PhysicsAnalysis/AraToolExample/src/components/AraToolExample_entries.cxx
@@ -5,9 +5,9 @@
#include "AraToolExample/AraToolUsingToolWrapper.h"
-DECLARE_TOOL_FACTORY( AnExampleAraToolWrapper )
-DECLARE_TOOL_FACTORY( AraToolUsingToolWrapper )
+DECLARE_COMPONENT( AnExampleAraToolWrapper )
+DECLARE_COMPONENT( AraToolUsingToolWrapper )
-DECLARE_ALGORITHM_FACTORY( AraToolExampleAlg )
-DECLARE_ALGORITHM_FACTORY( AraToolUsingToolAlg )
+DECLARE_COMPONENT( AraToolExampleAlg )
+DECLARE_COMPONENT( AraToolUsingToolAlg )
diff --git a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/components/AssociationComps_entries.cxx b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/components/AssociationComps_entries.cxx
index 1e32a1e5900c38ea606a620d0dc6e29f62262a9b..e3c6dac519e91cdacd425d82ac5f67156c2565e3 100644
--- a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/components/AssociationComps_entries.cxx
+++ b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/components/AssociationComps_entries.cxx
@@ -8,12 +8,12 @@
#include "../AssociationAlgorithm.h"
-DECLARE_ALGORITHM_FACTORY( AssocBuilder )
-DECLARE_ALGORITHM_FACTORY( AssocDumper )
-DECLARE_TOOL_FACTORY( DeltaROverlapTool )
-DECLARE_TOOL_FACTORY( AssocBuilderTool )
-DECLARE_TOOL_FACTORY( DeltaRAssociationTool )
-DECLARE_TOOL_FACTORY( AthenaBarCodeAssociationTool )
-DECLARE_TOOL_FACTORY( TriggerAssociationTool )
-DECLARE_ALGORITHM_FACTORY( AssociationAlgorithm )
+DECLARE_COMPONENT( AssocBuilder )
+DECLARE_COMPONENT( AssocDumper )
+DECLARE_COMPONENT( DeltaROverlapTool )
+DECLARE_COMPONENT( AssocBuilderTool )
+DECLARE_COMPONENT( DeltaRAssociationTool )
+DECLARE_COMPONENT( AthenaBarCodeAssociationTool )
+DECLARE_COMPONENT( TriggerAssociationTool )
+DECLARE_COMPONENT( AssociationAlgorithm )
diff --git a/PhysicsAnalysis/BPhys/BPhysTagTools/src/components/BPhysTagTools_entries.cxx b/PhysicsAnalysis/BPhys/BPhysTagTools/src/components/BPhysTagTools_entries.cxx
index 12062fdac7ca0f0a51e0714c8657976e64b75210..b0e34a82c7f6c009b6435ee65589b6feb6797768 100644
--- a/PhysicsAnalysis/BPhys/BPhysTagTools/src/components/BPhysTagTools_entries.cxx
+++ b/PhysicsAnalysis/BPhys/BPhysTagTools/src/components/BPhysTagTools_entries.cxx
@@ -1,6 +1,6 @@
#include "BPhysTagTools/BPhysTagTool.h"
-DECLARE_TOOL_FACTORY( BPhysTagTool )
+DECLARE_COMPONENT( BPhysTagTool )
diff --git a/PhysicsAnalysis/D2PDMaker/src/components/D2PDMaker_entries.cxx b/PhysicsAnalysis/D2PDMaker/src/components/D2PDMaker_entries.cxx
index 18cf77bf893f7ff0e6c0477eed0262f11d944258..0ca2c29685075ca4d9d604ebad63a9c28993eaf9 100644
--- a/PhysicsAnalysis/D2PDMaker/src/components/D2PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D2PDMaker/src/components/D2PDMaker_entries.cxx
@@ -13,18 +13,18 @@
#include "D2PDMaker/UserDataHelperTool.h"
#include "D2PDMaker/FilterTool.h"
-DECLARE_ALGORITHM_FACTORY( D2PDINavigable4MomentumSelector )
-DECLARE_ALGORITHM_FACTORY( D2PDParticleCombiner )
-DECLARE_ALGORITHM_FACTORY( D2PDElectronSelector )
-DECLARE_ALGORITHM_FACTORY( D2PDPhotonSelector )
-DECLARE_ALGORITHM_FACTORY( D2PDMuonSelector )
-DECLARE_ALGORITHM_FACTORY( D2PDTauSelector )
-DECLARE_ALGORITHM_FACTORY( D2PDJetSelector )
-DECLARE_ALGORITHM_FACTORY( D2PDTrackParticleSelector )
-DECLARE_ALGORITHM_FACTORY( D2PDVertexSelector )
-DECLARE_ALGORITHM_FACTORY( D2PDTruthParticleSelector )
-DECLARE_ALGORITHM_FACTORY( CheckD2PD )
-DECLARE_ALGORITHM_FACTORY( CreateControlPlots )
-DECLARE_TOOL_FACTORY( UserDataHelperTool )
-DECLARE_TOOL_FACTORY( FilterTool )
+DECLARE_COMPONENT( D2PDINavigable4MomentumSelector )
+DECLARE_COMPONENT( D2PDParticleCombiner )
+DECLARE_COMPONENT( D2PDElectronSelector )
+DECLARE_COMPONENT( D2PDPhotonSelector )
+DECLARE_COMPONENT( D2PDMuonSelector )
+DECLARE_COMPONENT( D2PDTauSelector )
+DECLARE_COMPONENT( D2PDJetSelector )
+DECLARE_COMPONENT( D2PDTrackParticleSelector )
+DECLARE_COMPONENT( D2PDVertexSelector )
+DECLARE_COMPONENT( D2PDTruthParticleSelector )
+DECLARE_COMPONENT( CheckD2PD )
+DECLARE_COMPONENT( CreateControlPlots )
+DECLARE_COMPONENT( UserDataHelperTool )
+DECLARE_COMPONENT( FilterTool )
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/components/BackgroundD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/components/BackgroundD3PDMaker_entries.cxx
index 2e0889333e54a69956dd9df4d3f413adfd43b8e1..dfb2681353cd19e0ceb6ee5bae1eacd54722411b 100644
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/components/BackgroundD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/components/BackgroundD3PDMaker_entries.cxx
@@ -8,12 +8,12 @@
#include "../BeamBackgroundJetAssociationTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, LucidPMTHitFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, RawTagInDetSPFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, BackgroundWordFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, BeamBackgroundDecisionFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, BeamBackgroundClusterFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, BeamBackgroundClusterAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, BeamBackgroundJetFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, BeamBackgroundJetAssociationTool)
+DECLARE_COMPONENT( D3PD::LucidPMTHitFillerTool )
+DECLARE_COMPONENT( D3PD::RawTagInDetSPFillerTool )
+DECLARE_COMPONENT( D3PD::BackgroundWordFillerTool )
+DECLARE_COMPONENT( D3PD::BeamBackgroundDecisionFillerTool )
+DECLARE_COMPONENT( D3PD::BeamBackgroundClusterFillerTool )
+DECLARE_COMPONENT( D3PD::BeamBackgroundClusterAssociationTool )
+DECLARE_COMPONENT( D3PD::BeamBackgroundJetFillerTool )
+DECLARE_COMPONENT( D3PD::BeamBackgroundJetAssociationTool )
diff --git a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/src/components/CaloD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/src/components/CaloD3PDMaker_entries.cxx
index 3bcb78428cf5c40c859f89f3ea638528bd145fff..e9e027fab4ffbc31426a47b48c51bac67f29fb12 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/src/components/CaloD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/src/components/CaloD3PDMaker_entries.cxx
@@ -46,51 +46,51 @@
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ClusterSamplingFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ClusterEMSamplingFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ClusterTimeFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ClusterMomentFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ClusterPositionInCaloFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MBTSFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MBTSTimeFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, CellFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, CaloInfoFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, CaloCellDetailsFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, CaloCellRawFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TileCellDetailsFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TileModuleBitsFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SGTileModuleBitsGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TileDigitFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SGTileDigitsGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TileRawChannelFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTileAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TileCellRawAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TileCellDigitAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TileCosmicMuonFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TileCosmicMuonTileCellAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TileMuFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TileL2FillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TileTTL1FillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TileTriggerFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TileHitFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TileHitInfoFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SGTileHitGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SGTileRawChannelGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TowerFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, LArDigitFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, LArCollisionTimeFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, LArNoisyROFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, LArRawChannelFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, LArRawChannelContainerGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, CaloClusterCellAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, CaloClusterExtendedCellAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, LArHitFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, LArHitContainerGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, CaloCalibHitFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, CaloCalibrationHitContainerGetterTool)
-DECLARE_ALGORITHM_FACTORY (CaloCellFilterAlg)
-DECLARE_ALGORITHM_FACTORY (ClusterFilter)
+DECLARE_COMPONENT( D3PD::ClusterSamplingFillerTool )
+DECLARE_COMPONENT( D3PD::ClusterEMSamplingFillerTool )
+DECLARE_COMPONENT( D3PD::ClusterTimeFillerTool )
+DECLARE_COMPONENT( D3PD::ClusterMomentFillerTool )
+DECLARE_COMPONENT( D3PD::ClusterPositionInCaloFillerTool )
+DECLARE_COMPONENT( D3PD::MBTSFillerTool )
+DECLARE_COMPONENT( D3PD::MBTSTimeFillerTool )
+DECLARE_COMPONENT( D3PD::CellFillerTool )
+DECLARE_COMPONENT( D3PD::CaloInfoFillerTool )
+DECLARE_COMPONENT( D3PD::CaloCellDetailsFillerTool )
+DECLARE_COMPONENT( D3PD::CaloCellRawFillerTool )
+DECLARE_COMPONENT( D3PD::TileCellDetailsFillerTool )
+DECLARE_COMPONENT( D3PD::TileModuleBitsFillerTool )
+DECLARE_COMPONENT( D3PD::SGTileModuleBitsGetterTool )
+DECLARE_COMPONENT( D3PD::TileDigitFillerTool )
+DECLARE_COMPONENT( D3PD::SGTileDigitsGetterTool )
+DECLARE_COMPONENT( D3PD::TileRawChannelFillerTool )
+DECLARE_COMPONENT( D3PD::JetTileAssociationTool )
+DECLARE_COMPONENT( D3PD::TileCellRawAssociationTool )
+DECLARE_COMPONENT( D3PD::TileCellDigitAssociationTool )
+DECLARE_COMPONENT( D3PD::TileCosmicMuonFillerTool )
+DECLARE_COMPONENT( D3PD::TileCosmicMuonTileCellAssociationTool )
+DECLARE_COMPONENT( D3PD::TileMuFillerTool )
+DECLARE_COMPONENT( D3PD::TileL2FillerTool )
+DECLARE_COMPONENT( D3PD::TileTTL1FillerTool )
+DECLARE_COMPONENT( D3PD::TileTriggerFillerTool )
+DECLARE_COMPONENT( D3PD::TileHitFillerTool )
+DECLARE_COMPONENT( D3PD::TileHitInfoFillerTool )
+DECLARE_COMPONENT( D3PD::SGTileHitGetterTool )
+DECLARE_COMPONENT( D3PD::SGTileRawChannelGetterTool )
+DECLARE_COMPONENT( D3PD::TowerFillerTool )
+DECLARE_COMPONENT( D3PD::LArDigitFillerTool )
+DECLARE_COMPONENT( D3PD::LArCollisionTimeFillerTool )
+DECLARE_COMPONENT( D3PD::LArNoisyROFillerTool )
+DECLARE_COMPONENT( D3PD::LArRawChannelFillerTool )
+DECLARE_COMPONENT( D3PD::LArRawChannelContainerGetterTool )
+DECLARE_COMPONENT( D3PD::CaloClusterCellAssociationTool )
+DECLARE_COMPONENT( D3PD::CaloClusterExtendedCellAssociationTool )
+DECLARE_COMPONENT( D3PD::LArHitFillerTool )
+DECLARE_COMPONENT( D3PD::LArHitContainerGetterTool )
+DECLARE_COMPONENT( D3PD::CaloCalibHitFillerTool )
+DECLARE_COMPONENT( D3PD::CaloCalibrationHitContainerGetterTool )
+DECLARE_COMPONENT( CaloCellFilterAlg )
+DECLARE_COMPONENT( ClusterFilter )
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SCFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, LArSCHitFillerTool)
+DECLARE_COMPONENT( D3PD::SCFillerTool )
+DECLARE_COMPONENT( D3PD::LArSCHitFillerTool )
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/components/D3PDMakerCoreComps_entries.cxx b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/components/D3PDMakerCoreComps_entries.cxx
index cab142812e2a95fe7abfcee1d82a0a088d7d5dde..e255d4d1ba94db58cb620acab62c1d88f7d04886 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/components/D3PDMakerCoreComps_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/components/D3PDMakerCoreComps_entries.cxx
@@ -21,25 +21,25 @@
#include "../FirstAssociationTool.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, MakerAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, DummyInitAlg)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, DummyVarFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, CollectionGetterRegistryTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ObjFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, VoidObjFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, VectorFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ContainedAssociationFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, IndexAssociationFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, IndexFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ContainedMultiAssociationFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ContainedVectorMultiAssociationFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, IndexMultiAssociationFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SGObjGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SGDataVectorGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, UserDataFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, AuxDataFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SelectedParticlesFilterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ContainerFlagFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, IdentityAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, FirstAssociationTool)
+DECLARE_COMPONENT( D3PD::MakerAlg )
+DECLARE_COMPONENT( D3PD::DummyInitAlg )
+DECLARE_COMPONENT( D3PD::DummyVarFillerTool )
+DECLARE_COMPONENT( D3PD::CollectionGetterRegistryTool )
+DECLARE_COMPONENT( D3PD::ObjFillerTool )
+DECLARE_COMPONENT( D3PD::VoidObjFillerTool )
+DECLARE_COMPONENT( D3PD::VectorFillerTool )
+DECLARE_COMPONENT( D3PD::ContainedAssociationFillerTool )
+DECLARE_COMPONENT( D3PD::IndexAssociationFillerTool )
+DECLARE_COMPONENT( D3PD::IndexFillerTool )
+DECLARE_COMPONENT( D3PD::ContainedMultiAssociationFillerTool )
+DECLARE_COMPONENT( D3PD::ContainedVectorMultiAssociationFillerTool )
+DECLARE_COMPONENT( D3PD::IndexMultiAssociationFillerTool )
+DECLARE_COMPONENT( D3PD::SGObjGetterTool )
+DECLARE_COMPONENT( D3PD::SGDataVectorGetterTool )
+DECLARE_COMPONENT( D3PD::UserDataFillerTool )
+DECLARE_COMPONENT( D3PD::AuxDataFillerTool )
+DECLARE_COMPONENT( D3PD::SelectedParticlesFilterTool )
+DECLARE_COMPONENT( D3PD::ContainerFlagFillerTool )
+DECLARE_COMPONENT( D3PD::IdentityAssociationTool )
+DECLARE_COMPONENT( D3PD::FirstAssociationTool )
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/src/components/D3PDMakerReader_entries.cxx b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/src/components/D3PDMakerReader_entries.cxx
index cbf2bb6fb5092b417e9fc3d47ec5bc6f5a4aeda0..d86aa9ca350c7786c129d7d923c55b38b7a79b59 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/src/components/D3PDMakerReader_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/src/components/D3PDMakerReader_entries.cxx
@@ -2,7 +2,7 @@
#include "../MultiReaderAlg.h"
#include "../RootReaderD3PDSvc.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( D3PD, ReaderAlg )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( D3PD, MultiReaderAlg )
-DECLARE_NAMESPACE_SERVICE_FACTORY( D3PD, RootReaderD3PDSvc )
+DECLARE_COMPONENT( D3PD::ReaderAlg )
+DECLARE_COMPONENT( D3PD::MultiReaderAlg )
+DECLARE_COMPONENT( D3PD::RootReaderD3PDSvc )
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerRoot/src/components/D3PDMakerRoot_entries.cxx b/PhysicsAnalysis/D3PDMaker/D3PDMakerRoot/src/components/D3PDMakerRoot_entries.cxx
index 4db21de3963b32dd879dc1982953cfcd3e9748bd..308f58702aa71c8da052151bbe22e6957ae25564 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerRoot/src/components/D3PDMakerRoot_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerRoot/src/components/D3PDMakerRoot_entries.cxx
@@ -1,5 +1,5 @@
#include "../RootD3PDSvc.h"
-DECLARE_NAMESPACE_SERVICE_FACTORY (D3PD, RootD3PDSvc)
+DECLARE_COMPONENT( D3PD::RootD3PDSvc )
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/src/components/D3PDMakerTest_entries.cxx b/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/src/components/D3PDMakerTest_entries.cxx
index ab229a2543d8d446f2f495cdc4a107df6b3567e1..7db092e22a4fb3610759e7d4f8b7f328d2aba51f 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/src/components/D3PDMakerTest_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/src/components/D3PDMakerTest_entries.cxx
@@ -15,19 +15,19 @@
#include "../IN4MHLVAssociationTool.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PDTest, FillerAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PDTest, HitsFillerAlg)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PDTest, Obj1FillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PDTest, Obj2FillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PDTest, Obj12FillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PDTest, Obj4FillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PDTest, Obj4GetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PDTest, Obj5FillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PDTest, DefaultFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PDTest, DefaultFillerTool2)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PDTest, Obj1Obj2AssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PDTest, Obj1Obj2MultiAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PDTest, ToObj2AssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PDTest, ToObj2MultiAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PDTest, IN4MHLVAssociationTool)
+DECLARE_COMPONENT( D3PDTest::FillerAlg )
+DECLARE_COMPONENT( D3PDTest::HitsFillerAlg )
+DECLARE_COMPONENT( D3PDTest::Obj1FillerTool )
+DECLARE_COMPONENT( D3PDTest::Obj2FillerTool )
+DECLARE_COMPONENT( D3PDTest::Obj12FillerTool )
+DECLARE_COMPONENT( D3PDTest::Obj4FillerTool )
+DECLARE_COMPONENT( D3PDTest::Obj4GetterTool )
+DECLARE_COMPONENT( D3PDTest::Obj5FillerTool )
+DECLARE_COMPONENT( D3PDTest::DefaultFillerTool )
+DECLARE_COMPONENT( D3PDTest::DefaultFillerTool2 )
+DECLARE_COMPONENT( D3PDTest::Obj1Obj2AssociationTool )
+DECLARE_COMPONENT( D3PDTest::Obj1Obj2MultiAssociationTool )
+DECLARE_COMPONENT( D3PDTest::ToObj2AssociationTool )
+DECLARE_COMPONENT( D3PDTest::ToObj2MultiAssociationTool )
+DECLARE_COMPONENT( D3PDTest::IN4MHLVAssociationTool )
diff --git a/PhysicsAnalysis/D3PDMaker/EventCommonD3PDMaker/src/components/EventCommonD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/EventCommonD3PDMaker/src/components/EventCommonD3PDMaker_entries.cxx
index 9064b09dcef6f7f8234c20380cf2d69c706883eb..274bc74dd5b1a324d308830d32e619a506dedc45 100644
--- a/PhysicsAnalysis/D3PDMaker/EventCommonD3PDMaker/src/components/EventCommonD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/EventCommonD3PDMaker/src/components/EventCommonD3PDMaker_entries.cxx
@@ -21,24 +21,24 @@
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, EventTypeFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, EventWeightFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, EventErrorStateFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, EventTrigInfoFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ChargeFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, FourMomFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, DRAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, DRConeAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, CompositeParticleAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, NavigableConstituentAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, IN4MCollectionGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, INav4MomLinkContainerGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, IN4MLinkContainerFlagFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, LBMetadataTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SimMetadataTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, IParticleLinksCollectionGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SkimDecisionFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SkimDecisionVectorFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, LumiBlockLengthFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, LeadingPtAssociationTool)
+DECLARE_COMPONENT( D3PD::EventTypeFillerTool )
+DECLARE_COMPONENT( D3PD::EventWeightFillerTool )
+DECLARE_COMPONENT( D3PD::EventErrorStateFillerTool )
+DECLARE_COMPONENT( D3PD::EventTrigInfoFillerTool )
+DECLARE_COMPONENT( D3PD::ChargeFillerTool )
+DECLARE_COMPONENT( D3PD::FourMomFillerTool )
+DECLARE_COMPONENT( D3PD::DRAssociationTool )
+DECLARE_COMPONENT( D3PD::DRConeAssociationTool )
+DECLARE_COMPONENT( D3PD::CompositeParticleAssociationTool )
+DECLARE_COMPONENT( D3PD::NavigableConstituentAssociationTool )
+DECLARE_COMPONENT( D3PD::IN4MCollectionGetterTool )
+DECLARE_COMPONENT( D3PD::INav4MomLinkContainerGetterTool )
+DECLARE_COMPONENT( D3PD::IN4MLinkContainerFlagFillerTool )
+DECLARE_COMPONENT( D3PD::LBMetadataTool )
+DECLARE_COMPONENT( D3PD::SimMetadataTool )
+DECLARE_COMPONENT( D3PD::IParticleLinksCollectionGetterTool )
+DECLARE_COMPONENT( D3PD::SkimDecisionFillerTool )
+DECLARE_COMPONENT( D3PD::SkimDecisionVectorFillerTool )
+DECLARE_COMPONENT( D3PD::LumiBlockLengthFillerTool )
+DECLARE_COMPONENT( D3PD::LeadingPtAssociationTool )
diff --git a/PhysicsAnalysis/D3PDMaker/ExoticsD3PDMaker/src/components/ExoticsD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/ExoticsD3PDMaker/src/components/ExoticsD3PDMaker_entries.cxx
index 4fde1ff3481cc722b8b8f460a5a309410270cf2b..9ca2b3f84249f6d9df9ea4500c762f4116f6686f 100644
--- a/PhysicsAnalysis/D3PDMaker/ExoticsD3PDMaker/src/components/ExoticsD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/ExoticsD3PDMaker/src/components/ExoticsD3PDMaker_entries.cxx
@@ -1,5 +1,5 @@
#include "../ZPrimeElectronSelector.h"
#include "../ZPrimeMuonSelector.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(D3PD, ZPrimeElectronSelector )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(D3PD, ZPrimeMuonSelector )
+DECLARE_COMPONENT( D3PD::ZPrimeElectronSelector )
+DECLARE_COMPONENT( D3PD::ZPrimeMuonSelector )
diff --git a/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/components/ForwardDetectorsD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/components/ForwardDetectorsD3PDMaker_entries.cxx
index 380e44b589a41b8814db229b6d8a8947ca9ee490..679db28adb5fd4143ea32d2073d912a6156a268b 100644
--- a/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/components/ForwardDetectorsD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/components/ForwardDetectorsD3PDMaker_entries.cxx
@@ -16,21 +16,21 @@
#include "../AfpTDLocRecoEvCollectionFillerTool.h"
#include "../AfpTruthInfoFillerTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, ZdcFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, ZdcDigitsFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, ZdcRecoFillerTool )
+DECLARE_COMPONENT( D3PD::ZdcFillerTool )
+DECLARE_COMPONENT( D3PD::ZdcDigitsFillerTool )
+DECLARE_COMPONENT( D3PD::ZdcRecoFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, AlfaHitCollectionFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, AlfaEventHeaderFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, AlfaTrackingDataFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, AlfaTruthInfoFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, AlfaMetaDataTool )
+DECLARE_COMPONENT( D3PD::AlfaHitCollectionFillerTool )
+DECLARE_COMPONENT( D3PD::AlfaEventHeaderFillerTool )
+DECLARE_COMPONENT( D3PD::AlfaTrackingDataFillerTool )
+DECLARE_COMPONENT( D3PD::AlfaTruthInfoFillerTool )
+DECLARE_COMPONENT( D3PD::AlfaMetaDataTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, AfpSIDSimHitCollectionFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, AfpSIDDigiCollectionFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, AfpSIDLocRecoEvCollectionFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, AfpTDSimHitCollectionFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, AfpTDDigiCollectionFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, AfpTDLocRecoEvCollectionFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, AfpTruthInfoFillerTool )
+DECLARE_COMPONENT( D3PD::AfpSIDSimHitCollectionFillerTool )
+DECLARE_COMPONENT( D3PD::AfpSIDDigiCollectionFillerTool )
+DECLARE_COMPONENT( D3PD::AfpSIDLocRecoEvCollectionFillerTool )
+DECLARE_COMPONENT( D3PD::AfpTDSimHitCollectionFillerTool )
+DECLARE_COMPONENT( D3PD::AfpTDDigiCollectionFillerTool )
+DECLARE_COMPONENT( D3PD::AfpTDLocRecoEvCollectionFillerTool )
+DECLARE_COMPONENT( D3PD::AfpTruthInfoFillerTool )
diff --git a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/components/HiggsD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/components/HiggsD3PDMaker_entries.cxx
index 414700e1def5d5dccd550e462c319b9936b297a1..9f7045593815e1b0db80e0a13027dc5abdfe805e 100644
--- a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/components/HiggsD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/components/HiggsD3PDMaker_entries.cxx
@@ -2,7 +2,7 @@
#include "../QuadrupletVertexAssociationTool.h"
#include "../QuadrupletCompositeParticleAssociationTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, QuadrupletFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, QuadrupletVertexAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, QuadrupletCompositeParticleAssociationTool)
+DECLARE_COMPONENT( D3PD::QuadrupletFillerTool )
+DECLARE_COMPONENT( D3PD::QuadrupletVertexAssociationTool )
+DECLARE_COMPONENT( D3PD::QuadrupletCompositeParticleAssociationTool )
diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDAnalysis/src/components/JetD3PDAnalysis_entries.cxx b/PhysicsAnalysis/D3PDMaker/JetD3PDAnalysis/src/components/JetD3PDAnalysis_entries.cxx
index d0fdeca19794a8f42de310d18de0a4481f2cd549..6e944c8617abbd79ce67304b14f85001d8c259e1 100644
--- a/PhysicsAnalysis/D3PDMaker/JetD3PDAnalysis/src/components/JetD3PDAnalysis_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/JetD3PDAnalysis/src/components/JetD3PDAnalysis_entries.cxx
@@ -2,5 +2,5 @@
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, JetVertexFractionAlg)
+DECLARE_COMPONENT( D3PD::JetVertexFractionAlg )
diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/components/JetD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/components/JetD3PDMaker_entries.cxx
index 42acfe57aa2abed8a942739cbe37fe4c9e318525..34278fb9a3b4413c781366abea795be99341de29 100644
--- a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/components/JetD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/components/JetD3PDMaker_entries.cxx
@@ -22,26 +22,26 @@
#include "../JetEFTriggerObjectAssociationTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetBTagWeightFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetFlavorTagComponentsFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTrueTagFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetVtxFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetVertexFractionFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetEMFractionFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetSamplingsFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetSignalStateFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetAuthorFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetMomentFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetConstituentFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, FlavorAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetCaloUtilsFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetShapeFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTileCellFillerTool)
-DECLARE_ALGORITHM_FACTORY (JetTileFilterAlg)
-//DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, JetFixupAlg)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetROIWordFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetSamplingsFracFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetL1TriggerObjectAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetL2TriggerObjectAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetEFTriggerObjectAssociationTool)
+DECLARE_COMPONENT( D3PD::JetBTagWeightFillerTool )
+DECLARE_COMPONENT( D3PD::JetFlavorTagComponentsFillerTool )
+DECLARE_COMPONENT( D3PD::JetTrueTagFillerTool )
+DECLARE_COMPONENT( D3PD::JetVtxFillerTool )
+DECLARE_COMPONENT( D3PD::JetVertexFractionFillerTool )
+DECLARE_COMPONENT( D3PD::JetEMFractionFillerTool )
+DECLARE_COMPONENT( D3PD::JetSamplingsFillerTool )
+DECLARE_COMPONENT( D3PD::JetSignalStateFillerTool )
+DECLARE_COMPONENT( D3PD::JetAuthorFillerTool )
+DECLARE_COMPONENT( D3PD::JetMomentFillerTool )
+DECLARE_COMPONENT( D3PD::JetConstituentFillerTool )
+DECLARE_COMPONENT( D3PD::FlavorAssociationTool )
+DECLARE_COMPONENT( D3PD::JetCaloUtilsFillerTool )
+DECLARE_COMPONENT( D3PD::JetShapeFillerTool )
+DECLARE_COMPONENT( D3PD::JetTileCellFillerTool )
+DECLARE_COMPONENT( JetTileFilterAlg )
+//DECLARE_COMPONENT( D3PD::JetFixupAlg )
+DECLARE_COMPONENT( D3PD::JetROIWordFillerTool )
+DECLARE_COMPONENT( D3PD::JetSamplingsFracFillerTool )
+DECLARE_COMPONENT( D3PD::JetL1TriggerObjectAssociationTool )
+DECLARE_COMPONENT( D3PD::JetL2TriggerObjectAssociationTool )
+DECLARE_COMPONENT( D3PD::JetEFTriggerObjectAssociationTool )
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/components/JetTagD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/components/JetTagD3PDMaker_entries.cxx
index ab30036f5896e60b805b9ed8d5e7c81a3d649527..8ae7ec64d60d85a2932e74c399ae96002a9dc300 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/components/JetTagD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/components/JetTagD3PDMaker_entries.cxx
@@ -39,46 +39,46 @@
#include "../JetTagQGPartonTruthInfoFillerTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagBTagWeightsFillerTool)
-//DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagJetTrackAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagJetNavigable4MomentumAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagMuonInJetGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagInfoBaseFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagIPInfoBaseFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagJetProbInfoBaseFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagSVInfoBaseFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagIPInfoPlusTrackAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagSVInfoPlusFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagSVInfoPlusTrackAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagJetMuonAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagJetFitterTagInfoFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagJetFitterGenericTagInfoFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagSoftMuonInfoMuonAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagJetGenSoftLeptonAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagElectronInJetGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagJetElectronAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagSoftElecInfoegammaAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagPhotonInJetGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagJetPhotonAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagVxOnJetAxisFillerTool)
-//DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagJetJFTwoTrackVertexAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagTwoTrackVertexFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagVxOnJetAxisTrackAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagTwoTrackVertexTrackAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagVKalVxInJetBadTrackAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagTruthInfoFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagGbbNNInfoFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagHadFlavorTagInfoFillerTool)
+DECLARE_COMPONENT( D3PD::JetTagBTagWeightsFillerTool )
+//DECLARE_COMPONENT( D3PD::JetTagJetTrackAssociationTool )
+DECLARE_COMPONENT( D3PD::JetTagJetNavigable4MomentumAssociationTool )
+DECLARE_COMPONENT( D3PD::JetTagMuonInJetGetterTool )
+DECLARE_COMPONENT( D3PD::JetTagInfoBaseFillerTool )
+DECLARE_COMPONENT( D3PD::JetTagIPInfoBaseFillerTool )
+DECLARE_COMPONENT( D3PD::JetTagJetProbInfoBaseFillerTool )
+DECLARE_COMPONENT( D3PD::JetTagSVInfoBaseFillerTool )
+DECLARE_COMPONENT( D3PD::JetTagIPInfoPlusTrackAssociationTool )
+DECLARE_COMPONENT( D3PD::JetTagSVInfoPlusFillerTool )
+DECLARE_COMPONENT( D3PD::JetTagSVInfoPlusTrackAssociationTool )
+DECLARE_COMPONENT( D3PD::JetTagJetMuonAssociationTool )
+DECLARE_COMPONENT( D3PD::JetTagJetFitterTagInfoFillerTool )
+DECLARE_COMPONENT( D3PD::JetTagJetFitterGenericTagInfoFillerTool )
+DECLARE_COMPONENT( D3PD::JetTagSoftMuonInfoMuonAssociationTool )
+DECLARE_COMPONENT( D3PD::JetTagJetGenSoftLeptonAssociationTool )
+DECLARE_COMPONENT( D3PD::JetTagElectronInJetGetterTool )
+DECLARE_COMPONENT( D3PD::JetTagJetElectronAssociationTool )
+DECLARE_COMPONENT( D3PD::JetTagSoftElecInfoegammaAssociationTool )
+DECLARE_COMPONENT( D3PD::JetTagPhotonInJetGetterTool )
+DECLARE_COMPONENT( D3PD::JetTagJetPhotonAssociationTool )
+DECLARE_COMPONENT( D3PD::JetTagVxOnJetAxisFillerTool )
+//DECLARE_COMPONENT( D3PD::JetTagJetJFTwoTrackVertexAssociationTool )
+DECLARE_COMPONENT( D3PD::JetTagTwoTrackVertexFillerTool )
+DECLARE_COMPONENT( D3PD::JetTagVxOnJetAxisTrackAssociationTool )
+DECLARE_COMPONENT( D3PD::JetTagTwoTrackVertexTrackAssociationTool )
+DECLARE_COMPONENT( D3PD::JetTagVKalVxInJetBadTrackAssociationTool )
+DECLARE_COMPONENT( D3PD::JetTagTruthInfoFillerTool )
+DECLARE_COMPONENT( D3PD::JetTagGbbNNInfoFillerTool )
+DECLARE_COMPONENT( D3PD::JetTagHadFlavorTagInfoFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagPixelModuleGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagPixelModCondFillerTool)
+DECLARE_COMPONENT( D3PD::JetTagPixelModuleGetterTool )
+DECLARE_COMPONENT( D3PD::JetTagPixelModCondFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagMSVVtxInfoGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagMultiSVInfoPlusFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagMSVVtxInfoFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagMSVVtxInfoTrackAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagMultiSVInfoMSVVtxInfoAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagQGPartonTruthInfoFillerTool)
+DECLARE_COMPONENT( D3PD::JetTagMSVVtxInfoGetterTool )
+DECLARE_COMPONENT( D3PD::JetTagMultiSVInfoPlusFillerTool )
+DECLARE_COMPONENT( D3PD::JetTagMSVVtxInfoFillerTool )
+DECLARE_COMPONENT( D3PD::JetTagMSVVtxInfoTrackAssociationTool )
+DECLARE_COMPONENT( D3PD::JetTagMultiSVInfoMSVVtxInfoAssociationTool )
+DECLARE_COMPONENT( D3PD::JetTagQGPartonTruthInfoFillerTool )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, JetTagJetFilterAlg)
+DECLARE_COMPONENT( D3PD::JetTagJetFilterAlg )
diff --git a/PhysicsAnalysis/D3PDMaker/MinBiasD3PDMaker/src/components/MinBiasD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/MinBiasD3PDMaker/src/components/MinBiasD3PDMaker_entries.cxx
index 314e4a2bb9ca886c0326a0e74b1b5651d5bd4463..15854783828af42cf56f6b9b5c455472593fbd42 100644
--- a/PhysicsAnalysis/D3PDMaker/MinBiasD3PDMaker/src/components/MinBiasD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/MinBiasD3PDMaker/src/components/MinBiasD3PDMaker_entries.cxx
@@ -1,6 +1,6 @@
#include "../UnassociatedHitsFillerTool.h"
#include "../UnassociatedHitsGetterTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, UnassociatedHitsFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, UnassociatedHitsGetterTool)
+DECLARE_COMPONENT( D3PD::UnassociatedHitsFillerTool )
+DECLARE_COMPONENT( D3PD::UnassociatedHitsGetterTool )
diff --git a/PhysicsAnalysis/D3PDMaker/MissingETD3PDMaker/src/components/MissingETD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/MissingETD3PDMaker/src/components/MissingETD3PDMaker_entries.cxx
index bcfaf0c40248db1119a895af056ee61994f9e24b..c5f910a22693ab4f5f4e5d9724c4bc0982f4a205 100644
--- a/PhysicsAnalysis/D3PDMaker/MissingETD3PDMaker/src/components/MissingETD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/MissingETD3PDMaker/src/components/MissingETD3PDMaker_entries.cxx
@@ -20,24 +20,24 @@
#include "../MissingETContainerFillerTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MissingETFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ScalarMissingETFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SumETFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MissingETPhiFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MissingETTruthNonIntFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ScalarMissingETTruthNonIntFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SumETTruthNonIntFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MissingETTruthNonIntPhiFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ScalarMissingETTruthIntFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SumETTruthIntFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MissingETTruthIntPhiFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MissingETTruthIntFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MissingETEtaRingsFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MissingETJetsInfoFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MissingETGoodnessFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MissingETRegionFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MissingETCaloSamplingFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MissingETCaloEMFracSETFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MissingETCompAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MissingETContainerFillerTool)
+DECLARE_COMPONENT( D3PD::MissingETFillerTool )
+DECLARE_COMPONENT( D3PD::ScalarMissingETFillerTool )
+DECLARE_COMPONENT( D3PD::SumETFillerTool )
+DECLARE_COMPONENT( D3PD::MissingETPhiFillerTool )
+DECLARE_COMPONENT( D3PD::MissingETTruthNonIntFillerTool )
+DECLARE_COMPONENT( D3PD::ScalarMissingETTruthNonIntFillerTool )
+DECLARE_COMPONENT( D3PD::SumETTruthNonIntFillerTool )
+DECLARE_COMPONENT( D3PD::MissingETTruthNonIntPhiFillerTool )
+DECLARE_COMPONENT( D3PD::ScalarMissingETTruthIntFillerTool )
+DECLARE_COMPONENT( D3PD::SumETTruthIntFillerTool )
+DECLARE_COMPONENT( D3PD::MissingETTruthIntPhiFillerTool )
+DECLARE_COMPONENT( D3PD::MissingETTruthIntFillerTool )
+DECLARE_COMPONENT( D3PD::MissingETEtaRingsFillerTool )
+DECLARE_COMPONENT( D3PD::MissingETJetsInfoFillerTool )
+DECLARE_COMPONENT( D3PD::MissingETGoodnessFillerTool )
+DECLARE_COMPONENT( D3PD::MissingETRegionFillerTool )
+DECLARE_COMPONENT( D3PD::MissingETCaloSamplingFillerTool )
+DECLARE_COMPONENT( D3PD::MissingETCaloEMFracSETFillerTool )
+DECLARE_COMPONENT( D3PD::MissingETCompAssociationTool )
+DECLARE_COMPONENT( D3PD::MissingETContainerFillerTool )
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/components/MuonD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/components/MuonD3PDMaker_entries.cxx
index a99cddf1637438d7dc231de519b6b035c623f7f1..946b08e7f41da8d7621d812a4a56eb3c0e5136b9 100644
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/components/MuonD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/components/MuonD3PDMaker_entries.cxx
@@ -36,40 +36,40 @@
#include "../TrackRecordCollectionGetterTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MuonTrkHitFillerTool) // Serhan
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MuonNumberOfSegmentsFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MuonTrackParticleAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MuonL1TriggerObjectAssociationTool) // Srivas
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MuonL2TriggerObjectAssociationTool) // Srivas
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MuonEFTriggerObjectAssociationTool) // Srivas
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MuonEFInfoTriggerObjectAssociationTool) // Srivas
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, L2MuonCB1FillerTool) // Srivas
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, L2MuonCB2FillerTool) // Srivas
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, EFMuonFillerTool) // Srivas
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MuonGenParticleAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, EFInfoMuonKinematicsFiller) // Srivas
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MuonSegmentAuthorFillerTool) // Srivas
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MuonSegmentLocationFillerTool) // Srivas
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MuonSegmentFitQualityFillerTool) // Srivas
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MuonSegmentT0FillerTool) // Srivas, Verena
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MuonTruthClassificationFillerTool) // Max
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, TruthMuonsToSG) // Srivas
-// DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MuonIDIsolTool) // Lashkar
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MuonSpShowerFillerTool) // Michiru, Haifeng
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MdtPrepDataFillerTool) // David
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, RpcPrepDataFillerTool) // David
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TgcPrepDataFillerTool) // David
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, CscPrepDataFillerTool) // David
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MdtPrepDataCollectionGetterTool) // David
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, RpcPrepDataCollectionGetterTool) // David
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TgcPrepDataCollectionGetterTool) // David
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, CscPrepDataCollectionGetterTool) // David
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MuonPatternCombinationFillerTool) // Daniel
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MuonPatternCombinationMissedHitFillerTool) // Daniel
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MuonSegmentTruthFillerTool) // Daniel
+DECLARE_COMPONENT( D3PD::MuonTrkHitFillerTool ) // Serhan
+DECLARE_COMPONENT( D3PD::MuonNumberOfSegmentsFillerTool )
+DECLARE_COMPONENT( D3PD::MuonTrackParticleAssociationTool )
+DECLARE_COMPONENT( D3PD::MuonL1TriggerObjectAssociationTool ) // Srivas
+DECLARE_COMPONENT( D3PD::MuonL2TriggerObjectAssociationTool ) // Srivas
+DECLARE_COMPONENT( D3PD::MuonEFTriggerObjectAssociationTool ) // Srivas
+DECLARE_COMPONENT( D3PD::MuonEFInfoTriggerObjectAssociationTool ) // Srivas
+DECLARE_COMPONENT( D3PD::L2MuonCB1FillerTool ) // Srivas
+DECLARE_COMPONENT( D3PD::L2MuonCB2FillerTool ) // Srivas
+DECLARE_COMPONENT( D3PD::EFMuonFillerTool ) // Srivas
+DECLARE_COMPONENT( D3PD::MuonGenParticleAssociationTool )
+DECLARE_COMPONENT( D3PD::EFInfoMuonKinematicsFiller ) // Srivas
+DECLARE_COMPONENT( D3PD::MuonSegmentAuthorFillerTool ) // Srivas
+DECLARE_COMPONENT( D3PD::MuonSegmentLocationFillerTool ) // Srivas
+DECLARE_COMPONENT( D3PD::MuonSegmentFitQualityFillerTool ) // Srivas
+DECLARE_COMPONENT( D3PD::MuonSegmentT0FillerTool ) // Srivas, Verena
+DECLARE_COMPONENT( D3PD::MuonTruthClassificationFillerTool ) // Max
+DECLARE_COMPONENT( D3PD::TruthMuonsToSG ) // Srivas
+// DECLARE_COMPONENT( D3PD::MuonIDIsolTool ) // Lashkar
+DECLARE_COMPONENT( D3PD::MuonSpShowerFillerTool ) // Michiru, Haifeng
+DECLARE_COMPONENT( D3PD::MdtPrepDataFillerTool ) // David
+DECLARE_COMPONENT( D3PD::RpcPrepDataFillerTool ) // David
+DECLARE_COMPONENT( D3PD::TgcPrepDataFillerTool ) // David
+DECLARE_COMPONENT( D3PD::CscPrepDataFillerTool ) // David
+DECLARE_COMPONENT( D3PD::MdtPrepDataCollectionGetterTool ) // David
+DECLARE_COMPONENT( D3PD::RpcPrepDataCollectionGetterTool ) // David
+DECLARE_COMPONENT( D3PD::TgcPrepDataCollectionGetterTool ) // David
+DECLARE_COMPONENT( D3PD::CscPrepDataCollectionGetterTool ) // David
+DECLARE_COMPONENT( D3PD::MuonPatternCombinationFillerTool ) // Daniel
+DECLARE_COMPONENT( D3PD::MuonPatternCombinationMissedHitFillerTool ) // Daniel
+DECLARE_COMPONENT( D3PD::MuonSegmentTruthFillerTool ) // Daniel
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MDTSimHitFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackRecordFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MuonTruthHitsFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackRecordCollectionGetterTool)
+DECLARE_COMPONENT( D3PD::MDTSimHitFillerTool )
+DECLARE_COMPONENT( D3PD::TrackRecordFillerTool )
+DECLARE_COMPONENT( D3PD::MuonTruthHitsFillerTool )
+DECLARE_COMPONENT( D3PD::TrackRecordCollectionGetterTool )
diff --git a/PhysicsAnalysis/D3PDMaker/PhysicsD3PDMaker/src/components/PhysicsD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/PhysicsD3PDMaker/src/components/PhysicsD3PDMaker_entries.cxx
index af4a6c30fc7ecfd690c3277ec3342b5db2093883..952fc838ba108e2562c7583b46e8cd43f29fb781 100644
--- a/PhysicsAnalysis/D3PDMaker/PhysicsD3PDMaker/src/components/PhysicsD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/PhysicsD3PDMaker/src/components/PhysicsD3PDMaker_entries.cxx
@@ -1,4 +1,4 @@
#include "../TrileptonSkimmer.h"
-DECLARE_ALGORITHM_FACTORY(TrileptonSkimmer)
+DECLARE_COMPONENT( TrileptonSkimmer )
diff --git a/PhysicsAnalysis/D3PDMaker/QcdD3PDMaker/src/components/QcdD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/QcdD3PDMaker/src/components/QcdD3PDMaker_entries.cxx
index 74c23ffeb831fe6fc0f16cebdfeb8676f47b37e7..230b6b0d2329e4601124898e120a6de5dab62ed8 100644
--- a/PhysicsAnalysis/D3PDMaker/QcdD3PDMaker/src/components/QcdD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/QcdD3PDMaker/src/components/QcdD3PDMaker_entries.cxx
@@ -1,6 +1,6 @@
#include "QcdD3PDMaker/preprocessing/QcdD3PDPreProcessing.h"
#include "QcdD3PDMaker/fillers/MuonSpShowerFillerTool.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (QcdD3PD, QcdD3PDPreProcessing)
-DECLARE_NAMESPACE_TOOL_FACTORY (QcdD3PD, MuonSpShowerFillerTool)
+DECLARE_COMPONENT( QcdD3PD::QcdD3PDPreProcessing )
+DECLARE_COMPONENT( QcdD3PD::MuonSpShowerFillerTool )
diff --git a/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/components/TileD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/components/TileD3PDMaker_entries.cxx
index 9c8ef6ac7cbcddad44087d21a27ffce9596471d1..f21b3a1f4dd8a81c5a1c65458cf8806cc5859fbd 100644
--- a/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/components/TileD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/components/TileD3PDMaker_entries.cxx
@@ -18,19 +18,19 @@
#include "../TrackTools.h"
//#include "../TrackParametersIdentificationHelper.h"
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TileCellFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TileTrackFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TileClusterFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TileMuonFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TileEventFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TileAssocFillerTool)
+DECLARE_COMPONENT( D3PD::TileCellFillerTool )
+DECLARE_COMPONENT( D3PD::TileTrackFillerTool )
+DECLARE_COMPONENT( D3PD::TileClusterFillerTool )
+DECLARE_COMPONENT( D3PD::TileMuonFillerTool )
+DECLARE_COMPONENT( D3PD::TileEventFillerTool )
+DECLARE_COMPONENT( D3PD::TileAssocFillerTool )
-DECLARE_ALGORITHM_FACTORY (TileTrackFilterAlg)
-DECLARE_ALGORITHM_FACTORY (TileClusterFilterAlg)
-DECLARE_ALGORITHM_FACTORY (TileEopFilterAlg)
-DECLARE_ALGORITHM_FACTORY (TileMuonFilterAlg)
-DECLARE_ALGORITHM_FACTORY (TileCosmicMuonFilterAlg)
+DECLARE_COMPONENT( TileTrackFilterAlg )
+DECLARE_COMPONENT( TileClusterFilterAlg )
+DECLARE_COMPONENT( TileEopFilterAlg )
+DECLARE_COMPONENT( TileMuonFilterAlg )
+DECLARE_COMPONENT( TileCosmicMuonFilterAlg )
-DECLARE_TOOL_FACTORY (TrackTools)
-//DECLARE_TOOL_FACTORY (TrackParametersIdentificationHelper)
+DECLARE_COMPONENT( TrackTools )
+//DECLARE_COMPONENT( TrackParametersIdentificationHelper )
diff --git a/PhysicsAnalysis/D3PDMaker/TopD3PDMaker/BoostedTopD3PDMaker/src/components/BoostedTopD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/TopD3PDMaker/BoostedTopD3PDMaker/src/components/BoostedTopD3PDMaker_entries.cxx
index ecab1d0426b8f22e1b668389aaf51d401693f96b..df33879aab4b3056cbe362e6017ad8e208c3c558 100644
--- a/PhysicsAnalysis/D3PDMaker/TopD3PDMaker/BoostedTopD3PDMaker/src/components/BoostedTopD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TopD3PDMaker/BoostedTopD3PDMaker/src/components/BoostedTopD3PDMaker_entries.cxx
@@ -2,6 +2,6 @@
//#include "../../BoostedTopD3PDMaker/MiniIsolationMuonFillerTool.h"
-//DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MiniIsolationElectronFillerTool)
-//DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MiniIsolationMuonFillerTool)
+//DECLARE_COMPONENT( D3PD::MiniIsolationElectronFillerTool )
+//DECLARE_COMPONENT( D3PD::MiniIsolationMuonFillerTool )
diff --git a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/components/TrackD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/components/TrackD3PDMaker_entries.cxx
index 3bcff70c888f7ffd1c52c661b64ac7a540e766c7..9aa2434c5daf626463e118e59edbf6f5921ab888 100644
--- a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/components/TrackD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/components/TrackD3PDMaker_entries.cxx
@@ -124,109 +124,109 @@
#include "../TRTUncompressedHitFillerTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackFitQualityFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, CovarianceFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ImpactSigmaFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, PerigeeFillerTool)
-//DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, PerigeeUnbiasedIPAtPVFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, PerigeeBLPredictionFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackStateOnSurfaceFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackTrackSummaryFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackInfoFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, PixelClusterFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackPIDFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackIsolationFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParametersFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ErrorMatrixErrorFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ErrorMatrixCovarianceFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParticleChargeFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, V0CandidateFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, V0ContainerGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, VertexPositionFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, VertexTypeFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, VertexKineFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, VertexTrackAssociationFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, VertexPurityFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, BeamSpotFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TruthTrackFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TruthVertexFillerTool)
-//DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParticleMCClassifierFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, PerigeeCovarianceAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TSOFitQualityAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, VxTrackAtVertexTrackParticleAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, VxTrackAtVertexTrkTrackAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, V0CandidateVxCandidateAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrkPrepRawDataGenParticleAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TSOSPixelClusterAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParametersErrorMatrixAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParticleFitQualityAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParticlePerigeeAtOOAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParticlePerigeePairAtOOAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParticlePerigeeAtPVAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParticlePerigeeAtBSAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParticleTrackSummaryAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParticleInfoAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParticleTSOAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParticleVertexAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParticleTruthAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParticleDetailedTruthAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParticleLastParametersAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParticleParametersAtBLFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrkTrackFitQualityAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrkTrackPerigeeAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrkTrackPerigeeAtPVAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrkTrackPerigeeAtBSAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrkTrackTrackSummaryAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrkTrackInfoAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrkTrackTSOAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrkTrackVertexAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrkTrackTruthAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrkTrackDetailedTruthAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, VertexFitQualityAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, VertexCovarianceAssociationTool)
-//DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, VertexTrackAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, VertexTrackParticleAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, PerigeePairOldPerigeeAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackBeamlineParametersAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrkTrackGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParticleGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TruthTrackGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TruthVertexGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, PixelClusterCollectionGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, BeamSpotGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParticleDetailedTruthAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrkTrackParametersAtBLFillerTool)
+DECLARE_COMPONENT( D3PD::TrackFitQualityFillerTool )
+DECLARE_COMPONENT( D3PD::CovarianceFillerTool )
+DECLARE_COMPONENT( D3PD::ImpactSigmaFillerTool )
+DECLARE_COMPONENT( D3PD::PerigeeFillerTool )
+//DECLARE_COMPONENT( D3PD::PerigeeUnbiasedIPAtPVFillerTool )
+DECLARE_COMPONENT( D3PD::PerigeeBLPredictionFillerTool )
+DECLARE_COMPONENT( D3PD::TrackStateOnSurfaceFillerTool )
+DECLARE_COMPONENT( D3PD::TrackTrackSummaryFillerTool )
+DECLARE_COMPONENT( D3PD::TrackInfoFillerTool )
+DECLARE_COMPONENT( D3PD::PixelClusterFillerTool )
+DECLARE_COMPONENT( D3PD::TrackPIDFillerTool )
+DECLARE_COMPONENT( D3PD::TrackIsolationFillerTool )
+DECLARE_COMPONENT( D3PD::TrackParametersFillerTool )
+DECLARE_COMPONENT( D3PD::ErrorMatrixErrorFillerTool )
+DECLARE_COMPONENT( D3PD::ErrorMatrixCovarianceFillerTool )
+DECLARE_COMPONENT( D3PD::TrackParticleChargeFillerTool )
+DECLARE_COMPONENT( D3PD::V0CandidateFillerTool )
+DECLARE_COMPONENT( D3PD::V0ContainerGetterTool )
+DECLARE_COMPONENT( D3PD::VertexPositionFillerTool )
+DECLARE_COMPONENT( D3PD::VertexTypeFillerTool )
+DECLARE_COMPONENT( D3PD::VertexKineFillerTool )
+DECLARE_COMPONENT( D3PD::VertexTrackAssociationFillerTool )
+DECLARE_COMPONENT( D3PD::VertexPurityFillerTool )
+DECLARE_COMPONENT( D3PD::BeamSpotFillerTool )
+DECLARE_COMPONENT( D3PD::TruthTrackFillerTool )
+DECLARE_COMPONENT( D3PD::TruthVertexFillerTool )
+//DECLARE_COMPONENT( D3PD::TrackParticleMCClassifierFillerTool )
+DECLARE_COMPONENT( D3PD::PerigeeCovarianceAssociationTool )
+DECLARE_COMPONENT( D3PD::TSOFitQualityAssociationTool )
+DECLARE_COMPONENT( D3PD::VxTrackAtVertexTrackParticleAssociationTool )
+DECLARE_COMPONENT( D3PD::VxTrackAtVertexTrkTrackAssociationTool )
+DECLARE_COMPONENT( D3PD::V0CandidateVxCandidateAssociationTool )
+DECLARE_COMPONENT( D3PD::TrkPrepRawDataGenParticleAssociationTool )
+DECLARE_COMPONENT( D3PD::TSOSPixelClusterAssociationTool )
+DECLARE_COMPONENT( D3PD::TrackParametersErrorMatrixAssociationTool )
+DECLARE_COMPONENT( D3PD::TrackParticleFitQualityAssociationTool )
+DECLARE_COMPONENT( D3PD::TrackParticlePerigeeAtOOAssociationTool )
+DECLARE_COMPONENT( D3PD::TrackParticlePerigeePairAtOOAssociationTool )
+DECLARE_COMPONENT( D3PD::TrackParticlePerigeeAtPVAssociationTool )
+DECLARE_COMPONENT( D3PD::TrackParticlePerigeeAtBSAssociationTool )
+DECLARE_COMPONENT( D3PD::TrackParticleTrackSummaryAssociationTool )
+DECLARE_COMPONENT( D3PD::TrackParticleInfoAssociationTool )
+DECLARE_COMPONENT( D3PD::TrackParticleTSOAssociationTool )
+DECLARE_COMPONENT( D3PD::TrackParticleVertexAssociationTool )
+DECLARE_COMPONENT( D3PD::TrackParticleTruthAssociationTool )
+DECLARE_COMPONENT( D3PD::TrackParticleDetailedTruthAssociationTool )
+DECLARE_COMPONENT( D3PD::TrackParticleLastParametersAssociationTool )
+DECLARE_COMPONENT( D3PD::TrackParticleParametersAtBLFillerTool )
+DECLARE_COMPONENT( D3PD::TrkTrackFitQualityAssociationTool )
+DECLARE_COMPONENT( D3PD::TrkTrackPerigeeAssociationTool )
+DECLARE_COMPONENT( D3PD::TrkTrackPerigeeAtPVAssociationTool )
+DECLARE_COMPONENT( D3PD::TrkTrackPerigeeAtBSAssociationTool )
+DECLARE_COMPONENT( D3PD::TrkTrackTrackSummaryAssociationTool )
+DECLARE_COMPONENT( D3PD::TrkTrackInfoAssociationTool )
+DECLARE_COMPONENT( D3PD::TrkTrackTSOAssociationTool )
+DECLARE_COMPONENT( D3PD::TrkTrackVertexAssociationTool )
+DECLARE_COMPONENT( D3PD::TrkTrackTruthAssociationTool )
+DECLARE_COMPONENT( D3PD::TrkTrackDetailedTruthAssociationTool )
+DECLARE_COMPONENT( D3PD::VertexFitQualityAssociationTool )
+DECLARE_COMPONENT( D3PD::VertexCovarianceAssociationTool )
+//DECLARE_COMPONENT( D3PD::VertexTrackAssociationTool )
+DECLARE_COMPONENT( D3PD::VertexTrackParticleAssociationTool )
+DECLARE_COMPONENT( D3PD::PerigeePairOldPerigeeAssociationTool )
+DECLARE_COMPONENT( D3PD::TrackBeamlineParametersAssociationTool )
+DECLARE_COMPONENT( D3PD::TrkTrackGetterTool )
+DECLARE_COMPONENT( D3PD::TrackParticleGetterTool )
+DECLARE_COMPONENT( D3PD::TruthTrackGetterTool )
+DECLARE_COMPONENT( D3PD::TruthVertexGetterTool )
+DECLARE_COMPONENT( D3PD::PixelClusterCollectionGetterTool )
+DECLARE_COMPONENT( D3PD::BeamSpotGetterTool )
+DECLARE_COMPONENT( D3PD::TrackParticleDetailedTruthAssociationTool )
+DECLARE_COMPONENT( D3PD::TrkTrackParametersAtBLFillerTool )
// SCT tools
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TRTPhaseFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SCTByteStreamErrorFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SCTClusterCollectionGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SCTClusterFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SCTClusterToTrackParticleAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SCTClusterSCTRDOAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SCTRDOCollectionGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SCTRDOFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SCTRDOClusterAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParticleToSCTClusterAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParticleToSCTClusterAssociationToolLight)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ClusterAssocFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SCTTrackParticleToMuonAssociationTool)
-
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SiHitFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SiHitTruthAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SiHitContainerGetterTool)
-
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TRTUncompressedHitFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TRTUncompressedHitContainerGetterTool )
+DECLARE_COMPONENT( D3PD::TRTPhaseFillerTool )
+DECLARE_COMPONENT( D3PD::SCTByteStreamErrorFillerTool )
+DECLARE_COMPONENT( D3PD::SCTClusterCollectionGetterTool )
+DECLARE_COMPONENT( D3PD::SCTClusterFillerTool )
+DECLARE_COMPONENT( D3PD::SCTClusterToTrackParticleAssociationTool )
+DECLARE_COMPONENT( D3PD::SCTClusterSCTRDOAssociationTool )
+DECLARE_COMPONENT( D3PD::SCTRDOCollectionGetterTool )
+DECLARE_COMPONENT( D3PD::SCTRDOFillerTool )
+DECLARE_COMPONENT( D3PD::SCTRDOClusterAssociationTool )
+DECLARE_COMPONENT( D3PD::TrackParticleToSCTClusterAssociationTool )
+DECLARE_COMPONENT( D3PD::TrackParticleToSCTClusterAssociationToolLight )
+DECLARE_COMPONENT( D3PD::ClusterAssocFillerTool )
+DECLARE_COMPONENT( D3PD::SCTTrackParticleToMuonAssociationTool )
+
+DECLARE_COMPONENT( D3PD::SiHitFillerTool )
+DECLARE_COMPONENT( D3PD::SiHitTruthAssociationTool )
+DECLARE_COMPONENT( D3PD::SiHitContainerGetterTool )
+
+DECLARE_COMPONENT( D3PD::TRTUncompressedHitFillerTool )
+DECLARE_COMPONENT( D3PD::TRTUncompressedHitContainerGetterTool )
// Pixel tools
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, PixelClusterPixelRDOAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, PixelRDOCollectionGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, PixelRDOFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, PixelRDOClusterAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, PixelClusterToTrackParticleAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParticleToPixelClusterAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParticleToPixelClusterAssociationToolLight)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ClusterAssocPixelFillerTool)
+DECLARE_COMPONENT( D3PD::PixelClusterPixelRDOAssociationTool )
+DECLARE_COMPONENT( D3PD::PixelRDOCollectionGetterTool )
+DECLARE_COMPONENT( D3PD::PixelRDOFillerTool )
+DECLARE_COMPONENT( D3PD::PixelRDOClusterAssociationTool )
+DECLARE_COMPONENT( D3PD::PixelClusterToTrackParticleAssociationTool )
+DECLARE_COMPONENT( D3PD::TrackParticleToPixelClusterAssociationTool )
+DECLARE_COMPONENT( D3PD::TrackParticleToPixelClusterAssociationToolLight )
+DECLARE_COMPONENT( D3PD::ClusterAssocPixelFillerTool )
diff --git a/PhysicsAnalysis/D3PDMaker/TrigCostD3PDMaker/src/components/TrigCostD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/TrigCostD3PDMaker/src/components/TrigCostD3PDMaker_entries.cxx
index 0bb39bd657aa1de368b93c700b7f4c121e0ab747..86fcac335e115c8ec38e1b8e080e7bd5c69b6088 100644
--- a/PhysicsAnalysis/D3PDMaker/TrigCostD3PDMaker/src/components/TrigCostD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TrigCostD3PDMaker/src/components/TrigCostD3PDMaker_entries.cxx
@@ -1,6 +1,6 @@
#include "../TrigCostD3PDMakerTool.h"
#include "../TrigCostConfMetadataTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, TrigCostD3PDMakerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, TrigCostConfMetadataTool )
+DECLARE_COMPONENT( D3PD::TrigCostD3PDMakerTool )
+DECLARE_COMPONENT( D3PD::TrigCostConfMetadataTool )
diff --git a/PhysicsAnalysis/D3PDMaker/TriggerD3PDMaker/src/components/TriggerD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/TriggerD3PDMaker/src/components/TriggerD3PDMaker_entries.cxx
index 3e892b578ef7790562632cb53165af636a712fcc..2b411a8e9a5564c562f757b9312f07f62ca884d9 100644
--- a/PhysicsAnalysis/D3PDMaker/TriggerD3PDMaker/src/components/TriggerD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TriggerD3PDMaker/src/components/TriggerD3PDMaker_entries.cxx
@@ -34,32 +34,32 @@
#include "../BunchConfigIDFillerTool.h"
#include "TriggerD3PDMaker/TriggerKeyTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, TriggerBitFillerTool )
+DECLARE_COMPONENT( D3PD::TriggerBitFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, Muon_ROIGetterTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, Jet_ROIGetterTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, EmTau_ROIGetterTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, JetET_ROIGetterTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, EnergySum_ROIGetterTool )
+DECLARE_COMPONENT( D3PD::Muon_ROIGetterTool )
+DECLARE_COMPONENT( D3PD::Jet_ROIGetterTool )
+DECLARE_COMPONENT( D3PD::EmTau_ROIGetterTool )
+DECLARE_COMPONENT( D3PD::JetET_ROIGetterTool )
+DECLARE_COMPONENT( D3PD::EnergySum_ROIGetterTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, Muon_ROIFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, Jet_ROIFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, EmTau_ROIthrPatternFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, EmTau_ROIObjectDecisionFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, JetET_ROIFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, EnergySum_ROIFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, MuCTPI_RDOFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, CTP_RDOFillerTool )
+DECLARE_COMPONENT( D3PD::Muon_ROIFillerTool )
+DECLARE_COMPONENT( D3PD::Jet_ROIFillerTool )
+DECLARE_COMPONENT( D3PD::EmTau_ROIthrPatternFillerTool )
+DECLARE_COMPONENT( D3PD::EmTau_ROIObjectDecisionFillerTool )
+DECLARE_COMPONENT( D3PD::JetET_ROIFillerTool )
+DECLARE_COMPONENT( D3PD::EnergySum_ROIFillerTool )
+DECLARE_COMPONENT( D3PD::MuCTPI_RDOFillerTool )
+DECLARE_COMPONENT( D3PD::CTP_RDOFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, ChainEntryFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, CombLinksFillerTool)
+DECLARE_COMPONENT( D3PD::ChainEntryFillerTool )
+DECLARE_COMPONENT( D3PD::CombLinksFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, TrigConfMetadataTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, TrigDecisionFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, TrigRoiDescriptorFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, TrigDBKeysFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, TrigOperationalInfoFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, BunchStructureMetadataTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, BunchConfigIDFillerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, TriggerKeyTool )
+DECLARE_COMPONENT( D3PD::TrigConfMetadataTool )
+DECLARE_COMPONENT( D3PD::TrigDecisionFillerTool )
+DECLARE_COMPONENT( D3PD::TrigRoiDescriptorFillerTool )
+DECLARE_COMPONENT( D3PD::TrigDBKeysFillerTool )
+DECLARE_COMPONENT( D3PD::TrigOperationalInfoFillerTool )
+DECLARE_COMPONENT( D3PD::BunchStructureMetadataTool )
+DECLARE_COMPONENT( D3PD::BunchConfigIDFillerTool )
+DECLARE_COMPONENT( D3PD::TriggerKeyTool )
diff --git a/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/src/components/TruthD3PDAnalysis_entries.cxx b/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/src/components/TruthD3PDAnalysis_entries.cxx
index 31c45c97152c24248acefdf6ade9f81c8e9c00a2..9932c4b080944bbec43dd1d1865ae813de5747b7 100644
--- a/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/src/components/TruthD3PDAnalysis_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/src/components/TruthD3PDAnalysis_entries.cxx
@@ -3,8 +3,8 @@
#include "../SimpleTruthParticleFilterTool.h"
#include "../D3PDMCTruthClassifier.h"
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, GenObjectsFilterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TruthParticleFilterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SimpleTruthParticleFilterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, D3PDMCTruthClassifier)
+DECLARE_COMPONENT( D3PD::GenObjectsFilterTool )
+DECLARE_COMPONENT( D3PD::TruthParticleFilterTool )
+DECLARE_COMPONENT( D3PD::SimpleTruthParticleFilterTool )
+DECLARE_COMPONENT( D3PD::D3PDMCTruthClassifier )
diff --git a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/components/TruthD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/components/TruthD3PDMaker_entries.cxx
index b896702ba023ca0685050f285b953870a599b698..e7cfe9c4da511bba28429c1f159532a2034d5d9d 100644
--- a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/components/TruthD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/components/TruthD3PDMaker_entries.cxx
@@ -39,42 +39,42 @@
#include "../TruthJetFilterTool.h"
// Getter tool(s):
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, GenEventGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, GenParticleGetterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, GenVertexGetterTool)
+DECLARE_COMPONENT( D3PD::GenEventGetterTool )
+DECLARE_COMPONENT( D3PD::GenParticleGetterTool )
+DECLARE_COMPONENT( D3PD::GenVertexGetterTool )
// Associator tool(s):
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, GenEventGenParticleAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, GenParticleEventAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, GenParticleParticleAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, GenParticleTruthParticleAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, GenParticleVertexAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, GenVertexParticleAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, GenVertexEventAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TruthParticleEtIsolationAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TruthParticleChildAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TruthParticleParentAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TruthParticleGenParticleAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TruthParticleProdVertexAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, PileUpInfoAssociatorTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TruthTauDecayAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TruthLeptonParentAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TruthLeptonNearbyAssociationTool)
+DECLARE_COMPONENT( D3PD::GenEventGenParticleAssociationTool )
+DECLARE_COMPONENT( D3PD::GenParticleEventAssociationTool )
+DECLARE_COMPONENT( D3PD::GenParticleParticleAssociationTool )
+DECLARE_COMPONENT( D3PD::GenParticleTruthParticleAssociationTool )
+DECLARE_COMPONENT( D3PD::GenParticleVertexAssociationTool )
+DECLARE_COMPONENT( D3PD::GenVertexParticleAssociationTool )
+DECLARE_COMPONENT( D3PD::GenVertexEventAssociationTool )
+DECLARE_COMPONENT( D3PD::TruthParticleEtIsolationAssociationTool )
+DECLARE_COMPONENT( D3PD::TruthParticleChildAssociationTool )
+DECLARE_COMPONENT( D3PD::TruthParticleParentAssociationTool )
+DECLARE_COMPONENT( D3PD::TruthParticleGenParticleAssociationTool )
+DECLARE_COMPONENT( D3PD::TruthParticleProdVertexAssociationTool )
+DECLARE_COMPONENT( D3PD::PileUpInfoAssociatorTool )
+DECLARE_COMPONENT( D3PD::TruthTauDecayAssociationTool )
+DECLARE_COMPONENT( D3PD::TruthLeptonParentAssociationTool )
+DECLARE_COMPONENT( D3PD::TruthLeptonNearbyAssociationTool )
// Filler tool(s):
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, GenEventFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, GenEventPileUpFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TruthParticleBremFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, GenParticleFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, GenParticlePerigeeFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, GenVertexFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TruthEtIsolationFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TruthParticleFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TruthParticleBarcodesFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, PileUpInfoFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TruthParticleFakerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetFullTruthTag)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, HforFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TruthParticleClassificationFillerTool)
+DECLARE_COMPONENT( D3PD::GenEventFillerTool )
+DECLARE_COMPONENT( D3PD::GenEventPileUpFillerTool )
+DECLARE_COMPONENT( D3PD::TruthParticleBremFillerTool )
+DECLARE_COMPONENT( D3PD::GenParticleFillerTool )
+DECLARE_COMPONENT( D3PD::GenParticlePerigeeFillerTool )
+DECLARE_COMPONENT( D3PD::GenVertexFillerTool )
+DECLARE_COMPONENT( D3PD::TruthEtIsolationFillerTool )
+DECLARE_COMPONENT( D3PD::TruthParticleFillerTool )
+DECLARE_COMPONENT( D3PD::TruthParticleBarcodesFillerTool )
+DECLARE_COMPONENT( D3PD::PileUpInfoFillerTool )
+DECLARE_COMPONENT( D3PD::TruthParticleFakerTool )
+DECLARE_COMPONENT( D3PD::JetFullTruthTag )
+DECLARE_COMPONENT( D3PD::HforFillerTool )
+DECLARE_COMPONENT( D3PD::TruthParticleClassificationFillerTool )
// Filter tool(s):
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, GenEventGetterFilterTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TruthJetFilterTool)
+DECLARE_COMPONENT( D3PD::GenEventGetterFilterTool )
+DECLARE_COMPONENT( D3PD::TruthJetFilterTool )
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/src/components/egammaD3PDAnalysis_entries.cxx b/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/src/components/egammaD3PDAnalysis_entries.cxx
index 0d1cda92503c0abe0a005f07612b6c128b29ecd0..de90e1f080eb75c522f850adc7da22c2a62ea3be 100644
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/src/components/egammaD3PDAnalysis_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/src/components/egammaD3PDAnalysis_entries.cxx
@@ -17,20 +17,20 @@
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, egammaDeltaEmax2Alg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, egammaShowerDepthAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, PhotonTruthAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, ElectronRedoOQAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, PhotonRedoOQAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, egammaCalcOQAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, egammaTruthAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, TileGapSelectionAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, TileGapSumAlg)
-
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, PhotonTruthTool)
-
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, egammaMaxECellAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, egammaSumCellsGainAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, egammaNbCellsGainAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, egammaTimeCorrAlg)
+DECLARE_COMPONENT( D3PD::egammaDeltaEmax2Alg )
+DECLARE_COMPONENT( D3PD::egammaShowerDepthAlg )
+DECLARE_COMPONENT( D3PD::PhotonTruthAlg )
+DECLARE_COMPONENT( D3PD::ElectronRedoOQAlg )
+DECLARE_COMPONENT( D3PD::PhotonRedoOQAlg )
+DECLARE_COMPONENT( D3PD::egammaCalcOQAlg )
+DECLARE_COMPONENT( D3PD::egammaTruthAlg )
+DECLARE_COMPONENT( D3PD::TileGapSelectionAlg )
+DECLARE_COMPONENT( D3PD::TileGapSumAlg )
+
+DECLARE_COMPONENT( D3PD::PhotonTruthTool )
+
+DECLARE_COMPONENT( D3PD::egammaMaxECellAlg )
+DECLARE_COMPONENT( D3PD::egammaSumCellsGainAlg )
+DECLARE_COMPONENT( D3PD::egammaNbCellsGainAlg )
+DECLARE_COMPONENT( D3PD::egammaTimeCorrAlg )
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/src/components/egammaD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/src/components/egammaD3PDMaker_entries.cxx
index 9f7efc725b6a66ca5d25eef0d597a41be8dc14df..085539050ca2df02eb9074be4355674b05b34c7c 100644
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/src/components/egammaD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/src/components/egammaD3PDMaker_entries.cxx
@@ -20,23 +20,23 @@
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, egammaLayer1ExtraFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, egammaRetaphiFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, egammaConversionFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, egammaConversion0FillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, egammaTruthClassificationFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ElectronTrackParticleAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, egammaClusterAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, egammaGenParticleAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, egammaL1TriggerObjectAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, egammaEFElectronTriggerObjectAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, egammaEFPhotonTriggerObjectAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ElectronJetDRAssociator)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ElectronL2TriggerObjectAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, PhotonL2TriggerObjectAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, egammaObjectDecisionFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, xAODElectronObjectDecisionFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, xAODPhotonObjectDecisionFillerTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ConversionVertexAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, egammaTraversedMaterialFillerTool)
+DECLARE_COMPONENT( D3PD::egammaLayer1ExtraFillerTool )
+DECLARE_COMPONENT( D3PD::egammaRetaphiFillerTool )
+DECLARE_COMPONENT( D3PD::egammaConversionFillerTool )
+DECLARE_COMPONENT( D3PD::egammaConversion0FillerTool )
+DECLARE_COMPONENT( D3PD::egammaTruthClassificationFillerTool )
+DECLARE_COMPONENT( D3PD::ElectronTrackParticleAssociationTool )
+DECLARE_COMPONENT( D3PD::egammaClusterAssociationTool )
+DECLARE_COMPONENT( D3PD::egammaGenParticleAssociationTool )
+DECLARE_COMPONENT( D3PD::egammaL1TriggerObjectAssociationTool )
+DECLARE_COMPONENT( D3PD::egammaEFElectronTriggerObjectAssociationTool )
+DECLARE_COMPONENT( D3PD::egammaEFPhotonTriggerObjectAssociationTool )
+DECLARE_COMPONENT( D3PD::ElectronJetDRAssociator )
+DECLARE_COMPONENT( D3PD::ElectronL2TriggerObjectAssociationTool )
+DECLARE_COMPONENT( D3PD::PhotonL2TriggerObjectAssociationTool )
+DECLARE_COMPONENT( D3PD::egammaObjectDecisionFillerTool )
+DECLARE_COMPONENT( D3PD::xAODElectronObjectDecisionFillerTool )
+DECLARE_COMPONENT( D3PD::xAODPhotonObjectDecisionFillerTool )
+DECLARE_COMPONENT( D3PD::ConversionVertexAssociationTool )
+DECLARE_COMPONENT( D3PD::egammaTraversedMaterialFillerTool )
diff --git a/PhysicsAnalysis/DPDUtils/src/components/DPDUtils_entries.cxx b/PhysicsAnalysis/DPDUtils/src/components/DPDUtils_entries.cxx
index 16ab90bbece76b20acd457ddbfa78abe230327e9..9d27a526d683b4d1bf75b8e1adcadfcbfbc5352b 100644
--- a/PhysicsAnalysis/DPDUtils/src/components/DPDUtils_entries.cxx
+++ b/PhysicsAnalysis/DPDUtils/src/components/DPDUtils_entries.cxx
@@ -3,9 +3,9 @@
#include "DPDUtils/DPDTagTool.h"
#include "DPDUtils/ObjectThinner.h"
-DECLARE_ALGORITHM_FACTORY( DPDPhotonFilter )
-DECLARE_ALGORITHM_FACTORY( ZeeFilter )
-DECLARE_ALGORITHM_FACTORY( ObjectThinner )
+DECLARE_COMPONENT( DPDPhotonFilter )
+DECLARE_COMPONENT( ZeeFilter )
+DECLARE_COMPONENT( ObjectThinner )
-DECLARE_TOOL_FACTORY( DPDTagTool )
+DECLARE_COMPONENT( DPDTagTool )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCalo/src/components/DerivationFrameworkCalo_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCalo/src/components/DerivationFrameworkCalo_entries.cxx
index 190098d81d56599d47d91b5495bef84d563c91bd..b06c237f58fe1372786f0d43e7e8b17a25020262 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCalo/src/components/DerivationFrameworkCalo_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCalo/src/components/DerivationFrameworkCalo_entries.cxx
@@ -7,12 +7,12 @@
using namespace DerivationFramework;
-DECLARE_TOOL_FACTORY( CaloClusterThinning )
-DECLARE_TOOL_FACTORY( JetCaloClusterThinning )
-DECLARE_TOOL_FACTORY( CellsInConeThinning )
-DECLARE_TOOL_FACTORY( GainDecorator )
-DECLARE_TOOL_FACTORY( MaxCellDecorator )
-DECLARE_TOOL_FACTORY( ClusterEnergyPerLayerDecorator )
+DECLARE_COMPONENT( CaloClusterThinning )
+DECLARE_COMPONENT( JetCaloClusterThinning )
+DECLARE_COMPONENT( CellsInConeThinning )
+DECLARE_COMPONENT( GainDecorator )
+DECLARE_COMPONENT( MaxCellDecorator )
+DECLARE_COMPONENT( ClusterEnergyPerLayerDecorator )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/src/components/DerivationFrameworkCore_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/src/components/DerivationFrameworkCore_entries.cxx
index e3dd871a221582220140ae5a98e1abbc691c4168..a5c95a17a7a7d7e146e246a07159415fd74429c9 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/src/components/DerivationFrameworkCore_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/src/components/DerivationFrameworkCore_entries.cxx
@@ -1,6 +1,6 @@
#include "DerivationFrameworkCore/DerivationKernel.h"
#include "DerivationFrameworkCore/CommonAugmentation.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( DerivationFramework , DerivationKernel )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( DerivationFramework , CommonAugmentation )
+DECLARE_COMPONENT( DerivationFramework::DerivationKernel )
+DECLARE_COMPONENT( DerivationFramework::CommonAugmentation )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/src/components/DerivationFrameworkEGamma_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/src/components/DerivationFrameworkEGamma_entries.cxx
index 11cf5557c06ce8a8cf2d75c1a51b3315c2b8da56..3c27b0642e86f2731433410e6ac478eb4965194e 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/src/components/DerivationFrameworkEGamma_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/src/components/DerivationFrameworkEGamma_entries.cxx
@@ -7,12 +7,12 @@
using namespace DerivationFramework;
-DECLARE_TOOL_FACTORY( PhotonsDirectionTool )
-DECLARE_TOOL_FACTORY( EGammaPassSelectionWrapper )
-DECLARE_TOOL_FACTORY( EGInvariantMassTool )
-DECLARE_TOOL_FACTORY( EGTransverseMassTool )
-DECLARE_TOOL_FACTORY( EGSelectionToolWrapper )
-DECLARE_TOOL_FACTORY( BkgElectronClassification )
+DECLARE_COMPONENT( PhotonsDirectionTool )
+DECLARE_COMPONENT( EGammaPassSelectionWrapper )
+DECLARE_COMPONENT( EGInvariantMassTool )
+DECLARE_COMPONENT( EGTransverseMassTool )
+DECLARE_COMPONENT( EGSelectionToolWrapper )
+DECLARE_COMPONENT( BkgElectronClassification )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/src/components/DerivationFrameworkExamples_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/src/components/DerivationFrameworkExamples_entries.cxx
index 54da8f468c5b4530a0865118e5a59c57e6fb8262..50c44ecb53ada0e62f0f71a29b19f13291fa284f 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/src/components/DerivationFrameworkExamples_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/src/components/DerivationFrameworkExamples_entries.cxx
@@ -3,7 +3,7 @@
#include "DerivationFrameworkExamples/AugmentationToolExample.h"
using namespace DerivationFramework;
-DECLARE_TOOL_FACTORY( SkimmingToolExample )
-DECLARE_TOOL_FACTORY( ThinningToolExample )
-DECLARE_TOOL_FACTORY( AugmentationToolExample )
+DECLARE_COMPONENT( SkimmingToolExample )
+DECLARE_COMPONENT( ThinningToolExample )
+DECLARE_COMPONENT( AugmentationToolExample )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/src/components/DerivationFrameworkExotics_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/src/components/DerivationFrameworkExotics_entries.cxx
index c8c913670cc3fe4eb1ec85dc1bc4d476ccd08a08..5cd08ae0e29d6b28b98ff56339a77a3a99a91448 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/src/components/DerivationFrameworkExotics_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/src/components/DerivationFrameworkExotics_entries.cxx
@@ -3,6 +3,6 @@
using namespace DerivationFramework;
-DECLARE_TOOL_FACTORY( SkimmingToolEXOT14 )
-DECLARE_TOOL_FACTORY( SkimmingToolEXOT5 )
+DECLARE_COMPONENT( SkimmingToolEXOT14 )
+DECLARE_COMPONENT( SkimmingToolEXOT5 )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/src/components/DerivationFrameworkHiggs_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/src/components/DerivationFrameworkHiggs_entries.cxx
index b9a05ad0d5a2d4ace9ace3a0e94176043a3fb7b4..f57ec57c534ef67394c84f00e2e911b4926d5009 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/src/components/DerivationFrameworkHiggs_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/src/components/DerivationFrameworkHiggs_entries.cxx
@@ -3,7 +3,7 @@
#include "DerivationFrameworkHiggs/SkimmingToolHIGG5VBF.h"
using namespace DerivationFramework;
-DECLARE_TOOL_FACTORY( SkimmingToolHIGG1 )
-DECLARE_TOOL_FACTORY( SkimmingToolHIGG2 )
-DECLARE_TOOL_FACTORY( SkimmingToolHIGG5VBF )
+DECLARE_COMPONENT( SkimmingToolHIGG1 )
+DECLARE_COMPONENT( SkimmingToolHIGG2 )
+DECLARE_COMPONENT( SkimmingToolHIGG5VBF )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/components/DerivationFrameworkInDet_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/components/DerivationFrameworkInDet_entries.cxx
index 07ba830a1388e73197e9f7d9790811184b8cbd2a..371f888792a6a2c81f67b053430a1f9e6d9f8f37 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/components/DerivationFrameworkInDet_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/components/DerivationFrameworkInDet_entries.cxx
@@ -19,22 +19,22 @@
using namespace DerivationFramework;
-DECLARE_TOOL_FACTORY( TrackToVertexWrapper )
-DECLARE_TOOL_FACTORY( TrackParticleThinning )
-DECLARE_TOOL_FACTORY( MuonTrackParticleThinning )
-DECLARE_TOOL_FACTORY( EgammaTrackParticleThinning )
-DECLARE_TOOL_FACTORY( TauTrackParticleThinning )
-DECLARE_TOOL_FACTORY( DiTauTrackParticleThinning )
-DECLARE_TOOL_FACTORY( JetTrackParticleThinning )
-DECLARE_TOOL_FACTORY( TrackParametersAtPV )
-DECLARE_TOOL_FACTORY( TrackStateOnSurfaceDecorator )
-DECLARE_TOOL_FACTORY( TrackParametersForTruthParticles )
-DECLARE_TOOL_FACTORY( EventInfoBSErrDecorator )
-DECLARE_TOOL_FACTORY( UnassociatedHitsDecorator )
-DECLARE_NAMESPACE_TOOL_FACTORY(DerivationFramework, UnassociatedHitsGetterTool)
-DECLARE_TOOL_FACTORY( LArCollisionTimeDecorator )
-DECLARE_TOOL_FACTORY( EGammaTracksThinning )
-DECLARE_TOOL_FACTORY( EGammaPrepRawDataThinning )
-DECLARE_TOOL_FACTORY( TrackMeasurementThinning )
-DECLARE_TOOL_FACTORY( EventInfoPixelDecorator )
+DECLARE_COMPONENT( TrackToVertexWrapper )
+DECLARE_COMPONENT( TrackParticleThinning )
+DECLARE_COMPONENT( MuonTrackParticleThinning )
+DECLARE_COMPONENT( EgammaTrackParticleThinning )
+DECLARE_COMPONENT( TauTrackParticleThinning )
+DECLARE_COMPONENT( DiTauTrackParticleThinning )
+DECLARE_COMPONENT( JetTrackParticleThinning )
+DECLARE_COMPONENT( TrackParametersAtPV )
+DECLARE_COMPONENT( TrackStateOnSurfaceDecorator )
+DECLARE_COMPONENT( TrackParametersForTruthParticles )
+DECLARE_COMPONENT( EventInfoBSErrDecorator )
+DECLARE_COMPONENT( UnassociatedHitsDecorator )
+DECLARE_COMPONENT( DerivationFramework::UnassociatedHitsGetterTool )
+DECLARE_COMPONENT( LArCollisionTimeDecorator )
+DECLARE_COMPONENT( EGammaTracksThinning )
+DECLARE_COMPONENT( EGammaPrepRawDataThinning )
+DECLARE_COMPONENT( TrackMeasurementThinning )
+DECLARE_COMPONENT( EventInfoPixelDecorator )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/components/DerivationFrameworkJetEtMiss_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/components/DerivationFrameworkJetEtMiss_entries.cxx
index 8e592bf6a3221158dac7ed788a467d9c4a4bd03a..26b4c0dc8ca75711c89e293e514000dff1524a50 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/components/DerivationFrameworkJetEtMiss_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/components/DerivationFrameworkJetEtMiss_entries.cxx
@@ -7,10 +7,10 @@
using namespace DerivationFramework;
-DECLARE_ALGORITHM_FACTORY( JetDecorAlg )
-DECLARE_TOOL_FACTORY( JetAugmentationTool )
-DECLARE_TOOL_FACTORY( PFlowAugmentationTool )
-DECLARE_TOOL_FACTORY( METTriggerAugmentationTool )
-DECLARE_TOOL_FACTORY( ViewContainerThinning )
-DECLARE_TOOL_FACTORY( JetExternalAssocTool )
+DECLARE_COMPONENT( JetDecorAlg )
+DECLARE_COMPONENT( JetAugmentationTool )
+DECLARE_COMPONENT( PFlowAugmentationTool )
+DECLARE_COMPONENT( METTriggerAugmentationTool )
+DECLARE_COMPONENT( ViewContainerThinning )
+DECLARE_COMPONENT( JetExternalAssocTool )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkL1Calo/src/components/DerivationFrameworkL1Calo_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkL1Calo/src/components/DerivationFrameworkL1Calo_entries.cxx
index 655e2b854eea21c85f085e0e2283cdcbf1aa82a7..07bae764b6ef76102a3810b7187bb03accaf16b5 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkL1Calo/src/components/DerivationFrameworkL1Calo_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkL1Calo/src/components/DerivationFrameworkL1Calo_entries.cxx
@@ -2,5 +2,5 @@
#include "xAODTrigL1Calo/L1TopoRawDataContainer.h"
#include "xAODTrigL1Calo/L1TopoRawDataAuxContainer.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( DerivationFramework , SaturatedTriggerTower )
+DECLARE_COMPONENT( DerivationFramework::SaturatedTriggerTower )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/components/DerivationFrameworkMCTruth_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/components/DerivationFrameworkMCTruth_entries.cxx
index 5d0d7f61ed7132e72b514ddd21255635845ec814..9cf62e589c6c76458b8a4cc25c6882495e02f35a 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/components/DerivationFrameworkMCTruth_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/components/DerivationFrameworkMCTruth_entries.cxx
@@ -13,16 +13,16 @@
using namespace DerivationFramework;
-DECLARE_TOOL_FACTORY( TruthDressingTool )
-DECLARE_TOOL_FACTORY( TruthIsolationTool )
-DECLARE_TOOL_FACTORY( MenuTruthThinning )
-DECLARE_TOOL_FACTORY( GenericTruthThinning )
-DECLARE_TOOL_FACTORY( TruthCollectionMaker )
-DECLARE_TOOL_FACTORY( TruthCollectionMakerTau )
-DECLARE_TOOL_FACTORY( TruthClassificationDecorator )
-DECLARE_ALGORITHM_FACTORY( CompactHardTruth )
-DECLARE_TOOL_FACTORY( HardTruthThinning )
+DECLARE_COMPONENT( TruthDressingTool )
+DECLARE_COMPONENT( TruthIsolationTool )
+DECLARE_COMPONENT( MenuTruthThinning )
+DECLARE_COMPONENT( GenericTruthThinning )
+DECLARE_COMPONENT( TruthCollectionMaker )
+DECLARE_COMPONENT( TruthCollectionMakerTau )
+DECLARE_COMPONENT( TruthClassificationDecorator )
+DECLARE_COMPONENT( CompactHardTruth )
+DECLARE_COMPONENT( HardTruthThinning )
-DECLARE_TOOL_FACTORY( HadronOriginDecorator )
-DECLARE_TOOL_FACTORY( HadronOriginClassifier )
+DECLARE_COMPONENT( HadronOriginDecorator )
+DECLARE_COMPONENT( HadronOriginClassifier )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_entries.cxx
index a046e393a84baf97b88e8c419db67816b422efd2..447800ad68ed56d32f30640da812d49537074136 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_entries.cxx
@@ -3,7 +3,7 @@
#include "DerivationFrameworkMuons/mcpDecorator.h"
using namespace DerivationFramework;
-DECLARE_TOOL_FACTORY( dimuonTaggingTool )
-DECLARE_TOOL_FACTORY( isolationDecorator )
-DECLARE_TOOL_FACTORY( mcpDecorator )
+DECLARE_COMPONENT( dimuonTaggingTool )
+DECLARE_COMPONENT( isolationDecorator )
+DECLARE_COMPONENT( mcpDecorator )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/src/components/DerivationFrameworkSUSY_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/src/components/DerivationFrameworkSUSY_entries.cxx
index 1bf28972a8384cf14efcb725615a89e930862fb1..58809f92779ebb4bd1c1aa9dd1a8c6539872f87c 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/src/components/DerivationFrameworkSUSY_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/src/components/DerivationFrameworkSUSY_entries.cxx
@@ -6,9 +6,9 @@
using namespace DerivationFramework;
-DECLARE_TOOL_FACTORY( Truth3CollectionMaker )
-DECLARE_TOOL_FACTORY( SUSYSignalTagger )
-DECLARE_TOOL_FACTORY( SUSYGenFilterTool )
-DECLARE_TOOL_FACTORY( TrackParticleCaloCellDecorator )
-DECLARE_TOOL_FACTORY( trackIsolationDecorator )
+DECLARE_COMPONENT( Truth3CollectionMaker )
+DECLARE_COMPONENT( SUSYSignalTagger )
+DECLARE_COMPONENT( SUSYGenFilterTool )
+DECLARE_COMPONENT( TrackParticleCaloCellDecorator )
+DECLARE_COMPONENT( trackIsolationDecorator )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/src/components/DerivationFrameworkTau_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/src/components/DerivationFrameworkTau_entries.cxx
index b469ff005d921c1a81909201b7a3e2bf0e217a1e..bf1e11dfc8d60a5662f272aa083a73b033b724ad 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/src/components/DerivationFrameworkTau_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/src/components/DerivationFrameworkTau_entries.cxx
@@ -6,9 +6,9 @@
using namespace DerivationFramework;
-DECLARE_TOOL_FACTORY( TauSelectionWrapper )
-DECLARE_TOOL_FACTORY( TauTruthMatchingWrapper )
-DECLARE_TOOL_FACTORY( TauPVRefitTool )
-DECLARE_TOOL_FACTORY( TauPVTrkSelectionTool )
-DECLARE_TOOL_FACTORY( TauOverlappingElectronLLHDecoratorWrapper )
+DECLARE_COMPONENT( TauSelectionWrapper )
+DECLARE_COMPONENT( TauTruthMatchingWrapper )
+DECLARE_COMPONENT( TauPVRefitTool )
+DECLARE_COMPONENT( TauPVTrkSelectionTool )
+DECLARE_COMPONENT( TauOverlappingElectronLLHDecoratorWrapper )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/src/components/DerivationFrameworkTools_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/src/components/DerivationFrameworkTools_entries.cxx
index 934902b490727ab0d057a373e394f7c089802ff6..0c5790141c9953392ce307e51de1e0287b6ed361 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/src/components/DerivationFrameworkTools_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/src/components/DerivationFrameworkTools_entries.cxx
@@ -11,14 +11,14 @@
using namespace DerivationFramework;
-DECLARE_TOOL_FACTORY( xAODStringSkimmingTool )
-DECLARE_TOOL_FACTORY( NTUPStringSkimmingTool )
-DECLARE_TOOL_FACTORY( InvariantMassTool )
-DECLARE_TOOL_FACTORY( DeltaRTool )
-DECLARE_TOOL_FACTORY( AsgSelectionToolWrapper )
-DECLARE_TOOL_FACTORY( FilterCombinationAND )
-DECLARE_TOOL_FACTORY( FilterCombinationOR )
-DECLARE_TOOL_FACTORY( TriggerSkimmingTool )
-DECLARE_TOOL_FACTORY( PrescaleTool )
-DECLARE_TOOL_FACTORY( GenericObjectThinning )
+DECLARE_COMPONENT( xAODStringSkimmingTool )
+DECLARE_COMPONENT( NTUPStringSkimmingTool )
+DECLARE_COMPONENT( InvariantMassTool )
+DECLARE_COMPONENT( DeltaRTool )
+DECLARE_COMPONENT( AsgSelectionToolWrapper )
+DECLARE_COMPONENT( FilterCombinationAND )
+DECLARE_COMPONENT( FilterCombinationOR )
+DECLARE_COMPONENT( TriggerSkimmingTool )
+DECLARE_COMPONENT( PrescaleTool )
+DECLARE_COMPONENT( GenericObjectThinning )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/src/components/DerivationFrameworkTop_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/src/components/DerivationFrameworkTop_entries.cxx
index 6f5734c5463ecbf035271b5e10d5dd27e60c8d9e..e673ac5e2e8afec1685f900c42a8f6933e890e45 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/src/components/DerivationFrameworkTop_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/src/components/DerivationFrameworkTop_entries.cxx
@@ -10,10 +10,10 @@
using namespace DerivationFramework;
-DECLARE_TOOL_FACTORY( TopHeavyFlavorFilterAugmentation )
-DECLARE_TOOL_FACTORY( TTbarPlusHeavyFlavorFilterTool )
-DECLARE_TOOL_FACTORY( BoostedHadTopAndTopPairFilterAugmentation )
-DECLARE_TOOL_FACTORY( BoostedHadTopAndTopPairFilterTool )
-DECLARE_TOOL_FACTORY( JetMSVAugmentation )
-DECLARE_TOOL_FACTORY( SV1TrackThinning )
+DECLARE_COMPONENT( TopHeavyFlavorFilterAugmentation )
+DECLARE_COMPONENT( TTbarPlusHeavyFlavorFilterTool )
+DECLARE_COMPONENT( BoostedHadTopAndTopPairFilterAugmentation )
+DECLARE_COMPONENT( BoostedHadTopAndTopPairFilterTool )
+DECLARE_COMPONENT( JetMSVAugmentation )
+DECLARE_COMPONENT( SV1TrackThinning )
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/src/components/ElectronEfficiencyCorrection_entries.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/src/components/ElectronEfficiencyCorrection_entries.cxx
index 0f1f13ecbc4008d95bfd0a66a36d0a2e0e95ddef..ec72b97a27778b834f7474ad3a0fa35bff89cc51 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/src/components/ElectronEfficiencyCorrection_entries.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/src/components/ElectronEfficiencyCorrection_entries.cxx
@@ -2,8 +2,8 @@
#include "ElectronEfficiencyCorrection/ElectronChargeEfficiencyCorrectionTool.h"
#include "../testAthenaElectronAlg.h"
-DECLARE_TOOL_FACTORY( AsgElectronEfficiencyCorrectionTool )
-DECLARE_TOOL_FACTORY( CP::ElectronChargeEfficiencyCorrectionTool )
+DECLARE_COMPONENT( AsgElectronEfficiencyCorrectionTool )
+DECLARE_COMPONENT( CP::ElectronChargeEfficiencyCorrectionTool )
-DECLARE_ALGORITHM_FACTORY( testAthenaElectronAlg )
+DECLARE_COMPONENT( testAthenaElectronAlg )
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/src/components/ElectronPhotonFourMomentumCorrection_entries.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/src/components/ElectronPhotonFourMomentumCorrection_entries.cxx
index 18a4b975da36ce8d541c296a06b3c10ddf2a256e..0fd84238d8b09f59655e30521c155ea22debc9d6 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/src/components/ElectronPhotonFourMomentumCorrection_entries.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/src/components/ElectronPhotonFourMomentumCorrection_entries.cxx
@@ -2,12 +2,12 @@
#include "../testAthenaEgammaCalibTool.h"
#include "../CalibratedEgammaProvider.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( CP, EgammaCalibrationAndSmearingTool )
-DECLARE_ALGORITHM_FACTORY( testAthenaEgammaCalibTool )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(CP,CalibratedEgammaProvider)
+DECLARE_COMPONENT( CP::EgammaCalibrationAndSmearingTool )
+DECLARE_COMPONENT( testAthenaEgammaCalibTool )
+DECLARE_COMPONENT( CP::CalibratedEgammaProvider )
#include "../dumpAllSystematics.h"
-DECLARE_ALGORITHM_FACTORY( DumpAllSystematics )
+DECLARE_COMPONENT( DumpAllSystematics )
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/src/components/ElectronPhotonSelectorTools_entries.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/src/components/ElectronPhotonSelectorTools_entries.cxx
index c8198a406ecef6f61f52d35a5b31e038ba41df77..b4460d449a74b10149b6ba481f6f6785761fc197 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/src/components/ElectronPhotonSelectorTools_entries.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/src/components/ElectronPhotonSelectorTools_entries.cxx
@@ -6,11 +6,11 @@
#include "ElectronPhotonSelectorTools/EGammaAmbiguityTool.h"
#include "ElectronPhotonSelectorTools/AsgElectronChargeIDSelectorTool.h"
-DECLARE_TOOL_FACTORY( AsgElectronIsEMSelector )
-DECLARE_TOOL_FACTORY( AsgElectronMultiLeptonSelector )
-DECLARE_TOOL_FACTORY( AsgElectronLikelihoodTool )
-DECLARE_TOOL_FACTORY( AsgPhotonIsEMSelector )
-DECLARE_TOOL_FACTORY( AsgForwardElectronIsEMSelector )
-DECLARE_TOOL_FACTORY( EGammaAmbiguityTool )
-DECLARE_TOOL_FACTORY( AsgElectronChargeIDSelectorTool )
+DECLARE_COMPONENT( AsgElectronIsEMSelector )
+DECLARE_COMPONENT( AsgElectronMultiLeptonSelector )
+DECLARE_COMPONENT( AsgElectronLikelihoodTool )
+DECLARE_COMPONENT( AsgPhotonIsEMSelector )
+DECLARE_COMPONENT( AsgForwardElectronIsEMSelector )
+DECLARE_COMPONENT( EGammaAmbiguityTool )
+DECLARE_COMPONENT( AsgElectronChargeIDSelectorTool )
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonShowerShapeFudgeTool/src/components/ElectronPhotonShowerShapeFudgeTool_entries.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonShowerShapeFudgeTool/src/components/ElectronPhotonShowerShapeFudgeTool_entries.cxx
index 8bf6a33722421903deece8272d260759eddd3db4..f525fae9103828b221d58e21bcb519ecc9917181 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonShowerShapeFudgeTool/src/components/ElectronPhotonShowerShapeFudgeTool_entries.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonShowerShapeFudgeTool/src/components/ElectronPhotonShowerShapeFudgeTool_entries.cxx
@@ -1,4 +1,4 @@
#include "ElectronPhotonShowerShapeFudgeTool/ElectronPhotonShowerShapeFudgeTool.h"
-DECLARE_TOOL_FACTORY( ElectronPhotonShowerShapeFudgeTool )
+DECLARE_COMPONENT( ElectronPhotonShowerShapeFudgeTool )
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/components/ElectronPhotonTagTools_entries.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/components/ElectronPhotonTagTools_entries.cxx
index e09062ac92c46c4c4bf28de69f6f8e3486d7fd14..21543765cde852aeaac5b85de43c33a77b3e727a 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/components/ElectronPhotonTagTools_entries.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/components/ElectronPhotonTagTools_entries.cxx
@@ -3,8 +3,8 @@
#include "ElectronPhotonTagTools/PhotonTagTool.h"
-DECLARE_TOOL_FACTORY( EgammaTagTool )
-DECLARE_TOOL_FACTORY( ElectronTagTool )
-DECLARE_TOOL_FACTORY( PhotonTagTool )
+DECLARE_COMPONENT( EgammaTagTool )
+DECLARE_COMPONENT( ElectronTagTool )
+DECLARE_COMPONENT( PhotonTagTool )
diff --git a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/src/components/IsolationCorrections_entries.cxx b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/src/components/IsolationCorrections_entries.cxx
index 9054874c4be848d5c566c02c66f979d50b532380..b3a0b477fe7d4e6f239b8a6aa4b469a230f72ea1 100644
--- a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/src/components/IsolationCorrections_entries.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/src/components/IsolationCorrections_entries.cxx
@@ -1,4 +1,4 @@
#include "IsolationCorrections/IsolationCorrectionTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( CP, IsolationCorrectionTool )
+DECLARE_COMPONENT( CP::IsolationCorrectionTool )
diff --git a/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/src/components/PhotonEfficiencyCorrection_entries.cxx b/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/src/components/PhotonEfficiencyCorrection_entries.cxx
index 16931998bf3a66ffad894a1c3ab911ee5615b9d7..4342c6854008ff93fc94819b90406a221ac9e167 100644
--- a/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/src/components/PhotonEfficiencyCorrection_entries.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/src/components/PhotonEfficiencyCorrection_entries.cxx
@@ -2,7 +2,7 @@
#include "../testAthenaPhotonAlg.h"
-DECLARE_TOOL_FACTORY( AsgPhotonEfficiencyCorrectionTool )
+DECLARE_COMPONENT( AsgPhotonEfficiencyCorrectionTool )
-DECLARE_ALGORITHM_FACTORY( testAthenaPhotonAlg )
+DECLARE_COMPONENT( testAthenaPhotonAlg )
diff --git a/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/src/components/PhotonVertexSelection_entries.cxx b/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/src/components/PhotonVertexSelection_entries.cxx
index cf4e58806b1e16ccb9070d50fd48a61b59b89c74..d5932bd6b539c9544126181a7ae16f55374d5d76 100644
--- a/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/src/components/PhotonVertexSelection_entries.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/src/components/PhotonVertexSelection_entries.cxx
@@ -3,8 +3,8 @@
#include "PhotonVertexSelection/PhotonPointingTool.h"
#include "../PhotonVertexSelectionAlg.h"
-DECLARE_NAMESPACE_TOOL_FACTORY(CP, PhotonVertexSelectionTool)
-DECLARE_NAMESPACE_TOOL_FACTORY(CP, ElectronRemovalTool)
-DECLARE_NAMESPACE_TOOL_FACTORY(CP, PhotonPointingTool)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( CP, PhotonVertexSelectionAlg )
+DECLARE_COMPONENT( CP::PhotonVertexSelectionTool )
+DECLARE_COMPONENT( CP::ElectronRemovalTool )
+DECLARE_COMPONENT( CP::PhotonPointingTool )
+DECLARE_COMPONENT( CP::PhotonVertexSelectionAlg )
diff --git a/PhysicsAnalysis/EventTag/EventTagAlgs/src/components/EventTagBuilder_entries.cxx b/PhysicsAnalysis/EventTag/EventTagAlgs/src/components/EventTagBuilder_entries.cxx
index 37807fa45768ed42b70ef7fd9c626026cac9deaf..2f208cd48ef1a5cf46aca7efeda6b2ea6e50ca9b 100644
--- a/PhysicsAnalysis/EventTag/EventTagAlgs/src/components/EventTagBuilder_entries.cxx
+++ b/PhysicsAnalysis/EventTag/EventTagAlgs/src/components/EventTagBuilder_entries.cxx
@@ -12,17 +12,17 @@
#include "EventTagAlgs/EventSplitter.h"
-DECLARE_ALGORITHM_FACTORY( AnalysisTagBuilder )
-DECLARE_ALGORITHM_FACTORY( RawInfoSummaryTagBuilder )
-DECLARE_ALGORITHM_FACTORY( ElectronTagBuilder )
-DECLARE_ALGORITHM_FACTORY( GlobalEventTagBuilder )
-DECLARE_ALGORITHM_FACTORY( GlobalTriggerTagBuilder )
-DECLARE_ALGORITHM_FACTORY( MuonTagBuilder )
-DECLARE_ALGORITHM_FACTORY( PhotonTagBuilder )
-DECLARE_ALGORITHM_FACTORY( TauJetTagBuilder )
-DECLARE_ALGORITHM_FACTORY( ParticleJetTagBuilder )
-DECLARE_ALGORITHM_FACTORY( MissingETTagBuilder )
+DECLARE_COMPONENT( AnalysisTagBuilder )
+DECLARE_COMPONENT( RawInfoSummaryTagBuilder )
+DECLARE_COMPONENT( ElectronTagBuilder )
+DECLARE_COMPONENT( GlobalEventTagBuilder )
+DECLARE_COMPONENT( GlobalTriggerTagBuilder )
+DECLARE_COMPONENT( MuonTagBuilder )
+DECLARE_COMPONENT( PhotonTagBuilder )
+DECLARE_COMPONENT( TauJetTagBuilder )
+DECLARE_COMPONENT( ParticleJetTagBuilder )
+DECLARE_COMPONENT( MissingETTagBuilder )
-DECLARE_ALGORITHM_FACTORY( EventSplitter )
+DECLARE_COMPONENT( EventSplitter )
diff --git a/PhysicsAnalysis/EventTag/EventTagRawAlgs/src/components/EventTagRawAlgs_entries.cxx b/PhysicsAnalysis/EventTag/EventTagRawAlgs/src/components/EventTagRawAlgs_entries.cxx
index 7972bf625d3a7087a58b16b9befe9bd72cda3e4d..f911a6d43988e54b170642b94c337e0ba0cb87da 100644
--- a/PhysicsAnalysis/EventTag/EventTagRawAlgs/src/components/EventTagRawAlgs_entries.cxx
+++ b/PhysicsAnalysis/EventTag/EventTagRawAlgs/src/components/EventTagRawAlgs_entries.cxx
@@ -1,4 +1,4 @@
#include "EventTagRawAlgs/RawInfoSummaryForTagWriter.h"
-DECLARE_ALGORITHM_FACTORY( RawInfoSummaryForTagWriter )
+DECLARE_COMPONENT( RawInfoSummaryForTagWriter )
diff --git a/PhysicsAnalysis/EventTag/EventTagUtils/src/components/EventTagUtils_entries.cxx b/PhysicsAnalysis/EventTag/EventTagUtils/src/components/EventTagUtils_entries.cxx
index 624785ce87d846745182d3fa1712956c7ca2c211..4c83c9f2511ae8c0c9915de606728754af81e835 100644
--- a/PhysicsAnalysis/EventTag/EventTagUtils/src/components/EventTagUtils_entries.cxx
+++ b/PhysicsAnalysis/EventTag/EventTagUtils/src/components/EventTagUtils_entries.cxx
@@ -7,10 +7,10 @@
-DECLARE_TOOL_FACTORY( RawInfoSummaryForTagTool )
-DECLARE_TOOL_FACTORY( EventInfoTagTool )
-DECLARE_TOOL_FACTORY( GlobalEventTagTool )
-DECLARE_TOOL_FACTORY( GlobalTriggerTagTool )
-DECLARE_ALGORITHM_FACTORY( RegistrationStreamTrig )
+DECLARE_COMPONENT( RawInfoSummaryForTagTool )
+DECLARE_COMPONENT( EventInfoTagTool )
+DECLARE_COMPONENT( GlobalEventTagTool )
+DECLARE_COMPONENT( GlobalTriggerTagTool )
+DECLARE_COMPONENT( RegistrationStreamTrig )
diff --git a/PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/src/components/ExoticPhysTagTools_entries.cxx b/PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/src/components/ExoticPhysTagTools_entries.cxx
index 37c34efb7d3331af31a3532dd3a44f8f611df97c..d7f4dd5b6f12bfe823ec6152dc02e56dc4247205 100644
--- a/PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/src/components/ExoticPhysTagTools_entries.cxx
+++ b/PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/src/components/ExoticPhysTagTools_entries.cxx
@@ -1,6 +1,6 @@
#include "ExoticPhysTagTools/ExoticPhysTagTool.h"
-DECLARE_TOOL_FACTORY( ExoticPhysTagTool )
+DECLARE_COMPONENT( ExoticPhysTagTool )
diff --git a/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/src/components/HIEventUtils_entries.cxx b/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/src/components/HIEventUtils_entries.cxx
index 43a8e12d74422ffc299ad2236afe171636a788b0..48691e8858bee359990241450eefd86ce89c2f6e 100644
--- a/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/src/components/HIEventUtils_entries.cxx
+++ b/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/src/components/HIEventUtils_entries.cxx
@@ -1,5 +1,5 @@
#include "HIEventUtils/HIEventShapeSummaryTool.h"
-DECLARE_TOOL_FACTORY(HIEventShapeSummaryTool)
+DECLARE_COMPONENT( HIEventShapeSummaryTool )
diff --git a/PhysicsAnalysis/HeavyIonPhys/HeavyIonPhysTagTools/src/components/HeavyIonPhysTagTools_entries.cxx b/PhysicsAnalysis/HeavyIonPhys/HeavyIonPhysTagTools/src/components/HeavyIonPhysTagTools_entries.cxx
index 6c367729df01b289d662f1019cfa20ea866f414c..ef92e399df7ac8dad3bf05268ab0cbe343f7fb43 100644
--- a/PhysicsAnalysis/HeavyIonPhys/HeavyIonPhysTagTools/src/components/HeavyIonPhysTagTools_entries.cxx
+++ b/PhysicsAnalysis/HeavyIonPhys/HeavyIonPhysTagTools/src/components/HeavyIonPhysTagTools_entries.cxx
@@ -1,6 +1,6 @@
#include "HeavyIonPhysTagTools/HeavyIonPhysTagTool.h"
-DECLARE_TOOL_FACTORY( HeavyIonPhysTagTool )
+DECLARE_COMPONENT( HeavyIonPhysTagTool )
diff --git a/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/src/components/HSG5DPDUtils_entries.cxx b/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/src/components/HSG5DPDUtils_entries.cxx
index 103cf3f1aaa38f9060658052c32fc6e7eb107c50..8a73f998fe6dad57ec5893d6a36a28c9c1e29e01 100644
--- a/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/src/components/HSG5DPDUtils_entries.cxx
+++ b/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/src/components/HSG5DPDUtils_entries.cxx
@@ -1,6 +1,6 @@
#include "HSG5DPDUtils/LeptonFilter.h"
#include "HSG5DPDUtils/LeptonJetsFilter.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( HSG5, LeptonFilter )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( HSG5, LeptonJetsFilter )
+DECLARE_COMPONENT( HSG5::LeptonFilter )
+DECLARE_COMPONENT( HSG5::LeptonJetsFilter )
diff --git a/PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/src/components/HiggsPhysTagTools_entries.cxx b/PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/src/components/HiggsPhysTagTools_entries.cxx
index e474a5ece57eb5c2d765ff2b23373fcd3561a493..918e80415400649186095f8c80c0d21b62f4aa84 100644
--- a/PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/src/components/HiggsPhysTagTools_entries.cxx
+++ b/PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/src/components/HiggsPhysTagTools_entries.cxx
@@ -1,6 +1,6 @@
#include "HiggsPhysTagTools/HiggsPhysTagTool.h"
-DECLARE_TOOL_FACTORY( HiggsPhysTagTool )
+DECLARE_COMPONENT( HiggsPhysTagTool )
diff --git a/PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint/src/components/ZMassConstraint_entries.cxx b/PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint/src/components/ZMassConstraint_entries.cxx
index 00333110e051aa889bbfd4de205d866766250e69..3068d4dc2eb2aac7000e86c3962001ec862f98af 100644
--- a/PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint/src/components/ZMassConstraint_entries.cxx
+++ b/PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint/src/components/ZMassConstraint_entries.cxx
@@ -1,6 +1,6 @@
#include "ZMassConstraint/ConstraintFit.h"
#include "../TestAthenaConstraintFit.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( ZMassConstraint, ConstraintFit )
-DECLARE_ALGORITHM_FACTORY( TestAthenaConstraintFit )
+DECLARE_COMPONENT( ZMassConstraint::ConstraintFit )
+DECLARE_COMPONENT( TestAthenaConstraintFit )
diff --git a/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/src/components/JetMissingEtTagTools_entries.cxx b/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/src/components/JetMissingEtTagTools_entries.cxx
index d61b06f7c9bc3619ff63e10275d6c4c167aa8553..1bc6454579307053d7701d5c17877947ab0415e8 100644
--- a/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/src/components/JetMissingEtTagTools_entries.cxx
+++ b/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/src/components/JetMissingEtTagTools_entries.cxx
@@ -2,7 +2,7 @@
#include "JetMissingEtTagTools/JetMissingEtTagTool.h"
-DECLARE_TOOL_FACTORY( JetMissingEtIdentificationTagTool )
-DECLARE_TOOL_FACTORY( JetMetTagTool )
+DECLARE_COMPONENT( JetMissingEtIdentificationTagTool )
+DECLARE_COMPONENT( JetMetTagTool )
diff --git a/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/src/components/JetSelectorTools_entries.cxx b/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/src/components/JetSelectorTools_entries.cxx
index 145c4b95d8c818166fd6eb7683347da2558c659e..40df2bbb5e3dfd22f2bb68dc742dec5c44f5fe81 100644
--- a/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/src/components/JetSelectorTools_entries.cxx
+++ b/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/src/components/JetSelectorTools_entries.cxx
@@ -1,4 +1,4 @@
#include "JetSelectorTools/JetCleaningTool.h"
-DECLARE_TOOL_FACTORY( JetCleaningTool )
+DECLARE_COMPONENT( JetCleaningTool )
diff --git a/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/components/MissingEtDQA_entries.cxx b/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/components/MissingEtDQA_entries.cxx
index aeab8b85ec9b35f6b538d0d500ff5de0f5249231..47c66bf56550c42ab7479b92b4ef56f789592134 100644
--- a/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/components/MissingEtDQA_entries.cxx
+++ b/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/components/MissingEtDQA_entries.cxx
@@ -1,4 +1,4 @@
#include "../PhysValMET.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( MissingEtDQA, PhysValMET )
+DECLARE_COMPONENT( MissingEtDQA::PhysValMET )
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/components/BTagging_entries.cxx b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/components/BTagging_entries.cxx
index f753e432170f3a72a43441e9c095084c40e85c6d..edda9ccd318955537adcf7b60c535f9a40e7e8c1 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/components/BTagging_entries.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/components/BTagging_entries.cxx
@@ -11,16 +11,16 @@
using namespace Analysis ;
-//DECLARE_ALGORITHM_FACTORY( BJetBuilder )
-//DECLARE_ALGORITHM_FACTORY( BJetBuilderFast )
-DECLARE_ALGORITHM_FACTORY( StandAloneJetBTaggerAlg )
-DECLARE_TOOL_FACTORY( BTagLabeling )
-DECLARE_TOOL_FACTORY( BTagTrackAssociation )
-DECLARE_TOOL_FACTORY( BTagSecVertexing )
-DECLARE_TOOL_FACTORY( BTagJetPtScaling )
-//DECLARE_TOOL_FACTORY( BTagRemoving )
-DECLARE_TOOL_FACTORY( BTagTool )
-DECLARE_TOOL_FACTORY( JetBTaggerTool )
+//DECLARE_COMPONENT( BJetBuilder )
+//DECLARE_COMPONENT( BJetBuilderFast )
+DECLARE_COMPONENT( StandAloneJetBTaggerAlg )
+DECLARE_COMPONENT( BTagLabeling )
+DECLARE_COMPONENT( BTagTrackAssociation )
+DECLARE_COMPONENT( BTagSecVertexing )
+DECLARE_COMPONENT( BTagJetPtScaling )
+//DECLARE_COMPONENT( BTagRemoving )
+DECLARE_COMPONENT( BTagTool )
+DECLARE_COMPONENT( JetBTaggerTool )
/** factory entries need to have the name of the package */
diff --git a/PhysicsAnalysis/JetTagging/JetTagCalibration/src/components/JetTagCalibration_entries.cxx b/PhysicsAnalysis/JetTagging/JetTagCalibration/src/components/JetTagCalibration_entries.cxx
index 4ecec38d25335ef84ad2c1c29ec347cab1a6d8d3..a0c82aa9df9a52986e32cffa083a1e60e59fe39a 100644
--- a/PhysicsAnalysis/JetTagging/JetTagCalibration/src/components/JetTagCalibration_entries.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagCalibration/src/components/JetTagCalibration_entries.cxx
@@ -2,5 +2,5 @@
using namespace Analysis ;
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, CalibrationBroker )
+DECLARE_COMPONENT( Analysis::CalibrationBroker )
diff --git a/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/components/JetTagMonitoring_entries.cxx b/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/components/JetTagMonitoring_entries.cxx
index 61440af014c7c1f7171f849b45ae63462d22bec7..9ed857914907923755a3c9d82cade3b4b87734b3 100644
--- a/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/components/JetTagMonitoring_entries.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/components/JetTagMonitoring_entries.cxx
@@ -1,4 +1,4 @@
#include "JetTagMonitoring/JetTagMonitoring.h"
-DECLARE_TOOL_FACTORY( JetTagMonitoring )
+DECLARE_COMPONENT( JetTagMonitoring )
diff --git a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/src/components/CalibrationDataInterface_entries.cxx b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/src/components/CalibrationDataInterface_entries.cxx
index 8a836da9239aa4adcf32b050b50479a2ab1d45e9..3958b728c9306cca846707a930439c695a67365d 100644
--- a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/src/components/CalibrationDataInterface_entries.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/src/components/CalibrationDataInterface_entries.cxx
@@ -2,7 +2,7 @@
#include "CalibrationDataInterface/CalibrationDataUpdater.h"
#include "CalibrationDataInterface/CalibrationDataInterfaceTester.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( Analysis, CalibrationDataUpdater )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( Analysis, CalibrationDataInterfaceTester )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, CalibrationDataInterfaceTool )
+DECLARE_COMPONENT( Analysis::CalibrationDataUpdater )
+DECLARE_COMPONENT( Analysis::CalibrationDataInterfaceTester )
+DECLARE_COMPONENT( Analysis::CalibrationDataInterfaceTool )
diff --git a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/src/components/xAODBTaggingEfficiency_entries.cxx b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/src/components/xAODBTaggingEfficiency_entries.cxx
index 8e937228c0e03ea7db08bc8203c18a111b559a45..9322d19701c8eeb07d14dd2ac852b86b336b034d 100644
--- a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/src/components/xAODBTaggingEfficiency_entries.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/src/components/xAODBTaggingEfficiency_entries.cxx
@@ -4,8 +4,8 @@
#include "../ToolTester.h"
// Should probably alter the namespace
-DECLARE_TOOL_FACTORY( BTaggingEfficiencyTool)
-DECLARE_TOOL_FACTORY( BTaggingSelectionTool)
+DECLARE_COMPONENT( BTaggingEfficiencyTool )
+DECLARE_COMPONENT( BTaggingSelectionTool )
-DECLARE_ALGORITHM_FACTORY( BTagToolTester )
+DECLARE_COMPONENT( BTagToolTester )
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/src/components/JetTagTools_entries.cxx b/PhysicsAnalysis/JetTagging/JetTagTools/src/components/JetTagTools_entries.cxx
index 2fce81144a4b4d15346e8f2cab9808669c32633f..0e51d247417ef356333ef632a513af73959e534c 100644
--- a/PhysicsAnalysis/JetTagging/JetTagTools/src/components/JetTagTools_entries.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/src/components/JetTagTools_entries.cxx
@@ -37,57 +37,57 @@
//#include "JetTagTools/EmulTag.h"
#include "JetTagTools/DummyTag.h"
-//DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, LifetimeTag )
-//DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, SecVtxTag )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, IPTag )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, RNNIPTag )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, SVTag )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, MultiSVTag )
-//DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, JetProbTag )
-//DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, SoftElectronTag )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, SoftMuonTag )
-//DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, CombinerTool )
-//DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, CombinerToolTag )
-//DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, LikelihoodTool )
-//DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, LikelihoodMultiDTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, NewLikelihoodTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, TrackSelector )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, JetFitterTag )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, JetFitterNtupleWriter )
-// DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, JetFitterLikelihood )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, JetFitterVariablesFactory )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, MSVVariablesFactory )
-//DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, JetFitterCharmVariablesFactory )
-//DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, GaiaVariablesFactory )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, DL1Tag )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, TagNtupleDumper )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, MultivariateTagManager )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, JetFitterNNTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, JetFitterDummyClassifier )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, JetFitterInputWriter )
-//DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, JetFitterCharmNNTool )
-//DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, GaiaNNTool );
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, SVForIPTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, BasicTrackGradeFactory )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, DetailedTrackGradeFactory )
-//DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, TrackCounting )
-//DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, GbbNNTag )
-//DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, HadFlavorTag )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, MV1Tag )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, MV2Tag )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, MyTag )
-//DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, MV3Tag )
-
-
-
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, JetVertexCharge )
-
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, ExKtbbTag )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, ExKtbbTagTool )
+//DECLARE_COMPONENT( Analysis::LifetimeTag )
+//DECLARE_COMPONENT( Analysis::SecVtxTag )
+DECLARE_COMPONENT( Analysis::IPTag )
+DECLARE_COMPONENT( Analysis::RNNIPTag )
+DECLARE_COMPONENT( Analysis::SVTag )
+DECLARE_COMPONENT( Analysis::MultiSVTag )
+//DECLARE_COMPONENT( Analysis::JetProbTag )
+//DECLARE_COMPONENT( Analysis::SoftElectronTag )
+DECLARE_COMPONENT( Analysis::SoftMuonTag )
+//DECLARE_COMPONENT( Analysis::CombinerTool )
+//DECLARE_COMPONENT( Analysis::CombinerToolTag )
+//DECLARE_COMPONENT( Analysis::LikelihoodTool )
+//DECLARE_COMPONENT( Analysis::LikelihoodMultiDTool )
+DECLARE_COMPONENT( Analysis::NewLikelihoodTool )
+DECLARE_COMPONENT( Analysis::TrackSelector )
+DECLARE_COMPONENT( Analysis::JetFitterTag )
+DECLARE_COMPONENT( Analysis::JetFitterNtupleWriter )
+// DECLARE_COMPONENT( Analysis::JetFitterLikelihood )
+DECLARE_COMPONENT( Analysis::JetFitterVariablesFactory )
+DECLARE_COMPONENT( Analysis::MSVVariablesFactory )
+//DECLARE_COMPONENT( Analysis::JetFitterCharmVariablesFactory )
+//DECLARE_COMPONENT( Analysis::GaiaVariablesFactory )
+DECLARE_COMPONENT( Analysis::DL1Tag )
+DECLARE_COMPONENT( Analysis::TagNtupleDumper )
+DECLARE_COMPONENT( Analysis::MultivariateTagManager )
+DECLARE_COMPONENT( Analysis::JetFitterNNTool )
+DECLARE_COMPONENT( Analysis::JetFitterDummyClassifier )
+DECLARE_COMPONENT( Analysis::JetFitterInputWriter )
+//DECLARE_COMPONENT( Analysis::JetFitterCharmNNTool )
+//DECLARE_COMPONENT( Analysis::GaiaNNTool );
+DECLARE_COMPONENT( Analysis::SVForIPTool )
+DECLARE_COMPONENT( Analysis::BasicTrackGradeFactory )
+DECLARE_COMPONENT( Analysis::DetailedTrackGradeFactory )
+//DECLARE_COMPONENT( Analysis::TrackCounting )
+//DECLARE_COMPONENT( Analysis::GbbNNTag )
+//DECLARE_COMPONENT( Analysis::HadFlavorTag )
+DECLARE_COMPONENT( Analysis::MV1Tag )
+DECLARE_COMPONENT( Analysis::MV2Tag )
+DECLARE_COMPONENT( Analysis::MyTag )
+//DECLARE_COMPONENT( Analysis::MV3Tag )
+
+
+
+DECLARE_COMPONENT( Analysis::JetVertexCharge )
+
+DECLARE_COMPONENT( Analysis::ExKtbbTag )
+DECLARE_COMPONENT( Analysis::ExKtbbTagTool )
// Until we put it elsewhere
-//DECLARE_ALGORITHM_FACTORY( SharedHitMapper )
+//DECLARE_COMPONENT( SharedHitMapper )
-//DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, EmulTag )
-DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, DummyTag )
+//DECLARE_COMPONENT( Analysis::EmulTag )
+DECLARE_COMPONENT( Analysis::DummyTag )
diff --git a/PhysicsAnalysis/JetTagging/JetTagValidation/JetTagDQA/src/components/JetTagDQA_entries.cxx b/PhysicsAnalysis/JetTagging/JetTagValidation/JetTagDQA/src/components/JetTagDQA_entries.cxx
index 3bb99f238d18aff6da7c2d5f4249b9328cc47394..790551482251d7429558bd033bb585567711d24c 100644
--- a/PhysicsAnalysis/JetTagging/JetTagValidation/JetTagDQA/src/components/JetTagDQA_entries.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagValidation/JetTagDQA/src/components/JetTagDQA_entries.cxx
@@ -1,4 +1,4 @@
#include "../PhysValBTag.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( JetTagDQA, PhysValBTag )
+DECLARE_COMPONENT( JetTagDQA::PhysValBTag )
diff --git a/PhysicsAnalysis/JetTagging/JetTaggingTagTools/src/components/JetTaggingTagTools_entries.cxx b/PhysicsAnalysis/JetTagging/JetTaggingTagTools/src/components/JetTaggingTagTools_entries.cxx
index 3850fd0834c51545c4ad20e2a365b8d44999c66d..88402c0d3fc1913b2f509fbdc86e9d70840e52e4 100644
--- a/PhysicsAnalysis/JetTagging/JetTaggingTagTools/src/components/JetTaggingTagTools_entries.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTaggingTagTools/src/components/JetTaggingTagTools_entries.cxx
@@ -1,6 +1,6 @@
#include "JetTaggingTagTools/JetTaggingTagTool.h"
-DECLARE_TOOL_FACTORY( JetTaggingTagTool )
+DECLARE_COMPONENT( JetTaggingTagTool )
diff --git a/PhysicsAnalysis/JpsiUpsilonTools/src/components/JpsiUpsilonTools_entries.cxx b/PhysicsAnalysis/JpsiUpsilonTools/src/components/JpsiUpsilonTools_entries.cxx
index e89d3c7bf6ca806d55b24807d110e5d76c65a2e2..103284bd6ae0c1274647ab28919a5c39ca6b43fc 100644
--- a/PhysicsAnalysis/JpsiUpsilonTools/src/components/JpsiUpsilonTools_entries.cxx
+++ b/PhysicsAnalysis/JpsiUpsilonTools/src/components/JpsiUpsilonTools_entries.cxx
@@ -11,14 +11,14 @@
using namespace Analysis;
-DECLARE_TOOL_FACTORY( JpsiFinder )
-DECLARE_TOOL_FACTORY( JpsiPlus1Track )
-DECLARE_TOOL_FACTORY( JpsiPlus2Tracks )
-//DECLARE_TOOL_FACTORY( JpsiEEFinder )
-DECLARE_TOOL_FACTORY( PrimaryVertexRefitter )
-DECLARE_ALGORITHM_FACTORY( JpsiAlg )
-//DECLARE_ALGORITHM_FACTORY( JpsiEEAlg )
-DECLARE_ALGORITHM_FACTORY( JpsiExample )
-//DECLARE_ALGORITHM_FACTORY( JpsiEEExample )
-//DECLARE_ALGORITHM_FACTORY( JpsiJpsiEEExample )
+DECLARE_COMPONENT( JpsiFinder )
+DECLARE_COMPONENT( JpsiPlus1Track )
+DECLARE_COMPONENT( JpsiPlus2Tracks )
+//DECLARE_COMPONENT( JpsiEEFinder )
+DECLARE_COMPONENT( PrimaryVertexRefitter )
+DECLARE_COMPONENT( JpsiAlg )
+//DECLARE_COMPONENT( JpsiEEAlg )
+DECLARE_COMPONENT( JpsiExample )
+//DECLARE_COMPONENT( JpsiEEExample )
+//DECLARE_COMPONENT( JpsiJpsiEEExample )
diff --git a/PhysicsAnalysis/MCTruthClassifier/src/components/MCTruthClassifier_entries.cxx b/PhysicsAnalysis/MCTruthClassifier/src/components/MCTruthClassifier_entries.cxx
index 6b1e6fe6ef3ad4fa630693afd496f918bf36e03a..92ad74d09e5e05fd46688589c2dbc682fdc65413 100644
--- a/PhysicsAnalysis/MCTruthClassifier/src/components/MCTruthClassifier_entries.cxx
+++ b/PhysicsAnalysis/MCTruthClassifier/src/components/MCTruthClassifier_entries.cxx
@@ -1,4 +1,4 @@
#include "MCTruthClassifier/MCTruthClassifier.h"
-DECLARE_TOOL_FACTORY ( MCTruthClassifier )
+DECLARE_COMPONENT( MCTruthClassifier )
diff --git a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/src/components/MuonEfficiencyCorrections_entries.cxx b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/src/components/MuonEfficiencyCorrections_entries.cxx
index fd457cb69c47fc0dba14b48d11907dde3be00bd8..a765d3992d12c97623b4cb34f715896e9bd841b6 100644
--- a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/src/components/MuonEfficiencyCorrections_entries.cxx
+++ b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/src/components/MuonEfficiencyCorrections_entries.cxx
@@ -5,13 +5,13 @@
#include "../MuonEfficiencyCorrectionsProvider.h"
#include "../TestTrigSF.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( CP, MuonEfficiencyScaleFactors )
+DECLARE_COMPONENT( CP::MuonEfficiencyScaleFactors )
-DECLARE_NAMESPACE_TOOL_FACTORY( CP, MuonTriggerScaleFactors )
+DECLARE_COMPONENT( CP::MuonTriggerScaleFactors )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( CP, MuonEfficiencyCorrections_TestAlg )
+DECLARE_COMPONENT( CP::MuonEfficiencyCorrections_TestAlg )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( CP, MuonEfficiencyCorrectionsProvider )
+DECLARE_COMPONENT( CP::MuonEfficiencyCorrectionsProvider )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trig, TestTrigSF )
+DECLARE_COMPONENT( Trig::TestTrigSF )
diff --git a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/src/components/MuonCalibrationAndSmearing_entries.cxx b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/src/components/MuonCalibrationAndSmearing_entries.cxx
index a98b39497443ab1ea9c99bc645088e09224ee13a..6516d336096460bc5116420e2cc2441868c7323a 100644
--- a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/src/components/MuonCalibrationAndSmearing_entries.cxx
+++ b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/src/components/MuonCalibrationAndSmearing_entries.cxx
@@ -3,7 +3,7 @@
#include "../TestMCASTTool.h"
#include "../CalibratedMuonsProvider.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( CP, MuonCalibrationAndSmearingTool )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( CP, TestMCASTTool )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( CP, CalibratedMuonsProvider )
+DECLARE_COMPONENT( CP::MuonCalibrationAndSmearingTool )
+DECLARE_COMPONENT( CP::TestMCASTTool )
+DECLARE_COMPONENT( CP::CalibratedMuonsProvider )
diff --git a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonCalibrationFit/src/components/MuonCalibrationFit_entries.cxx b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonCalibrationFit/src/components/MuonCalibrationFit_entries.cxx
index 3f5c566794022264772861b01ed9e52f92711232..7077cc0acc6df90cd4317192f36f9f6040eeb220 100644
--- a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonCalibrationFit/src/components/MuonCalibrationFit_entries.cxx
+++ b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonCalibrationFit/src/components/MuonCalibrationFit_entries.cxx
@@ -1,4 +1,4 @@
#include "MuonCalibrationFit/MuonCalibrationFit.h"
-DECLARE_ALGORITHM_FACTORY( MuonCalibrationFit )
+DECLARE_COMPONENT( MuonCalibrationFit )
diff --git a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPerformanceAlgs/src/components/MuonPerformanceAlgs_entries.cxx b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPerformanceAlgs/src/components/MuonPerformanceAlgs_entries.cxx
index f19491ab6de95786612ff12e976e9818be9316ac..bfc8d095e2ec1c107b21ae2e5628831a5db4a15a 100644
--- a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPerformanceAlgs/src/components/MuonPerformanceAlgs_entries.cxx
+++ b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPerformanceAlgs/src/components/MuonPerformanceAlgs_entries.cxx
@@ -7,10 +7,10 @@
#include "../MuonTPMetaDataAlg.h"
#include "../MuonTPJpsiVertexFittingAlg.h"
-DECLARE_ALGORITHM_FACTORY(MuonTPAlg)
-DECLARE_ALGORITHM_FACTORY(HighPtTrackPicker)
-DECLARE_ALGORITHM_FACTORY(MuonResonanceAlg)
-DECLARE_ALGORITHM_FACTORY(TrackIsolationDecorAlg)
-DECLARE_ALGORITHM_FACTORY(MuonTPMetaDataAlg)
-DECLARE_ALGORITHM_FACTORY(MuonTPJpsiVertexFittingAlg)
+DECLARE_COMPONENT( MuonTPAlg )
+DECLARE_COMPONENT( HighPtTrackPicker )
+DECLARE_COMPONENT( MuonResonanceAlg )
+DECLARE_COMPONENT( TrackIsolationDecorAlg )
+DECLARE_COMPONENT( MuonTPMetaDataAlg )
+DECLARE_COMPONENT( MuonTPJpsiVertexFittingAlg )
diff --git a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPtCalibNtupleMaker/src/components/MuonPtCalibNtupleMaker_entries.cxx b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPtCalibNtupleMaker/src/components/MuonPtCalibNtupleMaker_entries.cxx
index 48d3a66014378956f6d4e748c6129cad024c77b1..a82feba6fdef5ec40c1b6892faf262823851ae19 100644
--- a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPtCalibNtupleMaker/src/components/MuonPtCalibNtupleMaker_entries.cxx
+++ b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPtCalibNtupleMaker/src/components/MuonPtCalibNtupleMaker_entries.cxx
@@ -2,6 +2,6 @@
#include "MuonPtCalibNtupleMaker/CalibMuonsSelectorTool.h"
-DECLARE_ALGORITHM_FACTORY( CalibMuonsNtupleMaker )
-DECLARE_TOOL_FACTORY( CalibMuonsSelectorTool )
+DECLARE_COMPONENT( CalibMuonsNtupleMaker )
+DECLARE_COMPONENT( CalibMuonsSelectorTool )
diff --git a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonResonanceTools/src/components/MuonResonanceTools_entries.cxx b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonResonanceTools/src/components/MuonResonanceTools_entries.cxx
index e685dc181a4b9423d13be0ee67baef327b96c85c..62b667d5b750212c18a6184bffcb9b7e147329c1 100644
--- a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonResonanceTools/src/components/MuonResonanceTools_entries.cxx
+++ b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonResonanceTools/src/components/MuonResonanceTools_entries.cxx
@@ -6,7 +6,7 @@
#include "MuonResonanceTools/MuonResonancePairingTool.h"
-DECLARE_TOOL_FACTORY(MuonResonanceTool)
-DECLARE_TOOL_FACTORY(MuonResonanceSelectionTool)
-DECLARE_TOOL_FACTORY(MuonResonancePairingTool)
+DECLARE_COMPONENT( MuonResonanceTool )
+DECLARE_COMPONENT( MuonResonanceSelectionTool )
+DECLARE_COMPONENT( MuonResonancePairingTool )
diff --git a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonTPTools/src/components/MuonTPTools_entries.cxx b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonTPTools/src/components/MuonTPTools_entries.cxx
index 6c5ea6f3133d46145de2624c1b247c6a9ec7f629..85f1e10deb7a46f9aa4df8206eeff369734563e1 100644
--- a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonTPTools/src/components/MuonTPTools_entries.cxx
+++ b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonTPTools/src/components/MuonTPTools_entries.cxx
@@ -23,29 +23,29 @@
#include "MuonTPTools/MuonTPVertexHelper.h"
-DECLARE_TOOL_FACTORY(MuonTPTool)
-DECLARE_TOOL_FACTORY(MuonTPExtrapolationTool)
-DECLARE_TOOL_FACTORY(IDTrackIsolationDecoratorTool)
-DECLARE_TOOL_FACTORY(IDTrackCaloDepositsDecoratorTool)
-DECLARE_TOOL_FACTORY(BadMuonVetoHelperTool)
-DECLARE_TOOL_FACTORY(MuonTPTrigUtils)
-DECLARE_TOOL_FACTORY(MuonTPVertexHelper)
-
-// DECLARE_TOOL_FACTORY(MuonTPSelectionTool)
-DECLARE_TOOL_FACTORY(DiMuonTPSelectionTool)
-DECLARE_TOOL_FACTORY(HighPtSingleMuonSelectionTool)
-
-// DECLARE_TOOL_FACTORY(MuonTPEfficiencyTool)
-DECLARE_TOOL_FACTORY(MuonRecoTPEfficiencyTool)
-DECLARE_TOOL_FACTORY(MuonTrigTPEfficiencyTool)
-DECLARE_TOOL_FACTORY(MuonIsolTPEfficiencyTool)
-
-// DECLARE_TOOL_FACTORY(MuonTPPlotTool)
-DECLARE_TOOL_FACTORY(DiMuonTPPlotTool)
-// DECLARE_TOOL_FACTORY(JPsiMuonTPPlotTool)
-
-// DECLARE_TOOL_FACTORY(MuonTPTreeTool)
-DECLARE_TOOL_FACTORY(DiMuonTPTreeTool)
+DECLARE_COMPONENT( MuonTPTool )
+DECLARE_COMPONENT( MuonTPExtrapolationTool )
+DECLARE_COMPONENT( IDTrackIsolationDecoratorTool )
+DECLARE_COMPONENT( IDTrackCaloDepositsDecoratorTool )
+DECLARE_COMPONENT( BadMuonVetoHelperTool )
+DECLARE_COMPONENT( MuonTPTrigUtils )
+DECLARE_COMPONENT( MuonTPVertexHelper )
+
+// DECLARE_COMPONENT( MuonTPSelectionTool )
+DECLARE_COMPONENT( DiMuonTPSelectionTool )
+DECLARE_COMPONENT( HighPtSingleMuonSelectionTool )
+
+// DECLARE_COMPONENT( MuonTPEfficiencyTool )
+DECLARE_COMPONENT( MuonRecoTPEfficiencyTool )
+DECLARE_COMPONENT( MuonTrigTPEfficiencyTool )
+DECLARE_COMPONENT( MuonIsolTPEfficiencyTool )
+
+// DECLARE_COMPONENT( MuonTPPlotTool )
+DECLARE_COMPONENT( DiMuonTPPlotTool )
+// DECLARE_COMPONENT( JPsiMuonTPPlotTool )
+
+// DECLARE_COMPONENT( MuonTPTreeTool )
+DECLARE_COMPONENT( DiMuonTPTreeTool )
diff --git a/PhysicsAnalysis/MuonID/MuonSelectorTools/src/components/MuonSelectorTools_entries.cxx b/PhysicsAnalysis/MuonID/MuonSelectorTools/src/components/MuonSelectorTools_entries.cxx
index fcb7ee0804db550f124f93f0a554675b2bdf2126..edb246225158bb249e69a2880610f0b49882b7f7 100644
--- a/PhysicsAnalysis/MuonID/MuonSelectorTools/src/components/MuonSelectorTools_entries.cxx
+++ b/PhysicsAnalysis/MuonID/MuonSelectorTools/src/components/MuonSelectorTools_entries.cxx
@@ -5,9 +5,9 @@
using namespace CP;
-DECLARE_NAMESPACE_TOOL_FACTORY(CP, MuonSelectionTool )//DECLARE_TOOL_FACTORY( MuonSelectionTool ) is there a difference!?
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(CP, MuonSelectionAlg )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(CP, MuonQualityUpdaterAlg )
+DECLARE_COMPONENT( CP::MuonSelectionTool )//DECLARE_COMPONENT( MuonSelectionTool ) is there a difference!?
+DECLARE_COMPONENT( CP::MuonSelectionAlg )
+DECLARE_COMPONENT( CP::MuonQualityUpdaterAlg )
diff --git a/PhysicsAnalysis/MuonID/MuonTagTools/src/components/MuonTagTools_entries.cxx b/PhysicsAnalysis/MuonID/MuonTagTools/src/components/MuonTagTools_entries.cxx
index 7ad97d987d4214255e4a15ba026d4efd2c451c01..1d0300a57276324bcb3fbd6c6caae8604e4fc925 100644
--- a/PhysicsAnalysis/MuonID/MuonTagTools/src/components/MuonTagTools_entries.cxx
+++ b/PhysicsAnalysis/MuonID/MuonTagTools/src/components/MuonTagTools_entries.cxx
@@ -1,4 +1,4 @@
#include "MuonTagTools/MuonTagTool.h"
-DECLARE_TOOL_FACTORY( MuonTagTool )
+DECLARE_COMPONENT( MuonTagTool )
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/components/PhysVal_entries.cxx b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/components/PhysVal_entries.cxx
index a53ee86ec582deac5975069c2d678b5b3b7f15e0..460b9837a2393da480372ef4523f5499c7d16c44 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/components/PhysVal_entries.cxx
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/components/PhysVal_entries.cxx
@@ -1,4 +1,4 @@
#include "../PhysValExample.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( PhysVal, PhysValExample )
+DECLARE_COMPONENT( PhysVal::PhysValExample )
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/src/components/PrimaryDPDMaker_entries.cxx b/PhysicsAnalysis/PrimaryDPDMaker/src/components/PrimaryDPDMaker_entries.cxx
index 4d39fd48e2aa8e0f505758ed8a744cf7ebd1986d..d95193c1b7ba9df3ec77fa7ebe1a885a80ddfdae 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/src/components/PrimaryDPDMaker_entries.cxx
+++ b/PhysicsAnalysis/PrimaryDPDMaker/src/components/PrimaryDPDMaker_entries.cxx
@@ -9,12 +9,12 @@
using namespace DerivationFramework;
-DECLARE_ALGORITHM_FACTORY( PrimaryDPDPrescaler )
-DECLARE_ALGORITHM_FACTORY( ThinContainers )
-DECLARE_ALGORITHM_FACTORY( CollisionFilterAlg )
-DECLARE_ALGORITHM_FACTORY( muonTrkTrackThinTool )
-DECLARE_TOOL_FACTORY( MBTSTimeFilterTool )
-DECLARE_TOOL_FACTORY( CaloTimeFilterTool )
-DECLARE_TOOL_FACTORY( BCIDFilterTool )
-DECLARE_TOOL_FACTORY( CaloCellThinningTool )
+DECLARE_COMPONENT( PrimaryDPDPrescaler )
+DECLARE_COMPONENT( ThinContainers )
+DECLARE_COMPONENT( CollisionFilterAlg )
+DECLARE_COMPONENT( muonTrkTrackThinTool )
+DECLARE_COMPONENT( MBTSTimeFilterTool )
+DECLARE_COMPONENT( CaloTimeFilterTool )
+DECLARE_COMPONENT( BCIDFilterTool )
+DECLARE_COMPONENT( CaloCellThinningTool )
diff --git a/PhysicsAnalysis/PyAnalysis/PyAnalysisExamples/src/components/PyAnalysisExamples_entries.cxx b/PhysicsAnalysis/PyAnalysis/PyAnalysisExamples/src/components/PyAnalysisExamples_entries.cxx
index eaa422c7151ede66d9d7799c34b0edb368c4989d..814e3c6263ced9871653d0e03c6a8d156cc4d5a9 100644
--- a/PhysicsAnalysis/PyAnalysis/PyAnalysisExamples/src/components/PyAnalysisExamples_entries.cxx
+++ b/PhysicsAnalysis/PyAnalysis/PyAnalysisExamples/src/components/PyAnalysisExamples_entries.cxx
@@ -1,6 +1,6 @@
#include "PyAnalysisExamples/MyTool.h"
#include "PyAnalysisExamples/MySelectionAlg.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPyEx, MySelectionAlg)
-DECLARE_NAMESPACE_TOOL_FACTORY(AthPyEx, MyTool )
+DECLARE_COMPONENT( AthPyEx::MySelectionAlg )
+DECLARE_COMPONENT( AthPyEx::MyTool )
diff --git a/PhysicsAnalysis/RingerSelectorTools/src/components/RingerSelectorTools_entries.cxx b/PhysicsAnalysis/RingerSelectorTools/src/components/RingerSelectorTools_entries.cxx
index c8e26a0e80ab7819a87ed593f554f5693fedf872..d946cebf44eb98ed9b8581beac88ff0a4f7f7990 100644
--- a/PhysicsAnalysis/RingerSelectorTools/src/components/RingerSelectorTools_entries.cxx
+++ b/PhysicsAnalysis/RingerSelectorTools/src/components/RingerSelectorTools_entries.cxx
@@ -2,6 +2,6 @@
using namespace Ringer;
-DECLARE_TOOL_FACTORY( AsgElectronRingerSelector )
-//DECLARE_TOOL_FACTORY( AsgPhotonRingerSelector )
+DECLARE_COMPONENT( AsgElectronRingerSelector )
+//DECLARE_COMPONENT( AsgPhotonRingerSelector )
diff --git a/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/src/components/LongLivedParticleDPDMaker_entries.cxx b/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/src/components/LongLivedParticleDPDMaker_entries.cxx
index 2af36c54db4333912af8056e00144614c555f1fd..ee0c24b12b8d2f65c37a7d45f2c8b1776aa1f0cc 100644
--- a/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/src/components/LongLivedParticleDPDMaker_entries.cxx
+++ b/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/src/components/LongLivedParticleDPDMaker_entries.cxx
@@ -14,19 +14,19 @@
#include "LongLivedParticleDPDMaker/EmergingJetsFilterTool.h"
#include "LongLivedParticleDPDMaker/EmergingJetsHighPtFilterTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( DerivationFramework, RpvElectronD0Tool )
-DECLARE_NAMESPACE_TOOL_FACTORY( DerivationFramework, RpvMuonD0Tool )
-DECLARE_NAMESPACE_TOOL_FACTORY( DerivationFramework, RpvEgammaIDTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( DerivationFramework, DiLepFilters )
-DECLARE_NAMESPACE_TOOL_FACTORY( DerivationFramework, DiLepSkim )
-DECLARE_NAMESPACE_TOOL_FACTORY( DerivationFramework, HnlSkimmingTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( DerivationFramework, DVMissingETFilterTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( DerivationFramework, DVMeffFilterTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( DerivationFramework, DVTracklessJetFilterTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( DerivationFramework, KinkTrkSingleJetMetFilterTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( DerivationFramework, KinkTrkZmumuTagTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( DerivationFramework, KinkTrkZeeTagTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( DerivationFramework, HVJetMETFilterTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( DerivationFramework, EmergingJetsFilterTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( DerivationFramework, EmergingJetsHighPtFilterTool )
+DECLARE_COMPONENT( DerivationFramework::RpvElectronD0Tool )
+DECLARE_COMPONENT( DerivationFramework::RpvMuonD0Tool )
+DECLARE_COMPONENT( DerivationFramework::RpvEgammaIDTool )
+DECLARE_COMPONENT( DerivationFramework::DiLepFilters )
+DECLARE_COMPONENT( DerivationFramework::DiLepSkim )
+DECLARE_COMPONENT( DerivationFramework::HnlSkimmingTool )
+DECLARE_COMPONENT( DerivationFramework::DVMissingETFilterTool )
+DECLARE_COMPONENT( DerivationFramework::DVMeffFilterTool )
+DECLARE_COMPONENT( DerivationFramework::DVTracklessJetFilterTool )
+DECLARE_COMPONENT( DerivationFramework::KinkTrkSingleJetMetFilterTool )
+DECLARE_COMPONENT( DerivationFramework::KinkTrkZmumuTagTool )
+DECLARE_COMPONENT( DerivationFramework::KinkTrkZeeTagTool )
+DECLARE_COMPONENT( DerivationFramework::HVJetMETFilterTool )
+DECLARE_COMPONENT( DerivationFramework::EmergingJetsFilterTool )
+DECLARE_COMPONENT( DerivationFramework::EmergingJetsHighPtFilterTool )
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/src/components/SUSYPhysTagTools_entries.cxx b/PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/src/components/SUSYPhysTagTools_entries.cxx
index f51eb338873461a2d1a19451b93bc29e315cf2ba..ad6f3c5d298c05ca4295c22cb4f4e27249e64e3c 100644
--- a/PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/src/components/SUSYPhysTagTools_entries.cxx
+++ b/PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/src/components/SUSYPhysTagTools_entries.cxx
@@ -1,6 +1,6 @@
#include "SUSYPhysTagTools/SUSYPhysTagTool.h"
-DECLARE_TOOL_FACTORY( SUSYPhysTagTool )
+DECLARE_COMPONENT( SUSYPhysTagTool )
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/src/components/SUSYTools_entries.cxx b/PhysicsAnalysis/SUSYPhys/SUSYTools/src/components/SUSYTools_entries.cxx
index d7dc65057799aa714964d7266ffc4fb8d4fe52bb..d3740775627d24e8d9d77b7fd5897d5bdc7c1027 100644
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/src/components/SUSYTools_entries.cxx
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/src/components/SUSYTools_entries.cxx
@@ -2,7 +2,7 @@
#include "../SUSYToolsAlg.h"
#include "../ApplySUSYTools.h"
-DECLARE_NAMESPACE_TOOL_FACTORY(ST, SUSYObjDef_xAOD)
-DECLARE_ALGORITHM_FACTORY(SUSYToolsAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(ST, ApplySUSYTools)
+DECLARE_COMPONENT( ST::SUSYObjDef_xAOD )
+DECLARE_COMPONENT( SUSYToolsAlg )
+DECLARE_COMPONENT( ST::ApplySUSYTools )
diff --git a/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/src/components/StandardModelPhysTagTools_entries.cxx b/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/src/components/StandardModelPhysTagTools_entries.cxx
index da7a8b60a73e06817c164588fa176cd115463fee..db1570d0cb00541dd52ca466fafb72d912175cd2 100644
--- a/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/src/components/StandardModelPhysTagTools_entries.cxx
+++ b/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/src/components/StandardModelPhysTagTools_entries.cxx
@@ -1,6 +1,6 @@
#include "StandardModelPhysTagTools/StandardModelPhysTagTool.h"
-DECLARE_TOOL_FACTORY( StandardModelPhysTagTool )
+DECLARE_COMPONENT( StandardModelPhysTagTool )
diff --git a/PhysicsAnalysis/StandardModelPhys/Validation/ZeeValidation/src/components/ZeeValidation_entries.cxx b/PhysicsAnalysis/StandardModelPhys/Validation/ZeeValidation/src/components/ZeeValidation_entries.cxx
index 1db49f25e39f12060f6ca9b5764438598661358d..5b6290ce28b4cbe4eff051f6d8c93615378b354b 100644
--- a/PhysicsAnalysis/StandardModelPhys/Validation/ZeeValidation/src/components/ZeeValidation_entries.cxx
+++ b/PhysicsAnalysis/StandardModelPhys/Validation/ZeeValidation/src/components/ZeeValidation_entries.cxx
@@ -1,4 +1,4 @@
#include "../../ZeeValidation/ZeeValidationMonitoringTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( ZeeValidation, ZeeValidationMonitoringTool )
+DECLARE_COMPONENT( ZeeValidation::ZeeValidationMonitoringTool )
diff --git a/PhysicsAnalysis/StandardModelPhys/WZBenchmarks/WZSkims/src/components/WZSkims_entries.cxx b/PhysicsAnalysis/StandardModelPhys/WZBenchmarks/WZSkims/src/components/WZSkims_entries.cxx
index 136b14f049194412844367542aaecd2eba35dca0..647633abb643cb2878ef2b9d0597cc82ed717025 100644
--- a/PhysicsAnalysis/StandardModelPhys/WZBenchmarks/WZSkims/src/components/WZSkims_entries.cxx
+++ b/PhysicsAnalysis/StandardModelPhys/WZBenchmarks/WZSkims/src/components/WZSkims_entries.cxx
@@ -1,3 +1,3 @@
#include "WZSkims/WZSkimsMain.h"
-DECLARE_ALGORITHM_FACTORY( WZSkimsMain )
+DECLARE_COMPONENT( WZSkimsMain )
diff --git a/PhysicsAnalysis/TauID/DiTauMassTools/src/components/DiTauMassTools_entries.cxx b/PhysicsAnalysis/TauID/DiTauMassTools/src/components/DiTauMassTools_entries.cxx
index 511716d4bbc9f99692e57e88a82b6e5af691d901..31ea9d2e1be91c67cf017cdb4dabb3884978ebf1 100644
--- a/PhysicsAnalysis/TauID/DiTauMassTools/src/components/DiTauMassTools_entries.cxx
+++ b/PhysicsAnalysis/TauID/DiTauMassTools/src/components/DiTauMassTools_entries.cxx
@@ -1,4 +1,4 @@
#include "DiTauMassTools/MissingMassTool.h"
-DECLARE_TOOL_FACTORY( MissingMassTool )
+DECLARE_COMPONENT( MissingMassTool )
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/src/components/TauAnalysisTools_entries.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/src/components/TauAnalysisTools_entries.cxx
index 09cb993867494ddcdbbba7cb549892e00f3767d9..3bd98d0f7a5781b3cf4b51e1d58127d4eb137aaa 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/src/components/TauAnalysisTools_entries.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/src/components/TauAnalysisTools_entries.cxx
@@ -15,21 +15,21 @@
#include "../TauAnalysisToolsExampleAthena.h"
#include "TauAnalysisTools/BuildTruthTaus.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, CommonEfficiencyTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, CommonSmearingTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauSelectionTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauSmearingTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauSmearingRun1Tool )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauTruthMatchingTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauTruthTrackMatchingTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauEfficiencyCorrectionsTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauEfficiencyContJetIDTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauEfficiencyEleIDTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauEfficiencyJetIDTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauEfficiencyTriggerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauOverlappingElectronLLHDecorator )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, BuildTruthTaus)
+DECLARE_COMPONENT( TauAnalysisTools::CommonEfficiencyTool )
+DECLARE_COMPONENT( TauAnalysisTools::CommonSmearingTool )
+DECLARE_COMPONENT( TauAnalysisTools::TauSelectionTool )
+DECLARE_COMPONENT( TauAnalysisTools::TauSmearingTool )
+DECLARE_COMPONENT( TauAnalysisTools::TauSmearingRun1Tool )
+DECLARE_COMPONENT( TauAnalysisTools::TauTruthMatchingTool )
+DECLARE_COMPONENT( TauAnalysisTools::TauTruthTrackMatchingTool )
+DECLARE_COMPONENT( TauAnalysisTools::TauEfficiencyCorrectionsTool )
+DECLARE_COMPONENT( TauAnalysisTools::TauEfficiencyContJetIDTool )
+DECLARE_COMPONENT( TauAnalysisTools::TauEfficiencyEleIDTool )
+DECLARE_COMPONENT( TauAnalysisTools::TauEfficiencyJetIDTool )
+DECLARE_COMPONENT( TauAnalysisTools::TauEfficiencyTriggerTool )
+DECLARE_COMPONENT( TauAnalysisTools::TauOverlappingElectronLLHDecorator )
+DECLARE_COMPONENT( TauAnalysisTools::BuildTruthTaus )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( TauAnalysisTools, TauAnalysisToolsExampleAthena )
+DECLARE_COMPONENT( TauAnalysisTools::TauAnalysisToolsExampleAthena )
diff --git a/PhysicsAnalysis/TauID/TauDQA/src/components/TauDQA_entries.cxx b/PhysicsAnalysis/TauID/TauDQA/src/components/TauDQA_entries.cxx
index 74dff8583a46a2027842bd1663a5e036a4fabd51..062350b8b12551b08a4c1cd9b723ca5d4d12a42a 100644
--- a/PhysicsAnalysis/TauID/TauDQA/src/components/TauDQA_entries.cxx
+++ b/PhysicsAnalysis/TauID/TauDQA/src/components/TauDQA_entries.cxx
@@ -1,4 +1,4 @@
#include "../../share/PhysValTau.h"
-DECLARE_TOOL_FACTORY( PhysValTau )
+DECLARE_COMPONENT( PhysValTau )
diff --git a/PhysicsAnalysis/TauID/TauDiscriminant/src/components/TauDiscri_entries.cxx b/PhysicsAnalysis/TauID/TauDiscriminant/src/components/TauDiscri_entries.cxx
index bfc97aecc8ec1dc05e695c71398b71238c317a82..21a3ad7faa06aeb1c078fe27615f8cbc648cdedf 100644
--- a/PhysicsAnalysis/TauID/TauDiscriminant/src/components/TauDiscri_entries.cxx
+++ b/PhysicsAnalysis/TauID/TauDiscriminant/src/components/TauDiscri_entries.cxx
@@ -3,8 +3,8 @@
#include "TauDiscriminant/TauMuonVeto.h"
#include "TauDiscriminant/TauScoreFlatteningTool.h"
-DECLARE_TOOL_FACTORY( TauJetBDT )
-DECLARE_TOOL_FACTORY( TauEleBDT )
-DECLARE_TOOL_FACTORY( TauMuonVeto )
-DECLARE_TOOL_FACTORY( TauScoreFlatteningTool )
+DECLARE_COMPONENT( TauJetBDT )
+DECLARE_COMPONENT( TauEleBDT )
+DECLARE_COMPONENT( TauMuonVeto )
+DECLARE_COMPONENT( TauScoreFlatteningTool )
diff --git a/PhysicsAnalysis/TauID/TauTagTools/src/components/TauTagTools_entries.cxx b/PhysicsAnalysis/TauID/TauTagTools/src/components/TauTagTools_entries.cxx
index d49be6ad9188217fbbb800c594d3b0ce0587525a..bd6eae00175f75a14c82d06b07abd2da3e8f74b9 100644
--- a/PhysicsAnalysis/TauID/TauTagTools/src/components/TauTagTools_entries.cxx
+++ b/PhysicsAnalysis/TauID/TauTagTools/src/components/TauTagTools_entries.cxx
@@ -2,7 +2,7 @@
#include "TauTagTools/TauJetTagTool.h"
-DECLARE_TOOL_FACTORY( TauIdentificationTagTool )
-DECLARE_TOOL_FACTORY( TauJetTagTool )
+DECLARE_COMPONENT( TauIdentificationTagTool )
+DECLARE_COMPONENT( TauJetTagTool )
diff --git a/PhysicsAnalysis/TileID/TileTripReader/src/components/TileTripReader_entries.cxx b/PhysicsAnalysis/TileID/TileTripReader/src/components/TileTripReader_entries.cxx
index 12b7a71b44d4c039142b1d9aef037df58ea34849..37a0576ca1b441742ad234ba01ab600112fdb61b 100644
--- a/PhysicsAnalysis/TileID/TileTripReader/src/components/TileTripReader_entries.cxx
+++ b/PhysicsAnalysis/TileID/TileTripReader/src/components/TileTripReader_entries.cxx
@@ -1,4 +1,4 @@
#include "TileTripReader/AthTileTripReader.h"
-DECLARE_TOOL_FACTORY(AthTileTripReader)
+DECLARE_COMPONENT( AthTileTripReader )
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/src/components/QuickAna_entries.cxx b/PhysicsAnalysis/TopPhys/QuickAna/src/components/QuickAna_entries.cxx
index f7e2f73837e6d90ef0e4b981d3ffdbe330a63ef9..d59ef766cdcd5095a6c677a17e0fb3af9fbf5a94 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/src/components/QuickAna_entries.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/src/components/QuickAna_entries.cxx
@@ -1,6 +1,6 @@
#include "../AthExample.h"
#include <QuickAna/QuickAna.h>
-DECLARE_ALGORITHM_FACTORY( ana::AthExample )
-DECLARE_TOOL_FACTORY( ana::QuickAna )
+DECLARE_COMPONENT( ana::AthExample )
+DECLARE_COMPONENT( ana::QuickAna )
diff --git a/PhysicsAnalysis/TopPhys/TopPhysValMonitoring/src/components/TopPhysValMonitoring_entries.cxx b/PhysicsAnalysis/TopPhys/TopPhysValMonitoring/src/components/TopPhysValMonitoring_entries.cxx
index a34182795baae4451283d20cd7d212f88a5675e4..c14b2295587e431d9e9dcb2092479767a0015ce2 100644
--- a/PhysicsAnalysis/TopPhys/TopPhysValMonitoring/src/components/TopPhysValMonitoring_entries.cxx
+++ b/PhysicsAnalysis/TopPhys/TopPhysValMonitoring/src/components/TopPhysValMonitoring_entries.cxx
@@ -1,4 +1,4 @@
#include "TopPhysValMonitoring/TopPhysValMonitoring.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( TopPhysVal, TopPhysValMonitoring )
+DECLARE_COMPONENT( TopPhysVal::TopPhysValMonitoring )
diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/src/components/InDetTrackSystematicsTools_entries.cxx b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/src/components/InDetTrackSystematicsTools_entries.cxx
index aa1ab57687fb2b58e0393a747e3c983178ee8f32..9c055b766cfa69552c01c749c7c7a974ad790788 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/src/components/InDetTrackSystematicsTools_entries.cxx
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/src/components/InDetTrackSystematicsTools_entries.cxx
@@ -6,10 +6,10 @@
#include "../InDetTrackSmearingToolTester.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTrackSmearingTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTrackTruthOriginTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTrackTruthFilterTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTrackBiasingTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, JetTrackFilterTool )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetTrackSmearingToolTester )
+DECLARE_COMPONENT( InDet::InDetTrackSmearingTool )
+DECLARE_COMPONENT( InDet::InDetTrackTruthOriginTool )
+DECLARE_COMPONENT( InDet::InDetTrackTruthFilterTool )
+DECLARE_COMPONENT( InDet::InDetTrackBiasingTool )
+DECLARE_COMPONENT( InDet::JetTrackFilterTool )
+DECLARE_COMPONENT( InDet::InDetTrackSmearingToolTester )
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/components/McParticleAlgs_entries.cxx b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/components/McParticleAlgs_entries.cxx
index 207980c6bfafef0062fe3c41af65e2258f8db947..e57a61d8be96cc46e2d7fe6d92e7d6ecb1850af2 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/components/McParticleAlgs_entries.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/components/McParticleAlgs_entries.cxx
@@ -6,11 +6,11 @@
#include "../GenEventAsciiReader.h"
#include "../McAodTupleWriter.h"
-DECLARE_ALGORITHM_FACTORY( TruthParticleBuilder )
-DECLARE_ALGORITHM_FACTORY( McAodFilter )
-DECLARE_ALGORITHM_FACTORY( McAodValidationAlg )
-DECLARE_ALGORITHM_FACTORY( GenEventTupleWriter )
-DECLARE_ALGORITHM_FACTORY( GenEventAsciiWriter )
-DECLARE_ALGORITHM_FACTORY( GenEventAsciiReader )
-DECLARE_ALGORITHM_FACTORY( McAodTupleWriter )
+DECLARE_COMPONENT( TruthParticleBuilder )
+DECLARE_COMPONENT( McAodFilter )
+DECLARE_COMPONENT( McAodValidationAlg )
+DECLARE_COMPONENT( GenEventTupleWriter )
+DECLARE_COMPONENT( GenEventAsciiWriter )
+DECLARE_COMPONENT( GenEventAsciiReader )
+DECLARE_COMPONENT( McAodTupleWriter )
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTests/src/components/McParticleTests_entries.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTests/src/components/McParticleTests_entries.cxx
index 6fd9e89194508b39211abf635b08404034e99a78..ebf4dcaf9cfddf30e7c3d1ec9be8d3e1a4f0a8c1 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleTests/src/components/McParticleTests_entries.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTests/src/components/McParticleTests_entries.cxx
@@ -6,8 +6,8 @@
#include "McParticleKernel/ITruthParticleCnvTool.h"
-DECLARE_ALGORITHM_FACTORY( McAodSymLinkTests )
+DECLARE_COMPONENT( McAodSymLinkTests )
using namespace McAod;
-DECLARE_ALGORITHM_FACTORY( McTopAna )
-DECLARE_ALGORITHM_FACTORY( McTopAnaSolution )
+DECLARE_COMPONENT( McTopAna )
+DECLARE_COMPONENT( McTopAnaSolution )
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/components/McParticleTools_entries.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/components/McParticleTools_entries.cxx
index f3600b7a4fabd0e5bfa5c8bea6899e40c870b588..f2ea2e17d90e55a16bec7ddfb199336b6970cc48 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/components/McParticleTools_entries.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/components/McParticleTools_entries.cxx
@@ -19,24 +19,24 @@
#include "../McAodWriterTool.h"
#include "../McAodTupleWriterTool.h"
-DECLARE_TOOL_FACTORY( TruthParticleCnvTool )
-DECLARE_TOOL_FACTORY( McVtxFilterTool )
+DECLARE_COMPONENT( TruthParticleCnvTool )
+DECLARE_COMPONENT( McVtxFilterTool )
-DECLARE_TOOL_FACTORY( NoopFilterTool )
-DECLARE_TOOL_FACTORY( OldSpclMcFilterTool )
-DECLARE_TOOL_FACTORY( PileupFilterTool )
-DECLARE_TOOL_FACTORY( EtaPtFilterTool )
-DECLARE_TOOL_FACTORY( VtxBasedFilterTool )
-
-DECLARE_TOOL_FACTORY( TruthIsolationTool )
-
-DECLARE_TOOL_FACTORY( GenAodValidationTool )
-DECLARE_TOOL_FACTORY( SpclMcValidationTool )
-
-DECLARE_TOOL_FACTORY( HepMcTupleWriterTool )
-DECLARE_TOOL_FACTORY( HepMcFloatWriterTool )
-DECLARE_TOOL_FACTORY( HepMcWriterTool )
-DECLARE_TOOL_FACTORY( HepMcReaderTool )
-DECLARE_TOOL_FACTORY( McAodWriterTool )
-DECLARE_TOOL_FACTORY( McAodTupleWriterTool )
+DECLARE_COMPONENT( NoopFilterTool )
+DECLARE_COMPONENT( OldSpclMcFilterTool )
+DECLARE_COMPONENT( PileupFilterTool )
+DECLARE_COMPONENT( EtaPtFilterTool )
+DECLARE_COMPONENT( VtxBasedFilterTool )
+
+DECLARE_COMPONENT( TruthIsolationTool )
+
+DECLARE_COMPONENT( GenAodValidationTool )
+DECLARE_COMPONENT( SpclMcValidationTool )
+
+DECLARE_COMPONENT( HepMcTupleWriterTool )
+DECLARE_COMPONENT( HepMcFloatWriterTool )
+DECLARE_COMPONENT( HepMcWriterTool )
+DECLARE_COMPONENT( HepMcReaderTool )
+DECLARE_COMPONENT( McAodWriterTool )
+DECLARE_COMPONENT( McAodTupleWriterTool )