From dffffa79d78d41b87e45cdaaebcbdbee7ea57e30 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Thu, 26 Oct 2017 14:37:10 +0200
Subject: [PATCH] Migrate to DECLARE_COMPONENT macros
In addition make ChargeCollProbSvc constructor public as this is needed
by the Gaudi Plugin service.
Former-commit-id: b55322f6e269c3b3fcc30602aa307a0572ffbe78
---
.../components/InDetAlignGenAlgs_entries.cxx | 10 +-
.../components/InDetAlignGenTools_entries.cxx | 14 +--
.../InDetSurveyConstraintTool_entries.cxx | 4 +-
.../components/InDetAlignDBTools_entries.cxx | 6 +-
.../InDetAlignGeomTools_entries.cxx | 12 +--
.../InDetAlignNtupleTool_entries.cxx | 4 +-
.../InDetBeamSpotFinder_entries.cxx | 8 +-
.../src/components/PixelCalibAlgs_entries.cxx | 14 +--
.../src/components/SCT_CalibAlgs_entries.cxx | 14 +--
.../src/components/TRT_CalibAlgs_entries.cxx | 6 +-
.../src/components/TRT_CalibTools_entries.cxx | 18 ++--
.../InDetBeamSpotService_entries.cxx | 2 +-
.../PixelConditionsServices_entries.cxx | 28 +++---
.../PixelConditionsTools_entries.cxx | 16 ++--
.../SCT_ConditionsServices_entries.cxx | 96 +++++++++----------
.../components/SiLorentzAngleSvc_entries.cxx | 2 +-
.../components/SiPropertiesSvc_entries.cxx | 2 +-
.../components/TRT_ConditionsAlgs_entries.cxx | 6 +-
.../TRT_ConditionsServices_entries.cxx | 22 ++---
.../TRT_RecoConditionsServices_entries.cxx | 2 +-
.../InDetCosmicsEventPhase_entries.cxx | 10 +-
.../InDetCosmicsFilters_entries.cxx | 2 +-
.../TRT_SegmentsToTrack_entries.cxx | 2 +-
.../src/components/BCM_GeoModel_entries.cxx | 2 +-
.../src/components/BLM_GeoModel_entries.cxx | 2 +-
.../InDetRegionSelector_entries.cxx | 8 +-
.../InDetServMatGeoModel_entries.cxx | 4 +-
.../InDetTrackingGeometry_entries.cxx | 10 +-
.../src/components/PixelCabling_entries.cxx | 6 +-
.../src/components/PixelGeoModel_entries.cxx | 4 +-
.../src/components/SCT_Cabling_entries.cxx | 8 +-
.../src/components/SCT_GeoModel_entries.cxx | 2 +-
.../SCT_ModuleDistortions_entries.cxx | 4 +-
.../components/SCT_SLHC_GeoModel_entries.cxx | 2 +-
.../src/components/TRT_Cabling_entries.cxx | 14 +--
.../src/components/TRT_GeoModel_entries.cxx | 2 +-
.../components/BCM_Digitization_entries.cxx | 4 +-
.../components/FastSiDigitization_entries.cxx | 12 +--
.../components/TRTDigitization_entries.cxx | 4 +-
.../PixelDigitization/src/ChargeCollProbSvc.h | 2 -
.../components/PixelDigitization_entries.cxx | 26 ++---
.../components/SCT_Digitization_entries.cxx | 14 +--
.../components/TRTDigitization_entries.cxx | 6 +-
.../BCM_RawDataByteStreamCnv_entries.cxx | 8 +-
.../components/InDetEventCnvTools_entries.cxx | 2 +-
.../src/components/InDetJiveXML_entries.cxx | 16 ++--
.../InDetPrepRawDataToxAOD_entries.cxx | 8 +-
.../PixelRawDataByteStreamCnv_entries.cxx | 8 +-
.../SCT_RawDataByteStreamCnv_entries.cxx | 10 +-
.../TRT_RawDataByteStreamCnv_entries.cxx | 8 +-
.../InDetDetDescrExample_entries.cxx | 12 +--
.../src/components/BCM_G4_SD_entries.cxx | 2 +-
.../src/components/BLM_G4_SD_entries.cxx | 2 +-
.../src/components/PixelG4_SD_entries.cxx | 2 +-
.../src/components/SCT_G4_SD_entries.cxx | 4 +-
.../src/components/TRT_G4_SD_entries.cxx | 2 +-
.../components/InDetSimpleVisual_entries.cxx | 4 +-
.../InDetAlignmentMonitoring_entries.cxx | 22 ++---
.../InDetDiMuonMonitoring_entries.cxx | 2 +-
.../InDetGlobalMonitoring_entries.cxx | 22 ++---
.../InDetPerformanceMonitoring_entries.cxx | 14 +--
.../InDetVertexMonitoring_entries.cxx | 2 +-
.../components/PixelMonitoring_entries.cxx | 2 +-
.../src/components/SCT_Monitoring_entries.cxx | 16 ++--
.../src/components/TRT_Monitoring_entries.cxx | 4 +-
.../src/components/SCTExtension_entries.cxx | 2 +-
.../BCM_ZeroSuppression_entries.cxx | 2 +-
.../src/components/InDetOverlay_entries.cxx | 4 +-
.../components/BCM_BackgroundAlgs_entries.cxx | 2 +-
.../InDetCaloClusterROISelector_entries.cxx | 2 +-
.../InDetConversionFinder_entries.cxx | 2 +-
.../InDetExtensionProcessor_entries.cxx | 2 +-
.../components/InDetLowBetaFinder_entries.cxx | 2 +-
.../InDetPrepRawDataFormation_entries.cxx | 8 +-
.../components/InDetPriVxFinder_entries.cxx | 6 +-
.../InDetTrackPRD_Association_entries.cxx | 2 +-
.../src/components/InDetV0Finder_entries.cxx | 6 +-
.../src/components/InDetZVTOP_Alg_entries.cxx | 2 +-
.../SiSPSeededTrackFinder_entries.cxx | 2 +-
.../SiSpacePointFormation_entries.cxx | 2 +-
.../TRT_SeededTrackFinder_entries.cxx | 2 +-
.../TRT_StandaloneTrackFinder_entries.cxx | 2 +-
.../TRT_TrackExtensionAlg_entries.cxx | 2 +-
.../TRT_TrackSegmentsFinder_entries.cxx | 2 +-
.../InDetAmbiTrackSelectionTool_entries.cxx | 4 +-
.../InDetAssociationTools_entries.cxx | 4 +-
.../InDetCaloClusterROIBuilder_entries.cxx | 2 +-
...ingTRT_DriftCirclesOnTrackTool_entries.cxx | 6 +-
.../InDetConversionFinderTool_entries.cxx | 12 +--
.../components/InDetDNASeparator_entries.cxx | 2 +-
.../InDetMultipleVertexSeedFinder_entries.cxx | 6 +-
...tMultipleVertexSeedFinderUtils_entries.cxx | 4 +-
.../InDetPriVxFinderTool_entries.cxx | 10 +-
.../InDetResidualPullCalculators_entries.cxx | 2 +-
.../InDetSVWithMuonTool_entries.cxx | 2 +-
.../InDetSecVxFinderTool_entries.cxx | 6 +-
.../components/InDetTestBLayer_entries.cxx | 8 +-
.../InDetTestPixelLayer_entries.cxx | 8 +-
.../InDetTrackHoleSearch_entries.cxx | 2 +-
.../InDetTrackScoringTools_entries.cxx | 6 +-
.../InDetTrackSelectionTool_entries.cxx | 4 +-
.../InDetTrackSelectorTool_entries.cxx | 12 +--
.../InDetTrackSummaryHelperTool_entries.cxx | 2 +-
.../InDetVKalPriVxFinderTool_entries.cxx | 2 +-
.../InDetVKalVxInJetTool_entries.cxx | 2 +-
.../components/InDetZVTOPVxFinder_entries.cxx | 14 +--
.../components/PixelToTPIDTool_entries.cxx | 6 +-
.../SeedToTrackConversionTool_entries.cxx | 2 +-
.../SiClusterOnTrackTool_entries.cxx | 4 +-
.../SiClusterizationTool_entries.cxx | 22 ++---
...ombinatorialTrackFinderTool_xk_entries.cxx | 2 +-
.../SiDetElementsRoadTool_xk_entries.cxx | 2 +-
.../components/SiSpacePointTool_entries.cxx | 2 +-
.../SiSpacePointsSeedTool_xk_entries.cxx | 14 +--
.../SiTrackMakerTool_xk_entries.cxx | 2 +-
.../components/SiZvertexTool_xk_entries.cxx | 2 +-
.../TRT_DetElementsRoadTool_xk_entries.cxx | 2 +-
.../TRT_DriftCircleOnTrackTool_entries.cxx | 8 +-
.../TRT_DriftCircleTool_entries.cxx | 4 +-
.../TRT_DriftFunctionTool_entries.cxx | 2 +-
.../TRT_ElectronPidTools_entries.cxx | 4 +-
...TRT_SeededSpacePointFinderTool_entries.cxx | 4 +-
.../TRT_SeededTrackFinderTool_entries.cxx | 2 +-
.../TRT_SegmentToTrackTool_entries.cxx | 2 +-
.../src/components/TRT_ToT_tools_entries.cxx | 2 +-
.../TRT_TrackExtensionTool_DAF_entries.cxx | 2 +-
.../TRT_TrackExtensionTool_xk_entries.cxx | 4 +-
.../TRT_TrackHoleSearch_entries.cxx | 4 +-
.../TRT_TrackSegmentsTool_xk_entries.cxx | 6 +-
.../TrackVertexAssociationTool_entries.cxx | 12 +--
.../components/TRT_PAI_Process_entries.cxx | 2 +-
.../src/components/TRT_TR_Process_entries.cxx | 2 +-
.../InDetTrigAmbiguitySolver_entries.cxx | 2 +-
.../InDetTrigConversionFinder_entries.cxx | 2 +-
.../InDetTrigExtensProcessor_entries.cxx | 2 +-
.../InDetTrigParticleCreation_entries.cxx | 12 +--
.../InDetTrigPrepRawDataFormat_entries.cxx | 8 +-
.../InDetTrigPriVxFinder_entries.cxx | 4 +-
.../InDetTrigRawDataProvider_entries.cxx | 6 +-
.../TrkTrigTrackCollectionMerger_entries.cxx | 4 +-
.../InDetTrigTrackPRD_Association_entries.cxx | 2 +-
.../InDetTrigTrackResidualMonitor_entries.cxx | 6 +-
.../InDetTrigTrackSlimmer_entries.cxx | 6 +-
.../components/InDetTrigTruthAlgs_entries.cxx | 6 +-
.../InDetTrigVxSecondary_entries.cxx | 4 +-
.../SiTrigSPSeededTrackFinder_entries.cxx | 2 +-
.../SiTrigSpacePointFormation_entries.cxx | 4 +-
.../TRT_TrigSeededTrackFinder_entries.cxx | 2 +-
.../TRT_TrigStandaloneTrackFinder_entries.cxx | 2 +-
.../TRT_TrigTrackExtensionAlg_entries.cxx | 2 +-
.../TRT_TrigTrackSegmentsFinder_entries.cxx | 2 +-
.../src/components/InDetTruthAlgs_entries.cxx | 4 +-
.../components/InDetTruthTools_entries.cxx | 8 +-
.../InDetPerformanceRTT_entries.cxx | 2 +-
.../InDetPhysValMonitoring_entries.cxx | 30 +++---
.../components/InDetRecStatistics_entries.cxx | 2 +-
...egmentDriftCircleAssValidation_entries.cxx | 2 +-
...InDetTrackClusterAssValidation_entries.cxx | 2 +-
.../InDetTrackSplitterTool_entries.cxx | 2 +-
.../InDetTrackValidation_entries.cxx | 6 +-
.../InDetVertexSplitter_entries.cxx | 4 +-
161 files changed, 508 insertions(+), 534 deletions(-)
diff --git a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/components/InDetAlignGenAlgs_entries.cxx b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/components/InDetAlignGenAlgs_entries.cxx
index c018066d7c8..ca638bc10b3 100644
--- a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/components/InDetAlignGenAlgs_entries.cxx
+++ b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/components/InDetAlignGenAlgs_entries.cxx
@@ -5,9 +5,9 @@
#include "InDetAlignGenAlgs/InDetAlignWrt.h"
-DECLARE_ALGORITHM_FACTORY( SiDistWriteAlg )
-DECLARE_ALGORITHM_FACTORY( InDetAlignCog )
-DECLARE_ALGORITHM_FACTORY( AddTRTMomConstr )
-DECLARE_ALGORITHM_FACTORY( InDetAlignWrt )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDetAlignment, CreateMisalignAlg )
+DECLARE_COMPONENT( SiDistWriteAlg )
+DECLARE_COMPONENT( InDetAlignCog )
+DECLARE_COMPONENT( AddTRTMomConstr )
+DECLARE_COMPONENT( InDetAlignWrt )
+DECLARE_COMPONENT( InDetAlignment::CreateMisalignAlg )
diff --git a/InnerDetector/InDetAlignTools/InDetAlignGenTools/src/components/InDetAlignGenTools_entries.cxx b/InnerDetector/InDetAlignTools/InDetAlignGenTools/src/components/InDetAlignGenTools_entries.cxx
index 40f8fc62d3e..682dc3e0831 100644
--- a/InnerDetector/InDetAlignTools/InDetAlignGenTools/src/components/InDetAlignGenTools_entries.cxx
+++ b/InnerDetector/InDetAlignTools/InDetAlignGenTools/src/components/InDetAlignGenTools_entries.cxx
@@ -8,12 +8,12 @@
#include "InDetAlignGenTools/InDetAlignHitQualSelTool.h"
-DECLARE_TOOL_FACTORY( InDetAlignDBTool )
-DECLARE_TOOL_FACTORY( InDetAlignTrackSelTool )
-DECLARE_TOOL_FACTORY( InDetAlignFillTrack )
+DECLARE_COMPONENT( InDetAlignDBTool )
+DECLARE_COMPONENT( InDetAlignTrackSelTool )
+DECLARE_COMPONENT( InDetAlignFillTrack )
-DECLARE_TOOL_FACTORY( InDetAlignOverlapTool )
-DECLARE_TOOL_FACTORY( InDetAlignFillSiCluster )
-DECLARE_TOOL_FACTORY( InDetAlignHitQualSelTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDetAlignment, RefitSiOnlyTool )
+DECLARE_COMPONENT( InDetAlignOverlapTool )
+DECLARE_COMPONENT( InDetAlignFillSiCluster )
+DECLARE_COMPONENT( InDetAlignHitQualSelTool )
+DECLARE_COMPONENT( InDetAlignment::RefitSiOnlyTool )
diff --git a/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/components/InDetSurveyConstraintTool_entries.cxx b/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/components/InDetSurveyConstraintTool_entries.cxx
index e9067992c3a..b6a7d951a78 100644
--- a/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/components/InDetSurveyConstraintTool_entries.cxx
+++ b/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/components/InDetSurveyConstraintTool_entries.cxx
@@ -1,6 +1,6 @@
#include "InDetSurveyConstraintTool/SurveyConstraint.h"
#include "InDetSurveyConstraintTool/SurveyConstraintTestAlg.h"
-DECLARE_ALGORITHM_FACTORY( SurveyConstraintTestAlg )
-DECLARE_TOOL_FACTORY( SurveyConstraint )
+DECLARE_COMPONENT( SurveyConstraintTestAlg )
+DECLARE_COMPONENT( SurveyConstraint )
diff --git a/InnerDetector/InDetAlignment/InDetAlignDBTools/src/components/InDetAlignDBTools_entries.cxx b/InnerDetector/InDetAlignment/InDetAlignDBTools/src/components/InDetAlignDBTools_entries.cxx
index 224a87809ef..0592a92d482 100644
--- a/InnerDetector/InDetAlignment/InDetAlignDBTools/src/components/InDetAlignDBTools_entries.cxx
+++ b/InnerDetector/InDetAlignment/InDetAlignDBTools/src/components/InDetAlignDBTools_entries.cxx
@@ -2,7 +2,7 @@
#include "InDetAlignDBTools/TRTTrkAlignDBTool.h"
#include "InDetAlignDBTools/InDetTrkAlignDBTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, SiTrkAlignDBTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TRTTrkAlignDBTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTrkAlignDBTool )
+DECLARE_COMPONENT( InDet::SiTrkAlignDBTool )
+DECLARE_COMPONENT( InDet::TRTTrkAlignDBTool )
+DECLARE_COMPONENT( InDet::InDetTrkAlignDBTool )
diff --git a/InnerDetector/InDetAlignment/InDetAlignGeomTools/src/components/InDetAlignGeomTools_entries.cxx b/InnerDetector/InDetAlignment/InDetAlignGeomTools/src/components/InDetAlignGeomTools_entries.cxx
index ef52743e96c..7b2e83bd3d9 100644
--- a/InnerDetector/InDetAlignment/InDetAlignGeomTools/src/components/InDetAlignGeomTools_entries.cxx
+++ b/InnerDetector/InDetAlignment/InDetAlignGeomTools/src/components/InDetAlignGeomTools_entries.cxx
@@ -5,10 +5,10 @@
#include "InDetAlignGeomTools/InDetGeometryManagerTool.h"
#include "InDetAlignGeomTools/InDetAlignModuleTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TRTGeometryManagerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, PixelGeometryManagerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, SCTGeometryManagerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, SiGeometryManagerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetGeometryManagerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetAlignModuleTool )
+DECLARE_COMPONENT( InDet::TRTGeometryManagerTool )
+DECLARE_COMPONENT( InDet::PixelGeometryManagerTool )
+DECLARE_COMPONENT( InDet::SCTGeometryManagerTool )
+DECLARE_COMPONENT( InDet::SiGeometryManagerTool )
+DECLARE_COMPONENT( InDet::InDetGeometryManagerTool )
+DECLARE_COMPONENT( InDet::InDetAlignModuleTool )
diff --git a/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/components/InDetAlignNtupleTool_entries.cxx b/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/components/InDetAlignNtupleTool_entries.cxx
index 15758bb0482..350410fb6f1 100644
--- a/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/components/InDetAlignNtupleTool_entries.cxx
+++ b/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/components/InDetAlignNtupleTool_entries.cxx
@@ -2,6 +2,6 @@
#include "InDetAlignNtupleTools/DetailedIDNtupleTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, SimpleIDNtupleTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, DetailedIDNtupleTool )
+DECLARE_COMPONENT( InDet::SimpleIDNtupleTool )
+DECLARE_COMPONENT( InDet::DetailedIDNtupleTool )
diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/components/InDetBeamSpotFinder_entries.cxx b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/components/InDetBeamSpotFinder_entries.cxx
index c57c17c75c9..b10a8d9e538 100644
--- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/components/InDetBeamSpotFinder_entries.cxx
+++ b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/components/InDetBeamSpotFinder_entries.cxx
@@ -4,8 +4,8 @@
#include "../RefitTracksAndVertex.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(InDet, InDetBeamSpotFinder )
-DECLARE_NAMESPACE_TOOL_FACTORY(InDet, InDetBeamSpotVertex)
-DECLARE_NAMESPACE_TOOL_FACTORY(InDet, InDetBeamSpotRooFit)
-DECLARE_ALGORITHM_FACTORY( RefitTracksAndVertex )
+DECLARE_COMPONENT( InDet::InDetBeamSpotFinder )
+DECLARE_COMPONENT( InDet::InDetBeamSpotVertex )
+DECLARE_COMPONENT( InDet::InDetBeamSpotRooFit )
+DECLARE_COMPONENT( RefitTracksAndVertex )
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/components/PixelCalibAlgs_entries.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/components/PixelCalibAlgs_entries.cxx
index 909c847dfef..351d87e1dac 100644
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/components/PixelCalibAlgs_entries.cxx
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/components/PixelCalibAlgs_entries.cxx
@@ -6,11 +6,11 @@
#include "PixelCalibAlgs/CompareModulesTDAQandBytestream.h"
#include "../PixelCalibCondAlg.h"
-DECLARE_ALGORITHM_FACTORY( PixelBarrelSurvey )
-DECLARE_ALGORITHM_FACTORY( NoiseMapBuilder )
-DECLARE_ALGORITHM_FACTORY( PixMapDBWriter )
-DECLARE_ALGORITHM_FACTORY( PixMapOverlayWriter )
-DECLARE_ALGORITHM_FACTORY( PixelChargeToTConversion )
-DECLARE_ALGORITHM_FACTORY( CompareModulesTDAQandBytestream )
-DECLARE_ALGORITHM_FACTORY( PixelCalibCondAlg )
+DECLARE_COMPONENT( PixelBarrelSurvey )
+DECLARE_COMPONENT( NoiseMapBuilder )
+DECLARE_COMPONENT( PixMapDBWriter )
+DECLARE_COMPONENT( PixMapOverlayWriter )
+DECLARE_COMPONENT( PixelChargeToTConversion )
+DECLARE_COMPONENT( CompareModulesTDAQandBytestream )
+DECLARE_COMPONENT( PixelCalibCondAlg )
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/components/SCT_CalibAlgs_entries.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/components/SCT_CalibAlgs_entries.cxx
index cd4c4e87cb7..1c3f1c20085 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/components/SCT_CalibAlgs_entries.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/components/SCT_CalibAlgs_entries.cxx
@@ -8,13 +8,13 @@
-DECLARE_ALGORITHM_FACTORY( SCTCalib )
-DECLARE_SERVICE_FACTORY( SCT_CalibBsErrorSvc )
-DECLARE_SERVICE_FACTORY( SCTCalibWriteSvc )
-DECLARE_SERVICE_FACTORY(SCT_CalibHitmapSvc)
-DECLARE_SERVICE_FACTORY( SCT_CalibLbSvc )
-DECLARE_SERVICE_FACTORY( SCT_CalibModuleListSvc )
-DECLARE_SERVICE_FACTORY( SCT_CalibEventInfo )
+DECLARE_COMPONENT( SCTCalib )
+DECLARE_COMPONENT( SCT_CalibBsErrorSvc )
+DECLARE_COMPONENT( SCTCalibWriteSvc )
+DECLARE_COMPONENT( SCT_CalibHitmapSvc )
+DECLARE_COMPONENT( SCT_CalibLbSvc )
+DECLARE_COMPONENT( SCT_CalibModuleListSvc )
+DECLARE_COMPONENT( SCT_CalibEventInfo )
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/components/TRT_CalibAlgs_entries.cxx b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/components/TRT_CalibAlgs_entries.cxx
index daa26e1c5e8..562ece19242 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/components/TRT_CalibAlgs_entries.cxx
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/components/TRT_CalibAlgs_entries.cxx
@@ -2,8 +2,8 @@
#include "TRT_CalibAlgs/TRT_StrawStatus.h"
#include "TRT_CalibAlgs/TRTOccupancyInclude.h"
-DECLARE_ALGORITHM_FACTORY( TRTCalibrationMgr )
-DECLARE_ALGORITHM_FACTORY( TRTOccupancyInclude )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, TRT_StrawStatus )
+DECLARE_COMPONENT( TRTCalibrationMgr )
+DECLARE_COMPONENT( TRTOccupancyInclude )
+DECLARE_COMPONENT( InDet::TRT_StrawStatus )
diff --git a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/components/TRT_CalibTools_entries.cxx b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/components/TRT_CalibTools_entries.cxx
index 8e901c1e718..a74c72b1a32 100644
--- a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/components/TRT_CalibTools_entries.cxx
+++ b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/components/TRT_CalibTools_entries.cxx
@@ -8,13 +8,13 @@
//#include "../TRTCalModuleAccumulator.h"
//#include "../TRTCalStrawAccumulator.h"
-DECLARE_TOOL_FACTORY( TRTCalibTrackSelectionTool )
-DECLARE_TOOL_FACTORY( FillAlignTrkInfo )
-DECLARE_TOOL_FACTORY( FillAlignTRTHits )
-DECLARE_TOOL_FACTORY( TRTCalibrator )
-//DECLARE_TOOL_FACTORY( TRTCalAccumulator )
-DECLARE_TOOL_FACTORY( FitTool )
-//DECLARE_TOOL_FACTORY( TRTCalChipAccumulator )
-//DECLARE_TOOL_FACTORY( TRTCalModuleAccumulator )
-//DECLARE_TOOL_FACTORY( TRTCalStrawAccumulator )
+DECLARE_COMPONENT( TRTCalibTrackSelectionTool )
+DECLARE_COMPONENT( FillAlignTrkInfo )
+DECLARE_COMPONENT( FillAlignTRTHits )
+DECLARE_COMPONENT( TRTCalibrator )
+//DECLARE_COMPONENT( TRTCalAccumulator )
+DECLARE_COMPONENT( FitTool )
+//DECLARE_COMPONENT( TRTCalChipAccumulator )
+//DECLARE_COMPONENT( TRTCalModuleAccumulator )
+//DECLARE_COMPONENT( TRTCalStrawAccumulator )
diff --git a/InnerDetector/InDetConditions/InDetBeamSpotService/src/components/InDetBeamSpotService_entries.cxx b/InnerDetector/InDetConditions/InDetBeamSpotService/src/components/InDetBeamSpotService_entries.cxx
index 6c3d9f04b1f..0e1ee76dd29 100644
--- a/InnerDetector/InDetConditions/InDetBeamSpotService/src/components/InDetBeamSpotService_entries.cxx
+++ b/InnerDetector/InDetConditions/InDetBeamSpotService/src/components/InDetBeamSpotService_entries.cxx
@@ -1,4 +1,4 @@
#include "../BeamCondSvc.h"
-DECLARE_SERVICE_FACTORY( BeamCondSvc )
+DECLARE_COMPONENT( BeamCondSvc )
diff --git a/InnerDetector/InDetConditions/PixelConditionsServices/src/components/PixelConditionsServices_entries.cxx b/InnerDetector/InDetConditions/PixelConditionsServices/src/components/PixelConditionsServices_entries.cxx
index 202044c31d2..638f5b53fab 100644
--- a/InnerDetector/InDetConditions/PixelConditionsServices/src/components/PixelConditionsServices_entries.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsServices/src/components/PixelConditionsServices_entries.cxx
@@ -13,18 +13,18 @@
#include "../PixelOfflineCalibServiceTest.h"
//#include "../PixelConnCoolDbSvc.h"
-DECLARE_SERVICE_FACTORY( PixelOfflineCalibSvc )
-DECLARE_SERVICE_FACTORY( PixelCalibSvc )
-DECLARE_ALGORITHM_FACTORY( PixelOfflineCalibServiceTest )
-DECLARE_ALGORITHM_FACTORY( PixelCalibServiceTest )
-DECLARE_SERVICE_FACTORY( SpecialPixelMapSvc )
-DECLARE_ALGORITHM_FACTORY( PixelMapTestAlg )
-DECLARE_SERVICE_FACTORY( PixelDCSSvc )
-DECLARE_ALGORITHM_FACTORY( PixelDCSTestSvc )
-DECLARE_SERVICE_FACTORY( PixelConditionsSummarySvc )
-DECLARE_SERVICE_FACTORY( PixelSiliconConditionsSvc )
-DECLARE_SERVICE_FACTORY( PixelByteStreamErrorsSvc )
-DECLARE_SERVICE_FACTORY( PixelTDAQSvc )
-DECLARE_SERVICE_FACTORY( PixelRunConditionsDbSvc )
- //DECLARE_SERVICE_FACTORY( PixelConnCoolDbSvc )
+DECLARE_COMPONENT( PixelOfflineCalibSvc )
+DECLARE_COMPONENT( PixelCalibSvc )
+DECLARE_COMPONENT( PixelOfflineCalibServiceTest )
+DECLARE_COMPONENT( PixelCalibServiceTest )
+DECLARE_COMPONENT( SpecialPixelMapSvc )
+DECLARE_COMPONENT( PixelMapTestAlg )
+DECLARE_COMPONENT( PixelDCSSvc )
+DECLARE_COMPONENT( PixelDCSTestSvc )
+DECLARE_COMPONENT( PixelConditionsSummarySvc )
+DECLARE_COMPONENT( PixelSiliconConditionsSvc )
+DECLARE_COMPONENT( PixelByteStreamErrorsSvc )
+DECLARE_COMPONENT( PixelTDAQSvc )
+DECLARE_COMPONENT( PixelRunConditionsDbSvc )
+ //DECLARE_COMPONENT( PixelConnCoolDbSvc )
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/src/components/PixelConditionsTools_entries.cxx b/InnerDetector/InDetConditions/PixelConditionsTools/src/components/PixelConditionsTools_entries.cxx
index 9c827b4783c..14731743483 100644
--- a/InnerDetector/InDetConditions/PixelConditionsTools/src/components/PixelConditionsTools_entries.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/src/components/PixelConditionsTools_entries.cxx
@@ -7,14 +7,14 @@
#include "src/PixelDistortionsTool.h"
#include "src/PixelDistortionsTestReadWrite.h"
-DECLARE_TOOL_FACTORY( PixelRecoDbTool )
-DECLARE_TOOL_FACTORY( PixelCalibDbTool )
-DECLARE_ALGORITHM_FACTORY( PixelCalibDbTestWriteRead )
-DECLARE_ALGORITHM_FACTORY( PixelRecoDbTestWriteRead )
-DECLARE_TOOL_FACTORY( PixelDCSTool )
-DECLARE_ALGORITHM_FACTORY( PixelDCSTestReadWrite )
-DECLARE_TOOL_FACTORY( PixelDistortionsTool )
-DECLARE_ALGORITHM_FACTORY( PixelDistortionsTestReadWrite )
+DECLARE_COMPONENT( PixelRecoDbTool )
+DECLARE_COMPONENT( PixelCalibDbTool )
+DECLARE_COMPONENT( PixelCalibDbTestWriteRead )
+DECLARE_COMPONENT( PixelRecoDbTestWriteRead )
+DECLARE_COMPONENT( PixelDCSTool )
+DECLARE_COMPONENT( PixelDCSTestReadWrite )
+DECLARE_COMPONENT( PixelDistortionsTool )
+DECLARE_COMPONENT( PixelDistortionsTestReadWrite )
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsServices/src/components/SCT_ConditionsServices_entries.cxx b/InnerDetector/InDetConditions/SCT_ConditionsServices/src/components/SCT_ConditionsServices_entries.cxx
index 16f7f85087b..470d92f8efe 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsServices/src/components/SCT_ConditionsServices_entries.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsServices/src/components/SCT_ConditionsServices_entries.cxx
@@ -62,54 +62,54 @@
//specific to rod veto testing:
-DECLARE_ALGORITHM_FACTORY(SCT_RODVetoTestAlg)
-DECLARE_SERVICE_FACTORY(SCT_RODVetoSvc)
-
-DECLARE_ALGORITHM_FACTORY(SCT_ModuleVetoTestAlg)
-DECLARE_ALGORITHM_FACTORY(SCT_ConditionsSummaryTestAlg)
-DECLARE_ALGORITHM_FACTORY(SCT_CachedSummaryTestAlg)
-DECLARE_ALGORITHM_FACTORY(SCT_DCSConditionsHVCondAlg)
-DECLARE_ALGORITHM_FACTORY(SCT_DCSConditionsStatCondAlg)
-DECLARE_ALGORITHM_FACTORY(SCT_DCSConditionsTempCondAlg)
-DECLARE_ALGORITHM_FACTORY(SCT_DCSConditionsTestAlg)
-DECLARE_ALGORITHM_FACTORY(SCT_MonitorConditionsCondAlg)
-DECLARE_ALGORITHM_FACTORY(SCT_MonitorConditionsTestAlg)
-DECLARE_ALGORITHM_FACTORY(SCT_ReadCalibDataTestAlg)
-DECLARE_ALGORITHM_FACTORY(SCT_ReadCalibChipDataTestAlg)
-DECLARE_ALGORITHM_FACTORY(SCT_SiliconConditionsTestAlg)
-DECLARE_ALGORITHM_FACTORY(SCT_ReadoutTestAlg)
-DECLARE_ALGORITHM_FACTORY(SCT_LinkMaskingTestAlg)
-DECLARE_ALGORITHM_FACTORY(SCT_ConfigurationConditionsTestAlg)
-DECLARE_ALGORITHM_FACTORY(SCT_MajorityCondAlg)
-DECLARE_ALGORITHM_FACTORY(SCT_MajorityConditionsTestAlg)
-DECLARE_ALGORITHM_FACTORY(SCT_ConditionsParameterTestAlg)
-DECLARE_ALGORITHM_FACTORY(SCT_SensorsTestAlg)
-DECLARE_ALGORITHM_FACTORY(SCT_TdaqEnabledCondAlg)
-DECLARE_ALGORITHM_FACTORY(SCT_TdaqEnabledTestAlg)
-
-DECLARE_SERVICE_FACTORY(SCT_ConditionsSummarySvc)
-DECLARE_SERVICE_FACTORY(SCT_CachedSummarySvc)
-DECLARE_SERVICE_FACTORY(SCT_ModuleVetoSvc)
-DECLARE_SERVICE_FACTORY(SCT_StripVetoSvc)
-DECLARE_SERVICE_FACTORY(SCT_ConfigurationConditionsSvc)
-DECLARE_SERVICE_FACTORY(SCT_DCSConditionsSvc)
-DECLARE_SERVICE_FACTORY(SCT_ByteStreamErrorsSvc)
-DECLARE_SERVICE_FACTORY(SCT_MonitorConditionsSvc)
-DECLARE_SERVICE_FACTORY(SCT_FlaggedConditionSvc)
-DECLARE_SERVICE_FACTORY(SCT_ReadCalibDataSvc)
-DECLARE_SERVICE_FACTORY(SCT_ReadCalibChipDataSvc)
-DECLARE_SERVICE_FACTORY(SCT_SiliconConditionsSvc)
-DECLARE_SERVICE_FACTORY(SCT_LinkMaskingSvc)
-DECLARE_SERVICE_FACTORY(SCT_TdaqEnabledSvc)
-DECLARE_SERVICE_FACTORY(SCT_ConditionsParameterSvc)
-DECLARE_SERVICE_FACTORY(SCT_SensorsSvc)
-DECLARE_SERVICE_FACTORY(SCT_MajorityConditionsSvc)
-DECLARE_SERVICE_FACTORY(SCT_ChargeTrappingSvc)
-DECLARE_SERVICE_FACTORY(SCT_RadDamageSummarySvc)
-
-
-DECLARE_TOOL_FACTORY(SCT_ReadoutTool)
-DECLARE_TOOL_FACTORY(SCT_ElectricFieldTool)
+DECLARE_COMPONENT( SCT_RODVetoTestAlg )
+DECLARE_COMPONENT( SCT_RODVetoSvc )
+
+DECLARE_COMPONENT( SCT_ModuleVetoTestAlg )
+DECLARE_COMPONENT( SCT_ConditionsSummaryTestAlg )
+DECLARE_COMPONENT( SCT_CachedSummaryTestAlg )
+DECLARE_COMPONENT( SCT_DCSConditionsHVCondAlg )
+DECLARE_COMPONENT( SCT_DCSConditionsStatCondAlg )
+DECLARE_COMPONENT( SCT_DCSConditionsTempCondAlg )
+DECLARE_COMPONENT( SCT_DCSConditionsTestAlg )
+DECLARE_COMPONENT( SCT_MonitorConditionsCondAlg )
+DECLARE_COMPONENT( SCT_MonitorConditionsTestAlg )
+DECLARE_COMPONENT( SCT_ReadCalibDataTestAlg )
+DECLARE_COMPONENT( SCT_ReadCalibChipDataTestAlg )
+DECLARE_COMPONENT( SCT_SiliconConditionsTestAlg )
+DECLARE_COMPONENT( SCT_ReadoutTestAlg )
+DECLARE_COMPONENT( SCT_LinkMaskingTestAlg )
+DECLARE_COMPONENT( SCT_ConfigurationConditionsTestAlg )
+DECLARE_COMPONENT( SCT_MajorityCondAlg )
+DECLARE_COMPONENT( SCT_MajorityConditionsTestAlg )
+DECLARE_COMPONENT( SCT_ConditionsParameterTestAlg )
+DECLARE_COMPONENT( SCT_SensorsTestAlg )
+DECLARE_COMPONENT( SCT_TdaqEnabledCondAlg )
+DECLARE_COMPONENT( SCT_TdaqEnabledTestAlg )
+
+DECLARE_COMPONENT( SCT_ConditionsSummarySvc )
+DECLARE_COMPONENT( SCT_CachedSummarySvc )
+DECLARE_COMPONENT( SCT_ModuleVetoSvc )
+DECLARE_COMPONENT( SCT_StripVetoSvc )
+DECLARE_COMPONENT( SCT_ConfigurationConditionsSvc )
+DECLARE_COMPONENT( SCT_DCSConditionsSvc )
+DECLARE_COMPONENT( SCT_ByteStreamErrorsSvc )
+DECLARE_COMPONENT( SCT_MonitorConditionsSvc )
+DECLARE_COMPONENT( SCT_FlaggedConditionSvc )
+DECLARE_COMPONENT( SCT_ReadCalibDataSvc )
+DECLARE_COMPONENT( SCT_ReadCalibChipDataSvc )
+DECLARE_COMPONENT( SCT_SiliconConditionsSvc )
+DECLARE_COMPONENT( SCT_LinkMaskingSvc )
+DECLARE_COMPONENT( SCT_TdaqEnabledSvc )
+DECLARE_COMPONENT( SCT_ConditionsParameterSvc )
+DECLARE_COMPONENT( SCT_SensorsSvc )
+DECLARE_COMPONENT( SCT_MajorityConditionsSvc )
+DECLARE_COMPONENT( SCT_ChargeTrappingSvc )
+DECLARE_COMPONENT( SCT_RadDamageSummarySvc )
+
+
+DECLARE_COMPONENT( SCT_ReadoutTool )
+DECLARE_COMPONENT( SCT_ElectricFieldTool )
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/components/SiLorentzAngleSvc_entries.cxx b/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/components/SiLorentzAngleSvc_entries.cxx
index 47082db30e4..07227032065 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/components/SiLorentzAngleSvc_entries.cxx
+++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/components/SiLorentzAngleSvc_entries.cxx
@@ -1,4 +1,4 @@
#include "SiLorentzAngleSvc/SiLorentzAngleSvc.h"
-DECLARE_SERVICE_FACTORY(SiLorentzAngleSvc)
+DECLARE_COMPONENT( SiLorentzAngleSvc )
diff --git a/InnerDetector/InDetConditions/SiPropertiesSvc/src/components/SiPropertiesSvc_entries.cxx b/InnerDetector/InDetConditions/SiPropertiesSvc/src/components/SiPropertiesSvc_entries.cxx
index d09775722c4..6a342d22c7c 100644
--- a/InnerDetector/InDetConditions/SiPropertiesSvc/src/components/SiPropertiesSvc_entries.cxx
+++ b/InnerDetector/InDetConditions/SiPropertiesSvc/src/components/SiPropertiesSvc_entries.cxx
@@ -1,4 +1,4 @@
#include "SiPropertiesSvc/SiPropertiesSvc.h"
-DECLARE_SERVICE_FACTORY(SiPropertiesSvc)
+DECLARE_COMPONENT( SiPropertiesSvc )
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/components/TRT_ConditionsAlgs_entries.cxx b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/components/TRT_ConditionsAlgs_entries.cxx
index 23761e2f527..10aa096c8be 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/components/TRT_ConditionsAlgs_entries.cxx
+++ b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/components/TRT_ConditionsAlgs_entries.cxx
@@ -2,7 +2,7 @@
#include "TRT_ConditionsAlgs/TRTStrawAlign.h"
#include "TRT_ConditionsAlgs/TRTStrawStatusWrite.h"
-DECLARE_ALGORITHM_FACTORY( TRTCondWrite )
-DECLARE_ALGORITHM_FACTORY( TRTStrawAlign )
-DECLARE_ALGORITHM_FACTORY( TRTStrawStatusWrite )
+DECLARE_COMPONENT( TRTCondWrite )
+DECLARE_COMPONENT( TRTStrawAlign )
+DECLARE_COMPONENT( TRTStrawStatusWrite )
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/components/TRT_ConditionsServices_entries.cxx b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/components/TRT_ConditionsServices_entries.cxx
index 2678c0ca52d..7a175cd76aa 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/components/TRT_ConditionsServices_entries.cxx
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/components/TRT_ConditionsServices_entries.cxx
@@ -10,15 +10,15 @@
#include "src/TRT_ByteStream_ConditionsSvc.h"
#include "src/TRT_DAQ_ConditionsSvc.h"
-DECLARE_SERVICE_FACTORY( TRT_ConditionsSummarySvc )
-DECLARE_SERVICE_FACTORY( TRT_ConditionsTestSvc )
-DECLARE_SERVICE_FACTORY( TRT_AlignDbSvc )
-DECLARE_SERVICE_FACTORY( TRT_CalDbSvc )
-DECLARE_SERVICE_FACTORY( TRT_StrawAlignDbSvc )
-DECLARE_SERVICE_FACTORY( TRT_DCS_ConditionsSvc )
-DECLARE_SERVICE_FACTORY( TRT_HWMappingSvc )
-DECLARE_SERVICE_FACTORY( TRT_StrawNeighbourSvc )
-DECLARE_SERVICE_FACTORY( TRT_StrawStatusSummarySvc )
-DECLARE_SERVICE_FACTORY( TRT_ByteStream_ConditionsSvc )
-DECLARE_SERVICE_FACTORY( TRT_DAQ_ConditionsSvc )
+DECLARE_COMPONENT( TRT_ConditionsSummarySvc )
+DECLARE_COMPONENT( TRT_ConditionsTestSvc )
+DECLARE_COMPONENT( TRT_AlignDbSvc )
+DECLARE_COMPONENT( TRT_CalDbSvc )
+DECLARE_COMPONENT( TRT_StrawAlignDbSvc )
+DECLARE_COMPONENT( TRT_DCS_ConditionsSvc )
+DECLARE_COMPONENT( TRT_HWMappingSvc )
+DECLARE_COMPONENT( TRT_StrawNeighbourSvc )
+DECLARE_COMPONENT( TRT_StrawStatusSummarySvc )
+DECLARE_COMPONENT( TRT_ByteStream_ConditionsSvc )
+DECLARE_COMPONENT( TRT_DAQ_ConditionsSvc )
diff --git a/InnerDetector/InDetConditions/TRT_RecoConditionsServices/src/components/TRT_RecoConditionsServices_entries.cxx b/InnerDetector/InDetConditions/TRT_RecoConditionsServices/src/components/TRT_RecoConditionsServices_entries.cxx
index 430056d2fd5..6dce9be491e 100644
--- a/InnerDetector/InDetConditions/TRT_RecoConditionsServices/src/components/TRT_RecoConditionsServices_entries.cxx
+++ b/InnerDetector/InDetConditions/TRT_RecoConditionsServices/src/components/TRT_RecoConditionsServices_entries.cxx
@@ -1,4 +1,4 @@
#include "src/TRT_ActiveFractionSvc.h"
-DECLARE_SERVICE_FACTORY( TRT_ActiveFractionSvc )
+DECLARE_COMPONENT( TRT_ActiveFractionSvc )
diff --git a/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/components/InDetCosmicsEventPhase_entries.cxx b/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/components/InDetCosmicsEventPhase_entries.cxx
index 6980238b44f..356aa9114d0 100644
--- a/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/components/InDetCosmicsEventPhase_entries.cxx
+++ b/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/components/InDetCosmicsEventPhase_entries.cxx
@@ -5,12 +5,12 @@
#include "InDetCosmicsEventPhase/TRT_TrackTimingTool.h"
using namespace InDet;
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetCosmicsEventPhase )
+DECLARE_COMPONENT( InDet::InDetCosmicsEventPhase )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetCosmicsEventPhaseTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetFixedWindowTrackTimeTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetSlidingWindowTrackTimeTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TRT_TrackTimingTool )
+DECLARE_COMPONENT( InDet::InDetCosmicsEventPhaseTool )
+DECLARE_COMPONENT( InDet::InDetFixedWindowTrackTimeTool )
+DECLARE_COMPONENT( InDet::InDetSlidingWindowTrackTimeTool )
+DECLARE_COMPONENT( InDet::TRT_TrackTimingTool )
diff --git a/InnerDetector/InDetCosmics/InDetCosmicsFilters/src/components/InDetCosmicsFilters_entries.cxx b/InnerDetector/InDetCosmics/InDetCosmicsFilters/src/components/InDetCosmicsFilters_entries.cxx
index e6667354f2c..4991a6bb514 100644
--- a/InnerDetector/InDetCosmics/InDetCosmicsFilters/src/components/InDetCosmicsFilters_entries.cxx
+++ b/InnerDetector/InDetCosmics/InDetCosmicsFilters/src/components/InDetCosmicsFilters_entries.cxx
@@ -1,5 +1,5 @@
#include "InDetCosmicsFilters/TrackFilter.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet , TrackFilter )
+DECLARE_COMPONENT( InDet::TrackFilter )
diff --git a/InnerDetector/InDetCosmics/TRT_SegmentsToTrack/src/components/TRT_SegmentsToTrack_entries.cxx b/InnerDetector/InDetCosmics/TRT_SegmentsToTrack/src/components/TRT_SegmentsToTrack_entries.cxx
index ce063361354..9d1a7982df8 100644
--- a/InnerDetector/InDetCosmics/TRT_SegmentsToTrack/src/components/TRT_SegmentsToTrack_entries.cxx
+++ b/InnerDetector/InDetCosmics/TRT_SegmentsToTrack/src/components/TRT_SegmentsToTrack_entries.cxx
@@ -1,4 +1,4 @@
#include "TRT_SegmentsToTrack/TRT_SegmentsToTrack.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, TRT_SegmentsToTrack )
+DECLARE_COMPONENT( InDet::TRT_SegmentsToTrack )
diff --git a/InnerDetector/InDetDetDescr/BCM_GeoModel/src/components/BCM_GeoModel_entries.cxx b/InnerDetector/InDetDetDescr/BCM_GeoModel/src/components/BCM_GeoModel_entries.cxx
index 211401ce04b..ddffe56fa77 100644
--- a/InnerDetector/InDetDetDescr/BCM_GeoModel/src/components/BCM_GeoModel_entries.cxx
+++ b/InnerDetector/InDetDetDescr/BCM_GeoModel/src/components/BCM_GeoModel_entries.cxx
@@ -1,4 +1,4 @@
#include "BCM_GeoModel/BCM_Builder.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( InDetDD, BCM_Builder )
+DECLARE_COMPONENT( InDetDD::BCM_Builder )
diff --git a/InnerDetector/InDetDetDescr/BLM_GeoModel/src/components/BLM_GeoModel_entries.cxx b/InnerDetector/InDetDetDescr/BLM_GeoModel/src/components/BLM_GeoModel_entries.cxx
index ee30d2c4b9e..71ce8a12100 100644
--- a/InnerDetector/InDetDetDescr/BLM_GeoModel/src/components/BLM_GeoModel_entries.cxx
+++ b/InnerDetector/InDetDetDescr/BLM_GeoModel/src/components/BLM_GeoModel_entries.cxx
@@ -1,4 +1,4 @@
#include "BLM_GeoModel/BLM_Builder.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( InDetDD, BLM_Builder )
+DECLARE_COMPONENT( InDetDD::BLM_Builder )
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/components/InDetRegionSelector_entries.cxx b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/components/InDetRegionSelector_entries.cxx
index d0f20efd9c3..77b9d225e8a 100644
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/components/InDetRegionSelector_entries.cxx
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/components/InDetRegionSelector_entries.cxx
@@ -3,8 +3,8 @@
#include "InDetRegionSelector/FTK_RegionSelectorTable.h"
#include "InDetRegionSelector/TRT_RegionSelectorTable.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(InDetDD, InDetRegionSelectorLUT )
-DECLARE_TOOL_FACTORY( SiRegionSelectorTable )
-DECLARE_TOOL_FACTORY( TRT_RegionSelectorTable )
-DECLARE_TOOL_FACTORY( FTK_RegionSelectorTable )
+DECLARE_COMPONENT( InDetDD::InDetRegionSelectorLUT )
+DECLARE_COMPONENT( SiRegionSelectorTable )
+DECLARE_COMPONENT( TRT_RegionSelectorTable )
+DECLARE_COMPONENT( FTK_RegionSelectorTable )
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/components/InDetServMatGeoModel_entries.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/components/InDetServMatGeoModel_entries.cxx
index 33849f2dec8..2a96449d2f0 100644
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/components/InDetServMatGeoModel_entries.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/components/InDetServMatGeoModel_entries.cxx
@@ -1,6 +1,6 @@
#include "InDetServMatGeoModel/InDetServMatTool.h"
#include "InDetServMatGeoModel/InDetServMatBuilderToolSLHC.h"
-DECLARE_TOOL_FACTORY(InDetServMatTool)
-DECLARE_TOOL_FACTORY(InDetServMatBuilderToolSLHC)
+DECLARE_COMPONENT( InDetServMatTool )
+DECLARE_COMPONENT( InDetServMatBuilderToolSLHC )
diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/components/InDetTrackingGeometry_entries.cxx b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/components/InDetTrackingGeometry_entries.cxx
index feb1ae6d55b..53bdacb2e50 100644
--- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/components/InDetTrackingGeometry_entries.cxx
+++ b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/components/InDetTrackingGeometry_entries.cxx
@@ -6,9 +6,9 @@
using namespace InDet;
-DECLARE_TOOL_FACTORY( BeamPipeBuilder )
-DECLARE_TOOL_FACTORY( SiLayerBuilder )
-DECLARE_TOOL_FACTORY( TRT_LayerBuilder )
-DECLARE_TOOL_FACTORY( RobustTrackingGeometryBuilder )
-DECLARE_TOOL_FACTORY( StagedTrackingGeometryBuilder )
+DECLARE_COMPONENT( BeamPipeBuilder )
+DECLARE_COMPONENT( SiLayerBuilder )
+DECLARE_COMPONENT( TRT_LayerBuilder )
+DECLARE_COMPONENT( RobustTrackingGeometryBuilder )
+DECLARE_COMPONENT( StagedTrackingGeometryBuilder )
diff --git a/InnerDetector/InDetDetDescr/PixelCabling/src/components/PixelCabling_entries.cxx b/InnerDetector/InDetDetDescr/PixelCabling/src/components/PixelCabling_entries.cxx
index c3924de3185..271996a8aeb 100644
--- a/InnerDetector/InDetDetDescr/PixelCabling/src/components/PixelCabling_entries.cxx
+++ b/InnerDetector/InDetDetDescr/PixelCabling/src/components/PixelCabling_entries.cxx
@@ -3,7 +3,7 @@
#include "../PixelCablingSvc.h"
-DECLARE_TOOL_FACTORY( PixelFillCablingData_Final )
-DECLARE_TOOL_FACTORY( PixelFillCablingData )
-DECLARE_SERVICE_FACTORY(PixelCablingSvc)
+DECLARE_COMPONENT( PixelFillCablingData_Final )
+DECLARE_COMPONENT( PixelFillCablingData )
+DECLARE_COMPONENT( PixelCablingSvc )
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/components/PixelGeoModel_entries.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/components/PixelGeoModel_entries.cxx
index 68b6391402c..5e9ef7510a3 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/components/PixelGeoModel_entries.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/components/PixelGeoModel_entries.cxx
@@ -1,6 +1,6 @@
#include "PixelGeoModel/PixelDetectorTool.h"
#include "PixelGeoModel/IBLParameterSvc.h"
-DECLARE_TOOL_FACTORY(PixelDetectorTool)
-DECLARE_SERVICE_FACTORY(IBLParameterSvc)
+DECLARE_COMPONENT( PixelDetectorTool )
+DECLARE_COMPONENT( IBLParameterSvc )
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/src/components/SCT_Cabling_entries.cxx b/InnerDetector/InDetDetDescr/SCT_Cabling/src/components/SCT_Cabling_entries.cxx
index aaa0c75e358..5edb792e055 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/src/components/SCT_Cabling_entries.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/src/components/SCT_Cabling_entries.cxx
@@ -3,8 +3,8 @@
#include "../SCT_FillCablingFromCoraCool.h"
#include "SCT_Cabling/SCT_TestCablingAlg.h"
-DECLARE_SERVICE_FACTORY(SCT_CablingSvc)
-DECLARE_SERVICE_FACTORY(SCT_FillCablingFromText)
-DECLARE_SERVICE_FACTORY(SCT_FillCablingFromCoraCool)
-DECLARE_ALGORITHM_FACTORY(SCT_TestCablingAlg)
+DECLARE_COMPONENT( SCT_CablingSvc )
+DECLARE_COMPONENT( SCT_FillCablingFromText )
+DECLARE_COMPONENT( SCT_FillCablingFromCoraCool )
+DECLARE_COMPONENT( SCT_TestCablingAlg )
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/components/SCT_GeoModel_entries.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/components/SCT_GeoModel_entries.cxx
index 1a82db644bb..a458092d71f 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/components/SCT_GeoModel_entries.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/components/SCT_GeoModel_entries.cxx
@@ -1,4 +1,4 @@
#include "SCT_GeoModel/SCT_DetectorTool.h"
-DECLARE_TOOL_FACTORY(SCT_DetectorTool)
+DECLARE_COMPONENT( SCT_DetectorTool )
diff --git a/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/components/SCT_ModuleDistortions_entries.cxx b/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/components/SCT_ModuleDistortions_entries.cxx
index bf065da41bd..07e883256be 100644
--- a/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/components/SCT_ModuleDistortions_entries.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/components/SCT_ModuleDistortions_entries.cxx
@@ -1,6 +1,6 @@
#include "../SCT_DistortionsTool.h"
#include "../SCT_TestDistortionsTool.h"
-DECLARE_TOOL_FACTORY(SCT_DistortionsTool)
-DECLARE_ALGORITHM_FACTORY(SCT_TestDistortionsTool)
+DECLARE_COMPONENT( SCT_DistortionsTool )
+DECLARE_COMPONENT( SCT_TestDistortionsTool )
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/components/SCT_SLHC_GeoModel_entries.cxx b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/components/SCT_SLHC_GeoModel_entries.cxx
index 09c43d6755c..6493baafea8 100644
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/components/SCT_SLHC_GeoModel_entries.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/components/SCT_SLHC_GeoModel_entries.cxx
@@ -1,4 +1,4 @@
#include "SCT_SLHC_GeoModel/SCT_SLHC_DetectorTool.h"
-DECLARE_TOOL_FACTORY(SCT_SLHC_DetectorTool)
+DECLARE_COMPONENT( SCT_SLHC_DetectorTool )
diff --git a/InnerDetector/InDetDetDescr/TRT_Cabling/src/components/TRT_Cabling_entries.cxx b/InnerDetector/InDetDetDescr/TRT_Cabling/src/components/TRT_Cabling_entries.cxx
index 5394988c494..53d1e5518e2 100644
--- a/InnerDetector/InDetDetDescr/TRT_Cabling/src/components/TRT_Cabling_entries.cxx
+++ b/InnerDetector/InDetDetDescr/TRT_Cabling/src/components/TRT_Cabling_entries.cxx
@@ -7,12 +7,12 @@
#include "../TRT_FillCablingData_DC3.h"
-DECLARE_SERVICE_FACTORY( TRT_CablingSvc )
+DECLARE_COMPONENT( TRT_CablingSvc )
-DECLARE_TOOL_FACTORY( TRT_FillCablingData_DC1 )
-DECLARE_TOOL_FACTORY( TRT_FillCablingData_DC2 )
-DECLARE_TOOL_FACTORY( TRT_FillCablingData_DC3 )
-DECLARE_TOOL_FACTORY( TRT_FillCablingData_SR1 )
-DECLARE_TOOL_FACTORY( TRT_FillCablingData_TB04 )
-DECLARE_TOOL_FACTORY( TRT_FillCablingData_SR1_ECC )
+DECLARE_COMPONENT( TRT_FillCablingData_DC1 )
+DECLARE_COMPONENT( TRT_FillCablingData_DC2 )
+DECLARE_COMPONENT( TRT_FillCablingData_DC3 )
+DECLARE_COMPONENT( TRT_FillCablingData_SR1 )
+DECLARE_COMPONENT( TRT_FillCablingData_TB04 )
+DECLARE_COMPONENT( TRT_FillCablingData_SR1_ECC )
diff --git a/InnerDetector/InDetDetDescr/TRT_GeoModel/src/components/TRT_GeoModel_entries.cxx b/InnerDetector/InDetDetDescr/TRT_GeoModel/src/components/TRT_GeoModel_entries.cxx
index 2a8135f61d1..9cd4ef4c67d 100644
--- a/InnerDetector/InDetDetDescr/TRT_GeoModel/src/components/TRT_GeoModel_entries.cxx
+++ b/InnerDetector/InDetDetDescr/TRT_GeoModel/src/components/TRT_GeoModel_entries.cxx
@@ -1,4 +1,4 @@
#include "../TRT_DetectorTool.h"
-DECLARE_TOOL_FACTORY(TRT_DetectorTool)
+DECLARE_COMPONENT( TRT_DetectorTool )
diff --git a/InnerDetector/InDetDigitization/BCM_Digitization/src/components/BCM_Digitization_entries.cxx b/InnerDetector/InDetDigitization/BCM_Digitization/src/components/BCM_Digitization_entries.cxx
index 903f1f20986..26d3669d53d 100644
--- a/InnerDetector/InDetDigitization/BCM_Digitization/src/components/BCM_Digitization_entries.cxx
+++ b/InnerDetector/InDetDigitization/BCM_Digitization/src/components/BCM_Digitization_entries.cxx
@@ -1,6 +1,6 @@
#include "../BCM_Digitization.h"
#include "../BCM_DigitizationTool.h"
-DECLARE_ALGORITHM_FACTORY( BCM_Digitization )
-DECLARE_TOOL_FACTORY( BCM_DigitizationTool )
+DECLARE_COMPONENT( BCM_Digitization )
+DECLARE_COMPONENT( BCM_DigitizationTool )
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/src/components/FastSiDigitization_entries.cxx b/InnerDetector/InDetDigitization/FastSiDigitization/src/components/FastSiDigitization_entries.cxx
index 12f00953b30..3e0f4ee1475 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/src/components/FastSiDigitization_entries.cxx
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/src/components/FastSiDigitization_entries.cxx
@@ -10,10 +10,10 @@
#include "FastSiDigitization/ISiSmearedDigitizationTool.h"
#include "FastSiDigitization/SiSmearedDigitization.h"
-DECLARE_ALGORITHM_FACTORY(PixelFastDigitization)
-DECLARE_ALGORITHM_FACTORY(SCT_FastDigitization)
-DECLARE_ALGORITHM_FACTORY(SiSmearedDigitization)
-DECLARE_TOOL_FACTORY(PixelFastDigitizationTool)
-DECLARE_TOOL_FACTORY(SiSmearedDigitizationTool)
-DECLARE_TOOL_FACTORY(SCT_FastDigitizationTool)
+DECLARE_COMPONENT( PixelFastDigitization )
+DECLARE_COMPONENT( SCT_FastDigitization )
+DECLARE_COMPONENT( SiSmearedDigitization )
+DECLARE_COMPONENT( PixelFastDigitizationTool )
+DECLARE_COMPONENT( SiSmearedDigitizationTool )
+DECLARE_COMPONENT( SCT_FastDigitizationTool )
diff --git a/InnerDetector/InDetDigitization/FastTRT_Digitization/src/components/TRTDigitization_entries.cxx b/InnerDetector/InDetDigitization/FastTRT_Digitization/src/components/TRTDigitization_entries.cxx
index e6f6ed06dc3..e3702b7c1e3 100644
--- a/InnerDetector/InDetDigitization/FastTRT_Digitization/src/components/TRTDigitization_entries.cxx
+++ b/InnerDetector/InDetDigitization/FastTRT_Digitization/src/components/TRTDigitization_entries.cxx
@@ -2,7 +2,7 @@
#include "../../FastTRT_Digitization/TRTFastDigitizationTool.h"
#include "../../FastTRT_Digitization/ITRTFastDigitizationTool.h"
-DECLARE_ALGORITHM_FACTORY( TRTFastDigitization )
+DECLARE_COMPONENT( TRTFastDigitization )
-DECLARE_TOOL_FACTORY(TRTFastDigitizationTool)
+DECLARE_COMPONENT( TRTFastDigitizationTool )
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/ChargeCollProbSvc.h b/InnerDetector/InDetDigitization/PixelDigitization/src/ChargeCollProbSvc.h
index 3022ec5bd5b..4a9bbf74b49 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/ChargeCollProbSvc.h
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/ChargeCollProbSvc.h
@@ -44,8 +44,6 @@ public:
-protected:
-
friend class SvcFactory<ChargeCollProbSvc>;
// Standard Constructor
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/components/PixelDigitization_entries.cxx b/InnerDetector/InDetDigitization/PixelDigitization/src/components/PixelDigitization_entries.cxx
index e7bf072e5d5..db5e57b7b2f 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/components/PixelDigitization_entries.cxx
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/components/PixelDigitization_entries.cxx
@@ -12,17 +12,17 @@
#include "src/FEI4SimTool.h"
#include "src/FEI3SimTool.h"
-DECLARE_ALGORITHM_FACTORY(PixelDigitization)
-DECLARE_TOOL_FACTORY(EnergyDepositionTool)
-DECLARE_TOOL_FACTORY(PixelDigitizationTool)
-DECLARE_TOOL_FACTORY(PixelNoisyCellGenerator)
-DECLARE_TOOL_FACTORY(PixelChargeSmearer)
-DECLARE_TOOL_FACTORY(PixelDiodeCrossTalkGenerator)
-DECLARE_TOOL_FACTORY(PixelRandomDisabledCellGenerator)
-DECLARE_TOOL_FACTORY(SensorSimPlanarTool)
-DECLARE_TOOL_FACTORY(SensorSim3DTool)
-DECLARE_TOOL_FACTORY(RD53SimTool)
-DECLARE_TOOL_FACTORY(FEI4SimTool)
-DECLARE_TOOL_FACTORY(FEI3SimTool)
-DECLARE_SERVICE_FACTORY(ChargeCollProbSvc)
+DECLARE_COMPONENT( PixelDigitization )
+DECLARE_COMPONENT( EnergyDepositionTool )
+DECLARE_COMPONENT( PixelDigitizationTool )
+DECLARE_COMPONENT( PixelNoisyCellGenerator )
+DECLARE_COMPONENT( PixelChargeSmearer )
+DECLARE_COMPONENT( PixelDiodeCrossTalkGenerator )
+DECLARE_COMPONENT( PixelRandomDisabledCellGenerator )
+DECLARE_COMPONENT( SensorSimPlanarTool )
+DECLARE_COMPONENT( SensorSim3DTool )
+DECLARE_COMPONENT( RD53SimTool )
+DECLARE_COMPONENT( FEI4SimTool )
+DECLARE_COMPONENT( FEI3SimTool )
+DECLARE_COMPONENT( ChargeCollProbSvc )
diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/src/components/SCT_Digitization_entries.cxx b/InnerDetector/InDetDigitization/SCT_Digitization/src/components/SCT_Digitization_entries.cxx
index 222e1ac133f..e1a256d65f0 100644
--- a/InnerDetector/InDetDigitization/SCT_Digitization/src/components/SCT_Digitization_entries.cxx
+++ b/InnerDetector/InDetDigitization/SCT_Digitization/src/components/SCT_Digitization_entries.cxx
@@ -6,11 +6,11 @@
#include "../SCT_DetailedSurfaceChargesGenerator.h"
#include "../SCT_RandomDisabledCellGenerator.h"
-DECLARE_ALGORITHM_FACTORY(SCT_Digitization)
-DECLARE_TOOL_FACTORY(SCT_Amp)
-DECLARE_TOOL_FACTORY(SCT_FrontEnd)
-DECLARE_TOOL_FACTORY(SCT_DigitizationTool)
-DECLARE_TOOL_FACTORY(SCT_SurfaceChargesGenerator)
-DECLARE_TOOL_FACTORY(SCT_DetailedSurfaceChargesGenerator)
-DECLARE_TOOL_FACTORY(SCT_RandomDisabledCellGenerator)
+DECLARE_COMPONENT( SCT_Digitization )
+DECLARE_COMPONENT( SCT_Amp )
+DECLARE_COMPONENT( SCT_FrontEnd )
+DECLARE_COMPONENT( SCT_DigitizationTool )
+DECLARE_COMPONENT( SCT_SurfaceChargesGenerator )
+DECLARE_COMPONENT( SCT_DetailedSurfaceChargesGenerator )
+DECLARE_COMPONENT( SCT_RandomDisabledCellGenerator )
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/components/TRTDigitization_entries.cxx b/InnerDetector/InDetDigitization/TRT_Digitization/src/components/TRTDigitization_entries.cxx
index ed3a18fbae2..010fff581c6 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/components/TRTDigitization_entries.cxx
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/components/TRTDigitization_entries.cxx
@@ -2,8 +2,8 @@
#include "../TRTDigitizationTool.h"
#include "../TRT_SimDriftTimeTool.h"
-DECLARE_ALGORITHM_FACTORY( TRTDigitization )
+DECLARE_COMPONENT( TRTDigitization )
-DECLARE_TOOL_FACTORY(TRTDigitizationTool)
-DECLARE_TOOL_FACTORY( TRT_SimDriftTimeTool )
+DECLARE_COMPONENT( TRTDigitizationTool )
+DECLARE_COMPONENT( TRT_SimDriftTimeTool )
diff --git a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/components/BCM_RawDataByteStreamCnv_entries.cxx b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/components/BCM_RawDataByteStreamCnv_entries.cxx
index 4db96fd4315..ee3cde9e4b7 100644
--- a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/components/BCM_RawDataByteStreamCnv_entries.cxx
+++ b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/components/BCM_RawDataByteStreamCnv_entries.cxx
@@ -2,14 +2,14 @@
DECLARE_CONVERTER_FACTORY( BCM_RawContByteStreamCnv )
#include "BCM_RawDataByteStreamCnv/BCM_RawContByteStreamTool.h"
-DECLARE_TOOL_FACTORY( BCM_RawContByteStreamTool )
+DECLARE_COMPONENT( BCM_RawContByteStreamTool )
#include "BCM_RawDataByteStreamCnv/BCM_RawDataProvider.h"
-DECLARE_ALGORITHM_FACTORY( BCM_RawDataProvider )
+DECLARE_COMPONENT( BCM_RawDataProvider )
#include "BCM_RawDataByteStreamCnv/BCM_RawDataProviderTool.h"
-DECLARE_TOOL_FACTORY( BCM_RawDataProviderTool)
+DECLARE_COMPONENT( BCM_RawDataProviderTool )
#include "BCM_RawDataByteStreamCnv/BCM_RodDecoder.h"
-DECLARE_TOOL_FACTORY( BCM_RodDecoder )
+DECLARE_COMPONENT( BCM_RodDecoder )
diff --git a/InnerDetector/InDetEventCnv/InDetEventCnvTools/src/components/InDetEventCnvTools_entries.cxx b/InnerDetector/InDetEventCnv/InDetEventCnvTools/src/components/InDetEventCnvTools_entries.cxx
index d95cda34360..9c46fbf106d 100644
--- a/InnerDetector/InDetEventCnv/InDetEventCnvTools/src/components/InDetEventCnvTools_entries.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventCnvTools/src/components/InDetEventCnvTools_entries.cxx
@@ -2,5 +2,5 @@
using namespace InDet;
-DECLARE_TOOL_FACTORY( InDetEventCnvTool )
+DECLARE_COMPONENT( InDetEventCnvTool )
diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/src/components/InDetJiveXML_entries.cxx b/InnerDetector/InDetEventCnv/InDetJiveXML/src/components/InDetJiveXML_entries.cxx
index 78a9e8f5069..34fb473cd9e 100644
--- a/InnerDetector/InDetEventCnv/InDetJiveXML/src/components/InDetJiveXML_entries.cxx
+++ b/InnerDetector/InDetEventCnv/InDetJiveXML/src/components/InDetJiveXML_entries.cxx
@@ -9,12 +9,12 @@
using namespace JiveXML;
-DECLARE_TOOL_FACTORY(SiSpacePointRetriever)
-DECLARE_TOOL_FACTORY(TRTRetriever)
-DECLARE_TOOL_FACTORY(SiClusterRetriever)
-DECLARE_TOOL_FACTORY(PixelClusterRetriever)
-DECLARE_TOOL_FACTORY(SCTRDORetriever)
-DECLARE_TOOL_FACTORY(PixelRDORetriever)
-DECLARE_TOOL_FACTORY(InDetGeoModelTool)
-DECLARE_TOOL_FACTORY(BeamSpotRetriever)
+DECLARE_COMPONENT( SiSpacePointRetriever )
+DECLARE_COMPONENT( TRTRetriever )
+DECLARE_COMPONENT( SiClusterRetriever )
+DECLARE_COMPONENT( PixelClusterRetriever )
+DECLARE_COMPONENT( SCTRDORetriever )
+DECLARE_COMPONENT( PixelRDORetriever )
+DECLARE_COMPONENT( InDetGeoModelTool )
+DECLARE_COMPONENT( BeamSpotRetriever )
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/components/InDetPrepRawDataToxAOD_entries.cxx b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/components/InDetPrepRawDataToxAOD_entries.cxx
index 76bc59bfa76..8153bc95147 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/components/InDetPrepRawDataToxAOD_entries.cxx
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/components/InDetPrepRawDataToxAOD_entries.cxx
@@ -3,8 +3,8 @@
#include "../SCT_RawDataToxAOD.h"
#include "../PixelPrepDataToxAOD.h"
-DECLARE_ALGORITHM_FACTORY( TRT_PrepDataToxAOD )
-DECLARE_ALGORITHM_FACTORY( SCT_PrepDataToxAOD )
-DECLARE_ALGORITHM_FACTORY( SCT_RawDataToxAOD )
-DECLARE_ALGORITHM_FACTORY( PixelPrepDataToxAOD )
+DECLARE_COMPONENT( TRT_PrepDataToxAOD )
+DECLARE_COMPONENT( SCT_PrepDataToxAOD )
+DECLARE_COMPONENT( SCT_RawDataToxAOD )
+DECLARE_COMPONENT( PixelPrepDataToxAOD )
diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/components/PixelRawDataByteStreamCnv_entries.cxx b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/components/PixelRawDataByteStreamCnv_entries.cxx
index d21cfdf3f62..981c2099f56 100644
--- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/components/PixelRawDataByteStreamCnv_entries.cxx
+++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/components/PixelRawDataByteStreamCnv_entries.cxx
@@ -2,14 +2,14 @@
DECLARE_CONVERTER_FACTORY( PixelRawContByteStreamCnv )
#include "../PixelRawContByteStreamTool.h"
-DECLARE_TOOL_FACTORY( PixelRawContByteStreamTool )
+DECLARE_COMPONENT( PixelRawContByteStreamTool )
#include "../PixelRawDataProvider.h"
-DECLARE_ALGORITHM_FACTORY( PixelRawDataProvider )
+DECLARE_COMPONENT( PixelRawDataProvider )
#include "../PixelRawDataProviderTool.h"
-DECLARE_TOOL_FACTORY( PixelRawDataProviderTool)
+DECLARE_COMPONENT( PixelRawDataProviderTool )
#include "../PixelRodDecoder.h"
-DECLARE_TOOL_FACTORY( PixelRodDecoder )
+DECLARE_COMPONENT( PixelRodDecoder )
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/components/SCT_RawDataByteStreamCnv_entries.cxx b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/components/SCT_RawDataByteStreamCnv_entries.cxx
index 77aabbfa3ec..264fbc38e1d 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/components/SCT_RawDataByteStreamCnv_entries.cxx
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/components/SCT_RawDataByteStreamCnv_entries.cxx
@@ -2,17 +2,17 @@
DECLARE_CONVERTER_FACTORY( SCTRawContByteStreamCnv )
#include "../SCTRawContByteStreamService.h"
-DECLARE_SERVICE_FACTORY( SCTRawContByteStreamService )
+DECLARE_COMPONENT( SCTRawContByteStreamService )
#include "../SCTRawDataProvider.h"
-DECLARE_ALGORITHM_FACTORY( SCTRawDataProvider )
+DECLARE_COMPONENT( SCTRawDataProvider )
#include "../SCTRawDataProviderTool.h"
-DECLARE_TOOL_FACTORY( SCTRawDataProviderTool)
+DECLARE_COMPONENT( SCTRawDataProviderTool )
#include "../SCT_RodDecoder.h"
-DECLARE_TOOL_FACTORY( SCT_RodDecoder )
+DECLARE_COMPONENT( SCT_RodDecoder )
#include "../SCT_RodEncoder.h"
-DECLARE_TOOL_FACTORY( SCT_RodEncoder )
+DECLARE_COMPONENT( SCT_RodEncoder )
diff --git a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/components/TRT_RawDataByteStreamCnv_entries.cxx b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/components/TRT_RawDataByteStreamCnv_entries.cxx
index d1892562b77..155c2d0b2a2 100644
--- a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/components/TRT_RawDataByteStreamCnv_entries.cxx
+++ b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/components/TRT_RawDataByteStreamCnv_entries.cxx
@@ -2,14 +2,14 @@
DECLARE_CONVERTER_FACTORY( TRTRawContByteStreamCnv )
#include "../TRTRawContByteStreamTool.h"
-DECLARE_TOOL_FACTORY( TRTRawContByteStreamTool )
+DECLARE_COMPONENT( TRTRawContByteStreamTool )
#include "../TRTRawDataProvider.h"
-DECLARE_ALGORITHM_FACTORY( TRTRawDataProvider )
+DECLARE_COMPONENT( TRTRawDataProvider )
#include "../TRTRawDataProviderTool.h"
-DECLARE_TOOL_FACTORY( TRTRawDataProviderTool)
+DECLARE_COMPONENT( TRTRawDataProviderTool )
#include "../TRT_RodDecoder.h"
-DECLARE_TOOL_FACTORY( TRT_RodDecoder )
+DECLARE_COMPONENT( TRT_RodDecoder )
diff --git a/InnerDetector/InDetExample/InDetDetDescrExample/src/components/InDetDetDescrExample_entries.cxx b/InnerDetector/InDetExample/InDetDetDescrExample/src/components/InDetDetDescrExample_entries.cxx
index 8855fd3c605..7bb6509c6fb 100644
--- a/InnerDetector/InDetExample/InDetDetDescrExample/src/components/InDetDetDescrExample_entries.cxx
+++ b/InnerDetector/InDetExample/InDetDetDescrExample/src/components/InDetDetDescrExample_entries.cxx
@@ -5,10 +5,10 @@
#include "InDetDetDescrExample/InDetUpdateCaches.h"
#include "InDetDetDescrExample/PrintSiElements.h"
-DECLARE_ALGORITHM_FACTORY( ReadSiDetectorElements )
-DECLARE_ALGORITHM_FACTORY( ReadTRT_DetectorElements )
-DECLARE_ALGORITHM_FACTORY( TestSiAlignment )
-DECLARE_ALGORITHM_FACTORY( TestTRT_Alignment )
-DECLARE_ALGORITHM_FACTORY( InDetUpdateCaches )
-DECLARE_ALGORITHM_FACTORY( PrintSiElements )
+DECLARE_COMPONENT( ReadSiDetectorElements )
+DECLARE_COMPONENT( ReadTRT_DetectorElements )
+DECLARE_COMPONENT( TestSiAlignment )
+DECLARE_COMPONENT( TestTRT_Alignment )
+DECLARE_COMPONENT( InDetUpdateCaches )
+DECLARE_COMPONENT( PrintSiElements )
diff --git a/InnerDetector/InDetG4/BCM_G4_SD/src/components/BCM_G4_SD_entries.cxx b/InnerDetector/InDetG4/BCM_G4_SD/src/components/BCM_G4_SD_entries.cxx
index 3ccebbc3d6a..70e4357937f 100644
--- a/InnerDetector/InDetG4/BCM_G4_SD/src/components/BCM_G4_SD_entries.cxx
+++ b/InnerDetector/InDetG4/BCM_G4_SD/src/components/BCM_G4_SD_entries.cxx
@@ -1,4 +1,4 @@
#include "../BCMSensorSDTool.h"
-DECLARE_TOOL_FACTORY( BCMSensorSDTool )
+DECLARE_COMPONENT( BCMSensorSDTool )
diff --git a/InnerDetector/InDetG4/BLM_G4_SD/src/components/BLM_G4_SD_entries.cxx b/InnerDetector/InDetG4/BLM_G4_SD/src/components/BLM_G4_SD_entries.cxx
index 81b6eaf481e..800186f49ed 100644
--- a/InnerDetector/InDetG4/BLM_G4_SD/src/components/BLM_G4_SD_entries.cxx
+++ b/InnerDetector/InDetG4/BLM_G4_SD/src/components/BLM_G4_SD_entries.cxx
@@ -1,4 +1,4 @@
#include "../BLMSensorSDTool.h"
-DECLARE_TOOL_FACTORY( BLMSensorSDTool )
+DECLARE_COMPONENT( BLMSensorSDTool )
diff --git a/InnerDetector/InDetG4/PixelG4_SD/src/components/PixelG4_SD_entries.cxx b/InnerDetector/InDetG4/PixelG4_SD/src/components/PixelG4_SD_entries.cxx
index 88734839b2d..d4977c64cff 100644
--- a/InnerDetector/InDetG4/PixelG4_SD/src/components/PixelG4_SD_entries.cxx
+++ b/InnerDetector/InDetG4/PixelG4_SD/src/components/PixelG4_SD_entries.cxx
@@ -1,4 +1,4 @@
#include "../PixelSensorSDTool.h"
-DECLARE_TOOL_FACTORY( PixelSensorSDTool )
+DECLARE_COMPONENT( PixelSensorSDTool )
diff --git a/InnerDetector/InDetG4/SCT_G4_SD/src/components/SCT_G4_SD_entries.cxx b/InnerDetector/InDetG4/SCT_G4_SD/src/components/SCT_G4_SD_entries.cxx
index ad69db55dd7..7c70631ebe4 100644
--- a/InnerDetector/InDetG4/SCT_G4_SD/src/components/SCT_G4_SD_entries.cxx
+++ b/InnerDetector/InDetG4/SCT_G4_SD/src/components/SCT_G4_SD_entries.cxx
@@ -1,6 +1,6 @@
#include "../SctSensorSDTool.h"
#include "../SctSensor_CTBTool.h"
-DECLARE_TOOL_FACTORY( SctSensorSDTool )
-DECLARE_TOOL_FACTORY( SctSensor_CTBTool )
+DECLARE_COMPONENT( SctSensorSDTool )
+DECLARE_COMPONENT( SctSensor_CTBTool )
diff --git a/InnerDetector/InDetG4/TRT_G4_SD/src/components/TRT_G4_SD_entries.cxx b/InnerDetector/InDetG4/TRT_G4_SD/src/components/TRT_G4_SD_entries.cxx
index fbc0082ed23..8f746289834 100644
--- a/InnerDetector/InDetG4/TRT_G4_SD/src/components/TRT_G4_SD_entries.cxx
+++ b/InnerDetector/InDetG4/TRT_G4_SD/src/components/TRT_G4_SD_entries.cxx
@@ -1,4 +1,4 @@
#include "../TRTSensitiveDetectorTool.h"
-DECLARE_TOOL_FACTORY( TRTSensitiveDetectorTool )
+DECLARE_COMPONENT( TRTSensitiveDetectorTool )
diff --git a/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/components/InDetSimpleVisual_entries.cxx b/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/components/InDetSimpleVisual_entries.cxx
index 00d92d6d341..721efc890e5 100644
--- a/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/components/InDetSimpleVisual_entries.cxx
+++ b/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/components/InDetSimpleVisual_entries.cxx
@@ -2,7 +2,7 @@
#include "InDetSimpleVisual/GetDetectorLocalFrames.h"
-DECLARE_ALGORITHM_FACTORY( GetDetectorPositions )
-DECLARE_ALGORITHM_FACTORY( GetDetectorLocalFrames )
+DECLARE_COMPONENT( GetDetectorPositions )
+DECLARE_COMPONENT( GetDetectorLocalFrames )
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/components/InDetAlignmentMonitoring_entries.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/components/InDetAlignmentMonitoring_entries.cxx
index ba8bd102944..2d7d6aa0ad7 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/components/InDetAlignmentMonitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/components/InDetAlignmentMonitoring_entries.cxx
@@ -10,15 +10,15 @@
#include "src/TrackSelectionAlg.h"
#include "src/IDAlignMonPVBiases.h"
-DECLARE_TOOL_FACTORY(IDAlignMonPVBiases)
-DECLARE_TOOL_FACTORY(IDAlignMonEfficiencies)
-DECLARE_TOOL_FACTORY(IDAlignMonGenericTracks)
-DECLARE_TOOL_FACTORY(InDetAlignMonBeamSpot)
-DECLARE_TOOL_FACTORY(IDAlignMonResiduals)
-DECLARE_TOOL_FACTORY(IDAlignMonTruthComparison)
-DECLARE_TOOL_FACTORY(IDAlignMonNtuple)
-DECLARE_TOOL_FACTORY(IDAlignMonTrackSegments)
-DECLARE_TOOL_FACTORY(IDAlignMonSivsTRT)
-DECLARE_NAMESPACE_TOOL_FACTORY(InDetAlignMon, TrackSelectionTool)
-DECLARE_ALGORITHM_FACTORY(TrackSelectionAlg)
+DECLARE_COMPONENT( IDAlignMonPVBiases )
+DECLARE_COMPONENT( IDAlignMonEfficiencies )
+DECLARE_COMPONENT( IDAlignMonGenericTracks )
+DECLARE_COMPONENT( InDetAlignMonBeamSpot )
+DECLARE_COMPONENT( IDAlignMonResiduals )
+DECLARE_COMPONENT( IDAlignMonTruthComparison )
+DECLARE_COMPONENT( IDAlignMonNtuple )
+DECLARE_COMPONENT( IDAlignMonTrackSegments )
+DECLARE_COMPONENT( IDAlignMonSivsTRT )
+DECLARE_COMPONENT( InDetAlignMon::TrackSelectionTool )
+DECLARE_COMPONENT( TrackSelectionAlg )
diff --git a/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/components/InDetDiMuonMonitoring_entries.cxx b/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/components/InDetDiMuonMonitoring_entries.cxx
index c4126150686..0657ecf56b9 100644
--- a/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/components/InDetDiMuonMonitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/components/InDetDiMuonMonitoring_entries.cxx
@@ -1,3 +1,3 @@
#include "InDetDiMuonMonitoring/DiMuMon.h"
-DECLARE_TOOL_FACTORY( DiMuMon )
+DECLARE_COMPONENT( DiMuMon )
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/components/InDetGlobalMonitoring_entries.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/components/InDetGlobalMonitoring_entries.cxx
index 718de63eeab..c46fdc65c08 100644
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/components/InDetGlobalMonitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/components/InDetGlobalMonitoring_entries.cxx
@@ -11,15 +11,15 @@
#include "../InDetGlobalPrimaryVertexMonTool.h"
#include "../InDetGlobalErrorMonTool.h"
-DECLARE_ALGORITHM_FACTORY(InDetGlobalManager)
-DECLARE_TOOL_FACTORY(InDetGlobalHitsMonTool)
-DECLARE_TOOL_FACTORY(InDetGlobalMotherMonTool)
-DECLARE_TOOL_FACTORY(InDetGlobalSynchMonTool)
-DECLARE_TOOL_FACTORY(InDetGlobalNoiseOccupancyMonTool)
-DECLARE_TOOL_FACTORY(InDetGlobalTrackMonTool)
-DECLARE_TOOL_FACTORY(InDetGlobalBCMTool)
-DECLARE_TOOL_FACTORY(InDetGlobalPixelTool)
-DECLARE_TOOL_FACTORY(InDetGlobalBeamSpotMonTool)
-DECLARE_TOOL_FACTORY(InDetGlobalPrimaryVertexMonTool)
-DECLARE_TOOL_FACTORY(InDetGlobalErrorMonTool)
+DECLARE_COMPONENT( InDetGlobalManager )
+DECLARE_COMPONENT( InDetGlobalHitsMonTool )
+DECLARE_COMPONENT( InDetGlobalMotherMonTool )
+DECLARE_COMPONENT( InDetGlobalSynchMonTool )
+DECLARE_COMPONENT( InDetGlobalNoiseOccupancyMonTool )
+DECLARE_COMPONENT( InDetGlobalTrackMonTool )
+DECLARE_COMPONENT( InDetGlobalBCMTool )
+DECLARE_COMPONENT( InDetGlobalPixelTool )
+DECLARE_COMPONENT( InDetGlobalBeamSpotMonTool )
+DECLARE_COMPONENT( InDetGlobalPrimaryVertexMonTool )
+DECLARE_COMPONENT( InDetGlobalErrorMonTool )
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/components/InDetPerformanceMonitoring_entries.cxx b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/components/InDetPerformanceMonitoring_entries.cxx
index caffe46a382..d9bfcf8c469 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/components/InDetPerformanceMonitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/components/InDetPerformanceMonitoring_entries.cxx
@@ -7,11 +7,11 @@
#include "InDetPerformanceMonitoring/IDPerfMuonRefitter.h"
-DECLARE_TOOL_FACTORY(IDPerfMonZee)
-DECLARE_TOOL_FACTORY(IDPerfMonWenu)
-DECLARE_ALGORITHM_FACTORY(IDPerfMonZmumu)
-DECLARE_TOOL_FACTORY(IDPerfMonKshort)
-DECLARE_TOOL_FACTORY(TRT_Electron_Monitoring_Tool)
-DECLARE_ALGORITHM_FACTORY( IDPerfMonEoverP )
-DECLARE_ALGORITHM_FACTORY(IDPerfMuonRefitter)
+DECLARE_COMPONENT( IDPerfMonZee )
+DECLARE_COMPONENT( IDPerfMonWenu )
+DECLARE_COMPONENT( IDPerfMonZmumu )
+DECLARE_COMPONENT( IDPerfMonKshort )
+DECLARE_COMPONENT( TRT_Electron_Monitoring_Tool )
+DECLARE_COMPONENT( IDPerfMonEoverP )
+DECLARE_COMPONENT( IDPerfMuonRefitter )
diff --git a/InnerDetector/InDetMonitoring/InDetVertexMonitoring/src/components/InDetVertexMonitoring_entries.cxx b/InnerDetector/InDetMonitoring/InDetVertexMonitoring/src/components/InDetVertexMonitoring_entries.cxx
index 0224b47a12f..315432b6245 100644
--- a/InnerDetector/InDetMonitoring/InDetVertexMonitoring/src/components/InDetVertexMonitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/InDetVertexMonitoring/src/components/InDetVertexMonitoring_entries.cxx
@@ -1,4 +1,4 @@
#include "../InDetVertexMonitoring.h"
-DECLARE_TOOL_FACTORY( InDetVertexMonitoring )
+DECLARE_COMPONENT( InDetVertexMonitoring )
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/components/PixelMonitoring_entries.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/components/PixelMonitoring_entries.cxx
index 468b7e27b7d..c518195f476 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/components/PixelMonitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/components/PixelMonitoring_entries.cxx
@@ -1,5 +1,5 @@
#include "PixelMonitoring/PixelMainMon.h"
-DECLARE_TOOL_FACTORY( PixelMainMon )
+DECLARE_COMPONENT( PixelMainMon )
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/components/SCT_Monitoring_entries.cxx b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/components/SCT_Monitoring_entries.cxx
index 0d198e8e6a1..665ef08b722 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/components/SCT_Monitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/components/SCT_Monitoring_entries.cxx
@@ -9,12 +9,12 @@
using namespace SCT_Monitoring;
-DECLARE_TOOL_FACTORY(SCTMotherTrigMonTool)
-DECLARE_TOOL_FACTORY(SCTTracksMonTool)
-DECLARE_TOOL_FACTORY(SCTLorentzMonTool)
-DECLARE_TOOL_FACTORY(SCTRatioNoiseMonTool)
-DECLARE_TOOL_FACTORY(SCTErrMonTool)
-DECLARE_TOOL_FACTORY(SCTHitEffMonTool)
-DECLARE_TOOL_FACTORY(SCTHitsNoiseMonTool)
-DECLARE_TOOL_FACTORY(SCTSummaryMonTool)
+DECLARE_COMPONENT( SCTMotherTrigMonTool )
+DECLARE_COMPONENT( SCTTracksMonTool )
+DECLARE_COMPONENT( SCTLorentzMonTool )
+DECLARE_COMPONENT( SCTRatioNoiseMonTool )
+DECLARE_COMPONENT( SCTErrMonTool )
+DECLARE_COMPONENT( SCTHitEffMonTool )
+DECLARE_COMPONENT( SCTHitsNoiseMonTool )
+DECLARE_COMPONENT( SCTSummaryMonTool )
diff --git a/InnerDetector/InDetMonitoring/TRT_Monitoring/src/components/TRT_Monitoring_entries.cxx b/InnerDetector/InDetMonitoring/TRT_Monitoring/src/components/TRT_Monitoring_entries.cxx
index 1ddbcfa7af9..3cabca0e153 100644
--- a/InnerDetector/InDetMonitoring/TRT_Monitoring/src/components/TRT_Monitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/TRT_Monitoring/src/components/TRT_Monitoring_entries.cxx
@@ -1,9 +1,9 @@
#include "TRT_Monitoring/TRT_Monitoring_Tool.h"
#include "TRT_Monitoring/TRT_Hits_Monitoring_Tool.h"
-DECLARE_TOOL_FACTORY(TRT_Monitoring_Tool)
+DECLARE_COMPONENT( TRT_Monitoring_Tool )
#ifdef ONLINE
-DECLARE_TOOL_FACTORY(TRT_Hits_Monitoring_Tool)
+DECLARE_COMPONENT( TRT_Hits_Monitoring_Tool )
#endif
#ifdef ONLINE
diff --git a/InnerDetector/InDetPerformance/SCTExtension/src/components/SCTExtension_entries.cxx b/InnerDetector/InDetPerformance/SCTExtension/src/components/SCTExtension_entries.cxx
index 5e6a1d16725..e03ac570acc 100644
--- a/InnerDetector/InDetPerformance/SCTExtension/src/components/SCTExtension_entries.cxx
+++ b/InnerDetector/InDetPerformance/SCTExtension/src/components/SCTExtension_entries.cxx
@@ -1,3 +1,3 @@
#include "SCTExtension/SCTExtensionAlg.h"
-DECLARE_ALGORITHM_FACTORY( SCTExtensionAlg )
+DECLARE_COMPONENT( SCTExtensionAlg )
diff --git a/InnerDetector/InDetRawAlgs/BCM_ZeroSuppression/src/components/BCM_ZeroSuppression_entries.cxx b/InnerDetector/InDetRawAlgs/BCM_ZeroSuppression/src/components/BCM_ZeroSuppression_entries.cxx
index ab2069c00a4..b710913b073 100644
--- a/InnerDetector/InDetRawAlgs/BCM_ZeroSuppression/src/components/BCM_ZeroSuppression_entries.cxx
+++ b/InnerDetector/InDetRawAlgs/BCM_ZeroSuppression/src/components/BCM_ZeroSuppression_entries.cxx
@@ -1,4 +1,4 @@
#include "BCM_ZeroSuppression/BCM_ZeroSuppression.h"
-DECLARE_ALGORITHM_FACTORY( BCM_ZeroSuppression )
+DECLARE_COMPONENT( BCM_ZeroSuppression )
diff --git a/InnerDetector/InDetRawAlgs/InDetOverlay/src/components/InDetOverlay_entries.cxx b/InnerDetector/InDetRawAlgs/InDetOverlay/src/components/InDetOverlay_entries.cxx
index 3f46a1e2a50..de4d431be4a 100644
--- a/InnerDetector/InDetRawAlgs/InDetOverlay/src/components/InDetOverlay_entries.cxx
+++ b/InnerDetector/InDetRawAlgs/InDetOverlay/src/components/InDetOverlay_entries.cxx
@@ -1,7 +1,7 @@
#include "InDetOverlay/InDetOverlay.h"
#include "InDetOverlay/InDetSDOOverlay.h"
-DECLARE_ALGORITHM_FACTORY( InDetOverlay )
-DECLARE_ALGORITHM_FACTORY( InDetSDOOverlay )
+DECLARE_COMPONENT( InDetOverlay )
+DECLARE_COMPONENT( InDetSDOOverlay )
diff --git a/InnerDetector/InDetRecAlgs/BCM_BackgroundAlgs/src/components/BCM_BackgroundAlgs_entries.cxx b/InnerDetector/InDetRecAlgs/BCM_BackgroundAlgs/src/components/BCM_BackgroundAlgs_entries.cxx
index e59eb99310c..3824d99c191 100644
--- a/InnerDetector/InDetRecAlgs/BCM_BackgroundAlgs/src/components/BCM_BackgroundAlgs_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/BCM_BackgroundAlgs/src/components/BCM_BackgroundAlgs_entries.cxx
@@ -1,3 +1,3 @@
#include "BCM_BackgroundAlgs/BcmCollisionTimeAlg.h"
-DECLARE_ALGORITHM_FACTORY( BcmCollisionTimeAlg )
+DECLARE_COMPONENT( BcmCollisionTimeAlg )
diff --git a/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/components/InDetCaloClusterROISelector_entries.cxx b/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/components/InDetCaloClusterROISelector_entries.cxx
index 85dcd7fb104..04b71ab9f54 100644
--- a/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/components/InDetCaloClusterROISelector_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/components/InDetCaloClusterROISelector_entries.cxx
@@ -2,6 +2,6 @@
using namespace InDet;
-DECLARE_ALGORITHM_FACTORY( CaloClusterROI_Selector )
+DECLARE_COMPONENT( CaloClusterROI_Selector )
diff --git a/InnerDetector/InDetRecAlgs/InDetConversionFinder/src/components/InDetConversionFinder_entries.cxx b/InnerDetector/InDetRecAlgs/InDetConversionFinder/src/components/InDetConversionFinder_entries.cxx
index ab7a45b90d4..5faca6ba0d5 100644
--- a/InnerDetector/InDetRecAlgs/InDetConversionFinder/src/components/InDetConversionFinder_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetConversionFinder/src/components/InDetConversionFinder_entries.cxx
@@ -2,5 +2,5 @@
using namespace InDet;
-DECLARE_ALGORITHM_FACTORY( ConversionFinder )
+DECLARE_COMPONENT( ConversionFinder )
diff --git a/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/components/InDetExtensionProcessor_entries.cxx b/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/components/InDetExtensionProcessor_entries.cxx
index 60465a2b912..781114cf260 100644
--- a/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/components/InDetExtensionProcessor_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/components/InDetExtensionProcessor_entries.cxx
@@ -1,5 +1,5 @@
#include "InDetExtensionProcessor/InDetExtensionProcessor.h"
using namespace InDet;
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetExtensionProcessor )
+DECLARE_COMPONENT( InDet::InDetExtensionProcessor )
diff --git a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/components/InDetLowBetaFinder_entries.cxx b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/components/InDetLowBetaFinder_entries.cxx
index e53c7c00eeb..e55c85d9c54 100644
--- a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/components/InDetLowBetaFinder_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/components/InDetLowBetaFinder_entries.cxx
@@ -2,5 +2,5 @@
using namespace InDet;
-DECLARE_ALGORITHM_FACTORY( LowBetaAlg )
+DECLARE_COMPONENT( LowBetaAlg )
diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/components/InDetPrepRawDataFormation_entries.cxx b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/components/InDetPrepRawDataFormation_entries.cxx
index 69e09e0d8df..5c38fe3055b 100644
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/components/InDetPrepRawDataFormation_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/components/InDetPrepRawDataFormation_entries.cxx
@@ -6,8 +6,8 @@
using namespace InDet;
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, PixelClusterization)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, SCT_Clusterization )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, TRT_RIO_Maker )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, CacheCreator )
+DECLARE_COMPONENT( InDet::PixelClusterization )
+DECLARE_COMPONENT( InDet::SCT_Clusterization )
+DECLARE_COMPONENT( InDet::TRT_RIO_Maker )
+DECLARE_COMPONENT( InDet::CacheCreator )
diff --git a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/components/InDetPriVxFinder_entries.cxx b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/components/InDetPriVxFinder_entries.cxx
index a85485c151b..4bd69e1ff17 100644
--- a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/components/InDetPriVxFinder_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/components/InDetPriVxFinder_entries.cxx
@@ -2,7 +2,7 @@
#include "InDetPriVxFinder/InDetPriVxDummyFinder.h"
#include "InDetPriVxFinder/InDetVxLinksToTrackParticles.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetPriVxFinder )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetPriVxDummyFinder )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetVxLinksToTrackParticles )
+DECLARE_COMPONENT( InDet::InDetPriVxFinder )
+DECLARE_COMPONENT( InDet::InDetPriVxDummyFinder )
+DECLARE_COMPONENT( InDet::InDetVxLinksToTrackParticles )
diff --git a/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/components/InDetTrackPRD_Association_entries.cxx b/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/components/InDetTrackPRD_Association_entries.cxx
index 3636efbf526..196f5c0b545 100644
--- a/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/components/InDetTrackPRD_Association_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/components/InDetTrackPRD_Association_entries.cxx
@@ -2,5 +2,5 @@
using namespace InDet;
-DECLARE_ALGORITHM_FACTORY( InDetTrackPRD_Association )
+DECLARE_COMPONENT( InDetTrackPRD_Association )
diff --git a/InnerDetector/InDetRecAlgs/InDetV0Finder/src/components/InDetV0Finder_entries.cxx b/InnerDetector/InDetRecAlgs/InDetV0Finder/src/components/InDetV0Finder_entries.cxx
index 150a3d63e30..f5571a35fb5 100644
--- a/InnerDetector/InDetRecAlgs/InDetV0Finder/src/components/InDetV0Finder_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetV0Finder/src/components/InDetV0Finder_entries.cxx
@@ -4,9 +4,9 @@
using namespace InDet;
-DECLARE_TOOL_FACTORY( InDetV0FinderTool )
+DECLARE_COMPONENT( InDetV0FinderTool )
-DECLARE_ALGORITHM_FACTORY( InDetV0Finder )
-//DECLARE_ALGORITHM_FACTORY( InDetSimpleV0Finder )
+DECLARE_COMPONENT( InDetV0Finder )
+//DECLARE_COMPONENT( InDetSimpleV0Finder )
diff --git a/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/src/components/InDetZVTOP_Alg_entries.cxx b/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/src/components/InDetZVTOP_Alg_entries.cxx
index 841ff268c7b..f32c0279c77 100644
--- a/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/src/components/InDetZVTOP_Alg_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/src/components/InDetZVTOP_Alg_entries.cxx
@@ -2,5 +2,5 @@
using namespace InDet;
-DECLARE_ALGORITHM_FACTORY( InDetZVTOP_Alg )
+DECLARE_COMPONENT( InDetZVTOP_Alg )
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/components/SiSPSeededTrackFinder_entries.cxx b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/components/SiSPSeededTrackFinder_entries.cxx
index b21701ffc65..8c413ad80bc 100644
--- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/components/SiSPSeededTrackFinder_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/components/SiSPSeededTrackFinder_entries.cxx
@@ -2,5 +2,5 @@
using namespace InDet;
-DECLARE_ALGORITHM_FACTORY( SiSPSeededTrackFinder )
+DECLARE_COMPONENT( SiSPSeededTrackFinder )
diff --git a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/components/SiSpacePointFormation_entries.cxx b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/components/SiSpacePointFormation_entries.cxx
index 83e52a96999..28674a38214 100644
--- a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/components/SiSpacePointFormation_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/components/SiSpacePointFormation_entries.cxx
@@ -1,4 +1,4 @@
#include "SiSpacePointFormation/SiTrackerSpacePointFinder.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(InDet, SiTrackerSpacePointFinder)
+DECLARE_COMPONENT( InDet::SiTrackerSpacePointFinder )
diff --git a/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/components/TRT_SeededTrackFinder_entries.cxx b/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/components/TRT_SeededTrackFinder_entries.cxx
index cca4895330b..68cbcce484c 100644
--- a/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/components/TRT_SeededTrackFinder_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/components/TRT_SeededTrackFinder_entries.cxx
@@ -2,5 +2,5 @@
using namespace InDet;
-DECLARE_ALGORITHM_FACTORY( TRT_SeededTrackFinder )
+DECLARE_COMPONENT( TRT_SeededTrackFinder )
diff --git a/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/src/components/TRT_StandaloneTrackFinder_entries.cxx b/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/src/components/TRT_StandaloneTrackFinder_entries.cxx
index c538cb0b5d0..b6da9866b07 100644
--- a/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/src/components/TRT_StandaloneTrackFinder_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/src/components/TRT_StandaloneTrackFinder_entries.cxx
@@ -2,5 +2,5 @@
using namespace InDet;
-DECLARE_ALGORITHM_FACTORY( TRT_StandaloneTrackFinder )
+DECLARE_COMPONENT( TRT_StandaloneTrackFinder )
diff --git a/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/components/TRT_TrackExtensionAlg_entries.cxx b/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/components/TRT_TrackExtensionAlg_entries.cxx
index 5ceec201e55..6c36bc102bc 100644
--- a/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/components/TRT_TrackExtensionAlg_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/components/TRT_TrackExtensionAlg_entries.cxx
@@ -1,4 +1,4 @@
#include "TRT_TrackExtensionAlg/TRT_TrackExtensionAlg.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(InDet, TRT_TrackExtensionAlg )
+DECLARE_COMPONENT( InDet::TRT_TrackExtensionAlg )
diff --git a/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/src/components/TRT_TrackSegmentsFinder_entries.cxx b/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/src/components/TRT_TrackSegmentsFinder_entries.cxx
index b316c2131b0..5f23dd307e9 100644
--- a/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/src/components/TRT_TrackSegmentsFinder_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/src/components/TRT_TrackSegmentsFinder_entries.cxx
@@ -2,5 +2,5 @@
using namespace InDet;
-DECLARE_ALGORITHM_FACTORY( TRT_TrackSegmentsFinder )
+DECLARE_COMPONENT( TRT_TrackSegmentsFinder )
diff --git a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/components/InDetAmbiTrackSelectionTool_entries.cxx b/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/components/InDetAmbiTrackSelectionTool_entries.cxx
index aa622f97ec2..ab52f687478 100644
--- a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/components/InDetAmbiTrackSelectionTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/components/InDetAmbiTrackSelectionTool_entries.cxx
@@ -2,6 +2,6 @@
#include "InDetAmbiTrackSelectionTool/InDetDenseEnvAmbiTrackSelectionTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetAmbiTrackSelectionTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetDenseEnvAmbiTrackSelectionTool )
+DECLARE_COMPONENT( InDet::InDetAmbiTrackSelectionTool )
+DECLARE_COMPONENT( InDet::InDetDenseEnvAmbiTrackSelectionTool )
diff --git a/InnerDetector/InDetRecTools/InDetAssociationTools/src/components/InDetAssociationTools_entries.cxx b/InnerDetector/InDetRecTools/InDetAssociationTools/src/components/InDetAssociationTools_entries.cxx
index 91d4b2e889c..71749cf5921 100644
--- a/InnerDetector/InDetRecTools/InDetAssociationTools/src/components/InDetAssociationTools_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetAssociationTools/src/components/InDetAssociationTools_entries.cxx
@@ -1,6 +1,6 @@
#include "InDetAssociationTools/InDetPRD_AssociationToolGangedPixels.h"
#include "InDetAssociationTools/InDetPRD_Provider.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetPRD_AssociationToolGangedPixels )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetPRD_Provider )
+DECLARE_COMPONENT( InDet::InDetPRD_AssociationToolGangedPixels )
+DECLARE_COMPONENT( InDet::InDetPRD_Provider )
diff --git a/InnerDetector/InDetRecTools/InDetCaloClusterROIBuilder/src/components/InDetCaloClusterROIBuilder_entries.cxx b/InnerDetector/InDetRecTools/InDetCaloClusterROIBuilder/src/components/InDetCaloClusterROIBuilder_entries.cxx
index 3110c1e2b13..2dd7f3e78bd 100644
--- a/InnerDetector/InDetRecTools/InDetCaloClusterROIBuilder/src/components/InDetCaloClusterROIBuilder_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetCaloClusterROIBuilder/src/components/InDetCaloClusterROIBuilder_entries.cxx
@@ -3,5 +3,5 @@
using namespace InDet;
-DECLARE_TOOL_FACTORY (CaloClusterROI_Builder)
+DECLARE_COMPONENT( CaloClusterROI_Builder )
diff --git a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/components/CompetingTRT_DriftCirclesOnTrackTool_entries.cxx b/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/components/CompetingTRT_DriftCirclesOnTrackTool_entries.cxx
index 2c560e0bceb..f59f05f47f6 100644
--- a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/components/CompetingTRT_DriftCirclesOnTrackTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/components/CompetingTRT_DriftCirclesOnTrackTool_entries.cxx
@@ -2,7 +2,7 @@
#include "InDetCompetingRIOsOnTrackTool/CompetingPixelClustersOnTrackTool.h"
#include "InDetCompetingRIOsOnTrackTool/CompetingSCT_ClustersOnTrackTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, CompetingTRT_DriftCirclesOnTrackTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, CompetingPixelClustersOnTrackTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, CompetingSCT_ClustersOnTrackTool )
+DECLARE_COMPONENT( InDet::CompetingTRT_DriftCirclesOnTrackTool )
+DECLARE_COMPONENT( InDet::CompetingPixelClustersOnTrackTool )
+DECLARE_COMPONENT( InDet::CompetingSCT_ClustersOnTrackTool )
diff --git a/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/components/InDetConversionFinderTool_entries.cxx b/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/components/InDetConversionFinderTool_entries.cxx
index 076a16391f0..a8525660b25 100644
--- a/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/components/InDetConversionFinderTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/components/InDetConversionFinderTool_entries.cxx
@@ -6,10 +6,10 @@
#include "InDetConversionFinderTools/SingleTrackConversionTool.h"
using namespace InDet;
-DECLARE_TOOL_FACTORY( InDetConversionFinderTools )
-DECLARE_TOOL_FACTORY( TrackPairsSelector )
-DECLARE_TOOL_FACTORY( ConversionFinderUtils )
-DECLARE_TOOL_FACTORY( VertexPointEstimator )
-DECLARE_TOOL_FACTORY( ConversionPostSelector )
-DECLARE_TOOL_FACTORY( SingleTrackConversionTool )
+DECLARE_COMPONENT( InDetConversionFinderTools )
+DECLARE_COMPONENT( TrackPairsSelector )
+DECLARE_COMPONENT( ConversionFinderUtils )
+DECLARE_COMPONENT( VertexPointEstimator )
+DECLARE_COMPONENT( ConversionPostSelector )
+DECLARE_COMPONENT( SingleTrackConversionTool )
diff --git a/InnerDetector/InDetRecTools/InDetDNASeparator/src/components/InDetDNASeparator_entries.cxx b/InnerDetector/InDetRecTools/InDetDNASeparator/src/components/InDetDNASeparator_entries.cxx
index 101d112ecde..301a91ba7e4 100644
--- a/InnerDetector/InDetRecTools/InDetDNASeparator/src/components/InDetDNASeparator_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetDNASeparator/src/components/InDetDNASeparator_entries.cxx
@@ -1,4 +1,4 @@
#include "InDetDNASeparator/InDetDNASeparator.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetDNASeparator )
+DECLARE_COMPONENT( InDet::InDetDNASeparator )
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/components/InDetMultipleVertexSeedFinder_entries.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/components/InDetMultipleVertexSeedFinder_entries.cxx
index 68398ec6acf..d61726a19e2 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/components/InDetMultipleVertexSeedFinder_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/components/InDetMultipleVertexSeedFinder_entries.cxx
@@ -4,7 +4,7 @@
using namespace InDet;
-DECLARE_TOOL_FACTORY( SlidingWindowMultiSeedFinder )
-DECLARE_TOOL_FACTORY( DivisiveMultiSeedFinder )
-DECLARE_TOOL_FACTORY( HistogrammingMultiSeedFinder )
+DECLARE_COMPONENT( SlidingWindowMultiSeedFinder )
+DECLARE_COMPONENT( DivisiveMultiSeedFinder )
+DECLARE_COMPONENT( HistogrammingMultiSeedFinder )
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/components/InDetMultipleVertexSeedFinderUtils_entries.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/components/InDetMultipleVertexSeedFinderUtils_entries.cxx
index 694453f3be3..b2ff7c72159 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/components/InDetMultipleVertexSeedFinderUtils_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/components/InDetMultipleVertexSeedFinderUtils_entries.cxx
@@ -3,6 +3,6 @@
using namespace InDet;
-DECLARE_TOOL_FACTORY( InDetTrackZ0SortingTool )
-DECLARE_TOOL_FACTORY( InDetTrackClusterCleaningTool )
+DECLARE_COMPONENT( InDetTrackZ0SortingTool )
+DECLARE_COMPONENT( InDetTrackClusterCleaningTool )
diff --git a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/components/InDetPriVxFinderTool_entries.cxx b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/components/InDetPriVxFinderTool_entries.cxx
index 6f564930778..98dc68e9410 100644
--- a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/components/InDetPriVxFinderTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/components/InDetPriVxFinderTool_entries.cxx
@@ -8,9 +8,9 @@
using namespace InDet;
-DECLARE_TOOL_FACTORY( InDetPriVxFinderTool )
-DECLARE_TOOL_FACTORY( InDetAdaptivePriVxFinderTool )
-DECLARE_TOOL_FACTORY( InDetIterativePriVxFinderTool )
-DECLARE_TOOL_FACTORY( InDetAdaptiveMultiPriVxFinderTool )
-DECLARE_TOOL_FACTORY( InDetMultiPriVxFinderTool )
+DECLARE_COMPONENT( InDetPriVxFinderTool )
+DECLARE_COMPONENT( InDetAdaptivePriVxFinderTool )
+DECLARE_COMPONENT( InDetIterativePriVxFinderTool )
+DECLARE_COMPONENT( InDetAdaptiveMultiPriVxFinderTool )
+DECLARE_COMPONENT( InDetMultiPriVxFinderTool )
diff --git a/InnerDetector/InDetRecTools/InDetResidualPullCalculators/src/components/InDetResidualPullCalculators_entries.cxx b/InnerDetector/InDetRecTools/InDetResidualPullCalculators/src/components/InDetResidualPullCalculators_entries.cxx
index f55a52823d4..02272bfd076 100644
--- a/InnerDetector/InDetRecTools/InDetResidualPullCalculators/src/components/InDetResidualPullCalculators_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetResidualPullCalculators/src/components/InDetResidualPullCalculators_entries.cxx
@@ -1,4 +1,4 @@
#include "../SCT_ResidualPullCalculator.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, SCT_ResidualPullCalculator )
+DECLARE_COMPONENT( InDet::SCT_ResidualPullCalculator )
diff --git a/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/components/InDetSVWithMuonTool_entries.cxx b/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/components/InDetSVWithMuonTool_entries.cxx
index 58fa9a1e15c..9e35432802b 100644
--- a/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/components/InDetSVWithMuonTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/components/InDetSVWithMuonTool_entries.cxx
@@ -2,5 +2,5 @@
using namespace InDet;
-DECLARE_TOOL_FACTORY( InDetSVWithMuonTool )
+DECLARE_COMPONENT( InDetSVWithMuonTool )
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_entries.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_entries.cxx
index 1724022f60d..b44277cf605 100644
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_entries.cxx
@@ -4,7 +4,7 @@
using namespace InDet;
-DECLARE_TOOL_FACTORY( InDetJetFitterVxFinder )
-DECLARE_TOOL_FACTORY( InDetJetFitterUtils )
-DECLARE_TOOL_FACTORY( InDetImprovedJetFitterVxFinder )
+DECLARE_COMPONENT( InDetJetFitterVxFinder )
+DECLARE_COMPONENT( InDetJetFitterUtils )
+DECLARE_COMPONENT( InDetImprovedJetFitterVxFinder )
diff --git a/InnerDetector/InDetRecTools/InDetTestBLayer/src/components/InDetTestBLayer_entries.cxx b/InnerDetector/InDetRecTools/InDetTestBLayer/src/components/InDetTestBLayer_entries.cxx
index 458c6085c61..54efc57ce73 100644
--- a/InnerDetector/InDetRecTools/InDetTestBLayer/src/components/InDetTestBLayer_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetTestBLayer/src/components/InDetTestBLayer_entries.cxx
@@ -1,10 +1,4 @@
#include "InDetTestBLayer/InDetTestBLayerTool.h"
-
-using namespace InDet ;
-
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTestBLayerTool )
-
-
-/** factory entries need to have the name of the package */
+DECLARE_COMPONENT( InDet::InDetTestBLayerTool )
diff --git a/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/components/InDetTestPixelLayer_entries.cxx b/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/components/InDetTestPixelLayer_entries.cxx
index 4bf1cf617b7..53aaef437f3 100644
--- a/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/components/InDetTestPixelLayer_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/components/InDetTestPixelLayer_entries.cxx
@@ -1,10 +1,4 @@
#include "InDetTestPixelLayer/InDetTestPixelLayerTool.h"
-
-using namespace InDet ;
-
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTestPixelLayerTool )
-
-
-/** factory entries need to have the name of the package */
+DECLARE_COMPONENT( InDet::InDetTestPixelLayerTool )
diff --git a/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/components/InDetTrackHoleSearch_entries.cxx b/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/components/InDetTrackHoleSearch_entries.cxx
index b791dadebc9..8845981d380 100644
--- a/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/components/InDetTrackHoleSearch_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/components/InDetTrackHoleSearch_entries.cxx
@@ -1,4 +1,4 @@
#include "InDetTrackHoleSearch/InDetTrackHoleSearchTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTrackHoleSearchTool )
+DECLARE_COMPONENT( InDet::InDetTrackHoleSearchTool )
diff --git a/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/components/InDetTrackScoringTools_entries.cxx b/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/components/InDetTrackScoringTools_entries.cxx
index b9f639fd5ad..177d0df99af 100644
--- a/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/components/InDetTrackScoringTools_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/components/InDetTrackScoringTools_entries.cxx
@@ -2,7 +2,7 @@
#include "InDetTrackScoringTools/InDetCosmicScoringTool.h"
#include "InDetTrackScoringTools/InDetTrtTrackScoringTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetAmbiScoringTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetCosmicScoringTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTrtTrackScoringTool )
+DECLARE_COMPONENT( InDet::InDetAmbiScoringTool )
+DECLARE_COMPONENT( InDet::InDetCosmicScoringTool )
+DECLARE_COMPONENT( InDet::InDetTrtTrackScoringTool )
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/components/InDetTrackSelectionTool_entries.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/components/InDetTrackSelectionTool_entries.cxx
index 954f4767a9b..f58d9e5cb63 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/components/InDetTrackSelectionTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/components/InDetTrackSelectionTool_entries.cxx
@@ -2,7 +2,7 @@
#include "../ToolTester.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTrackSelectionTool )
+DECLARE_COMPONENT( InDet::InDetTrackSelectionTool )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, ToolTester )
+DECLARE_COMPONENT( InDet::ToolTester )
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/components/InDetTrackSelectorTool_entries.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/components/InDetTrackSelectorTool_entries.cxx
index 05ebb86baf0..de88d40ed86 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/components/InDetTrackSelectorTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/components/InDetTrackSelectorTool_entries.cxx
@@ -7,10 +7,10 @@
using namespace InDet;
-DECLARE_TOOL_FACTORY( InDetTrackSelectorTool )
-DECLARE_TOOL_FACTORY( InDetIsoTrackSelectorTool )
-DECLARE_TOOL_FACTORY( InDetCosmicTrackSelectorTool )
-DECLARE_TOOL_FACTORY( InDetDetailedTrackSelectorTool )
-DECLARE_TOOL_FACTORY( InDetConversionTrackSelectorTool )
-DECLARE_TOOL_FACTORY( InDetTrtDriftCircleCutTool )
+DECLARE_COMPONENT( InDetTrackSelectorTool )
+DECLARE_COMPONENT( InDetIsoTrackSelectorTool )
+DECLARE_COMPONENT( InDetCosmicTrackSelectorTool )
+DECLARE_COMPONENT( InDetDetailedTrackSelectorTool )
+DECLARE_COMPONENT( InDetConversionTrackSelectorTool )
+DECLARE_COMPONENT( InDetTrtDriftCircleCutTool )
diff --git a/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/components/InDetTrackSummaryHelperTool_entries.cxx b/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/components/InDetTrackSummaryHelperTool_entries.cxx
index b3f32aad539..e62280d5fb3 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/components/InDetTrackSummaryHelperTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/components/InDetTrackSummaryHelperTool_entries.cxx
@@ -2,5 +2,5 @@
using namespace InDet;
-DECLARE_TOOL_FACTORY( InDetTrackSummaryHelperTool )
+DECLARE_COMPONENT( InDetTrackSummaryHelperTool )
diff --git a/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/components/InDetVKalPriVxFinderTool_entries.cxx b/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/components/InDetVKalPriVxFinderTool_entries.cxx
index 09a43271f50..99166422f98 100644
--- a/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/components/InDetVKalPriVxFinderTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/components/InDetVKalPriVxFinderTool_entries.cxx
@@ -2,5 +2,5 @@
using namespace InDet;
-DECLARE_TOOL_FACTORY( InDetVKalPriVxFinderTool )
+DECLARE_COMPONENT( InDetVKalPriVxFinderTool )
diff --git a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/components/InDetVKalVxInJetTool_entries.cxx b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/components/InDetVKalVxInJetTool_entries.cxx
index c6ee63e8e9b..24809f0610b 100644
--- a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/components/InDetVKalVxInJetTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/components/InDetVKalVxInJetTool_entries.cxx
@@ -2,5 +2,5 @@
using namespace InDet;
-DECLARE_TOOL_FACTORY( InDetVKalVxInJetTool )
+DECLARE_COMPONENT( InDetVKalVxInJetTool )
diff --git a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/components/InDetZVTOPVxFinder_entries.cxx b/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/components/InDetZVTOPVxFinder_entries.cxx
index 933c7e5521e..390f7cfe8c9 100644
--- a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/components/InDetZVTOPVxFinder_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/components/InDetZVTOPVxFinder_entries.cxx
@@ -6,11 +6,11 @@
#include "InDetZVTOPVxFinder/ZVTOP_SimpleVtxProbCalc.h"
#include "InDetZVTOPVxFinder/ZVTOP_AmbiguitySolver.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, ZVTOP_Tool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, ZVTOP_SecVtxTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, ZVTOP_SpatialPointFinder )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, ZVTOP_SlowSpatialPointFinder )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, ZVTOP_TrkProbTubeCalc )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, ZVTOP_SimpleVtxProbCalc )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, ZVTOP_AmbiguitySolver )
+DECLARE_COMPONENT( InDet::ZVTOP_Tool )
+DECLARE_COMPONENT( InDet::ZVTOP_SecVtxTool )
+DECLARE_COMPONENT( InDet::ZVTOP_SpatialPointFinder )
+DECLARE_COMPONENT( InDet::ZVTOP_SlowSpatialPointFinder )
+DECLARE_COMPONENT( InDet::ZVTOP_TrkProbTubeCalc )
+DECLARE_COMPONENT( InDet::ZVTOP_SimpleVtxProbCalc )
+DECLARE_COMPONENT( InDet::ZVTOP_AmbiguitySolver )
diff --git a/InnerDetector/InDetRecTools/PixelToTPIDTool/src/components/PixelToTPIDTool_entries.cxx b/InnerDetector/InDetRecTools/PixelToTPIDTool/src/components/PixelToTPIDTool_entries.cxx
index 6787b15f6c8..f71e7bea0c8 100644
--- a/InnerDetector/InDetRecTools/PixelToTPIDTool/src/components/PixelToTPIDTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/PixelToTPIDTool/src/components/PixelToTPIDTool_entries.cxx
@@ -2,7 +2,7 @@
#include "PixelToTPIDTool/PixeldEdxTestAlg.h"
#include "PixelToTPIDTool/PixeldEdxAODFix.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, PixelToTPIDTool )
-DECLARE_ALGORITHM_FACTORY(PixeldEdxTestAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(InDet,PixeldEdxAODFix)
+DECLARE_COMPONENT( InDet::PixelToTPIDTool )
+DECLARE_COMPONENT( PixeldEdxTestAlg )
+DECLARE_COMPONENT( InDet::PixeldEdxAODFix )
diff --git a/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/components/SeedToTrackConversionTool_entries.cxx b/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/components/SeedToTrackConversionTool_entries.cxx
index 8c815df9e33..23d8825d3de 100644
--- a/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/components/SeedToTrackConversionTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/components/SeedToTrackConversionTool_entries.cxx
@@ -2,5 +2,5 @@
using namespace InDet;
-DECLARE_TOOL_FACTORY( SeedToTrackConversionTool )
+DECLARE_COMPONENT( SeedToTrackConversionTool )
diff --git a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/components/SiClusterOnTrackTool_entries.cxx b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/components/SiClusterOnTrackTool_entries.cxx
index ecbcbbb3550..3f10389402e 100644
--- a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/components/SiClusterOnTrackTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/components/SiClusterOnTrackTool_entries.cxx
@@ -1,6 +1,6 @@
#include "SiClusterOnTrackTool/PixelClusterOnTrackTool.h"
#include "SiClusterOnTrackTool/SCT_ClusterOnTrackTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY(InDet, PixelClusterOnTrackTool)
-DECLARE_NAMESPACE_TOOL_FACTORY(InDet, SCT_ClusterOnTrackTool)
+DECLARE_COMPONENT( InDet::PixelClusterOnTrackTool )
+DECLARE_COMPONENT( InDet::SCT_ClusterOnTrackTool )
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/components/SiClusterizationTool_entries.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/components/SiClusterizationTool_entries.cxx
index 9dec14c2ca1..8b9a64434b9 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/components/SiClusterizationTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/components/SiClusterizationTool_entries.cxx
@@ -17,17 +17,17 @@
using namespace InDet;
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, MergedPixelsTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, SCT_ClusteringTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, PixelGangedAmbiguitiesFinder )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, ClusterMakerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TotPixelClusterSplitter )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, NnPixelClusterSplitter )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, NnClusterizationFactory )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, NnPixelClusterSplitProbTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TruthPixelClusterSplitter )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TruthClusterizationFactory )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TruthPixelClusterSplitProbTool )
+DECLARE_COMPONENT( InDet::MergedPixelsTool )
+DECLARE_COMPONENT( InDet::SCT_ClusteringTool )
+DECLARE_COMPONENT( InDet::PixelGangedAmbiguitiesFinder )
+DECLARE_COMPONENT( InDet::ClusterMakerTool )
+DECLARE_COMPONENT( InDet::TotPixelClusterSplitter )
+DECLARE_COMPONENT( InDet::NnPixelClusterSplitter )
+DECLARE_COMPONENT( InDet::NnClusterizationFactory )
+DECLARE_COMPONENT( InDet::NnPixelClusterSplitProbTool )
+DECLARE_COMPONENT( InDet::TruthPixelClusterSplitter )
+DECLARE_COMPONENT( InDet::TruthClusterizationFactory )
+DECLARE_COMPONENT( InDet::TruthPixelClusterSplitProbTool )
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/components/SiCombinatorialTrackFinderTool_xk_entries.cxx b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/components/SiCombinatorialTrackFinderTool_xk_entries.cxx
index 00f9e7d3e04..135d5e00b90 100644
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/components/SiCombinatorialTrackFinderTool_xk_entries.cxx
+++ b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/components/SiCombinatorialTrackFinderTool_xk_entries.cxx
@@ -2,5 +2,5 @@
using namespace InDet;
-DECLARE_TOOL_FACTORY( SiCombinatorialTrackFinder_xk)
+DECLARE_COMPONENT( SiCombinatorialTrackFinder_xk )
diff --git a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/components/SiDetElementsRoadTool_xk_entries.cxx b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/components/SiDetElementsRoadTool_xk_entries.cxx
index 34c2aa13f82..9de9dc94a1f 100644
--- a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/components/SiDetElementsRoadTool_xk_entries.cxx
+++ b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/components/SiDetElementsRoadTool_xk_entries.cxx
@@ -2,5 +2,5 @@
using namespace InDet;
-DECLARE_TOOL_FACTORY( SiDetElementsRoadMaker_xk)
+DECLARE_COMPONENT( SiDetElementsRoadMaker_xk )
diff --git a/InnerDetector/InDetRecTools/SiSpacePointTool/src/components/SiSpacePointTool_entries.cxx b/InnerDetector/InDetRecTools/SiSpacePointTool/src/components/SiSpacePointTool_entries.cxx
index b306838c01a..71c64c53025 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointTool/src/components/SiSpacePointTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointTool/src/components/SiSpacePointTool_entries.cxx
@@ -1,4 +1,4 @@
#include "SiSpacePointTool/SiSpacePointMakerTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, SiSpacePointMakerTool )
+DECLARE_COMPONENT( InDet::SiSpacePointMakerTool )
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/components/SiSpacePointsSeedTool_xk_entries.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/components/SiSpacePointsSeedTool_xk_entries.cxx
index 70014883eb1..899ae675335 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/components/SiSpacePointsSeedTool_xk_entries.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/components/SiSpacePointsSeedTool_xk_entries.cxx
@@ -8,11 +8,11 @@
using namespace InDet;
-DECLARE_TOOL_FACTORY( SiSpacePointsSeedMaker_ATLxk )
-DECLARE_TOOL_FACTORY( SiSpacePointsSeedMaker_LowMomentum)
-DECLARE_TOOL_FACTORY( SiSpacePointsSeedMaker_BeamGas )
-DECLARE_TOOL_FACTORY( SiSpacePointsSeedMaker_Cosmic )
-DECLARE_TOOL_FACTORY( SiSpacePointsSeedMaker_HeavyIon )
-DECLARE_TOOL_FACTORY( SiSpacePointsSeedMaker_Trigger )
-DECLARE_TOOL_FACTORY( SiSpacePointsSeedMaker_ITK )
+DECLARE_COMPONENT( SiSpacePointsSeedMaker_ATLxk )
+DECLARE_COMPONENT( SiSpacePointsSeedMaker_LowMomentum )
+DECLARE_COMPONENT( SiSpacePointsSeedMaker_BeamGas )
+DECLARE_COMPONENT( SiSpacePointsSeedMaker_Cosmic )
+DECLARE_COMPONENT( SiSpacePointsSeedMaker_HeavyIon )
+DECLARE_COMPONENT( SiSpacePointsSeedMaker_Trigger )
+DECLARE_COMPONENT( SiSpacePointsSeedMaker_ITK )
diff --git a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/components/SiTrackMakerTool_xk_entries.cxx b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/components/SiTrackMakerTool_xk_entries.cxx
index dcd12ed87e1..125f971d04d 100644
--- a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/components/SiTrackMakerTool_xk_entries.cxx
+++ b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/components/SiTrackMakerTool_xk_entries.cxx
@@ -2,5 +2,5 @@
using namespace InDet;
-DECLARE_TOOL_FACTORY( SiTrackMaker_xk)
+DECLARE_COMPONENT( SiTrackMaker_xk )
diff --git a/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/components/SiZvertexTool_xk_entries.cxx b/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/components/SiZvertexTool_xk_entries.cxx
index f161eadcc9d..9fc8d210ed2 100644
--- a/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/components/SiZvertexTool_xk_entries.cxx
+++ b/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/components/SiZvertexTool_xk_entries.cxx
@@ -2,5 +2,5 @@
using namespace InDet;
-DECLARE_TOOL_FACTORY( SiZvertexMaker_xk )
+DECLARE_COMPONENT( SiZvertexMaker_xk )
diff --git a/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/src/components/TRT_DetElementsRoadTool_xk_entries.cxx b/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/src/components/TRT_DetElementsRoadTool_xk_entries.cxx
index b7a991e90d4..cbf3ad2be09 100644
--- a/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/src/components/TRT_DetElementsRoadTool_xk_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/src/components/TRT_DetElementsRoadTool_xk_entries.cxx
@@ -2,5 +2,5 @@
using namespace InDet;
-DECLARE_TOOL_FACTORY(TRT_DetElementsRoadMaker_xk)
+DECLARE_COMPONENT( TRT_DetElementsRoadMaker_xk )
diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/components/TRT_DriftCircleOnTrackTool_entries.cxx b/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/components/TRT_DriftCircleOnTrackTool_entries.cxx
index d265ef6d324..749c551d93d 100644
--- a/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/components/TRT_DriftCircleOnTrackTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/components/TRT_DriftCircleOnTrackTool_entries.cxx
@@ -3,8 +3,8 @@
#include "TRT_DriftCircleOnTrackTool/TRT_DriftCircleOnTrackRecalibrateTool.h"
#include "TRT_DriftCircleOnTrackTool/TRT_DriftCircleOnTrackNoDriftTimeTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY(InDet, TRT_DriftCircleOnTrackTool)
-DECLARE_NAMESPACE_TOOL_FACTORY(InDet, TRT_DriftCircleOnTrackUniversalTool)
-DECLARE_NAMESPACE_TOOL_FACTORY(InDet, TRT_DriftCircleOnTrackRecalibrateTool)
-DECLARE_NAMESPACE_TOOL_FACTORY(InDet, TRT_DriftCircleOnTrackNoDriftTimeTool)
+DECLARE_COMPONENT( InDet::TRT_DriftCircleOnTrackTool )
+DECLARE_COMPONENT( InDet::TRT_DriftCircleOnTrackUniversalTool )
+DECLARE_COMPONENT( InDet::TRT_DriftCircleOnTrackRecalibrateTool )
+DECLARE_COMPONENT( InDet::TRT_DriftCircleOnTrackNoDriftTimeTool )
diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/components/TRT_DriftCircleTool_entries.cxx b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/components/TRT_DriftCircleTool_entries.cxx
index 94597659054..915820ec00d 100644
--- a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/components/TRT_DriftCircleTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/components/TRT_DriftCircleTool_entries.cxx
@@ -2,6 +2,6 @@
#include "TRT_DriftCircleTool/TRT_DriftCircleToolCosmics.h"
-DECLARE_NAMESPACE_TOOL_FACTORY(InDet,TRT_DriftCircleTool)
-DECLARE_NAMESPACE_TOOL_FACTORY(InDet,TRT_DriftCircleToolCosmics)
+DECLARE_COMPONENT( InDet::TRT_DriftCircleTool )
+DECLARE_COMPONENT( InDet::TRT_DriftCircleToolCosmics )
diff --git a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/components/TRT_DriftFunctionTool_entries.cxx b/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/components/TRT_DriftFunctionTool_entries.cxx
index 5f1f4b60afe..fcaffef4b32 100644
--- a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/components/TRT_DriftFunctionTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/components/TRT_DriftFunctionTool_entries.cxx
@@ -1,4 +1,4 @@
#include "TRT_DriftFunctionTool/TRT_DriftFunctionTool.h"
-DECLARE_TOOL_FACTORY( TRT_DriftFunctionTool )
+DECLARE_COMPONENT( TRT_DriftFunctionTool )
diff --git a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/components/TRT_ElectronPidTools_entries.cxx b/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/components/TRT_ElectronPidTools_entries.cxx
index d6e52af58d0..cd6a264906b 100644
--- a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/components/TRT_ElectronPidTools_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/components/TRT_ElectronPidTools_entries.cxx
@@ -2,6 +2,6 @@
#include "TRT_ElectronPidTools/TRT_ElectronPidToolRun2.h"
#include "TRT_ElectronPidTools/TRT_LocalOccupancy.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TRT_ElectronPidToolRun2 )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TRT_LocalOccupancy )
+DECLARE_COMPONENT( InDet::TRT_ElectronPidToolRun2 )
+DECLARE_COMPONENT( InDet::TRT_LocalOccupancy )
diff --git a/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/components/TRT_SeededSpacePointFinderTool_entries.cxx b/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/components/TRT_SeededSpacePointFinderTool_entries.cxx
index 4f37cd36b00..ba46e2ed9f4 100644
--- a/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/components/TRT_SeededSpacePointFinderTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/components/TRT_SeededSpacePointFinderTool_entries.cxx
@@ -3,6 +3,6 @@
using namespace InDet;
-DECLARE_TOOL_FACTORY( TRT_SeededSpacePointFinder_ATL )
-DECLARE_TOOL_FACTORY( SimpleTRT_SeededSpacePointFinder_ATL )
+DECLARE_COMPONENT( TRT_SeededSpacePointFinder_ATL )
+DECLARE_COMPONENT( SimpleTRT_SeededSpacePointFinder_ATL )
diff --git a/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/components/TRT_SeededTrackFinderTool_entries.cxx b/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/components/TRT_SeededTrackFinderTool_entries.cxx
index fed16ec1513..c20f9ae85d6 100644
--- a/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/components/TRT_SeededTrackFinderTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/components/TRT_SeededTrackFinderTool_entries.cxx
@@ -2,5 +2,5 @@
using namespace InDet;
-DECLARE_TOOL_FACTORY( TRT_SeededTrackFinder_ATL)
+DECLARE_COMPONENT( TRT_SeededTrackFinder_ATL )
diff --git a/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/src/components/TRT_SegmentToTrackTool_entries.cxx b/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/src/components/TRT_SegmentToTrackTool_entries.cxx
index 4fc9d6bdad6..a63a5dfa090 100644
--- a/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/src/components/TRT_SegmentToTrackTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/src/components/TRT_SegmentToTrackTool_entries.cxx
@@ -1,5 +1,5 @@
#include "TRT_SegmentToTrackTool/TRT_SegmentToTrackTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TRT_SegmentToTrackTool )
+DECLARE_COMPONENT( InDet::TRT_SegmentToTrackTool )
diff --git a/InnerDetector/InDetRecTools/TRT_ToT_Tools/src/components/TRT_ToT_tools_entries.cxx b/InnerDetector/InDetRecTools/TRT_ToT_Tools/src/components/TRT_ToT_tools_entries.cxx
index d3f069e9bbe..937cec963e0 100644
--- a/InnerDetector/InDetRecTools/TRT_ToT_Tools/src/components/TRT_ToT_tools_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_ToT_Tools/src/components/TRT_ToT_tools_entries.cxx
@@ -1,3 +1,3 @@
#include "TRT_ToT_Tools/TRT_ToT_dEdx.h"
-DECLARE_TOOL_FACTORY( TRT_ToT_dEdx )
+DECLARE_COMPONENT( TRT_ToT_dEdx )
diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/src/components/TRT_TrackExtensionTool_DAF_entries.cxx b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/src/components/TRT_TrackExtensionTool_DAF_entries.cxx
index 3d882b7bb7d..2d4fefcfab6 100644
--- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/src/components/TRT_TrackExtensionTool_DAF_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/src/components/TRT_TrackExtensionTool_DAF_entries.cxx
@@ -1,4 +1,4 @@
#include "TRT_TrackExtensionTool_DAF/TRT_TrackExtensionTool_DAF.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TRT_TrackExtensionTool_DAF )
+DECLARE_COMPONENT( InDet::TRT_TrackExtensionTool_DAF )
diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/components/TRT_TrackExtensionTool_xk_entries.cxx b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/components/TRT_TrackExtensionTool_xk_entries.cxx
index 6a55bc84526..5265228cef4 100644
--- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/components/TRT_TrackExtensionTool_xk_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/components/TRT_TrackExtensionTool_xk_entries.cxx
@@ -3,6 +3,6 @@
using namespace InDet;
-DECLARE_TOOL_FACTORY(TRT_TrackExtensionTool_xk)
-DECLARE_TOOL_FACTORY(TRT_TrackExtensionToolCosmics)
+DECLARE_COMPONENT( TRT_TrackExtensionTool_xk )
+DECLARE_COMPONENT( TRT_TrackExtensionToolCosmics )
diff --git a/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/src/components/TRT_TrackHoleSearch_entries.cxx b/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/src/components/TRT_TrackHoleSearch_entries.cxx
index 69586eb55c8..fc50f955d0d 100644
--- a/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/src/components/TRT_TrackHoleSearch_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/src/components/TRT_TrackHoleSearch_entries.cxx
@@ -1,7 +1,7 @@
#include "TRT_TrackHoleSearch/TRTTrackHoleSearchTool.h"
#include "TRT_TrackHoleSearch/TRTStrawEfficiency.h"
-DECLARE_TOOL_FACTORY( TRTTrackHoleSearchTool )
-DECLARE_ALGORITHM_FACTORY( TRTStrawEfficiency )
+DECLARE_COMPONENT( TRTTrackHoleSearchTool )
+DECLARE_COMPONENT( TRTStrawEfficiency )
diff --git a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/components/TRT_TrackSegmentsTool_xk_entries.cxx b/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/components/TRT_TrackSegmentsTool_xk_entries.cxx
index 4a7fb285f27..1ada9ca5033 100644
--- a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/components/TRT_TrackSegmentsTool_xk_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/components/TRT_TrackSegmentsTool_xk_entries.cxx
@@ -4,7 +4,7 @@
using namespace InDet;
-DECLARE_TOOL_FACTORY( TRT_TrackSegmentsMaker_ATLxk )
-DECLARE_TOOL_FACTORY( TRT_TrackSegmentsMaker_ECcosmics )
-DECLARE_TOOL_FACTORY( TRT_TrackSegmentsMaker_BarrelCosmics )
+DECLARE_COMPONENT( TRT_TrackSegmentsMaker_ATLxk )
+DECLARE_COMPONENT( TRT_TrackSegmentsMaker_ECcosmics )
+DECLARE_COMPONENT( TRT_TrackSegmentsMaker_BarrelCosmics )
diff --git a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/components/TrackVertexAssociationTool_entries.cxx b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/components/TrackVertexAssociationTool_entries.cxx
index 9c6ab9c22dc..fc583d5648e 100644
--- a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/components/TrackVertexAssociationTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/components/TrackVertexAssociationTool_entries.cxx
@@ -8,10 +8,10 @@
using namespace xAOD;
-DECLARE_NAMESPACE_TOOL_FACTORY(CP,LooseTrackVertexAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY(CP,TightTrackVertexAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY(CP,BaseTrackVertexAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY(CP,ElectronTrackVertexAssociationTool)
-DECLARE_NAMESPACE_TOOL_FACTORY(CP,MuonTrackVertexAssociationTool)
-DECLARE_ALGORITHM_FACTORY(TrackVertexAssoTestAlg)
+DECLARE_COMPONENT( CP::LooseTrackVertexAssociationTool )
+DECLARE_COMPONENT( CP::TightTrackVertexAssociationTool )
+DECLARE_COMPONENT( CP::BaseTrackVertexAssociationTool )
+DECLARE_COMPONENT( CP::ElectronTrackVertexAssociationTool )
+DECLARE_COMPONENT( CP::MuonTrackVertexAssociationTool )
+DECLARE_COMPONENT( TrackVertexAssoTestAlg )
diff --git a/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/components/TRT_PAI_Process_entries.cxx b/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/components/TRT_PAI_Process_entries.cxx
index d818e0b7551..ef036904c8e 100644
--- a/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/components/TRT_PAI_Process_entries.cxx
+++ b/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/components/TRT_PAI_Process_entries.cxx
@@ -1,5 +1,5 @@
#include "TRT_PAI_Process/TRT_PAI_Process.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
-DECLARE_TOOL_FACTORY( TRT_PAI_Process )
+DECLARE_COMPONENT( TRT_PAI_Process )
diff --git a/InnerDetector/InDetSimUtils/TRT_TR_Process/src/components/TRT_TR_Process_entries.cxx b/InnerDetector/InDetSimUtils/TRT_TR_Process/src/components/TRT_TR_Process_entries.cxx
index 6a9731e808d..da6d4a1e2f6 100644
--- a/InnerDetector/InDetSimUtils/TRT_TR_Process/src/components/TRT_TR_Process_entries.cxx
+++ b/InnerDetector/InDetSimUtils/TRT_TR_Process/src/components/TRT_TR_Process_entries.cxx
@@ -1,6 +1,6 @@
#include "../TRTPhysicsTool.h"
-DECLARE_TOOL_FACTORY( TRTPhysicsTool )
+DECLARE_COMPONENT( TRTPhysicsTool )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/components/InDetTrigAmbiguitySolver_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/components/InDetTrigAmbiguitySolver_entries.cxx
index 503e564f919..0de6f3ae1f7 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/components/InDetTrigAmbiguitySolver_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/components/InDetTrigAmbiguitySolver_entries.cxx
@@ -3,5 +3,5 @@
using namespace InDet;
-DECLARE_ALGORITHM_FACTORY( InDetTrigAmbiguitySolver )
+DECLARE_COMPONENT( InDetTrigAmbiguitySolver )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/components/InDetTrigConversionFinder_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/components/InDetTrigConversionFinder_entries.cxx
index 5aeda17ecb1..2873bfef224 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/components/InDetTrigConversionFinder_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/components/InDetTrigConversionFinder_entries.cxx
@@ -2,5 +2,5 @@
using namespace InDet;
-DECLARE_ALGORITHM_FACTORY( TrigConversionFinder )
+DECLARE_COMPONENT( TrigConversionFinder )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/components/InDetTrigExtensProcessor_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/components/InDetTrigExtensProcessor_entries.cxx
index e317c818dde..0da26584e69 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/components/InDetTrigExtensProcessor_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/components/InDetTrigExtensProcessor_entries.cxx
@@ -1,5 +1,5 @@
#include "InDetTrigExtensProcessor/InDetTrigExtensProcessor.h"
using namespace InDet;
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetTrigExtensProcessor )
+DECLARE_COMPONENT( InDet::InDetTrigExtensProcessor )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/components/InDetTrigParticleCreation_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/components/InDetTrigParticleCreation_entries.cxx
index 56ca04c30a2..e5d0e430301 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/components/InDetTrigParticleCreation_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/components/InDetTrigParticleCreation_entries.cxx
@@ -4,12 +4,8 @@
#include "InDetTrigParticleCreation/TrigVertexxAODCnv.h"
#include "TrkTrack/Track.h"
-using namespace InDet;
-
-DECLARE_ALGORITHM_FACTORY( TrigParticleCreator )
-DECLARE_ALGORITHM_FACTORY( TrigTrackingxAODCnv )
-DECLARE_ALGORITHM_FACTORY( TrigTrackingxAODCnvMT )
-DECLARE_ALGORITHM_FACTORY( TrigVertexxAODCnv )
-
-/** factory entries need to have the name of the package */
+DECLARE_COMPONENT( InDet::TrigParticleCreator )
+DECLARE_COMPONENT( InDet::TrigTrackingxAODCnv )
+DECLARE_COMPONENT( InDet::TrigTrackingxAODCnvMT )
+DECLARE_COMPONENT( InDet::TrigVertexxAODCnv )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/components/InDetTrigPrepRawDataFormat_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/components/InDetTrigPrepRawDataFormat_entries.cxx
index 9063069c382..917a9ea32a6 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/components/InDetTrigPrepRawDataFormat_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/components/InDetTrigPrepRawDataFormat_entries.cxx
@@ -6,8 +6,8 @@
using namespace InDet;
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, SCT_TrgClusterization )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, Pixel_TrgClusterization )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, TRT_TrgRIO_Maker )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, FTK_TrackMaker )
+DECLARE_COMPONENT( InDet::SCT_TrgClusterization )
+DECLARE_COMPONENT( InDet::Pixel_TrgClusterization )
+DECLARE_COMPONENT( InDet::TRT_TrgRIO_Maker )
+DECLARE_COMPONENT( InDet::FTK_TrackMaker )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/src/components/InDetTrigPriVxFinder_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/src/components/InDetTrigPriVxFinder_entries.cxx
index bf8a84450a8..3a3c15b98bd 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/src/components/InDetTrigPriVxFinder_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/src/components/InDetTrigPriVxFinder_entries.cxx
@@ -4,6 +4,6 @@
using namespace InDet;
-DECLARE_ALGORITHM_FACTORY( TrigVxPrimary )
-DECLARE_ALGORITHM_FACTORY( TrigVxPrimaryAllTE )
+DECLARE_COMPONENT( TrigVxPrimary )
+DECLARE_COMPONENT( TrigVxPrimaryAllTE )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/components/InDetTrigRawDataProvider_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/components/InDetTrigRawDataProvider_entries.cxx
index e1525c007b8..917f2861f2e 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/components/InDetTrigRawDataProvider_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/components/InDetTrigRawDataProvider_entries.cxx
@@ -2,7 +2,7 @@
#include "InDetTrigRawDataProvider/TrigPixRawDataProvider.h"
#include "InDetTrigRawDataProvider/TrigSCTRawDataProvider.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TrigPixRawDataProvider )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TrigSCTRawDataProvider )
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TrigTRTRawDataProvider )
+DECLARE_COMPONENT( InDet::TrigPixRawDataProvider )
+DECLARE_COMPONENT( InDet::TrigSCTRawDataProvider )
+DECLARE_COMPONENT( InDet::TrigTRTRawDataProvider )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/src/components/TrkTrigTrackCollectionMerger_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/src/components/TrkTrigTrackCollectionMerger_entries.cxx
index 653ac56e5c4..c42e808e874 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/src/components/TrkTrigTrackCollectionMerger_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/src/components/TrkTrigTrackCollectionMerger_entries.cxx
@@ -8,6 +8,6 @@
using namespace Trk;
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, TrigTrackCollectionMerger )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, SimpleTrigTrackCollMerger )
+DECLARE_COMPONENT( Trk::TrigTrackCollectionMerger )
+DECLARE_COMPONENT( Trk::SimpleTrigTrackCollMerger )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/src/components/InDetTrigTrackPRD_Association_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/src/components/InDetTrigTrackPRD_Association_entries.cxx
index a9ffce7aba2..51f2beca425 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/src/components/InDetTrigTrackPRD_Association_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/src/components/InDetTrigTrackPRD_Association_entries.cxx
@@ -2,5 +2,5 @@
using namespace InDet;
-DECLARE_ALGORITHM_FACTORY( InDetTrigTrackPRD_Association )
+DECLARE_COMPONENT( InDetTrigTrackPRD_Association )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/components/InDetTrigTrackResidualMonitor_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/components/InDetTrigTrackResidualMonitor_entries.cxx
index b837bc5a3bf..9a784546f61 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/components/InDetTrigTrackResidualMonitor_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/components/InDetTrigTrackResidualMonitor_entries.cxx
@@ -1,9 +1,5 @@
#include "InDetTrigTrackResidualMonitor/TrigTrackResidualMonitor.h"
#include "TrkTrack/Track.h"
-using namespace InDet;
-
-DECLARE_ALGORITHM_FACTORY( TrigTrackResidualMonitor )
-
-/** factory entries need to have the name of the package */
+DECLARE_COMPONENT( InDet::TrigTrackResidualMonitor )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/components/InDetTrigTrackSlimmer_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/components/InDetTrigTrackSlimmer_entries.cxx
index 0f739395cb0..fde22322e02 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/components/InDetTrigTrackSlimmer_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/components/InDetTrigTrackSlimmer_entries.cxx
@@ -1,9 +1,5 @@
#include "InDetTrigTrackSlimmer/TrigTrackSlimmer.h"
#include "TrkTrack/Track.h"
-using namespace InDet;
-
-DECLARE_ALGORITHM_FACTORY( TrigTrackSlimmer )
-
-/** factory entries need to have the name of the package */
+DECLARE_COMPONENT( InDet::TrigTrackSlimmer )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/src/components/InDetTrigTruthAlgs_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/src/components/InDetTrigTruthAlgs_entries.cxx
index ae91bb0ed94..768acdbba03 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/src/components/InDetTrigTruthAlgs_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/src/components/InDetTrigTruthAlgs_entries.cxx
@@ -5,7 +5,7 @@
using namespace InDet;
-DECLARE_ALGORITHM_FACTORY( TrigTrackParticleTruthMaker )
-DECLARE_ALGORITHM_FACTORY( PRD_TrigMultiTruthMaker )
-DECLARE_ALGORITHM_FACTORY( InDetTrigDetailedTrackTruthMaker )
+DECLARE_COMPONENT( TrigTrackParticleTruthMaker )
+DECLARE_COMPONENT( PRD_TrigMultiTruthMaker )
+DECLARE_COMPONENT( InDetTrigDetailedTrackTruthMaker )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/components/InDetTrigVxSecondary_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/components/InDetTrigVxSecondary_entries.cxx
index 353c9782ac2..7a30eb706e0 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/components/InDetTrigVxSecondary_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/components/InDetTrigVxSecondary_entries.cxx
@@ -3,6 +3,6 @@
using namespace InDet;
-DECLARE_ALGORITHM_FACTORY( TrigVxSecondary )
-DECLARE_ALGORITHM_FACTORY( TrigVxSecondaryCombo )
+DECLARE_COMPONENT( TrigVxSecondary )
+DECLARE_COMPONENT( TrigVxSecondaryCombo )
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/components/SiTrigSPSeededTrackFinder_entries.cxx b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/components/SiTrigSPSeededTrackFinder_entries.cxx
index 049993c01cc..1e4aa94a9b8 100644
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/components/SiTrigSPSeededTrackFinder_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/components/SiTrigSPSeededTrackFinder_entries.cxx
@@ -7,5 +7,5 @@
using namespace InDet;
-DECLARE_ALGORITHM_FACTORY( SiTrigSPSeededTrackFinder )
+DECLARE_COMPONENT( SiTrigSPSeededTrackFinder )
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/components/SiTrigSpacePointFormation_entries.cxx b/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/components/SiTrigSpacePointFormation_entries.cxx
index 63ac69e7e9b..221a10b91d8 100644
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/components/SiTrigSpacePointFormation_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/components/SiTrigSpacePointFormation_entries.cxx
@@ -3,6 +3,6 @@
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, SCT_TrigSpacePointTool )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, SiTrigSpacePointFinder )
+DECLARE_COMPONENT( InDet::SCT_TrigSpacePointTool )
+DECLARE_COMPONENT( InDet::SiTrigSpacePointFinder )
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/components/TRT_TrigSeededTrackFinder_entries.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/components/TRT_TrigSeededTrackFinder_entries.cxx
index 98eab4ed8b6..b4a46cef934 100644
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/components/TRT_TrigSeededTrackFinder_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/components/TRT_TrigSeededTrackFinder_entries.cxx
@@ -3,5 +3,5 @@
using namespace InDet;
-DECLARE_ALGORITHM_FACTORY( TRT_TrigSeededTrackFinder )
+DECLARE_COMPONENT( TRT_TrigSeededTrackFinder )
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/src/components/TRT_TrigStandaloneTrackFinder_entries.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/src/components/TRT_TrigStandaloneTrackFinder_entries.cxx
index 5710295254b..2d7b7cb7d50 100644
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/src/components/TRT_TrigStandaloneTrackFinder_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/src/components/TRT_TrigStandaloneTrackFinder_entries.cxx
@@ -2,5 +2,5 @@
using namespace InDet;
-DECLARE_ALGORITHM_FACTORY( TRT_TrigStandaloneTrackFinder )
+DECLARE_COMPONENT( TRT_TrigStandaloneTrackFinder )
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/src/components/TRT_TrigTrackExtensionAlg_entries.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/src/components/TRT_TrigTrackExtensionAlg_entries.cxx
index f40a858785b..ab36d5c894e 100644
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/src/components/TRT_TrigTrackExtensionAlg_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/src/components/TRT_TrigTrackExtensionAlg_entries.cxx
@@ -2,5 +2,5 @@
#include "InDetRecToolInterfaces/ITRT_TrackExtensionTool.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, TRT_TrigTrackExtensionAlg )
+DECLARE_COMPONENT( InDet::TRT_TrigTrackExtensionAlg )
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/components/TRT_TrigTrackSegmentsFinder_entries.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/components/TRT_TrigTrackSegmentsFinder_entries.cxx
index d0034203269..b1d7b62ed07 100644
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/components/TRT_TrigTrackSegmentsFinder_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/components/TRT_TrigTrackSegmentsFinder_entries.cxx
@@ -3,5 +3,5 @@
using namespace InDet;
-DECLARE_ALGORITHM_FACTORY( TRT_TrigTrackSegmentsFinder )
+DECLARE_COMPONENT( TRT_TrigTrackSegmentsFinder )
diff --git a/InnerDetector/InDetTruth/InDetTruthAlgs/src/components/InDetTruthAlgs_entries.cxx b/InnerDetector/InDetTruth/InDetTruthAlgs/src/components/InDetTruthAlgs_entries.cxx
index 5e621d3ca79..ab75652e685 100644
--- a/InnerDetector/InDetTruth/InDetTruthAlgs/src/components/InDetTruthAlgs_entries.cxx
+++ b/InnerDetector/InDetTruth/InDetTruthAlgs/src/components/InDetTruthAlgs_entries.cxx
@@ -1,6 +1,6 @@
#include "InDetTruthAlgs/PRD_MultiTruthMaker.h"
#include "InDetTruthAlgs/InDetDetailedTrackTruthMaker.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetDetailedTrackTruthMaker )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, PRD_MultiTruthMaker )
+DECLARE_COMPONENT( InDet::InDetDetailedTrackTruthMaker )
+DECLARE_COMPONENT( InDet::PRD_MultiTruthMaker )
diff --git a/InnerDetector/InDetTruth/InDetTruthTools/src/components/InDetTruthTools_entries.cxx b/InnerDetector/InDetTruth/InDetTruthTools/src/components/InDetTruthTools_entries.cxx
index fcf7829950d..3bf6c7c3883 100644
--- a/InnerDetector/InDetTruth/InDetTruthTools/src/components/InDetTruthTools_entries.cxx
+++ b/InnerDetector/InDetTruth/InDetTruthTools/src/components/InDetTruthTools_entries.cxx
@@ -3,8 +3,8 @@
#include "InDetTruthTools/PRD_TruthTrajectoryManipulatorID.h"
#include "InDetTruthTools/PRD_TruthTrajectorySelectorID.h"
-DECLARE_NAMESPACE_TOOL_FACTORY(InDet, PRD_MultiTruthBuilder)
-DECLARE_NAMESPACE_TOOL_FACTORY(InDet, PRD_TruthTrajectorySorterID)
-DECLARE_NAMESPACE_TOOL_FACTORY(InDet, PRD_TruthTrajectoryManipulatorID)
-DECLARE_NAMESPACE_TOOL_FACTORY(InDet, PRD_TruthTrajectorySelectorID)
+DECLARE_COMPONENT( InDet::PRD_MultiTruthBuilder )
+DECLARE_COMPONENT( InDet::PRD_TruthTrajectorySorterID )
+DECLARE_COMPONENT( InDet::PRD_TruthTrajectoryManipulatorID )
+DECLARE_COMPONENT( InDet::PRD_TruthTrajectorySelectorID )
diff --git a/InnerDetector/InDetValidation/InDetPerformanceRTT/src/components/InDetPerformanceRTT_entries.cxx b/InnerDetector/InDetValidation/InDetPerformanceRTT/src/components/InDetPerformanceRTT_entries.cxx
index 51daa4030ba..8d5b03d0639 100644
--- a/InnerDetector/InDetValidation/InDetPerformanceRTT/src/components/InDetPerformanceRTT_entries.cxx
+++ b/InnerDetector/InDetValidation/InDetPerformanceRTT/src/components/InDetPerformanceRTT_entries.cxx
@@ -1,5 +1,5 @@
#include "InDetPerformanceRTT/IDStandardPerformance.h"
-DECLARE_TOOL_FACTORY(IDStandardPerformance)
+DECLARE_COMPONENT( IDStandardPerformance )
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/components/InDetPhysValMonitoring_entries.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/components/InDetPhysValMonitoring_entries.cxx
index 1374ce8448b..0dc86cd58cc 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/components/InDetPhysValMonitoring_entries.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/components/InDetPhysValMonitoring_entries.cxx
@@ -15,19 +15,19 @@
#include "../DummyTrackSlimmingTool.h"
-DECLARE_ALGORITHM_FACTORY(InDetPhysValDecoratorAlg)
-DECLARE_ALGORITHM_FACTORY(AlgTestHistoDefSvc)
-DECLARE_SERVICE_FACTORY(HistogramDefinitionSvc)
-DECLARE_TOOL_FACTORY(InDetPhysValMonitoringTool)
-DECLARE_TOOL_FACTORY(InDetPhysValLargeD0Tool)
-DECLARE_TOOL_FACTORY(ToolTestMonitoringPlots)
-DECLARE_TOOL_FACTORY(InDetPhysValTruthDecoratorTool)
-DECLARE_TOOL_FACTORY(InDetPhysHitDecoratorTool)
-DECLARE_TOOL_FACTORY(ParameterErrDecoratorTool)
-DECLARE_TOOL_FACTORY(TruthClassDecoratorTool)
-DECLARE_TOOL_FACTORY(TrackTruthSelectionTool)
-DECLARE_TOOL_FACTORY(dRMatchingTool)
-DECLARE_TOOL_FACTORY(TrackSelectionTool)
-DECLARE_TOOL_FACTORY( DummyTrackSlimmingTool)
-DECLARE_TOOL_FACTORY( AthTruthSelectionTool)
+DECLARE_COMPONENT( InDetPhysValDecoratorAlg )
+DECLARE_COMPONENT( AlgTestHistoDefSvc )
+DECLARE_COMPONENT( HistogramDefinitionSvc )
+DECLARE_COMPONENT( InDetPhysValMonitoringTool )
+DECLARE_COMPONENT( InDetPhysValLargeD0Tool )
+DECLARE_COMPONENT( ToolTestMonitoringPlots )
+DECLARE_COMPONENT( InDetPhysValTruthDecoratorTool )
+DECLARE_COMPONENT( InDetPhysHitDecoratorTool )
+DECLARE_COMPONENT( ParameterErrDecoratorTool )
+DECLARE_COMPONENT( TruthClassDecoratorTool )
+DECLARE_COMPONENT( TrackTruthSelectionTool )
+DECLARE_COMPONENT( dRMatchingTool )
+DECLARE_COMPONENT( TrackSelectionTool )
+DECLARE_COMPONENT( DummyTrackSlimmingTool )
+DECLARE_COMPONENT( AthTruthSelectionTool )
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/src/components/InDetRecStatistics_entries.cxx b/InnerDetector/InDetValidation/InDetRecStatistics/src/components/InDetRecStatistics_entries.cxx
index 87166c3306f..ec0dd079327 100644
--- a/InnerDetector/InDetValidation/InDetRecStatistics/src/components/InDetRecStatistics_entries.cxx
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/src/components/InDetRecStatistics_entries.cxx
@@ -1,4 +1,4 @@
#include "InDetRecStatistics/InDetRecStatisticsAlg.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetRecStatisticsAlg)
+DECLARE_COMPONENT( InDet::InDetRecStatisticsAlg )
diff --git a/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/components/InDetSegmentDriftCircleAssValidation_entries.cxx b/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/components/InDetSegmentDriftCircleAssValidation_entries.cxx
index 2db92704671..320c9226e36 100644
--- a/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/components/InDetSegmentDriftCircleAssValidation_entries.cxx
+++ b/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/components/InDetSegmentDriftCircleAssValidation_entries.cxx
@@ -1,4 +1,4 @@
#include "InDetSegmentDriftCircleAssValidation/SegmentDriftCircleAssValidation.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(InDet, SegmentDriftCircleAssValidation )
+DECLARE_COMPONENT( InDet::SegmentDriftCircleAssValidation )
diff --git a/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/components/InDetTrackClusterAssValidation_entries.cxx b/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/components/InDetTrackClusterAssValidation_entries.cxx
index 35072cd63de..28518e31fe2 100644
--- a/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/components/InDetTrackClusterAssValidation_entries.cxx
+++ b/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/components/InDetTrackClusterAssValidation_entries.cxx
@@ -1,4 +1,4 @@
#include "InDetTrackClusterAssValidation/TrackClusterAssValidation.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(InDet, TrackClusterAssValidation )
+DECLARE_COMPONENT( InDet::TrackClusterAssValidation )
diff --git a/InnerDetector/InDetValidation/InDetTrackSplitterTool/src/components/InDetTrackSplitterTool_entries.cxx b/InnerDetector/InDetValidation/InDetTrackSplitterTool/src/components/InDetTrackSplitterTool_entries.cxx
index 721160e6c0c..f15f00fa7da 100644
--- a/InnerDetector/InDetValidation/InDetTrackSplitterTool/src/components/InDetTrackSplitterTool_entries.cxx
+++ b/InnerDetector/InDetValidation/InDetTrackSplitterTool/src/components/InDetTrackSplitterTool_entries.cxx
@@ -1,3 +1,3 @@
#include "InDetTrackSplitterTool/InDetTrackSplitterTool.h"
-DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTrackSplitterTool )
+DECLARE_COMPONENT( InDet::InDetTrackSplitterTool )
diff --git a/InnerDetector/InDetValidation/InDetTrackValidation/src/components/InDetTrackValidation_entries.cxx b/InnerDetector/InDetValidation/InDetTrackValidation/src/components/InDetTrackValidation_entries.cxx
index 52f1c38d6c5..071db95e513 100644
--- a/InnerDetector/InDetValidation/InDetTrackValidation/src/components/InDetTrackValidation_entries.cxx
+++ b/InnerDetector/InDetValidation/InDetTrackValidation/src/components/InDetTrackValidation_entries.cxx
@@ -2,7 +2,7 @@
#include "InDetTrackValidation/InDetSplittedTracksCreator.h"
#include "InDetTrackValidation/HoleSearchValidation.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, SCT_ClusterValidationNtupleWriter )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetSplittedTracksCreator )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, HoleSearchValidation )
+DECLARE_COMPONENT( InDet::SCT_ClusterValidationNtupleWriter )
+DECLARE_COMPONENT( InDet::InDetSplittedTracksCreator )
+DECLARE_COMPONENT( InDet::HoleSearchValidation )
diff --git a/InnerDetector/InDetValidation/InDetVertexSplitter/src/components/InDetVertexSplitter_entries.cxx b/InnerDetector/InDetValidation/InDetVertexSplitter/src/components/InDetVertexSplitter_entries.cxx
index 09883e02df4..d2bd7c8abff 100644
--- a/InnerDetector/InDetValidation/InDetVertexSplitter/src/components/InDetVertexSplitter_entries.cxx
+++ b/InnerDetector/InDetValidation/InDetVertexSplitter/src/components/InDetVertexSplitter_entries.cxx
@@ -3,6 +3,6 @@
using namespace InDet;
-DECLARE_ALGORITHM_FACTORY( InDetVertexSplitter )
-DECLARE_ALGORITHM_FACTORY( InDetVertexSplitterHist )
+DECLARE_COMPONENT( InDetVertexSplitter )
+DECLARE_COMPONENT( InDetVertexSplitterHist )
--
GitLab