diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_entries.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_entries.cxx
index 95f998da367e2d89df59f5a80995bdb3d0d5915c..ee7fac071580f8ab79284f3a048427327d700f4a 100644
--- a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_entries.cxx
+++ b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_entries.cxx
@@ -1,6 +1,6 @@
#include "AthenaDBTestRec/TestCoolRecRead.h"
#include "AthenaDBTestRec/DetStoreDump.h"
-DECLARE_ALGORITHM_FACTORY( TestCoolRecRead )
-DECLARE_ALGORITHM_FACTORY( DetStoreDump )
+DECLARE_COMPONENT( TestCoolRecRead )
+DECLARE_COMPONENT( DetStoreDump )
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_entries.cxx b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_entries.cxx
index 2ed3f375b2c5314a1813f5d9071252628a055b00..9c98761e4f53cc49cbb860e5a439492e276dc281 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_entries.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_entries.cxx
@@ -10,15 +10,15 @@
#include "../RunEventMetaWriter.h"
#include "../DummyLumirangeTool.h"
-DECLARE_ALGORITHM_FACTORY(StoreDump)
-DECLARE_ALGORITHM_FACTORY(PassAllFilter)
-DECLARE_ALGORITHM_FACTORY(PassNoneFilter)
-DECLARE_ALGORITHM_FACTORY(AddTrigMap)
-DECLARE_ALGORITHM_FACTORY(EventSplit)
-DECLARE_ALGORITHM_FACTORY(EventTagReader)
-DECLARE_ALGORITHM_FACTORY(EventTagWriter)
-DECLARE_ALGORITHM_FACTORY(TagEventTagWriter)
-DECLARE_ALGORITHM_FACTORY(RunEventTagWriter)
-DECLARE_ALGORITHM_FACTORY(RunEventMetaWriter)
-DECLARE_ALGORITHM_FACTORY(DummyLumirangeTool)
+DECLARE_COMPONENT( StoreDump )
+DECLARE_COMPONENT( PassAllFilter )
+DECLARE_COMPONENT( PassNoneFilter )
+DECLARE_COMPONENT( AddTrigMap )
+DECLARE_COMPONENT( EventSplit )
+DECLARE_COMPONENT( EventTagReader )
+DECLARE_COMPONENT( EventTagWriter )
+DECLARE_COMPONENT( TagEventTagWriter )
+DECLARE_COMPONENT( RunEventTagWriter )
+DECLARE_COMPONENT( RunEventMetaWriter )
+DECLARE_COMPONENT( DummyLumirangeTool )
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_entries.cxx b/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_entries.cxx
index bbe912f5a338163ded6149c153122018b5650d38..bc5a61a70127b6314c6380d5391fb9396b82739c 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_entries.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_entries.cxx
@@ -15,20 +15,20 @@
#include "../PileUpEventInfoWriter.h"
#include "../PileUpEventInfoReader.h"
-DECLARE_ALGORITHM_FACTORY(AthenaPoolTestDataWriter)
-DECLARE_ALGORITHM_FACTORY(AthenaPoolTestDataReader)
-DECLARE_ALGORITHM_FACTORY(AthenaPoolTestAttrWriter)
-DECLARE_ALGORITHM_FACTORY(AthenaPoolTestAttrReader)
-// DECLARE_ALGORITHM_FACTORY(CaloClusterFakeWriter)
-// DECLARE_ALGORITHM_FACTORY(CaloClusterFakeReader)
-DECLARE_ALGORITHM_FACTORY(InDetRawDataFakeWriter)
-DECLARE_ALGORITHM_FACTORY(InDetRawDataFakeReader)
-DECLARE_ALGORITHM_FACTORY(TrkTrackFakeWriter)
-DECLARE_ALGORITHM_FACTORY(TrkTrackFakeReader)
-DECLARE_ALGORITHM_FACTORY(LArCellContFakeWriter)
-DECLARE_ALGORITHM_FACTORY(LArCellContFakeReader)
-DECLARE_ALGORITHM_FACTORY(EventInfoWriter)
-DECLARE_ALGORITHM_FACTORY(EventInfoReader)
-DECLARE_ALGORITHM_FACTORY(PileUpEventInfoWriter)
-DECLARE_ALGORITHM_FACTORY(PileUpEventInfoReader)
+DECLARE_COMPONENT( AthenaPoolTestDataWriter )
+DECLARE_COMPONENT( AthenaPoolTestDataReader )
+DECLARE_COMPONENT( AthenaPoolTestAttrWriter )
+DECLARE_COMPONENT( AthenaPoolTestAttrReader )
+// DECLARE_COMPONENT( CaloClusterFakeWriter )
+// DECLARE_COMPONENT( CaloClusterFakeReader )
+DECLARE_COMPONENT( InDetRawDataFakeWriter )
+DECLARE_COMPONENT( InDetRawDataFakeReader )
+DECLARE_COMPONENT( TrkTrackFakeWriter )
+DECLARE_COMPONENT( TrkTrackFakeReader )
+DECLARE_COMPONENT( LArCellContFakeWriter )
+DECLARE_COMPONENT( LArCellContFakeReader )
+DECLARE_COMPONENT( EventInfoWriter )
+DECLARE_COMPONENT( EventInfoReader )
+DECLARE_COMPONENT( PileUpEventInfoWriter )
+DECLARE_COMPONENT( PileUpEventInfoReader )
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx
index 276c8e9956043d0cb950e9ce27996fa7576418d2..4cb36bb1e0773e7d9d847b617649395e24840e9c 100644
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx
@@ -1,6 +1,6 @@
#include "IOVDbTestAlg/IOVDbTestAlg.h"
#include "IOVDbTestAlg/IOVDbTestCoolDCS.h"
-DECLARE_ALGORITHM_FACTORY(IOVDbTestAlg)
-DECLARE_ALGORITHM_FACTORY(IOVDbTestCoolDCS)
+DECLARE_COMPONENT( IOVDbTestAlg )
+DECLARE_COMPONENT( IOVDbTestCoolDCS )
diff --git a/Commission/CommissionRec/src/components/CommissionRec_entries.cxx b/Commission/CommissionRec/src/components/CommissionRec_entries.cxx
index 81fe3179ba5d86490a67815bddec444275d9aa12..4e94bd74933ab168e445c24f984526ed3985d8ad 100644
--- a/Commission/CommissionRec/src/components/CommissionRec_entries.cxx
+++ b/Commission/CommissionRec/src/components/CommissionRec_entries.cxx
@@ -1,4 +1,4 @@
#include "CommissionRec/ComTimeRec.h"
-DECLARE_ALGORITHM_FACTORY( ComTimeRec )
+DECLARE_COMPONENT( ComTimeRec )
diff --git a/Commission/CommissionUtils/src/components/CommissionUtils_entries.cxx b/Commission/CommissionUtils/src/components/CommissionUtils_entries.cxx
index 487c86e60698ea720391491962da65972d8ab3e0..bb8f50fb2e2781d75a63b5772bf404efa019c188 100644
--- a/Commission/CommissionUtils/src/components/CommissionUtils_entries.cxx
+++ b/Commission/CommissionUtils/src/components/CommissionUtils_entries.cxx
@@ -1,5 +1,5 @@
#include "CommissionUtils/CosmicTriggerTimeTool.h"
-DECLARE_TOOL_FACTORY( CosmicTriggerTimeTool )
+DECLARE_COMPONENT( CosmicTriggerTimeTool )
diff --git a/DataQuality/DataQualityTools/src/components/DataQualityTools_entries.cxx b/DataQuality/DataQualityTools/src/components/DataQualityTools_entries.cxx
index f27315aa7cfeee4ccd07d3be026c0638952f5a01..99e080ef3e2868bc5fc92b4251afe681f589b131 100644
--- a/DataQuality/DataQualityTools/src/components/DataQualityTools_entries.cxx
+++ b/DataQuality/DataQualityTools/src/components/DataQualityTools_entries.cxx
@@ -14,19 +14,19 @@
#include "DataQualityTools/DQTGlobalWZFinderTool.h"
#include "DataQualityTools/DQTLumiMonTool.h"
-DECLARE_TOOL_FACTORY(DataQualityFatherMonTool)
-//DECLARE_TOOL_FACTORY(DQTMuTrkEff)
-DECLARE_TOOL_FACTORY(DQTDetSynchMonTool)
-DECLARE_TOOL_FACTORY(DQTMuonIDTrackTool)
-//DECLARE_TOOL_FACTORY(DQTElectronQualityTool)
-//DECLARE_TOOL_FACTORY(DQTGlobalWFinderTool)
-//DECLARE_TOOL_FACTORY(DQTNonCollBkg_ZDC)
-DECLARE_TOOL_FACTORY(DQTBackgroundMon)
-//DECLARE_TOOL_FACTORY(DQTRateMonTool)
-//DECLARE_TOOL_FACTORY(DQTCaloClusterTool)
-DECLARE_TOOL_FACTORY(DQTDataFlowMonTool)
-//DECLARE_TOOL_FACTORY(DQTTopLeptonJetsFinderTool)
-//DECLARE_TOOL_FACTORY(DQTGlobalTopDilFinderTool)
-DECLARE_TOOL_FACTORY(DQTGlobalWZFinderTool)
-DECLARE_TOOL_FACTORY(DQTLumiMonTool)
+DECLARE_COMPONENT( DataQualityFatherMonTool )
+//DECLARE_COMPONENT( DQTMuTrkEff )
+DECLARE_COMPONENT( DQTDetSynchMonTool )
+DECLARE_COMPONENT( DQTMuonIDTrackTool )
+//DECLARE_COMPONENT( DQTElectronQualityTool )
+//DECLARE_COMPONENT( DQTGlobalWFinderTool )
+//DECLARE_COMPONENT( DQTNonCollBkg_ZDC )
+DECLARE_COMPONENT( DQTBackgroundMon )
+//DECLARE_COMPONENT( DQTRateMonTool )
+//DECLARE_COMPONENT( DQTCaloClusterTool )
+DECLARE_COMPONENT( DQTDataFlowMonTool )
+//DECLARE_COMPONENT( DQTTopLeptonJetsFinderTool )
+//DECLARE_COMPONENT( DQTGlobalTopDilFinderTool )
+DECLARE_COMPONENT( DQTGlobalWZFinderTool )
+DECLARE_COMPONENT( DQTLumiMonTool )
diff --git a/DataQuality/GoodRunsLists/src/components/GoodRunsLists_entries.cxx b/DataQuality/GoodRunsLists/src/components/GoodRunsLists_entries.cxx
index d1cb525abc81323c8f356cf710229bc80ea29bbe..388feacfcbcdef7fd19ffcf3d3cfd7c9ebae7f41 100644
--- a/DataQuality/GoodRunsLists/src/components/GoodRunsLists_entries.cxx
+++ b/DataQuality/GoodRunsLists/src/components/GoodRunsLists_entries.cxx
@@ -2,11 +2,11 @@
#include "GoodRunsLists/TriggerRegistryTool.h"
#include "GoodRunsLists/GoodRunsListSelectionTool.h"
-DECLARE_TOOL_FACTORY( GoodRunsListSelectorTool )
-DECLARE_TOOL_FACTORY( GoodRunsListSelectionTool )
-DECLARE_TOOL_FACTORY( TriggerRegistryTool )
+DECLARE_COMPONENT( GoodRunsListSelectorTool )
+DECLARE_COMPONENT( GoodRunsListSelectionTool )
+DECLARE_COMPONENT( TriggerRegistryTool )
#include "../GRLSelectorAlg.h"
-DECLARE_ALGORITHM_FACTORY( GRLSelectorAlg )
+DECLARE_COMPONENT( GRLSelectorAlg )
diff --git a/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_entries.cxx b/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_entries.cxx
index d5cb1991e9e9c14cc1f18705d70ffbf559236aab..a6920e11c96688722a66df8064a8ed62db138318 100644
--- a/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_entries.cxx
+++ b/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_entries.cxx
@@ -3,8 +3,8 @@
#include "GoodRunsListsUser/GoodRunsListSelectorAlg.h"
#include "GoodRunsListsUser/GRLTriggerSelectorAlg.h"
-DECLARE_ALGORITHM_FACTORY( DummyDumperAlg )
-DECLARE_ALGORITHM_FACTORY( TriggerSelectorAlg )
-DECLARE_ALGORITHM_FACTORY( GoodRunsListSelectorAlg )
-DECLARE_ALGORITHM_FACTORY( GRLTriggerSelectorAlg )
+DECLARE_COMPONENT( DummyDumperAlg )
+DECLARE_COMPONENT( TriggerSelectorAlg )
+DECLARE_COMPONENT( GoodRunsListSelectorAlg )
+DECLARE_COMPONENT( GRLTriggerSelectorAlg )
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.h b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.h
index 903e1834b92f4e3a021b93970b5c9db0b1e17d53..c746b4d7950531cf072136fb97becbf111553a06 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.h
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.h
@@ -157,7 +157,6 @@ public:
/// Implementation of IIncidentListener: Handle for EndEvent incidence
void handle(const Incident& incident);
-protected: // constructor and destructor
/// Standard Service Constructor
AthenaPoolCnvSvc(const std::string& name, ISvcLocator* pSvcLocator);
/// Destructor
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_entries.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_entries.cxx
index 9f9ca68a431903be1734c22c6ba62ebdd77625b3..0a5c71facf9a91878970cbb3f7546c3e07a5738e 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_entries.cxx
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_entries.cxx
@@ -4,9 +4,9 @@
#include "../CondAttrListCollCnv.h"
#include "../CondAttrListVecCnv.h"
-DECLARE_SERVICE_FACTORY(AthenaPoolCnvSvc)
-DECLARE_SERVICE_FACTORY(AthenaRootSerializeSvc)
-DECLARE_CONVERTER_FACTORY(AthenaAttributeListCnv)
-DECLARE_CONVERTER_FACTORY(CondAttrListCollCnv)
-DECLARE_CONVERTER_FACTORY(CondAttrListVecCnv)
+DECLARE_COMPONENT( AthenaPoolCnvSvc )
+DECLARE_COMPONENT( AthenaRootSerializeSvc )
+DECLARE_CONVERTER_FACTORY( AthenaAttributeListCnv )
+DECLARE_CONVERTER_FACTORY( CondAttrListCollCnv )
+DECLARE_CONVERTER_FACTORY( CondAttrListVecCnv )
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_entries.cxx b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_entries.cxx
index 105b23b442e7a6cdda2390b8d7f043eafec74b9c..9d130b4e487e5d04833a20d62e8515a2b68f8878 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_entries.cxx
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_entries.cxx
@@ -9,14 +9,14 @@
#include "../QueryTag.h"
#include "../PassNoneFilter.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, WriteData)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, ReWriteData)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, ReadData)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, ReadBs)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, WriteCond)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, ReadCond)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, WriteTag)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, PassNoneFilter)
-DECLARE_NAMESPACE_TOOL_FACTORY(AthPoolEx, ReadMeta)
-DECLARE_NAMESPACE_TOOL_FACTORY(AthPoolEx, QueryTag)
+DECLARE_COMPONENT( AthPoolEx::WriteData )
+DECLARE_COMPONENT( AthPoolEx::ReWriteData )
+DECLARE_COMPONENT( AthPoolEx::ReadData )
+DECLARE_COMPONENT( AthPoolEx::ReadBs )
+DECLARE_COMPONENT( AthPoolEx::WriteCond )
+DECLARE_COMPONENT( AthPoolEx::ReadCond )
+DECLARE_COMPONENT( AthPoolEx::WriteTag )
+DECLARE_COMPONENT( AthPoolEx::PassNoneFilter )
+DECLARE_COMPONENT( AthPoolEx::ReadMeta )
+DECLARE_COMPONENT( AthPoolEx::QueryTag )
diff --git a/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_entries.cxx b/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_entries.cxx
index dd6a8edb698ac66635404e26fbc8f50ac911c4b6..97f97f3b4bc6c7c60823f04300775e57e1678ded 100644
--- a/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_entries.cxx
+++ b/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_entries.cxx
@@ -1,4 +1,4 @@
#include "../AthenaRootStreamerSvc.h"
-DECLARE_SERVICE_FACTORY(AthenaRootStreamerSvc)
+DECLARE_COMPONENT( AthenaRootStreamerSvc )
diff --git a/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_entries.cxx b/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_entries.cxx
index 6cbdf8f898079180b568f8a83e733245d5a7a60d..7d52ed1c536829f2f9cbf295381343a47ae8e391 100644
--- a/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_entries.cxx
+++ b/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_entries.cxx
@@ -2,7 +2,7 @@
#include "../MetadataTest.h"
#include "../RequireUniqueEvent.h"
-DECLARE_ALGORITHM_FACTORY(EventCount)
-DECLARE_ALGORITHM_FACTORY(MetadataTest)
-DECLARE_ALGORITHM_FACTORY(RequireUniqueEvent)
+DECLARE_COMPONENT( EventCount )
+DECLARE_COMPONENT( MetadataTest )
+DECLARE_COMPONENT( RequireUniqueEvent )
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_entries.cxx b/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_entries.cxx
index 6d267acc6ca19ee189682babd21c4bd5a4672af2..dba98905d35855f975bb297ba8a70d4d6777505e 100644
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_entries.cxx
+++ b/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_entries.cxx
@@ -2,7 +2,7 @@
#include "../EventSelectorAthenaPool.h"
#include "../CondProxyProvider.h"
-DECLARE_SERVICE_FACTORY(AthenaPoolAddressProviderSvc)
-DECLARE_SERVICE_FACTORY(EventSelectorAthenaPool)
-DECLARE_SERVICE_FACTORY(CondProxyProvider)
+DECLARE_COMPONENT( AthenaPoolAddressProviderSvc )
+DECLARE_COMPONENT( EventSelectorAthenaPool )
+DECLARE_COMPONENT( CondProxyProvider )
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_entries.cxx b/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_entries.cxx
index b06cc814393ae87d983ebe34ff17e5b93bb4593d..b56a3778a5049a0ec6b47a255599978f0570d9f4 100644
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_entries.cxx
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_entries.cxx
@@ -5,10 +5,10 @@
#include "../EventInfoAttListTool.h"
#include "../EventInfoTagBuilder.h"
-DECLARE_TOOL_FACTORY(AthenaPoolOutputStreamTool)
-DECLARE_TOOL_FACTORY(MakeEventStreamInfo)
-DECLARE_TOOL_FACTORY(CopyEventStreamInfo)
-DECLARE_TOOL_FACTORY(EventInfoAttListTool)
-DECLARE_ALGORITHM_FACTORY(MakeInputDataHeader)
-DECLARE_ALGORITHM_FACTORY(EventInfoTagBuilder)
+DECLARE_COMPONENT( AthenaPoolOutputStreamTool )
+DECLARE_COMPONENT( MakeEventStreamInfo )
+DECLARE_COMPONENT( CopyEventStreamInfo )
+DECLARE_COMPONENT( EventInfoAttListTool )
+DECLARE_COMPONENT( MakeInputDataHeader )
+DECLARE_COMPONENT( EventInfoTagBuilder )
diff --git a/Database/AthenaPOOL/PoolSvc/src/PoolSvc.h b/Database/AthenaPOOL/PoolSvc/src/PoolSvc.h
index 7cce67755e69ae495189a135950072ce283f6b10..9181173b4dc0e5433365cc249d6ba7cd8f8e4bd8 100644
--- a/Database/AthenaPOOL/PoolSvc/src/PoolSvc.h
+++ b/Database/AthenaPOOL/PoolSvc/src/PoolSvc.h
@@ -173,7 +173,6 @@ public: // Non-static members
/// Setup Frontier cache for given logical or physical connection name
StatusCode setFrontierCache(const std::string& conn) const;
-protected: // constructor and destructor
/// Standard Service Constructor
PoolSvc(const std::string& name, ISvcLocator* pSvcLocator);
/// Destructor
diff --git a/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_entries.cxx b/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_entries.cxx
index f369ec522454108ce8b96811455646487959a16d..c5b50301aa18e009636923896e03d361ed1b17b4 100644
--- a/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_entries.cxx
+++ b/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_entries.cxx
@@ -1,4 +1,4 @@
#include "../PoolSvc.h"
-DECLARE_SERVICE_FACTORY(PoolSvc)
+DECLARE_COMPONENT( PoolSvc )
diff --git a/Database/AthenaPOOL/RDBAccessSvc/src/RDBAccessSvc.h b/Database/AthenaPOOL/RDBAccessSvc/src/RDBAccessSvc.h
index 0e00afe7eecefff7240e0b98191d1291730cd1bc..c4a1de6d755180d729d03a4a76d35628e6e12646 100755
--- a/Database/AthenaPOOL/RDBAccessSvc/src/RDBAccessSvc.h
+++ b/Database/AthenaPOOL/RDBAccessSvc/src/RDBAccessSvc.h
@@ -120,8 +120,6 @@ class RDBAccessSvc final : public AthService, virtual public IRDBAccessSvc
StatusCode finalize() override;
StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface ) override;
- protected:
-
friend class SvcFactory<RDBAccessSvc>;
/// Standard Service Constructor
diff --git a/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_entries.cxx b/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_entries.cxx
index 25f8b31451196d5dd80195c62f9436ab7215738f..e93fa3bb87428b08a2ef711afba86171409444d1 100644
--- a/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_entries.cxx
+++ b/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_entries.cxx
@@ -1,6 +1,6 @@
#include "../RDBAccessSvc.h"
#include "../SourceCompAlg.h"
-DECLARE_SERVICE_FACTORY(RDBAccessSvc)
-DECLARE_ALGORITHM_FACTORY(SourceCompAlg)
+DECLARE_COMPONENT( RDBAccessSvc )
+DECLARE_COMPONENT( SourceCompAlg )
diff --git a/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_entries.cxx b/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_entries.cxx
index e134dbb2639b42e711d1ff34b93c52bd1514b526..efa19ea658873420417bb56ca19895f73e74102d 100644
--- a/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_entries.cxx
+++ b/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_entries.cxx
@@ -1,5 +1,5 @@
#include "../RootFileTransformationsTool.h"
-DECLARE_TOOL_FACTORY(RootFileTransformationsTool)
+DECLARE_COMPONENT( RootFileTransformationsTool )
diff --git a/Database/AthenaRoot/AthenaRootComps/src/RootNtupleOutputStream.h b/Database/AthenaRoot/AthenaRootComps/src/RootNtupleOutputStream.h
index ae3db16e4cbb89e2539c30fada221337e840a2be..3aacc2df9eee000116a904980323a3d9df5559e7 100755
--- a/Database/AthenaRoot/AthenaRootComps/src/RootNtupleOutputStream.h
+++ b/Database/AthenaRoot/AthenaRootComps/src/RootNtupleOutputStream.h
@@ -102,14 +102,14 @@ protected:
/// vector of AlgTools that that are executed by this stream
ToolHandleArray<IAthenaOutputTool> m_helperTools;
-protected:
+public:
+ typedef std::vector<std::pair<std::string, std::string> > TypeKeyPairs;
+
/// Standard algorithm Constructor
RootNtupleOutputStream(const std::string& name, ISvcLocator* pSvcLocator);
/// Standard Destructor
virtual ~RootNtupleOutputStream();
-public:
- typedef std::vector<std::pair<std::string, std::string> > TypeKeyPairs;
/// \name implement IAlgorithm
//@{
virtual StatusCode initialize();
diff --git a/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_entries.cxx b/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_entries.cxx
index b94fed8000c7e37888002f3dc9dbd519c03fad92..4ea9a62bb230acdd45059784c180d57595365195 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_entries.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_entries.cxx
@@ -20,24 +20,24 @@
#include "../xAODCnv.h"
#include "../xAODEventSelector.h"
-DECLARE_NAMESPACE_SERVICE_FACTORY(Athena, NtupleCnvSvc)
-//DECLARE_NAMESPACE_CONVERTER_FACTORY (Athena, LeafCnv)
+DECLARE_COMPONENT( Athena::NtupleCnvSvc )
+//DECLARE_CONVERTER_FACTORY( Athena::LeafCnv )
-//DECLARE_NAMESPACE_CONVERTER_FACTORY (Athena, RootCnv)
-DECLARE_NAMESPACE_SERVICE_FACTORY( Athena, RootCnvSvc )
-DECLARE_NAMESPACE_SERVICE_FACTORY( Athena, RootSvc )
-DECLARE_NAMESPACE_TOOL_FACTORY( Athena, RootOutputStreamTool )
+//DECLARE_CONVERTER_FACTORY( Athena::RootCnv )
+DECLARE_COMPONENT( Athena::RootCnvSvc )
+DECLARE_COMPONENT( Athena::RootSvc )
+DECLARE_COMPONENT( Athena::RootOutputStreamTool )
-DECLARE_NAMESPACE_SERVICE_FACTORY( Athena, xAODCnvSvc )
+DECLARE_COMPONENT( Athena::xAODCnvSvc )
-DECLARE_NAMESPACE_SERVICE_FACTORY(Athena, RootNtupleEventSelector)
-DECLARE_NAMESPACE_SERVICE_FACTORY(Athena, xAODEventSelector)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(Athena, RootNtupleOutputStream)
-DECLARE_NAMESPACE_TOOL_FACTORY( Athena, RootNtupleOutputMetadataTool )
+DECLARE_COMPONENT( Athena::RootNtupleEventSelector )
+DECLARE_COMPONENT( Athena::xAODEventSelector )
+DECLARE_COMPONENT( Athena::RootNtupleOutputStream )
+DECLARE_COMPONENT( Athena::RootNtupleOutputMetadataTool )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( Athena, RootAsciiDumperAlg )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( Athena, RootAsciiDumperAlgHandle )
+DECLARE_COMPONENT( Athena::RootAsciiDumperAlg )
+DECLARE_COMPONENT( Athena::RootAsciiDumperAlgHandle )
-DECLARE_SERVICE_FACTORY( IoSvc )
+DECLARE_COMPONENT( IoSvc )
diff --git a/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_entries.cxx b/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_entries.cxx
index e783176a34d921772df2365bbf185cfac4caf825..0aabda962d630ba7db3b931231d3f68b0bfbfd3a 100644
--- a/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_entries.cxx
+++ b/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_entries.cxx
@@ -1,4 +1,4 @@
#include "../DBReplicaSvc.h"
-DECLARE_SERVICE_FACTORY( DBReplicaSvc )
+DECLARE_COMPONENT( DBReplicaSvc )
diff --git a/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_entries.cxx b/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_entries.cxx
index 56f2dbf59ff51d880b9e3341e91dfcd7e094e01e..b8fa2afef781fc144a0d8eb856bf77205039f2a3 100644
--- a/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_entries.cxx
+++ b/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_entries.cxx
@@ -3,8 +3,8 @@
#include "CoolLumiUtilities/BunchLumisTool.h"
#include "CoolLumiUtilities/OnlineLumiCalibrationTool.h"
-DECLARE_TOOL_FACTORY( FillParamsTool )
-DECLARE_TOOL_FACTORY( BunchGroupTool )
-DECLARE_TOOL_FACTORY( BunchLumisTool )
-DECLARE_TOOL_FACTORY( OnlineLumiCalibrationTool )
+DECLARE_COMPONENT( FillParamsTool )
+DECLARE_COMPONENT( BunchGroupTool )
+DECLARE_COMPONENT( BunchLumisTool )
+DECLARE_COMPONENT( OnlineLumiCalibrationTool )
diff --git a/Database/FileStager/src/components/FileStager_entries.cxx b/Database/FileStager/src/components/FileStager_entries.cxx
index b784249f8b7e149db28057df0484320659d36c3b..52801bf0dc2381a9f504c68ada6c08a7cd39f3f1 100644
--- a/Database/FileStager/src/components/FileStager_entries.cxx
+++ b/Database/FileStager/src/components/FileStager_entries.cxx
@@ -1,5 +1,5 @@
#include "FileStager/FileStagerAlg.h"
-DECLARE_ALGORITHM_FACTORY( FileStagerAlg )
+DECLARE_COMPONENT( FileStagerAlg )
diff --git a/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_entries.cxx b/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_entries.cxx
index 11168740737fa185b24450faf35e477ebd83896b..2a6e02f9ea68119e410c7d355fdf2c145e19a7dc 100644
--- a/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_entries.cxx
+++ b/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_entries.cxx
@@ -1,4 +1,4 @@
#include "../IOVDbMetaDataTool.h"
-DECLARE_TOOL_FACTORY( IOVDbMetaDataTool )
+DECLARE_COMPONENT( IOVDbMetaDataTool )
diff --git a/Database/IOVDbSvc/src/components/IOVDbSvc_entries.cxx b/Database/IOVDbSvc/src/components/IOVDbSvc_entries.cxx
index b7305b8b218061b76c2358d6baac07d4124b2713..fa61d7792e64f7cd6600e5fc5693cfa5538b5d39 100644
--- a/Database/IOVDbSvc/src/components/IOVDbSvc_entries.cxx
+++ b/Database/IOVDbSvc/src/components/IOVDbSvc_entries.cxx
@@ -1,4 +1,4 @@
#include "../IOVDbSvc.h"
-DECLARE_SERVICE_FACTORY(IOVDbSvc)
+DECLARE_COMPONENT( IOVDbSvc )
diff --git a/Database/RegistrationServices/src/RegistrationStream.h b/Database/RegistrationServices/src/RegistrationStream.h
index 08afdd41189fc9a903832580e360b1692eccd724..8934f2d0f7aa141360444fcf5bcc12ffecfa4e21 100755
--- a/Database/RegistrationServices/src/RegistrationStream.h
+++ b/Database/RegistrationServices/src/RegistrationStream.h
@@ -75,14 +75,14 @@ public:
/// Callback method to reinitialize the internal state of the component for I/O purposes (e.g. upon @c fork(2))
virtual StatusCode io_reinit();
-private:
-
/// Standard RegistrationStream Constructor
RegistrationStream(const std::string& name, ISvcLocator* pSvcLocator);
/// Standard Destructor
virtual ~RegistrationStream();
+private:
+
/// PRIVATE METHODS
/// Handler for ItemNames Property
void itemListHandler( Property& );
diff --git a/Database/RegistrationServices/src/components/RegistrationServices_entries.cxx b/Database/RegistrationServices/src/components/RegistrationServices_entries.cxx
index d579ef1d5107d2338a747df0de8dc6365d731a7a..3829f35e32e40392cf93da304dc8fc39747ffd16 100644
--- a/Database/RegistrationServices/src/components/RegistrationServices_entries.cxx
+++ b/Database/RegistrationServices/src/components/RegistrationServices_entries.cxx
@@ -6,10 +6,10 @@
#include "../RegistrationStreamLCGTool.h"
#include "../RegistrationStreamTagTool.h"
-DECLARE_ALGORITHM_FACTORY(RegistrationStream)
-DECLARE_ALGORITHM_FACTORY(RegistrationStreamDefMeta)
-DECLARE_ALGORITHM_FACTORY(OutputConditionsAlg)
-DECLARE_TOOL_FACTORY(InputCollectionMetadataCopy)
-DECLARE_TOOL_FACTORY(RegistrationStreamLCGTool)
-DECLARE_TOOL_FACTORY(RegistrationStreamTagTool)
+DECLARE_COMPONENT( RegistrationStream )
+DECLARE_COMPONENT( RegistrationStreamDefMeta )
+DECLARE_COMPONENT( OutputConditionsAlg )
+DECLARE_COMPONENT( InputCollectionMetadataCopy )
+DECLARE_COMPONENT( RegistrationStreamLCGTool )
+DECLARE_COMPONENT( RegistrationStreamTagTool )
diff --git a/DetectorDescription/AGDD/AGDD2GeoSvc/AGDD2GeoSvc/AGDD2GeoSvc.h b/DetectorDescription/AGDD/AGDD2GeoSvc/AGDD2GeoSvc/AGDD2GeoSvc.h
index 17f052420c5f39573dd2db1ff53d19157d7c1d2a..14a5016bc3badd001f52bda4762ea276d8ca3258 100644
--- a/DetectorDescription/AGDD/AGDD2GeoSvc/AGDD2GeoSvc/AGDD2GeoSvc.h
+++ b/DetectorDescription/AGDD/AGDD2GeoSvc/AGDD2GeoSvc/AGDD2GeoSvc.h
@@ -38,8 +38,6 @@ public:
void addHandler(XMLHandler* v) { m_handlerVector.push_back(v);}
-protected:
-
friend class SvcFactory<AGDDtoGeoSvc>;
// Standard Constructor
diff --git a/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_entries.cxx b/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_entries.cxx
index 4d659704f562d5b0538fd7e24d030bd4fe92b233..f0cc6d13ec00856bb0db6cd5e6b4aac6baafb0b2 100644
--- a/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_entries.cxx
+++ b/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_entries.cxx
@@ -1,6 +1,6 @@
#include "AGDD2GeoSvc/AGDD2GeoSvc.h"
#include "AGDD2GeoSvc/DefaultAGDDTool.h"
-DECLARE_SERVICE_FACTORY(AGDDtoGeoSvc)
-DECLARE_TOOL_FACTORY(DefaultAGDDTool)
+DECLARE_COMPONENT( AGDDtoGeoSvc )
+DECLARE_COMPONENT( DefaultAGDDTool )
diff --git a/DetectorDescription/DetDescrCnvSvc/DetDescrCnvSvc/DetDescrCnvSvc.h b/DetectorDescription/DetDescrCnvSvc/DetDescrCnvSvc/DetDescrCnvSvc.h
index 0089037427d456a703724fab8d84c71874fdf682..6b2efdf18f3f724a0eb3572e52e1f64947908868 100755
--- a/DetectorDescription/DetDescrCnvSvc/DetDescrCnvSvc/DetDescrCnvSvc.h
+++ b/DetectorDescription/DetDescrCnvSvc/DetDescrCnvSvc/DetDescrCnvSvc.h
@@ -71,7 +71,6 @@ public:
// virtual StatusCode updateAddress( SG::TransientAddress* tad );
-protected:
/**@name: Object implementation */
//@{
/// Standard Constructor
diff --git a/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_entries.cxx b/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_entries.cxx
index 88e534944bbddf0d52ec097c4ca50c9c625ea563..5c89829e419518b30255f0768956d20ab80b24de 100644
--- a/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_entries.cxx
+++ b/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_entries.cxx
@@ -1,4 +1,4 @@
#include "DetDescrCnvSvc/DetDescrCnvSvc.h"
-DECLARE_SERVICE_FACTORY( DetDescrCnvSvc )
+DECLARE_COMPONENT( DetDescrCnvSvc )
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_entries.cxx b/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_entries.cxx
index 745646995a9b710d0244865d4a2cbe9231945e76..b773e3cade471755635ec60cd10fd081b5809b8e 100644
--- a/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_entries.cxx
+++ b/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_entries.cxx
@@ -3,8 +3,8 @@
#include "DetDescrCondExample/ReadWriteCoolStrFile.h"
#include "DetDescrCondExample/CoolHistExample.h"
-DECLARE_ALGORITHM_FACTORY( ReadAlignTrans )
-DECLARE_ALGORITHM_FACTORY( ReadTopTrans )
-DECLARE_ALGORITHM_FACTORY( ReadWriteCoolStrFile )
-DECLARE_ALGORITHM_FACTORY( CoolHistExample )
+DECLARE_COMPONENT( ReadAlignTrans )
+DECLARE_COMPONENT( ReadTopTrans )
+DECLARE_COMPONENT( ReadWriteCoolStrFile )
+DECLARE_COMPONENT( CoolHistExample )
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_entries.cxx b/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_entries.cxx
index e8f449519b24d7061f6a38492357ca916f024105..2d963fd2513000ea71ca26126aaf591d52164e25 100644
--- a/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_entries.cxx
+++ b/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_entries.cxx
@@ -2,7 +2,7 @@
#include "../CoolStrFileSvc.h"
#include "../CoolHistSvc.h"
-DECLARE_TOOL_FACTORY( AlignTransTool )
-DECLARE_SERVICE_FACTORY( CoolStrFileSvc )
-DECLARE_SERVICE_FACTORY( CoolHistSvc )
+DECLARE_COMPONENT( AlignTransTool )
+DECLARE_COMPONENT( CoolStrFileSvc )
+DECLARE_COMPONENT( CoolHistSvc )
diff --git a/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_entries.cxx b/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_entries.cxx
index a5f3487bc5f6358db22bf4b9cb266d2690d31da5..a460af7061fbe0b784b532845b32042b5fd4e5d1 100644
--- a/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_entries.cxx
+++ b/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_entries.cxx
@@ -1,6 +1,6 @@
#include "../DetStatusSvc.h"
#include "DetectorStatus/DetStatusAlg.h"
-DECLARE_SERVICE_FACTORY(DetStatusSvc)
-DECLARE_ALGORITHM_FACTORY(DetStatusAlg)
+DECLARE_COMPONENT( DetStatusSvc )
+DECLARE_COMPONENT( DetStatusAlg )
diff --git a/DetectorDescription/GeoModel/GeoModelExamples/src/components/GeoModelExamples_entries.cxx b/DetectorDescription/GeoModel/GeoModelExamples/src/components/GeoModelExamples_entries.cxx
index 1070c344bfc80b664b7f2818fe2d2c049d6231e6..df75fb3afa5d9c3c9aede7b72a3f1428613830de 100644
--- a/DetectorDescription/GeoModel/GeoModelExamples/src/components/GeoModelExamples_entries.cxx
+++ b/DetectorDescription/GeoModel/GeoModelExamples/src/components/GeoModelExamples_entries.cxx
@@ -1,4 +1,4 @@
#include "..//ToyDetectorTool.h"
-DECLARE_TOOL_FACTORY(ToyDetectorTool)
+DECLARE_COMPONENT( ToyDetectorTool )
diff --git a/DetectorDescription/GeoModel/GeoModelSvc/src/GeoDbTagSvc.h b/DetectorDescription/GeoModel/GeoModelSvc/src/GeoDbTagSvc.h
index 897d8bb17a11c8646fe9fbc5daaa3604d96f2be7..6749afae79045d121687cd3d98175726d7343a7f 100644
--- a/DetectorDescription/GeoModel/GeoModelSvc/src/GeoDbTagSvc.h
+++ b/DetectorDescription/GeoModel/GeoModelSvc/src/GeoDbTagSvc.h
@@ -20,12 +20,13 @@ class GeoDbTagSvc : public AthService, virtual public IGeoDbTagSvc
virtual StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface );
- protected:
friend class SvcFactory<GeoDbTagSvc>;
GeoDbTagSvc(const std::string& name, ISvcLocator* svc);
virtual ~GeoDbTagSvc();
+ protected:
+
void setAtlasVersion(const std::string& tag) { m_AtlasVersion=tag; }
void setInDetVersionOverride(const std::string& tag) { m_InDetVersionOverride=tag; }
void setPixelVersionOverride(const std::string& tag) { m_PixelVersionOverride=tag; }
diff --git a/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.h b/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.h
index 66dcef7586d23ee5ca77635c0bebcdf6ba1379ad..a54fc8f44ff7890fa55d5f4b0e90ba850ae724fa 100755
--- a/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.h
+++ b/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.h
@@ -42,8 +42,6 @@ public:
virtual StatusCode clear();
-protected:
-
friend class SvcFactory<GeoModelSvc>;
// Standard Constructor
@@ -52,6 +50,9 @@ protected:
// Standard Destructor
virtual ~GeoModelSvc();
+
+protected:
+
// StatusCode append( IGeoModelTool* pddTool,
// std::vector<IGeoModelTool*>* theTools );
// StatusCode decodeNames( StringArrayProperty& theNames,
diff --git a/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_entries.cxx b/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_entries.cxx
index 962f94839b2730662dd6f82eb50840d3595f103c..eda713dbfd8ad653043574a80c2a6f3ce576ddd4 100644
--- a/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_entries.cxx
+++ b/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_entries.cxx
@@ -1,6 +1,6 @@
#include "../GeoModelSvc.h"
#include "../GeoDbTagSvc.h"
-DECLARE_SERVICE_FACTORY(GeoModelSvc)
-DECLARE_SERVICE_FACTORY(GeoDbTagSvc)
+DECLARE_COMPONENT( GeoModelSvc )
+DECLARE_COMPONENT( GeoDbTagSvc )
diff --git a/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_entries.cxx b/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_entries.cxx
index 17d72309c07289d85144462cde53c6517c24dec1..231cc1c6b54a08c5a21929708c3ab7951a178fbf 100644
--- a/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_entries.cxx
+++ b/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_entries.cxx
@@ -1,4 +1,4 @@
#include "../GeometryDBSvc.h"
-DECLARE_SERVICE_FACTORY(GeometryDBSvc)
+DECLARE_COMPONENT( GeometryDBSvc )
diff --git a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx b/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx
index e76f1c33b8026054011eb0d2e77f003df610bba9..641832c3c32531658920746162e490f405159593 100644
--- a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx
+++ b/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx
@@ -4,5 +4,5 @@
DECLARE_CONVERTER_FACTORY( AtlasIDDetDescrCnv )
DECLARE_CONVERTER_FACTORY( IdDictDetDescrCnv )
-DECLARE_ALGORITHM_FACTORY( IdDictCnvTest )
+DECLARE_COMPONENT( IdDictCnvTest )
diff --git a/DetectorDescription/RegionSelector/src/components/RegionSelector_entries.cxx b/DetectorDescription/RegionSelector/src/components/RegionSelector_entries.cxx
index 83c73996683a6e053df3ef89e54cad6e3eb96da1..2f7680f880fe0c8aa93315e506a00942b0a23cf0 100644
--- a/DetectorDescription/RegionSelector/src/components/RegionSelector_entries.cxx
+++ b/DetectorDescription/RegionSelector/src/components/RegionSelector_entries.cxx
@@ -2,6 +2,6 @@
#include "../RegSelSvc.h"
// #include "../NewRegSelSvc.h"
-DECLARE_SERVICE_FACTORY( RegSelSvc )
-// DECLARE_SERVICE_FACTORY( NewRegSelSvc )
+DECLARE_COMPONENT( RegSelSvc )
+// DECLARE_COMPONENT( NewRegSelSvc )
diff --git a/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_entries.cxx b/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_entries.cxx
index 856ff7d745b0689d5f6a05f325a387b628928db3..0152c881b5a535191a748099dc37256e82aa3ea3 100644
--- a/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_entries.cxx
@@ -1,16 +1,16 @@
#include "AFP_ByteStream2RawCnv/RawDataProvider.h"
-DECLARE_ALGORITHM_FACTORY( RawDataProvider )
+DECLARE_COMPONENT( RawDataProvider )
#include "AFP_ByteStream2RawCnv/AFP_ByteStream2RawCnv.h"
-DECLARE_TOOL_FACTORY( AFP_ByteStream2RawCnv )
+DECLARE_COMPONENT( AFP_ByteStream2RawCnv )
#include "AFP_ByteStream2RawCnv/AFP_RawDataProviderTool.h"
-DECLARE_TOOL_FACTORY( AFP_RawDataProviderTool )
+DECLARE_COMPONENT( AFP_RawDataProviderTool )
#include "AFP_ByteStream2RawCnv/AFP_RawDataProvider.h"
-DECLARE_ALGORITHM_FACTORY( AFP_RawDataProvider )
+DECLARE_COMPONENT( AFP_RawDataProvider )
diff --git a/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_entries.cxx b/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_entries.cxx
index c9d4eca02fcd705dd7589778c62e1ff51e7f6e40..15e7e6127a86617f42efdf18597f36b96334fbc1 100644
--- a/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_entries.cxx
@@ -1,7 +1,7 @@
#include "AFP_Digitization/AFP_DigiTop.h"
#include "AFP_Digitization/AFP_PileUpTool.h"
-DECLARE_ALGORITHM_FACTORY(AFP_DigiTop)
+DECLARE_COMPONENT( AFP_DigiTop )
-DECLARE_TOOL_FACTORY( AFP_PileUpTool )
+DECLARE_COMPONENT( AFP_PileUpTool )
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_entries.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_entries.cxx
index a35d1ed844c33a9990dbfa08de983a32381ecde9..2b7e014c262021636bf4a572f9db2b548a7558bf 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_entries.cxx
@@ -7,13 +7,13 @@
#include "src/AFP_TDLocRecoEvCollectionCnv.h"
#include "src/AFP_SIDLocRecoEvCollectionCnv.h"
-DECLARE_ALGORITHM_FACTORY( AFP_TDSimHitCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( AFP_TDDigiCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( AFP_SIDSimHitCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( AFP_SiDigiCollectionCnv )
+DECLARE_COMPONENT( AFP_TDSimHitCollectionCnv )
+DECLARE_COMPONENT( AFP_TDDigiCollectionCnv )
+DECLARE_COMPONENT( AFP_SIDSimHitCollectionCnv )
+DECLARE_COMPONENT( AFP_SiDigiCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( AFP_TDLocRecoEvCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( AFP_SIDLocRecoEvCollectionCnv )
+DECLARE_COMPONENT( AFP_TDLocRecoEvCollectionCnv )
+DECLARE_COMPONENT( AFP_SIDLocRecoEvCollectionCnv )
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_entries.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_entries.cxx
index 6e448fd44fc2779a870b5f9c3fc2046fa9c5524a..962b01e575884f7d92be6b3407a2f155cfe98388 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_entries.cxx
@@ -2,7 +2,7 @@
#include "src/AFP_TDDigiCollectionCnv.h"
#include "src/AFP_SIDSimHitCollectionCnv.h"
-DECLARE_ALGORITHM_FACTORY( AFP_TDSimHitCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( AFP_TDSimDigiCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( AFP_SIDSimHitCollectionCnv )
+DECLARE_COMPONENT( AFP_TDSimHitCollectionCnv )
+DECLARE_COMPONENT( AFP_TDSimDigiCollectionCnv )
+DECLARE_COMPONENT( AFP_SIDSimHitCollectionCnv )
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_entries.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_entries.cxx
index b0205cc929fe53dd4b93151f7bc9d988f161875c..0a92a0218241c4e4223e496fbd2a9e000393a545 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_entries.cxx
@@ -39,43 +39,43 @@
#include "AFP_EventTPCnv/AFP_SIDLocRecoEvCollectionCnv_p1.h"
-DECLARE_ALGORITHM_FACTORY( AFP_TDSimHit_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_TDSimHitCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_TDSimHitCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_TDSimHitCollectionCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( AFP_TDDigi_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_TDDigiCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_TDDigiCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_TDDigiCollectionCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( AFP_RawData_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_RawDataCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_RawDataCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_RawDataCollectionCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_RawDataContainer_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_RawDataContainerCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( AFP_SIDSimHit_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_SIDSimHitCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_SIDSimHitCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_SIDSimHitCollectionCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( AFP_SiDigi_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_SiDigiCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_SiDigiCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_SiDigiCollectionCnv_p1 )
-
-
-DECLARE_ALGORITHM_FACTORY( AFP_TDLocRecoEvent_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_TDLocRecoEventCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_TDLocRecoEvCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_TDLocRecoEvCollectionCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( AFP_SIDLocRecoEvent_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_SIDLocRecoEventCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_SIDLocRecoEvCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_SIDLocRecoEvCollectionCnv_p1 )
+DECLARE_COMPONENT( AFP_TDSimHit_p1 )
+DECLARE_COMPONENT( AFP_TDSimHitCnv_p1 )
+DECLARE_COMPONENT( AFP_TDSimHitCollection_p1 )
+DECLARE_COMPONENT( AFP_TDSimHitCollectionCnv_p1 )
+
+DECLARE_COMPONENT( AFP_TDDigi_p1 )
+DECLARE_COMPONENT( AFP_TDDigiCnv_p1 )
+DECLARE_COMPONENT( AFP_TDDigiCollection_p1 )
+DECLARE_COMPONENT( AFP_TDDigiCollectionCnv_p1 )
+
+DECLARE_COMPONENT( AFP_RawData_p1 )
+DECLARE_COMPONENT( AFP_RawDataCnv_p1 )
+DECLARE_COMPONENT( AFP_RawDataCollection_p1 )
+DECLARE_COMPONENT( AFP_RawDataCollectionCnv_p1 )
+DECLARE_COMPONENT( AFP_RawDataContainer_p1 )
+DECLARE_COMPONENT( AFP_RawDataContainerCnv_p1 )
+
+DECLARE_COMPONENT( AFP_SIDSimHit_p1 )
+DECLARE_COMPONENT( AFP_SIDSimHitCnv_p1 )
+DECLARE_COMPONENT( AFP_SIDSimHitCollection_p1 )
+DECLARE_COMPONENT( AFP_SIDSimHitCollectionCnv_p1 )
+
+DECLARE_COMPONENT( AFP_SiDigi_p1 )
+DECLARE_COMPONENT( AFP_SiDigiCnv_p1 )
+DECLARE_COMPONENT( AFP_SiDigiCollection_p1 )
+DECLARE_COMPONENT( AFP_SiDigiCollectionCnv_p1 )
+
+
+DECLARE_COMPONENT( AFP_TDLocRecoEvent_p1 )
+DECLARE_COMPONENT( AFP_TDLocRecoEventCnv_p1 )
+DECLARE_COMPONENT( AFP_TDLocRecoEvCollection_p1 )
+DECLARE_COMPONENT( AFP_TDLocRecoEvCollectionCnv_p1 )
+
+DECLARE_COMPONENT( AFP_SIDLocRecoEvent_p1 )
+DECLARE_COMPONENT( AFP_SIDLocRecoEventCnv_p1 )
+DECLARE_COMPONENT( AFP_SIDLocRecoEvCollection_p1 )
+DECLARE_COMPONENT( AFP_SIDLocRecoEvCollectionCnv_p1 )
diff --git a/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_entries.cxx b/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_entries.cxx
index 6a7e0de75d307ebe9a13ad521bccd2d4eab98802..221bbd0a44e8117dc3f55032750122632e3beeed 100644
--- a/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_entries.cxx
@@ -2,7 +2,7 @@
#include "../AFP_SiDSensitiveDetectorTool.h"
#include "../AFP_TDSensitiveDetectorTool.h"
-DECLARE_TOOL_FACTORY(AFP_SensitiveDetectorTool) //TODO remove once separate versions tested
-DECLARE_TOOL_FACTORY(AFP_SiDSensitiveDetectorTool)
-DECLARE_TOOL_FACTORY(AFP_TDSensitiveDetectorTool)
+DECLARE_COMPONENT( AFP_SensitiveDetectorTool ) //TODO remove once separate versions tested
+DECLARE_COMPONENT( AFP_SiDSensitiveDetectorTool )
+DECLARE_COMPONENT( AFP_TDSensitiveDetectorTool )
diff --git a/ForwardDetectors/AFP/AFP_GeoModel/src/components/AFP_GeoModel_entries.cxx b/ForwardDetectors/AFP/AFP_GeoModel/src/components/AFP_GeoModel_entries.cxx
index c974462d74faa2b7ede395509c0660239f29583f..b483358fd76cd9ffe6499f396f776755e1a2be7d 100644
--- a/ForwardDetectors/AFP/AFP_GeoModel/src/components/AFP_GeoModel_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_GeoModel/src/components/AFP_GeoModel_entries.cxx
@@ -1,4 +1,4 @@
#include "../AFP_GeoModelTool.h"
-DECLARE_TOOL_FACTORY(AFP_GeoModelTool)
+DECLARE_COMPONENT( AFP_GeoModelTool )
diff --git a/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_entries.cxx b/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_entries.cxx
index 4950c86fc9ea126799773070349f66d389663bcd..24b4c15c475c82c51fc93a4cee0c8901435e47e4 100644
--- a/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_entries.cxx
@@ -1,4 +1,4 @@
#include "AFP_Geometry/AFP_Geometry.h"
-DECLARE_TOOL_FACTORY(AFP_Geometry)
+DECLARE_COMPONENT( AFP_Geometry )
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_entries.cxx b/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_entries.cxx
index 914dd313d514a613d0142cf8c0a56f3d8d992349..846ee503dd4f1b506b0bb9aaf38af106e86b9839 100644
--- a/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_entries.cxx
@@ -1,6 +1,6 @@
#include "AFP_Monitoring/AFPHitsMonitorTool.h"
#include "AFP_Monitoring/AFPTechnicalMonitorTool.h"
-DECLARE_TOOL_FACTORY(AFPHitsMonitorTool)
-DECLARE_TOOL_FACTORY(AFPTechnicalMonitorTool)
+DECLARE_COMPONENT( AFPHitsMonitorTool )
+DECLARE_COMPONENT( AFPTechnicalMonitorTool )
diff --git a/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_entries.cxx b/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_entries.cxx
index 96caea07ca0a6d6dc3eb56a63a092545ea8a4786..28cbcaed20884333a7036058aac3977df4d45dee 100644
--- a/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_entries.cxx
@@ -1,6 +1,6 @@
#include <AFP_Raw2Digi/AFP_Raw2Digi.h>
#include "../AFP_Raw2DigiTool.h"
-DECLARE_ALGORITHM_FACTORY( AFP_Raw2Digi )
-DECLARE_TOOL_FACTORY( AFP_Raw2DigiTool )
+DECLARE_COMPONENT( AFP_Raw2Digi )
+DECLARE_COMPONENT( AFP_Raw2DigiTool )
diff --git a/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_entries.cxx b/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_entries.cxx
index 95a545690130572281db6ba024c88b2bc6e852ac..75138fd962896ddc96aa2a93b2f1b0f8928ad2b9 100644
--- a/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_entries.cxx
@@ -1,6 +1,6 @@
#include "AFP_LocRecoEv/AFP_SIDLocRecoEvent.h"
#include "AFP_LocRecoEv/AFP_TDLocRecoEvent.h"
-DECLARE_ALGORITHM_FACTORY(AFP_SIDLocRecoEvent)
-DECLARE_ALGORITHM_FACTORY(AFP_TDLocRecoEvent)
+DECLARE_COMPONENT( AFP_SIDLocRecoEvent )
+DECLARE_COMPONENT( AFP_TDLocRecoEvent )
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_entries.cxx b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_entries.cxx
index d50a52695e433aea1f6ce9535d13ddd2df500756..8bd17486b66bf6987b5f845f09965f8dbc475c43 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_entries.cxx
@@ -1,6 +1,6 @@
#include "AFP_LocReco/AFP_TDLocReco.h"
#include "AFP_LocReco/AFP_SIDLocReco.h"
-DECLARE_ALGORITHM_FACTORY(AFP_TDLocReco)
-DECLARE_ALGORITHM_FACTORY(AFP_SIDLocReco)
+DECLARE_COMPONENT( AFP_TDLocReco )
+DECLARE_COMPONENT( AFP_SIDLocReco )
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_entries.cxx b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_entries.cxx
index c0c503545288ed08d36c02c4f944d64855e387a7..f1963bfdcfa89ddce15ca97d6093b832b3118b66 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_entries.cxx
@@ -3,8 +3,8 @@
#include "../AFPSiRowColToLocalCSTool.h"
#include "../AFPSiClusterBasicNearestNeighbour.h"
-DECLARE_TOOL_FACTORY(AFPSiClusterTool)
-DECLARE_TOOL_FACTORY(AFPSiClusterSingleHitTool)
-DECLARE_TOOL_FACTORY(AFPSiRowColToLocalCSTool)
-DECLARE_TOOL_FACTORY(AFPSiClusterBasicNearestNeighbour)
+DECLARE_COMPONENT( AFPSiClusterTool )
+DECLARE_COMPONENT( AFPSiClusterSingleHitTool )
+DECLARE_COMPONENT( AFPSiRowColToLocalCSTool )
+DECLARE_COMPONENT( AFPSiClusterBasicNearestNeighbour )
diff --git a/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_entries.cxx b/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_entries.cxx
index 4b7f8c4af6a379f24065d51bab4ae811a2b7b275..9bad587306e59f3d454dfbd74436135f4fb404ff 100644
--- a/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_entries.cxx
@@ -3,8 +3,8 @@
#include "AFP_SimEv/AFP_SIDSimHitCollection.h"
#include "AFP_SimEv/AFP_SIDSimHit.h"
-DECLARE_ALGORITHM_FACTORY(AFP_TDSimHit)
-DECLARE_ALGORITHM_FACTORY(AFP_TDSimHitCollection)
-DECLARE_ALGORITHM_FACTORY(AFP_SIDSimHit)
-DECLARE_ALGORITHM_FACTORY(AFP_SIDSimHitCollection)
+DECLARE_COMPONENT( AFP_TDSimHit )
+DECLARE_COMPONENT( AFP_TDSimHitCollection )
+DECLARE_COMPONENT( AFP_SIDSimHit )
+DECLARE_COMPONENT( AFP_SIDSimHitCollection )
diff --git a/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_entries.cxx b/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_entries.cxx
index 0aefecdbc52a0d8fa285887c63827c56a1b636e7..d332df6e4584fb51921b88e1c0a8dd52c736ec9a 100644
--- a/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_entries.cxx
@@ -1,6 +1,6 @@
#include "ALFA_BeamTransport/ALFA_BeamTransport.h"
-DECLARE_ALGORITHM_FACTORY( ALFA_BeamTransport )
+DECLARE_COMPONENT( ALFA_BeamTransport )
-//DECLARE_ALGORITHM_FACTORY( THistSvc )
+//DECLARE_COMPONENT( THistSvc )
diff --git a/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_entries.cxx b/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_entries.cxx
index 0979b76dc91942d1f786210fa84edb87280dc521..47042fc4a3c203696ac79e1dd63e9ed2938aa947 100644
--- a/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_entries.cxx
@@ -1,4 +1,4 @@
#include "ALFA_CLinkAlg/ALFA_CLinkAlg.h"
-DECLARE_ALGORITHM_FACTORY(ALFA_CLinkAlg)
+DECLARE_COMPONENT( ALFA_CLinkAlg )
diff --git a/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_entries.cxx b/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_entries.cxx
index d0ecf2c9a1926bbbb23d5ce24e9d171ae22dea9e..e648747465001573f9d8a7520db36409c3ae6403 100644
--- a/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_entries.cxx
@@ -1,4 +1,4 @@
#include "ALFA_CLinkEv/ALFA_CLinkEvent.h"
-DECLARE_ALGORITHM_FACTORY(ALFA_CLinkEvent)
+DECLARE_COMPONENT( ALFA_CLinkEvent )
diff --git a/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_entries.cxx b/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_entries.cxx
index 69060ffbc072fb86aa4bc793df7967f7d1064e73..6f7c2cf8cd1284cad40bc53002dae8645d88f9e8 100644
--- a/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_entries.cxx
@@ -2,6 +2,6 @@
#include "ALFA_Digitization/ALFA_PileUpTool.h"
-DECLARE_ALGORITHM_FACTORY(ALFA_DigiAlg)
-DECLARE_TOOL_FACTORY(ALFA_PileUpTool)
+DECLARE_COMPONENT( ALFA_DigiAlg )
+DECLARE_COMPONENT( ALFA_PileUpTool )
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_entries.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_entries.cxx
index 6376da7e76dfbcf96dc0855da02047b1dd031ae5..d476d4bd98e0a8a477443cee78d9b342508cb86a 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_entries.cxx
@@ -9,14 +9,14 @@
#include "src/ALFA_GloRecEvCollectionCnv.h"
#include "src/ALFA_CLinkEventCnv.h"
-DECLARE_ALGORITHM_FACTORY( ALFA_HitCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( ALFA_DigitCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( ALFA_ODHitCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( ALFA_ODDigitCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataContainerCnv )
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataContainerCnv_charge )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecEvCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecODEvCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( ALFA_GloRecEvCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( ALFA_CLinkEventCnv )
+DECLARE_COMPONENT( ALFA_HitCollectionCnv )
+DECLARE_COMPONENT( ALFA_DigitCollectionCnv )
+DECLARE_COMPONENT( ALFA_ODHitCollectionCnv )
+DECLARE_COMPONENT( ALFA_ODDigitCollectionCnv )
+DECLARE_COMPONENT( ALFA_RawDataContainerCnv )
+DECLARE_COMPONENT( ALFA_RawDataContainerCnv_charge )
+DECLARE_COMPONENT( ALFA_LocRecEvCollectionCnv )
+DECLARE_COMPONENT( ALFA_LocRecODEvCollectionCnv )
+DECLARE_COMPONENT( ALFA_GloRecEvCollectionCnv )
+DECLARE_COMPONENT( ALFA_CLinkEventCnv )
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_entries.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_entries.cxx
index 236c96135e992dbc5eb7a25d0dd2329efc7e2cc7..a2e0a787c1c416b7e2d047c87a2b37cd18ee8a4f 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_entries.cxx
@@ -2,7 +2,7 @@
#include "src/ALFA_DigitCollectionCnv.h"
#include "src/ALFA_ODHitCollectionCnv.h"
-DECLARE_ALGORITHM_FACTORY( ALFA_HitCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( ALFA_DigitCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( ALFA_ODHitCollectionCnv )
+DECLARE_COMPONENT( ALFA_HitCollectionCnv )
+DECLARE_COMPONENT( ALFA_DigitCollectionCnv )
+DECLARE_COMPONENT( ALFA_ODHitCollectionCnv )
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_entries.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_entries.cxx
index d263b8d1e14cf3405a68f70eaec5e8be6c58bb45..9e40ec94b3147dc49d8d01754a1b4f5add2a2970 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_entries.cxx
@@ -55,57 +55,57 @@
-DECLARE_ALGORITHM_FACTORY( ALFA_Hit_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_HitCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_HitCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_HitCollectionCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( ALFA_Digit_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_DigitCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_DigitCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_DigitCollectionCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( ALFA_ODHit_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_ODHitCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_ODHitCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_ODHitCollectionCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( ALFA_ODDigit_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_ODDigitCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_ODDigitCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_ODDigitCollectionCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( ALFA_RawData_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataCollectionCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataContainer_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataContainerCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( ALFA_RawData_charge_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataCnv_charge_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataCollection_charge_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataCollectionCnv_charge_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataContainer_charge_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataContainerCnv_charge_p1 )
-
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecEvent_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecEventCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecEvCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecEvCollectionCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecODEvent_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecODEventCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecODEvCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecODEvCollectionCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecCorrEvent_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecCorrEventCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecCorrEvCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecCorrEvCollectionCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecCorrODEvent_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecCorrODEventCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecCorrODEvCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecCorrODEvCollectionCnv_p1 )
+DECLARE_COMPONENT( ALFA_Hit_p1 )
+DECLARE_COMPONENT( ALFA_HitCnv_p1 )
+DECLARE_COMPONENT( ALFA_HitCollection_p1 )
+DECLARE_COMPONENT( ALFA_HitCollectionCnv_p1 )
+
+DECLARE_COMPONENT( ALFA_Digit_p1 )
+DECLARE_COMPONENT( ALFA_DigitCnv_p1 )
+DECLARE_COMPONENT( ALFA_DigitCollection_p1 )
+DECLARE_COMPONENT( ALFA_DigitCollectionCnv_p1 )
+
+DECLARE_COMPONENT( ALFA_ODHit_p1 )
+DECLARE_COMPONENT( ALFA_ODHitCnv_p1 )
+DECLARE_COMPONENT( ALFA_ODHitCollection_p1 )
+DECLARE_COMPONENT( ALFA_ODHitCollectionCnv_p1 )
+
+DECLARE_COMPONENT( ALFA_ODDigit_p1 )
+DECLARE_COMPONENT( ALFA_ODDigitCnv_p1 )
+DECLARE_COMPONENT( ALFA_ODDigitCollection_p1 )
+DECLARE_COMPONENT( ALFA_ODDigitCollectionCnv_p1 )
+
+DECLARE_COMPONENT( ALFA_RawData_p1 )
+DECLARE_COMPONENT( ALFA_RawDataCnv_p1 )
+DECLARE_COMPONENT( ALFA_RawDataCollection_p1 )
+DECLARE_COMPONENT( ALFA_RawDataCollectionCnv_p1 )
+DECLARE_COMPONENT( ALFA_RawDataContainer_p1 )
+DECLARE_COMPONENT( ALFA_RawDataContainerCnv_p1 )
+
+DECLARE_COMPONENT( ALFA_RawData_charge_p1 )
+DECLARE_COMPONENT( ALFA_RawDataCnv_charge_p1 )
+DECLARE_COMPONENT( ALFA_RawDataCollection_charge_p1 )
+DECLARE_COMPONENT( ALFA_RawDataCollectionCnv_charge_p1 )
+DECLARE_COMPONENT( ALFA_RawDataContainer_charge_p1 )
+DECLARE_COMPONENT( ALFA_RawDataContainerCnv_charge_p1 )
+
+DECLARE_COMPONENT( ALFA_LocRecEvent_p1 )
+DECLARE_COMPONENT( ALFA_LocRecEventCnv_p1 )
+DECLARE_COMPONENT( ALFA_LocRecEvCollection_p1 )
+DECLARE_COMPONENT( ALFA_LocRecEvCollectionCnv_p1 )
+
+DECLARE_COMPONENT( ALFA_LocRecODEvent_p1 )
+DECLARE_COMPONENT( ALFA_LocRecODEventCnv_p1 )
+DECLARE_COMPONENT( ALFA_LocRecODEvCollection_p1 )
+DECLARE_COMPONENT( ALFA_LocRecODEvCollectionCnv_p1 )
+
+DECLARE_COMPONENT( ALFA_LocRecCorrEvent_p1 )
+DECLARE_COMPONENT( ALFA_LocRecCorrEventCnv_p1 )
+DECLARE_COMPONENT( ALFA_LocRecCorrEvCollection_p1 )
+DECLARE_COMPONENT( ALFA_LocRecCorrEvCollectionCnv_p1 )
+
+DECLARE_COMPONENT( ALFA_LocRecCorrODEvent_p1 )
+DECLARE_COMPONENT( ALFA_LocRecCorrODEventCnv_p1 )
+DECLARE_COMPONENT( ALFA_LocRecCorrODEvCollection_p1 )
+DECLARE_COMPONENT( ALFA_LocRecCorrODEvCollectionCnv_p1 )
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_entries.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_entries.cxx
index 5ac67e6da18149fca8e31c795c7bbe3d3fc6329f..5bf6aae75ad30579ca67614b8cefcdca986dc4e2 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_entries.cxx
@@ -1,18 +1,18 @@
#include "ALFA_RawDataByteStreamCnv/ALFA_RawDataProvider.h"
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataProvider)
+DECLARE_COMPONENT( ALFA_RawDataProvider )
#include "ALFA_RawDataByteStreamCnv/ALFA_RawDataProvider_charge.h"
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataProvider_charge)
+DECLARE_COMPONENT( ALFA_RawDataProvider_charge )
#include "ALFA_RawDataByteStreamCnv/ALFA_RawDataProviderTool.h"
-DECLARE_TOOL_FACTORY( ALFA_RawDataProviderTool)
+DECLARE_COMPONENT( ALFA_RawDataProviderTool )
#include "ALFA_RawDataByteStreamCnv/ALFA_RawDataProviderTool_charge.h"
-DECLARE_TOOL_FACTORY( ALFA_RawDataProviderTool_charge)
+DECLARE_COMPONENT( ALFA_RawDataProviderTool_charge )
#include "ALFA_RawDataByteStreamCnv/ALFA_Decoder.h"
-DECLARE_TOOL_FACTORY( ALFA_Decoder )
+DECLARE_COMPONENT( ALFA_Decoder )
#include "ALFA_RawDataByteStreamCnv/ALFA_Decoder_charge.h"
-DECLARE_TOOL_FACTORY( ALFA_Decoder_charge )
+DECLARE_COMPONENT( ALFA_Decoder_charge )
diff --git a/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_entries.cxx b/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_entries.cxx
index 3addc70f77fdb04ce02856e080307986b047c7db..1742e18564178cda1cb3449e35b0c8a9cde5c59e 100644
--- a/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_entries.cxx
@@ -1,4 +1,4 @@
#include "../ALFA_SensitiveDetectorTool.h"
-DECLARE_TOOL_FACTORY(ALFA_SensitiveDetectorTool)
+DECLARE_COMPONENT( ALFA_SensitiveDetectorTool )
diff --git a/ForwardDetectors/ALFA/ALFA_GeoModel/src/components/ALFA_GeoModel_entries.cxx b/ForwardDetectors/ALFA/ALFA_GeoModel/src/components/ALFA_GeoModel_entries.cxx
index b00ecacc9883049c7b242a9358f4adddbe7d699a..aebb7566d2ca392d23190eabfd7d2a04d42852a5 100644
--- a/ForwardDetectors/ALFA/ALFA_GeoModel/src/components/ALFA_GeoModel_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_GeoModel/src/components/ALFA_GeoModel_entries.cxx
@@ -1,4 +1,4 @@
#include "../ALFA_DetectorTool.h"
-DECLARE_TOOL_FACTORY(ALFA_DetectorTool)
+DECLARE_COMPONENT( ALFA_DetectorTool )
diff --git a/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_entries.cxx b/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_entries.cxx
index 701c7300ddd748d7d4bd1ef80df69d86b6085be5..d4120c26852e77436e7c6f742db200c913965a80 100644
--- a/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_entries.cxx
@@ -1,4 +1,4 @@
#include "ALFA_Geometry/ALFA_GeometryReader.h"
-DECLARE_TOOL_FACTORY(ALFA_GeometryReader)
+DECLARE_COMPONENT( ALFA_GeometryReader )
diff --git a/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_entries.cxx b/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_entries.cxx
index 9e30925a2d5995f01221789b32029d0357f17a33..fa7d1a68aabea890e8c07bd8af414d2d67db9cad 100644
--- a/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_entries.cxx
@@ -1,5 +1,5 @@
#include "ALFA_Ntuple/ALFA_Ntuple.h"
-DECLARE_ALGORITHM_FACTORY( ALFA_Ntuple )
+DECLARE_COMPONENT( ALFA_Ntuple )
diff --git a/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_entries.cxx b/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_entries.cxx
index e53e081db745a86d49619c12405a78cd4afa76e6..fa852077de00054180bcd0cda1dd83c398bfba33 100644
--- a/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_entries.cxx
@@ -1,4 +1,4 @@
#include "ALFA_Raw2Digit/ALFA_Raw2Digit.h"
-DECLARE_ALGORITHM_FACTORY(ALFA_Raw2Digit)
+DECLARE_COMPONENT( ALFA_Raw2Digit )
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_entries.cxx b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_entries.cxx
index 2c78f1d7ec86c02e0440599fe0d159b63561f65f..45d6128585a31ad2f3d5de43471167bed70054d5 100644
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_entries.cxx
@@ -1,6 +1,6 @@
#include "ALFA_GloRecEv/ALFA_GloRecEvent.h"
#include "ALFA_GloRecEv/ALFA_GloRecODEvent.h"
-DECLARE_ALGORITHM_FACTORY(ALFA_GloRecEvent)
-DECLARE_ALGORITHM_FACTORY(ALFA_GloRecODEvent)
+DECLARE_COMPONENT( ALFA_GloRecEvent )
+DECLARE_COMPONENT( ALFA_GloRecODEvent )
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_entries.cxx b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_entries.cxx
index ffc7e4c208d90b13cc8ba658b74a548426e4322b..7d8ac9afc50e68f27d3a00ca6cc1d813dd97f7c4 100644
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_entries.cxx
@@ -1,6 +1,6 @@
#include "ALFA_LocRecCorrEv/ALFA_LocRecCorrEvent.h"
#include "ALFA_LocRecCorrEv/ALFA_LocRecCorrODEvent.h"
-DECLARE_ALGORITHM_FACTORY(ALFA_LocRecCorrEvent)
-DECLARE_ALGORITHM_FACTORY(ALFA_LocRecCorrODEvent)
+DECLARE_COMPONENT( ALFA_LocRecCorrEvent )
+DECLARE_COMPONENT( ALFA_LocRecCorrODEvent )
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_entries.cxx b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_entries.cxx
index 6e5b11330ceef987dc703798fa0b10597956c05c..6cfe9589be6a375f7d47fb3382fbe12aaffc4700 100644
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_entries.cxx
@@ -1,6 +1,6 @@
#include "ALFA_LocRecEv/ALFA_LocRecEvent.h"
#include "ALFA_LocRecEv/ALFA_LocRecODEvent.h"
-DECLARE_ALGORITHM_FACTORY(ALFA_LocRecEvent)
-DECLARE_ALGORITHM_FACTORY(ALFA_LocRecODEvent)
+DECLARE_COMPONENT( ALFA_LocRecEvent )
+DECLARE_COMPONENT( ALFA_LocRecODEvent )
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_entries.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_entries.cxx
index 31bc4ee6962b066eea805f422b9f901e42de110c..ee792159d3699453ce55af5dfa5f3e5947a7a09b 100644
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_entries.cxx
@@ -1,4 +1,4 @@
#include "ALFA_GloRec/ALFA_GloRec.h"
-DECLARE_ALGORITHM_FACTORY(ALFA_GloRec)
+DECLARE_COMPONENT( ALFA_GloRec )
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_entries.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_entries.cxx
index ddbbb0a951c191449f2185159eefa6b43b49256e..2a06550bb5b0d12b88510dec530fef1ae70e7f54 100644
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_entries.cxx
@@ -1,4 +1,4 @@
#include "ALFA_LocRec/ALFA_LocRec.h"
-DECLARE_ALGORITHM_FACTORY(ALFA_LocRec)
+DECLARE_COMPONENT( ALFA_LocRec )
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_entries.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_entries.cxx
index 41031b248c423ebae12f06d2807ca98570b1fa8d..e2be714eacd7d49eefb2c89cfd65696d0ce6130c 100644
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_entries.cxx
@@ -1,4 +1,4 @@
#include "ALFA_LocRecCorr/ALFA_LocRecCorr.h"
-DECLARE_ALGORITHM_FACTORY(ALFA_LocRecCorr)
+DECLARE_COMPONENT( ALFA_LocRecCorr )
diff --git a/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_entries.cxx b/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_entries.cxx
index da0ca27bad63a0c698b95452d17e4781b5fd0ed1..3b500d7818a41949ff173447fa31ece27e9f240f 100644
--- a/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_entries.cxx
@@ -3,8 +3,8 @@
#include "ALFA_SimEv/ALFA_ODHitCollection.h"
#include "ALFA_SimEv/ALFA_ODHit.h"
-DECLARE_ALGORITHM_FACTORY(ALFA_Hit)
-DECLARE_ALGORITHM_FACTORY(ALFA_HitCollection)
-DECLARE_ALGORITHM_FACTORY(ALFA_ODHit)
-DECLARE_ALGORITHM_FACTORY(ALFA_ODHitCollection)
+DECLARE_COMPONENT( ALFA_Hit )
+DECLARE_COMPONENT( ALFA_HitCollection )
+DECLARE_COMPONENT( ALFA_ODHit )
+DECLARE_COMPONENT( ALFA_ODHitCollection )
diff --git a/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_entries.cxx b/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_entries.cxx
index 891ab838adf77648c1f137f8c7957dcd8368388b..9802a3f51533e423f596d9d672982af920933a79 100644
--- a/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_entries.cxx
+++ b/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_entries.cxx
@@ -1,4 +1,4 @@
#include "ZdcIDDetDescrCnv.h"
-DECLARE_CONVERTER_FACTORY(ZdcIDDetDescrCnv)
+DECLARE_CONVERTER_FACTORY( ZdcIDDetDescrCnv )
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/components/ForwardRegionGeoModel_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/components/ForwardRegionGeoModel_entries.cxx
index 1f597ddd1c34e498471f64deb202a1b163dbf88d..0947d041ab163102c753b22114755b8b9fe97914 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/components/ForwardRegionGeoModel_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/components/ForwardRegionGeoModel_entries.cxx
@@ -1,4 +1,4 @@
#include "../ForwardRegionGeoModelTool.h"
-DECLARE_TOOL_FACTORY(ForwardRegionGeoModelTool)
+DECLARE_COMPONENT( ForwardRegionGeoModelTool )
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionMgField/src/components/ForwardRegionMgField_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegionMgField/src/components/ForwardRegionMgField_entries.cxx
index 5bbd79dc61b1f43481e75309000b78f6ab6bcb6a..ebfbe8f567186014e9b8df6e1f2431a7fb205279 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionMgField/src/components/ForwardRegionMgField_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegionMgField/src/components/ForwardRegionMgField_entries.cxx
@@ -1,4 +1,4 @@
#include "../ForwardRegionFieldSvc.h"
-DECLARE_NAMESPACE_SERVICE_FACTORY( MagField, ForwardRegionFieldSvc )
+DECLARE_COMPONENT( MagField::ForwardRegionFieldSvc )
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_entries.cxx
index 56d1d2046cb144fee38eceafebef8043c32fd0fe..bd1d6a175ddc9eddf0e09d80cdaaf819aadefaf5 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_entries.cxx
@@ -1,4 +1,4 @@
#include "ForwardRegionProperties/ForwardRegionProperties.h"
-DECLARE_TOOL_FACTORY(ForwardRegionProperties)
+DECLARE_COMPONENT( ForwardRegionProperties )
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_entries.cxx
index 16f6435edb4c345537a4f76d52fcc105e83b51e1..a94fcd67f2d824a0bb2896d662d12beef49b31f9 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_entries.cxx
@@ -1,4 +1,4 @@
#include "src/SimulationHitCollectionCnv.h"
-DECLARE_ALGORITHM_FACTORY( SimulationHitCollectionCnv )
+DECLARE_COMPONENT( SimulationHitCollectionCnv )
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_entries.cxx
index 16f6435edb4c345537a4f76d52fcc105e83b51e1..a94fcd67f2d824a0bb2896d662d12beef49b31f9 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_entries.cxx
@@ -1,4 +1,4 @@
#include "src/SimulationHitCollectionCnv.h"
-DECLARE_ALGORITHM_FACTORY( SimulationHitCollectionCnv )
+DECLARE_COMPONENT( SimulationHitCollectionCnv )
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_entries.cxx
index 010cba068ee5b352b8af4484647d1521c30c4232..5e0f1f987dc598a0da28634ffaed39979e289928 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_entries.cxx
@@ -4,8 +4,8 @@
#include "ForwardRegion_EventTPCnv/SimulationHitHitCollectionCnv_p1.h"
-DECLARE_ALGORITHM_FACTORY( SimulationHit_p1 )
-DECLARE_ALGORITHM_FACTORY( SimulationHitHitCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( SimulationHitHitCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( SimulationHitHitCollectionCnv_p1 )
+DECLARE_COMPONENT( SimulationHit_p1 )
+DECLARE_COMPONENT( SimulationHitHitCnv_p1 )
+DECLARE_COMPONENT( SimulationHitHitCollection_p1 )
+DECLARE_COMPONENT( SimulationHitHitCollectionCnv_p1 )
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_entries.cxx
index e6abdc58d0679016fd2685ceafcb7798f6d05aa8..0a767855725c065481cb3a46db68162aa0f9c0dd 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_entries.cxx
@@ -1,6 +1,6 @@
#include "ForwardRegion_SimEv/SimulationHitCollection.h"
#include "ForwardRegion_SimEv/SimulationHit.h"
-DECLARE_ALGORITHM_FACTORY(SimulationHit)
-DECLARE_ALGORITHM_FACTORY(SimulationHitCollection)
+DECLARE_COMPONENT( SimulationHit )
+DECLARE_COMPONENT( SimulationHitCollection )
diff --git a/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_entries.cxx b/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_entries.cxx
index affd320a0cfb9cf1868278455dc8673771cba35a..e5ade9047392510f03c499b5954a4c7e34676a77 100644
--- a/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_entries.cxx
+++ b/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_entries.cxx
@@ -1,4 +1,4 @@
#include "../ForwardTransportModelTool.h"
-DECLARE_TOOL_FACTORY( ForwardTransportModelTool )
+DECLARE_COMPONENT( ForwardTransportModelTool )
diff --git a/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_entries.cxx b/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_entries.cxx
index d8e79953d4e6fd1670da008d6397c693bf070389..5a359b0a752d1252a78541d4626a889fc410a1ba 100644
--- a/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_entries.cxx
+++ b/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_entries.cxx
@@ -1,4 +1,4 @@
#include "ForwardTransportFast/ForwardTransportFast.h"
-DECLARE_ALGORITHM_FACTORY( ForwardTransportFast )
+DECLARE_COMPONENT( ForwardTransportFast )
diff --git a/ForwardDetectors/ForwardTransportSvc/src/ForwardTransportSvc.h b/ForwardDetectors/ForwardTransportSvc/src/ForwardTransportSvc.h
index ebf407219627fac5991ce160538f4e0b25f904e2..2c18ab665b02241940f9a97e628b973ef7f33dfb 100755
--- a/ForwardDetectors/ForwardTransportSvc/src/ForwardTransportSvc.h
+++ b/ForwardDetectors/ForwardTransportSvc/src/ForwardTransportSvc.h
@@ -36,8 +36,6 @@ class ForwardTransportSvc: public AthService, virtual public IForwardTransportSv
virtual HepMC::GenEvent* getEvent();
- protected:
-
friend class SvcFactory<ForwardTransportSvc>;
ForwardTransportSvc(const std::string& name, ISvcLocator* svc);
diff --git a/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_entries.cxx b/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_entries.cxx
index deec131c08c265d97fcb650b5fb4f71fc9a91e0e..cf80ea07096ca3b82a2c44765c3fa3d18f639d32 100644
--- a/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_entries.cxx
+++ b/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_entries.cxx
@@ -1,4 +1,4 @@
#include "../ForwardTransportSvc.h"
-DECLARE_SERVICE_FACTORY(ForwardTransportSvc)
+DECLARE_COMPONENT( ForwardTransportSvc )
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_entries.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_entries.cxx
index 15f50575e9e18a245187e3efb8364649f5296b38..5ba06c1e29f89904ddcce4bc81e4b7f52661eda4 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_entries.cxx
@@ -1,9 +1,9 @@
#include "LUCID_RawDataByteStreamCnv/LUCID_ByteStreamRawDataCnv.h"
-DECLARE_ALGORITHM_FACTORY ( LUCID_ByteStreamRawDataCnv )
+DECLARE_COMPONENT( LUCID_ByteStreamRawDataCnv )
#include "LUCID_RawDataByteStreamCnv/LUCID_DigitRawDataCnv.h"
-DECLARE_ALGORITHM_FACTORY ( LUCID_DigitRawDataCnv )
+DECLARE_COMPONENT( LUCID_DigitRawDataCnv )
#include "LUCID_RawDataByteStreamCnv/LUCID_DigitByteStreamCnv.h"
-DECLARE_CONVERTER_FACTORY ( LUCID_DigitByteStreamCnv )
+DECLARE_CONVERTER_FACTORY( LUCID_DigitByteStreamCnv )
diff --git a/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_entries.cxx b/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_entries.cxx
index 8f82570f7d21df0c983aa2a5c78069d006261849..78f790b4bec20a0b6e3c96bca1a8dea35653afe6 100644
--- a/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_entries.cxx
@@ -2,7 +2,7 @@
#include "../LUCID_PileUpTool.h"
-DECLARE_ALGORITHM_FACTORY( LUCID_DigiTop )
-DECLARE_TOOL_FACTORY( LUCID_PileUpTool )
+DECLARE_COMPONENT( LUCID_DigiTop )
+DECLARE_COMPONENT( LUCID_PileUpTool )
diff --git a/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_entries.cxx b/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_entries.cxx
index 42524996f88b97a6a47200dbccfa0357bf92e561..0ccdf14f204f518915f12740ddb0bacea08ad351 100644
--- a/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_entries.cxx
@@ -1,4 +1,4 @@
#include "../LUCID_SensitiveDetectorTool.h"
-DECLARE_TOOL_FACTORY(LUCID_SensitiveDetectorTool)
+DECLARE_COMPONENT( LUCID_SensitiveDetectorTool )
diff --git a/ForwardDetectors/LUCID/LUCID_GeoModel/src/components/LUCID_GeoModel_entries.cxx b/ForwardDetectors/LUCID/LUCID_GeoModel/src/components/LUCID_GeoModel_entries.cxx
index 70751bacfa9df5d111317571315854474956c240..b9d2018de9e2effae452a94e41e1a1895ca683a0 100644
--- a/ForwardDetectors/LUCID/LUCID_GeoModel/src/components/LUCID_GeoModel_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_GeoModel/src/components/LUCID_GeoModel_entries.cxx
@@ -1,4 +1,4 @@
#include "../LUCID_DetectorTool.h"
-DECLARE_TOOL_FACTORY(LUCID_DetectorTool)
+DECLARE_COMPONENT( LUCID_DetectorTool )
diff --git a/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_entries.cxx b/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_entries.cxx
index 6ed27c9c003ab3c90edb7db2bebcd761dba1e240..05a53b223f91b34592ef66e9ecf442311b99ba53 100644
--- a/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_entries.cxx
@@ -1,3 +1,3 @@
#include "LUCID_Monitoring/LUCID_HitsMoniTool.h"
-DECLARE_TOOL_FACTORY(LUCID_HitsMoniTool)
+DECLARE_COMPONENT( LUCID_HitsMoniTool )
diff --git a/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_entries.cxx b/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_entries.cxx
index 20fc7ae00ffbe528dfe2020c3e9e16385b77f8be..c74bc777cbb2a6387676c60831b1add661c8ac52 100644
--- a/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_entries.cxx
@@ -1,4 +1,4 @@
#include "../LucidPhysicsTool.h"
-DECLARE_TOOL_FACTORY( LucidPhysicsTool )
+DECLARE_COMPONENT( LucidPhysicsTool )
diff --git a/ForwardDetectors/ZDC/ZDC_GeoM/src/components/ZDC_GeoM_entries.cxx b/ForwardDetectors/ZDC/ZDC_GeoM/src/components/ZDC_GeoM_entries.cxx
index bcc6aec7d96213dca597cfd33c2749a658cc222e..675ea397cb5090725887fc71296f3c13248a80a4 100644
--- a/ForwardDetectors/ZDC/ZDC_GeoM/src/components/ZDC_GeoM_entries.cxx
+++ b/ForwardDetectors/ZDC/ZDC_GeoM/src/components/ZDC_GeoM_entries.cxx
@@ -1,4 +1,4 @@
#include "../ZDC_DetTool.h"
-DECLARE_TOOL_FACTORY(ZDC_DetTool)
+DECLARE_COMPONENT( ZDC_DetTool )
diff --git a/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_entries.cxx b/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_entries.cxx
index dabf8912e7eb6ec63dca685aa45cef3bc4109692..5e2451cd80ecd4938d2ef67d08b7d7a2e59feefa 100644
--- a/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_entries.cxx
+++ b/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_entries.cxx
@@ -1,6 +1,6 @@
#include "../ZDC_PixelSDTool.h"
#include "../ZDC_StripSDTool.h"
-DECLARE_TOOL_FACTORY( ZDC_PixelSDTool )
-DECLARE_TOOL_FACTORY( ZDC_StripSDTool )
+DECLARE_COMPONENT( ZDC_PixelSDTool )
+DECLARE_COMPONENT( ZDC_StripSDTool )
diff --git a/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_entries.cxx b/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_entries.cxx
index 6d8873ed6de045968ca4c0357cb17b5f62277441..d7dc3091f7fece16ff53259b487fce53d7abcb3b 100644
--- a/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_entries.cxx
+++ b/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_entries.cxx
@@ -1,7 +1,7 @@
#include "ZDC_SimuDigitization/ZDC_DigiTop.h"
#include "ZDC_SimuDigitization/ZDC_PileUpTool.h"
-DECLARE_ALGORITHM_FACTORY(ZDC_DigiTop)
+DECLARE_COMPONENT( ZDC_DigiTop )
-DECLARE_TOOL_FACTORY( ZDC_PileUpTool )
+DECLARE_COMPONENT( ZDC_PileUpTool )
diff --git a/ForwardDetectors/ZDC/ZdcAnalysis/src/components/ZdcAnalysis_entries.cxx b/ForwardDetectors/ZDC/ZdcAnalysis/src/components/ZdcAnalysis_entries.cxx
index aadd419870397983739a3fb5ccf124ba19069c06..bcc716a43171692a3eefbafcba7e40be102796b3 100644
--- a/ForwardDetectors/ZDC/ZdcAnalysis/src/components/ZdcAnalysis_entries.cxx
+++ b/ForwardDetectors/ZDC/ZdcAnalysis/src/components/ZdcAnalysis_entries.cxx
@@ -2,7 +2,7 @@
#include "ZdcAnalysis/ZdcAnalysisTool.h"
-DECLARE_TOOL_FACTORY (ZDC::ZdcAnalysisTool)
+DECLARE_COMPONENT( ZDC::ZdcAnalysisTool )
#endif
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_entries.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_entries.cxx
index 10a0c8ad477c59326e17df4c17ed44cca422e24a..c50568d7645bead64d7abb36da5eb66dec352e77 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_entries.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_entries.cxx
@@ -14,12 +14,12 @@
#include "ZdcByteStream/ZdcL1CaloErrorByteStreamTool.h"
-DECLARE_TOOL_FACTORY (ZdcByteStreamTool)
-DECLARE_TOOL_FACTORY (ZdcByteStreamReadV1V2Tool)
-DECLARE_TOOL_FACTORY (ZdcL1CaloErrorByteStreamTool)
-DECLARE_TOOL_FACTORY (ZdcDataAccessV2)
-DECLARE_CONVERTER_FACTORY (ZdcByteStreamCnv)
-DECLARE_ALGORITHM_FACTORY (ZdcByteStreamTester)
-DECLARE_ALGORITHM_FACTORY (ZdcByteStreamRawData)
-DECLARE_ALGORITHM_FACTORY (ZdcByteStreamRawDataV2)
+DECLARE_COMPONENT( ZdcByteStreamTool )
+DECLARE_COMPONENT( ZdcByteStreamReadV1V2Tool )
+DECLARE_COMPONENT( ZdcL1CaloErrorByteStreamTool )
+DECLARE_COMPONENT( ZdcDataAccessV2 )
+DECLARE_CONVERTER_FACTORY( ZdcByteStreamCnv )
+DECLARE_COMPONENT( ZdcByteStreamTester )
+DECLARE_COMPONENT( ZdcByteStreamRawData )
+DECLARE_COMPONENT( ZdcByteStreamRawDataV2 )
diff --git a/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_entries.cxx b/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_entries.cxx
index a016c68e141162e519fbce99a6d6913699814e75..06bbf781cdeb71c164ca4fbc04a5e3a66541bee4 100644
--- a/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_entries.cxx
+++ b/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_entries.cxx
@@ -6,10 +6,10 @@
#include "ZdcRec/ZdcRecNoiseTool.h"
#include "ZdcRec/ZdcSignalSinc.h"
-DECLARE_ALGORITHM_FACTORY (ZdcRec)
-DECLARE_ALGORITHM_FACTORY (ZdcRecV2)
-DECLARE_ALGORITHM_FACTORY (ZdcRecV3)
-DECLARE_TOOL_FACTORY (ZdcRecChannelTool)
-DECLARE_TOOL_FACTORY (ZdcRecChannelToolV2)
-DECLARE_TOOL_FACTORY (ZdcRecNoiseTool)
+DECLARE_COMPONENT( ZdcRec )
+DECLARE_COMPONENT( ZdcRecV2 )
+DECLARE_COMPONENT( ZdcRecV3 )
+DECLARE_COMPONENT( ZdcRecChannelTool )
+DECLARE_COMPONENT( ZdcRecChannelToolV2 )
+DECLARE_COMPONENT( ZdcRecNoiseTool )
diff --git a/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_entries.cxx b/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_entries.cxx
index 3125915a1fbcb5113695b5415d28680298aa0f20..cb4b40c24f5984ae9c14d75f84c2f4a6f8062217 100644
--- a/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_entries.cxx
+++ b/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_entries.cxx
@@ -1,4 +1,4 @@
#include "ByteStreamEmonSvc/ByteStreamEmonInputSvc.h"
-DECLARE_SERVICE_FACTORY( ByteStreamEmonInputSvc )
+DECLARE_COMPONENT( ByteStreamEmonInputSvc )
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_entries.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_entries.cxx
index 5d3673d0a98b2f6f9a020e1ee1399438d6273612..9ee255197dd56c1629fbb6142610545186a39f86 100644
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_entries.cxx
@@ -1,6 +1,6 @@
#include "TrigExL2muCalibTest/L2muCalibTest.h"
#include "TrigExL2muCalibTest/TrigPartialEBFilter.h"
-DECLARE_ALGORITHM_FACTORY( L2muCalibTest )
-DECLARE_ALGORITHM_FACTORY( TrigPartialEBFilter )
+DECLARE_COMPONENT( L2muCalibTest )
+DECLARE_COMPONENT( TrigPartialEBFilter )
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_entries.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_entries.cxx
index d640228f125331803e0500417e83be5efc59ae69..9def105eb61f4422c7a1621ee7f98230f39d1e09 100644
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_entries.cxx
@@ -1,4 +1,4 @@
#include "TrigExMTHelloWorld/MTHelloWorld.h"
-DECLARE_ALGORITHM_FACTORY( MTHelloWorld )
+DECLARE_COMPONENT( MTHelloWorld )
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_entries.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_entries.cxx
index 56f6895d0d83f16c3444a28bf70cb3af81638164..b45bcb5dc6811586d69f7661e06c26859e09b594 100644
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_entries.cxx
@@ -1,4 +1,4 @@
#include "TrigExMTHelloWorldLvl1/MTHelloWorldLvl1.h"
-DECLARE_ALGORITHM_FACTORY( MTHelloWorldLvl1 )
+DECLARE_COMPONENT( MTHelloWorldLvl1 )
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_entries.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_entries.cxx
index fdc36b7183145b5f2a4f0e45a81e69767873b5b8..e0e4182e9f0c6838f6881b5b7d3faf95042afd42 100644
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_entries.cxx
@@ -2,7 +2,7 @@
#include "TrigExMTHistNtup/MTNtup.h"
#include "TrigExMTHistNtup/MTTHist.h"
-DECLARE_ALGORITHM_FACTORY( MTHist )
-DECLARE_ALGORITHM_FACTORY( MTNtup )
-DECLARE_ALGORITHM_FACTORY( MTTHist )
+DECLARE_COMPONENT( MTHist )
+DECLARE_COMPONENT( MTNtup )
+DECLARE_COMPONENT( MTTHist )
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_entries.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_entries.cxx
index 5f5c3b201021cc61fb9d8ac4cdf3a11bdae7e956..d66f2baecfc76419c617fe2b900f9b8a948a23f2 100644
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_entries.cxx
@@ -1,4 +1,4 @@
#include "TrigExPartialEB/MTCalibPeb.h"
-DECLARE_ALGORITHM_FACTORY( MTCalibPeb )
+DECLARE_COMPONENT( MTCalibPeb )
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_entries.cxx b/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_entries.cxx
index a20b96713c6686188161a33a6fd499a009ccf52c..cc6b8886284f81d3aaa0319132661e6b01f64782 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_entries.cxx
@@ -7,12 +7,12 @@
#include "../TrigPreFlightCheck.h"
#include "../TrigCOOLUpdateHelper.h"
-DECLARE_SERVICE_FACTORY( TrigMessageSvc )
-DECLARE_SERVICE_FACTORY( TrigMonTHistSvc )
-DECLARE_SERVICE_FACTORY( TrigIS )
-DECLARE_SERVICE_FACTORY( HltEventLoopMgr )
-DECLARE_SERVICE_FACTORY( HltROBDataProviderSvc )
-DECLARE_TOOL_FACTORY( TrigISHelper )
-DECLARE_TOOL_FACTORY( TrigPreFlightCheck )
-DECLARE_TOOL_FACTORY( TrigCOOLUpdateHelper )
+DECLARE_COMPONENT( TrigMessageSvc )
+DECLARE_COMPONENT( TrigMonTHistSvc )
+DECLARE_COMPONENT( TrigIS )
+DECLARE_COMPONENT( HltEventLoopMgr )
+DECLARE_COMPONENT( HltROBDataProviderSvc )
+DECLARE_COMPONENT( TrigISHelper )
+DECLARE_COMPONENT( TrigPreFlightCheck )
+DECLARE_COMPONENT( TrigCOOLUpdateHelper )
diff --git a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_entries.cxx b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_entries.cxx
index 97ce6fab731857fac3b41b9fad85d681083e6783..719ef868ca87bb80a2f2a5211eebc3a3ebc67a48 100644
--- a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_entries.cxx
+++ b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_entries.cxx
@@ -3,8 +3,8 @@
#include "src/TrigALFAROBMonitor.h"
#include "src/TrigL1TopoROBMonitor.h"
-DECLARE_ALGORITHM_FACTORY( TrigROBMonitor )
-DECLARE_ALGORITHM_FACTORY( TrigMuCTPiROBMonitor )
-DECLARE_ALGORITHM_FACTORY( TrigALFAROBMonitor )
-DECLARE_ALGORITHM_FACTORY( TrigL1TopoROBMonitor )
+DECLARE_COMPONENT( TrigROBMonitor )
+DECLARE_COMPONENT( TrigMuCTPiROBMonitor )
+DECLARE_COMPONENT( TrigALFAROBMonitor )
+DECLARE_COMPONENT( TrigL1TopoROBMonitor )
diff --git a/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_entries.cxx b/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_entries.cxx
index 984ab30cb5c1bffe13e4fa43dbe6d8d7f18475ba..b1a196e09d667425bf98b54db8317e3635e96237 100644
--- a/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_entries.cxx
+++ b/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_entries.cxx
@@ -12,18 +12,18 @@
#include "LumiBlockComps/LumiBlockTester.h"
#endif
-DECLARE_ALGORITHM_FACTORY( CreateLumiBlockCollectionFromFile )
-//DECLARE_ALGORITHM_FACTORY( CreateAANTFromLumiBlockCollection )
+DECLARE_COMPONENT( CreateLumiBlockCollectionFromFile )
+//DECLARE_COMPONENT( CreateAANTFromLumiBlockCollection )
#ifndef XAOD_ANALYSIS
-DECLARE_ALGORITHM_FACTORY( LumiBlockMuWriter )
-DECLARE_ALGORITHM_FACTORY( LumiBlockTester )
-DECLARE_TOOL_FACTORY( LumiBlockMuTool )
-DECLARE_TOOL_FACTORY( LuminosityTool )
-DECLARE_TOOL_FACTORY( TrigLivefractionTool )
-DECLARE_SERVICE_FACTORY( LumiCalcSvc )
+DECLARE_COMPONENT( LumiBlockMuWriter )
+DECLARE_COMPONENT( LumiBlockTester )
+DECLARE_COMPONENT( LumiBlockMuTool )
+DECLARE_COMPONENT( LuminosityTool )
+DECLARE_COMPONENT( TrigLivefractionTool )
+DECLARE_COMPONENT( LumiCalcSvc )
#endif
-DECLARE_TOOL_FACTORY( LumiBlockMetaDataTool )
+DECLARE_COMPONENT( LumiBlockMetaDataTool )
#include "../xAOD2NtupLumiSvc.h"
-DECLARE_SERVICE_FACTORY( xAOD2NtupLumiSvc )
+DECLARE_COMPONENT( xAOD2NtupLumiSvc )
diff --git a/MagneticField/MagFieldServices/src/components/MagFieldServices_entries.cxx b/MagneticField/MagFieldServices/src/components/MagFieldServices_entries.cxx
index f60805156971144c01de8af1b6d36728b2c867aa..4b16a448307e522847e02fa5f8af884097b89811 100644
--- a/MagneticField/MagFieldServices/src/components/MagFieldServices_entries.cxx
+++ b/MagneticField/MagFieldServices/src/components/MagFieldServices_entries.cxx
@@ -1,6 +1,6 @@
#include "MagFieldServices/AtlasFieldSvc.h"
#include "MagFieldServices/H8FieldSvc.h"
-DECLARE_NAMESPACE_SERVICE_FACTORY( MagField , AtlasFieldSvc )
-DECLARE_NAMESPACE_SERVICE_FACTORY( MagField , H8FieldSvc )
+DECLARE_COMPONENT( MagField::AtlasFieldSvc )
+DECLARE_COMPONENT( MagField::H8FieldSvc )
diff --git a/MagneticField/MagFieldUtils/src/components/MagFieldUtils_entries.cxx b/MagneticField/MagFieldUtils/src/components/MagFieldUtils_entries.cxx
index 7423a4f612a7048502b4dbb22e1f6fcccc6b6f7a..f0d04aae274864ab3ac846457c3ba3e4ed4833d0 100644
--- a/MagneticField/MagFieldUtils/src/components/MagFieldUtils_entries.cxx
+++ b/MagneticField/MagFieldUtils/src/components/MagFieldUtils_entries.cxx
@@ -2,7 +2,7 @@
#include "MagFieldUtils/SolenoidTest.h"
#include "MagFieldUtils/IdentityManipulator.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( MagField , MagFieldTestbedAlg )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( MagField , SolenoidTest )
-DECLARE_NAMESPACE_TOOL_FACTORY( MagField , IdentityManipulator )
+DECLARE_COMPONENT( MagField::MagFieldTestbedAlg )
+DECLARE_COMPONENT( MagField::SolenoidTest )
+DECLARE_COMPONENT( MagField::IdentityManipulator )
diff --git a/Offloading/OffloadSvc/src/components/OffloadSvc_entries.cxx b/Offloading/OffloadSvc/src/components/OffloadSvc_entries.cxx
index d5d368981b18ba73541018ef17a1b05e376c3f8c..79a96478d5caaa62bf7d9d4a8422ddd245c823b4 100644
--- a/Offloading/OffloadSvc/src/components/OffloadSvc_entries.cxx
+++ b/Offloading/OffloadSvc/src/components/OffloadSvc_entries.cxx
@@ -1,5 +1,5 @@
#include "OffloadSvc/OffloadSvc.h"
-DECLARE_SERVICE_FACTORY( OffloadSvc )
+DECLARE_COMPONENT( OffloadSvc )
diff --git a/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_entries.cxx b/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_entries.cxx
index 89a53c727c7b9d5825e0e47bdcd3b49df7eecb55..b538675d4159aeb497c982bc5f007d5b88265021 100644
--- a/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_entries.cxx
+++ b/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_entries.cxx
@@ -1,4 +1,4 @@
#include "TBCaloGeometry/TBCaloCoordinate.h"
-DECLARE_TOOL_FACTORY( TBCaloCoordinate )
+DECLARE_COMPONENT( TBCaloCoordinate )
diff --git a/TestBeam/TBCnv/src/components/TBCnv_entries.cxx b/TestBeam/TBCnv/src/components/TBCnv_entries.cxx
index 1b685183bee4eb8d9d38aa52a4996a102c3557c1..b9ac61b6b81a338b31a279f24c29dced5fba679b 100644
--- a/TestBeam/TBCnv/src/components/TBCnv_entries.cxx
+++ b/TestBeam/TBCnv/src/components/TBCnv_entries.cxx
@@ -27,7 +27,7 @@ typedef TBDataCnv<TBTriggerPatternUnit> TBTriggerPatternUnitCnv;
typedef TBDataCnv<TBTailCatcherRaw> TBTailCatcherRawCnv;
typedef TBDataCnv<TBEventInfo> TBEventInfoCnv;
-DECLARE_TOOL_FACTORY( TBByteStreamCnvTool )
+DECLARE_COMPONENT( TBByteStreamCnvTool )
DECLARE_CONVERTER_FACTORY( TBTDCCnv )
DECLARE_CONVERTER_FACTORY( TBTDCRawContCnv )
DECLARE_CONVERTER_FACTORY( TBLArDigitContainerCnv )
@@ -38,8 +38,8 @@ DECLARE_CONVERTER_FACTORY( TBScintillatorRawContCnv )
DECLARE_CONVERTER_FACTORY( TBTriggerPatternUnitCnv )
DECLARE_CONVERTER_FACTORY( TBTailCatcherRawCnv )
DECLARE_CONVERTER_FACTORY( TBEventInfoCnv )
-DECLARE_ALGORITHM_FACTORY( ReadTBLArDigits )
-DECLARE_ALGORITHM_FACTORY( ReadTBLArCalibDigits )
-DECLARE_ALGORITHM_FACTORY( TBCheckBCIDs )
+DECLARE_COMPONENT( ReadTBLArDigits )
+DECLARE_COMPONENT( ReadTBLArCalibDigits )
+DECLARE_COMPONENT( TBCheckBCIDs )
diff --git a/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_entries.cxx b/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_entries.cxx
index edd669498cd775643cfe2429e7e49ddcc2fea7a4..fec5d99610c89388e34edbf57ce2866008835e5e 100644
--- a/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_entries.cxx
+++ b/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_entries.cxx
@@ -1,5 +1,5 @@
#include "../TBCaloPosTool.h"
#include "../TBCaloCoolPosTool.h"
-DECLARE_TOOL_FACTORY( TBCaloPosTool )
-DECLARE_TOOL_FACTORY( TBCaloCoolPosTool )
+DECLARE_COMPONENT( TBCaloPosTool )
+DECLARE_COMPONENT( TBCaloCoolPosTool )
diff --git a/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_entries.cxx b/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_entries.cxx
index ee72e1c097a0247d07c1a6a47f0eb80db10d33da..e5b068d13d47825d56e9a1e092f9be0101cd7c1e 100644
--- a/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_entries.cxx
+++ b/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_entries.cxx
@@ -1,4 +1,4 @@
#include "TBCondRunPar/TBCondRunParTool.h"
-DECLARE_TOOL_FACTORY( TBCondRunParTool )
+DECLARE_COMPONENT( TBCondRunParTool )
diff --git a/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_entries.cxx b/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_entries.cxx
index fa95bc5dec38a5846ba78df256833693695adee1..46b2dc3b6471e68129a31348edb302866a978077 100644
--- a/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_entries.cxx
+++ b/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_entries.cxx
@@ -1,5 +1,5 @@
#include "TBDetDescrAlg/TBDetDescrLoader.h"
-DECLARE_ALGORITHM_FACTORY( TBDetDescrLoader )
+DECLARE_COMPONENT( TBDetDescrLoader )
diff --git a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx b/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx
index 76f0282c5b0871739781aeb0deade6e3d456d92b..3e672a92ad2d29a596513fc257f8c4a56b6c5632 100644
--- a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx
+++ b/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx
@@ -1,4 +1,4 @@
#include "TBDetDescrCnv/TBDetDescrCnv.h"
-DECLARE_CONVERTER_FACTORY(TBDetDescrCnv)
+DECLARE_CONVERTER_FACTORY( TBDetDescrCnv )
diff --git a/TestBeam/TBMonitoring/src/components/TBMonitoring_entries.cxx b/TestBeam/TBMonitoring/src/components/TBMonitoring_entries.cxx
index dc42f8393ddb96266cb0741865022fb1a4b6f3c2..bf73cf76abe775045897c5316d35dfcdf6f75298 100644
--- a/TestBeam/TBMonitoring/src/components/TBMonitoring_entries.cxx
+++ b/TestBeam/TBMonitoring/src/components/TBMonitoring_entries.cxx
@@ -11,14 +11,14 @@
-DECLARE_TOOL_FACTORY(TBBPCMonTool)
-DECLARE_TOOL_FACTORY(TBMWPCMonTool)
-DECLARE_TOOL_FACTORY(TBPhaseMonTool)
-DECLARE_TOOL_FACTORY(TBScintillatorMonTool)
-DECLARE_TOOL_FACTORY(TBTailCatcherRawMonTool)
-DECLARE_TOOL_FACTORY(TBTriggerPatternUnitMonTool)
-DECLARE_TOOL_FACTORY(TBTDCRawMonTool)
-DECLARE_TOOL_FACTORY(TBADCRawMonTool)
-DECLARE_TOOL_FACTORY(TBCaloResponseMonTool)
-DECLARE_TOOL_FACTORY(TBBeamQualityDoubleHitsMonTool)
+DECLARE_COMPONENT( TBBPCMonTool )
+DECLARE_COMPONENT( TBMWPCMonTool )
+DECLARE_COMPONENT( TBPhaseMonTool )
+DECLARE_COMPONENT( TBScintillatorMonTool )
+DECLARE_COMPONENT( TBTailCatcherRawMonTool )
+DECLARE_COMPONENT( TBTriggerPatternUnitMonTool )
+DECLARE_COMPONENT( TBTDCRawMonTool )
+DECLARE_COMPONENT( TBADCRawMonTool )
+DECLARE_COMPONENT( TBCaloResponseMonTool )
+DECLARE_COMPONENT( TBBeamQualityDoubleHitsMonTool )
diff --git a/TestBeam/TBRec/src/components/TBRec_entries.cxx b/TestBeam/TBRec/src/components/TBRec_entries.cxx
index 1c368c9837c955c42e3641262eccd873ce331f59..ad9244c6747758fab254200294956e6497d7159f 100644
--- a/TestBeam/TBRec/src/components/TBRec_entries.cxx
+++ b/TestBeam/TBRec/src/components/TBRec_entries.cxx
@@ -48,57 +48,57 @@
#include "TBRec/TBExtrapolTrackToCaloTool.h"
#include "TBRec/TBTrackToCaloAlg.h"
-DECLARE_ALGORITHM_FACTORY( TBXMLWriter )
-DECLARE_ALGORITHM_FACTORY( TBAlgoSequencer )
-DECLARE_ALGORITHM_FACTORY( TBBPCRec )
-DECLARE_ALGORITHM_FACTORY( TBMWPCRec )
-DECLARE_ALGORITHM_FACTORY( TBScintillatorRec )
-DECLARE_ALGORITHM_FACTORY( TBTailCatcherRec )
-DECLARE_ALGORITHM_FACTORY( TBPlaneTrackingAlgo )
-DECLARE_ALGORITHM_FACTORY( TBPhaseRec )
-DECLARE_ALGORITHM_FACTORY( TBLArRawChannelBuilder )
-DECLARE_ALGORITHM_FACTORY( TBECLArRawChannelBuilder )
-DECLARE_ALGORITHM_FACTORY( TBEventStreamer )
-DECLARE_ALGORITHM_FACTORY( CBNTAA_BeamInstrumentation )
-DECLARE_ALGORITHM_FACTORY( CBNTAA_TBADCRaw )
-DECLARE_ALGORITHM_FACTORY( CBNTAA_TBTDCRaw )
-DECLARE_ALGORITHM_FACTORY( CBNTAA_TBInfo )
-DECLARE_ALGORITHM_FACTORY( CBNTAA_TBTrack )
-DECLARE_ALGORITHM_FACTORY( CBNTAA_TBScint )
-DECLARE_ALGORITHM_FACTORY( CBNT_Timing )
-DECLARE_ALGORITHM_FACTORY( CBNT_CaloH6 )
-DECLARE_ALGORITHM_FACTORY( CBNT_UpstreamMat )
-DECLARE_ALGORITHM_FACTORY( TBPartIDCherenkovMuTag )
+DECLARE_COMPONENT( TBXMLWriter )
+DECLARE_COMPONENT( TBAlgoSequencer )
+DECLARE_COMPONENT( TBBPCRec )
+DECLARE_COMPONENT( TBMWPCRec )
+DECLARE_COMPONENT( TBScintillatorRec )
+DECLARE_COMPONENT( TBTailCatcherRec )
+DECLARE_COMPONENT( TBPlaneTrackingAlgo )
+DECLARE_COMPONENT( TBPhaseRec )
+DECLARE_COMPONENT( TBLArRawChannelBuilder )
+DECLARE_COMPONENT( TBECLArRawChannelBuilder )
+DECLARE_COMPONENT( TBEventStreamer )
+DECLARE_COMPONENT( CBNTAA_BeamInstrumentation )
+DECLARE_COMPONENT( CBNTAA_TBADCRaw )
+DECLARE_COMPONENT( CBNTAA_TBTDCRaw )
+DECLARE_COMPONENT( CBNTAA_TBInfo )
+DECLARE_COMPONENT( CBNTAA_TBTrack )
+DECLARE_COMPONENT( CBNTAA_TBScint )
+DECLARE_COMPONENT( CBNT_Timing )
+DECLARE_COMPONENT( CBNT_CaloH6 )
+DECLARE_COMPONENT( CBNT_UpstreamMat )
+DECLARE_COMPONENT( TBPartIDCherenkovMuTag )
-DECLARE_ALGORITHM_FACTORY( TBBeamQuality )
-DECLARE_ALGORITHM_FACTORY( TBNoiseWrite )
-DECLARE_ALGORITHM_FACTORY( TBTree_CaloClusterH6 )
-DECLARE_ALGORITHM_FACTORY( CBNTAA_TBTPValidation )
-DECLARE_ALGORITHM_FACTORY( TBTrackInfoFromTag )
-DECLARE_ALGORITHM_FACTORY( TBBeamQualityMC )
-DECLARE_ALGORITHM_FACTORY( TBXCryYTableRead )
-DECLARE_ALGORITHM_FACTORY( TBDMContainerSplitter )
+DECLARE_COMPONENT( TBBeamQuality )
+DECLARE_COMPONENT( TBNoiseWrite )
+DECLARE_COMPONENT( TBTree_CaloClusterH6 )
+DECLARE_COMPONENT( CBNTAA_TBTPValidation )
+DECLARE_COMPONENT( TBTrackInfoFromTag )
+DECLARE_COMPONENT( TBBeamQualityMC )
+DECLARE_COMPONENT( TBXCryYTableRead )
+DECLARE_COMPONENT( TBDMContainerSplitter )
-DECLARE_ALGORITHM_FACTORY( TBTrackToCaloAlg )
+DECLARE_COMPONENT( TBTrackToCaloAlg )
-DECLARE_TOOL_FACTORY( TBXMLEventWriterTool )
-DECLARE_TOOL_FACTORY( TBXMLCaloCellWriterTool )
-DECLARE_TOOL_FACTORY( TBPatternUnitStreamerTool )
-DECLARE_TOOL_FACTORY( TBPatternUnitStreamerToolH8 )
-DECLARE_TOOL_FACTORY( TBEventInfoStreamerTool )
-DECLARE_TOOL_FACTORY( TBPreScalerStreamerTool )
+DECLARE_COMPONENT( TBXMLEventWriterTool )
+DECLARE_COMPONENT( TBXMLCaloCellWriterTool )
+DECLARE_COMPONENT( TBPatternUnitStreamerTool )
+DECLARE_COMPONENT( TBPatternUnitStreamerToolH8 )
+DECLARE_COMPONENT( TBEventInfoStreamerTool )
+DECLARE_COMPONENT( TBPreScalerStreamerTool )
-DECLARE_TOOL_FACTORY( TBBeamQualityDoubleHitsTool )
-DECLARE_TOOL_FACTORY( TBBeamQualityMuonToolH6 )
-DECLARE_TOOL_FACTORY( TBBeamQualityEMFractionTool )
-DECLARE_TOOL_FACTORY( TBBeamQualityTrackingTool )
+DECLARE_COMPONENT( TBBeamQualityDoubleHitsTool )
+DECLARE_COMPONENT( TBBeamQualityMuonToolH6 )
+DECLARE_COMPONENT( TBBeamQualityEMFractionTool )
+DECLARE_COMPONENT( TBBeamQualityTrackingTool )
-DECLARE_TOOL_FACTORY( TBPhaseStreamerTool )
-DECLARE_TOOL_FACTORY( TBEMECCellEtaCorrection )
-DECLARE_TOOL_FACTORY( TBClusterMaker )
-DECLARE_TOOL_FACTORY( TBCellNoiseCorrection )
-DECLARE_TOOL_FACTORY( TBCellContainerFillerTool )
-DECLARE_TOOL_FACTORY( TBEMECXTalkToyModel )
+DECLARE_COMPONENT( TBPhaseStreamerTool )
+DECLARE_COMPONENT( TBEMECCellEtaCorrection )
+DECLARE_COMPONENT( TBClusterMaker )
+DECLARE_COMPONENT( TBCellNoiseCorrection )
+DECLARE_COMPONENT( TBCellContainerFillerTool )
+DECLARE_COMPONENT( TBEMECXTalkToyModel )
-DECLARE_TOOL_FACTORY( TBExtrapolTrackToCaloTool )
+DECLARE_COMPONENT( TBExtrapolTrackToCaloTool )
diff --git a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_entries.cxx b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_entries.cxx
index 78973664d58c734b174678bbaf676f2335d391c0..2dc672dadc22a87b0e005f25e8f388010a6ebc79 100644
--- a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_entries.cxx
+++ b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_entries.cxx
@@ -2,6 +2,6 @@
#include "../HelloTool.h"
-DECLARE_ALGORITHM_FACTORY( HelloAlg )
-DECLARE_TOOL_FACTORY( HelloTool )
+DECLARE_COMPONENT( HelloAlg )
+DECLARE_COMPONENT( HelloTool )
diff --git a/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_entries.cxx b/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_entries.cxx
index 73b1c60846f415d9060a4727c4acf9b07aaaf972..eba40429787cc481f8f6233f3b4db80ef3ce8dd9 100644
--- a/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_entries.cxx
+++ b/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_entries.cxx
@@ -1,5 +1,5 @@
#include "../ValgrindHelperAlg.h"
-DECLARE_ALGORITHM_FACTORY( ValgrindHelperAlg )
+DECLARE_COMPONENT( ValgrindHelperAlg )
diff --git a/graphics/EventDisplayFilters/src/components/EventDisplayFilters_entries.cxx b/graphics/EventDisplayFilters/src/components/EventDisplayFilters_entries.cxx
index ea62ba2b71f25181afbab5ee8a3ad6e46d372333..9e28eb1c01d3ebb68b89b0c11c7fcac20c629984 100644
--- a/graphics/EventDisplayFilters/src/components/EventDisplayFilters_entries.cxx
+++ b/graphics/EventDisplayFilters/src/components/EventDisplayFilters_entries.cxx
@@ -1,7 +1,7 @@
#include "EventDisplayFilters/FilterUsingMBTS.h"
#include "EventDisplayFilters/FilterUsingMBTSTiming.h"
#include "EventDisplayFilters/FilterUsingSpacePoints.h"
-DECLARE_ALGORITHM_FACTORY( FilterUsingMBTS )
-DECLARE_ALGORITHM_FACTORY( FilterUsingMBTSTiming )
-DECLARE_ALGORITHM_FACTORY( FilterUsingSpacePoints )
+DECLARE_COMPONENT( FilterUsingMBTS )
+DECLARE_COMPONENT( FilterUsingMBTSTiming )
+DECLARE_COMPONENT( FilterUsingSpacePoints )
diff --git a/graphics/GeometryJiveXML/src/components/GeometryJiveXML_entries.cxx b/graphics/GeometryJiveXML/src/components/GeometryJiveXML_entries.cxx
index 6e8448a951df1e6e78a8515a2bdfb435dda21989..068f3a518e55a2e5b4e7c0de8bf9c86ea0df6e20 100644
--- a/graphics/GeometryJiveXML/src/components/GeometryJiveXML_entries.cxx
+++ b/graphics/GeometryJiveXML/src/components/GeometryJiveXML_entries.cxx
@@ -3,6 +3,6 @@
using namespace JiveXML;
-DECLARE_TOOL_FACTORY(GeometryWriter)
-DECLARE_TOOL_FACTORY(MuonGeometryWriter)
+DECLARE_COMPONENT( GeometryWriter )
+DECLARE_COMPONENT( MuonGeometryWriter )
diff --git a/graphics/JiveXML/src/components/JiveXML_entries.cxx b/graphics/JiveXML/src/components/JiveXML_entries.cxx
index 2ff8b52f1a6f6c98510901c36a9ebf2362e9687c..783e60e0b466de3a705c76b6631c16054811292a 100644
--- a/graphics/JiveXML/src/components/JiveXML_entries.cxx
+++ b/graphics/JiveXML/src/components/JiveXML_entries.cxx
@@ -7,12 +7,12 @@
#include "JiveXML/XMLFormatTool.h"
#endif
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( JiveXML , AlgoJiveXML )
-DECLARE_NAMESPACE_SERVICE_FACTORY( JiveXML, ONCRPCServerSvc )
-DECLARE_NAMESPACE_SERVICE_FACTORY( JiveXML, ExternalONCRPCServerSvc )
-DECLARE_NAMESPACE_TOOL_FACTORY( JiveXML , StreamToFileTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( JiveXML , StreamToServerTool )
+DECLARE_COMPONENT( JiveXML::AlgoJiveXML )
+DECLARE_COMPONENT( JiveXML::ONCRPCServerSvc )
+DECLARE_COMPONENT( JiveXML::ExternalONCRPCServerSvc )
+DECLARE_COMPONENT( JiveXML::StreamToFileTool )
+DECLARE_COMPONENT( JiveXML::StreamToServerTool )
#ifndef __APPLE__
-DECLARE_NAMESPACE_TOOL_FACTORY( JiveXML , XMLFormatTool )
+DECLARE_COMPONENT( JiveXML::XMLFormatTool )
#endif
diff --git a/graphics/VP1/VP1Algs/src/components/VP1Algs_entries.cxx b/graphics/VP1/VP1Algs/src/components/VP1Algs_entries.cxx
index 1812e53189f0ec344454df4f726db991b85e5f67..f0e37d2d022f4b7497d916f1e8b9f96aa1bda8d0 100644
--- a/graphics/VP1/VP1Algs/src/components/VP1Algs_entries.cxx
+++ b/graphics/VP1/VP1Algs/src/components/VP1Algs_entries.cxx
@@ -8,6 +8,6 @@
#include "VP1Algs/VP1Alg.h"
//#include "VP1Algs/VP1EventProd.h"
-DECLARE_ALGORITHM_FACTORY(VP1Alg)
-//DECLARE_ALGORITHM_FACTORY(VP1EventProd)
+DECLARE_COMPONENT( VP1Alg )
+//DECLARE_COMPONENT( VP1EventProd )
diff --git a/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_entries.cxx b/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_entries.cxx
index 103f01a86c362914f44b45dcaa403f5ddc238e18..b7c276a4c4fedc2991bed9dbac46ded992c7c966 100644
--- a/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_entries.cxx
+++ b/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_entries.cxx
@@ -1,5 +1,5 @@
#include "VP1AlgsBatch/VP1BatchOnLatestEvent.h"
-DECLARE_ALGORITHM_FACTORY(VP1BatchOnLatestEvent)
+DECLARE_COMPONENT( VP1BatchOnLatestEvent )
diff --git a/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_entries.cxx b/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_entries.cxx
index 6ce98bcc93b53097ce998c2863ea2ee30b607b30..e9e5aff52c41c60ca3a5e96f9776f4fd40e8e7e8 100644
--- a/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_entries.cxx
+++ b/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_entries.cxx
@@ -1,4 +1,4 @@
#include "VP1AlgsEventProd/VP1EventProd.h"
-DECLARE_ALGORITHM_FACTORY(VP1EventProd)
+DECLARE_COMPONENT( VP1EventProd )
diff --git a/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_entries.cxx b/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_entries.cxx
index 8ffcc394fa1e691b03ad5eb47922a78cc3d8ff33..e572441e47a83ed4661471cfe6fda93a73b7554e 100644
--- a/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_entries.cxx
+++ b/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_entries.cxx
@@ -1,4 +1,4 @@
#include "VP1TrkAuxAlgs/VP1TrkInitializer.h"
-DECLARE_ALGORITHM_FACTORY(VP1TrkInitializer)
+DECLARE_COMPONENT( VP1TrkInitializer )