diff --git a/Calorimeter/CaloDetDescr/src/CaloSuperCellIDTool.h b/Calorimeter/CaloDetDescr/src/CaloSuperCellIDTool.h
index fb0a3f40e92f8fc62401e4a56f0ff3c2571f7d8a..d72758ad736e81d6e134bb0208afc1e84dae79ac 100644
--- a/Calorimeter/CaloDetDescr/src/CaloSuperCellIDTool.h
+++ b/Calorimeter/CaloDetDescr/src/CaloSuperCellIDTool.h
@@ -27,7 +27,7 @@ class CaloCell_ID;
 class CaloCell_SuperCell_ID;
 
 class CaloSuperCellIDTool
-  : public extends1<AthAlgTool, ICaloSuperCellIDTool>
+  : public extends<AthAlgTool, ICaloSuperCellIDTool>
 {
 public:
   /**
diff --git a/Control/AthenaExamples/AthExHive/src/HiveExSvc.h b/Control/AthenaExamples/AthExHive/src/HiveExSvc.h
index b3efd251928227a5d4bde32d4103f8fe3cbd408c..4e44c181a293edf1ab57d9fa31c9541d05b7a1d7 100644
--- a/Control/AthenaExamples/AthExHive/src/HiveExSvc.h
+++ b/Control/AthenaExamples/AthExHive/src/HiveExSvc.h
@@ -21,7 +21,7 @@
 #include <mutex>
 #include <memory>
 
-class HiveExSvc : public extends1<AthService,IHiveExSvc> {
+class HiveExSvc : public extends<AthService,IHiveExSvc> {
 
 public:
   HiveExSvc(const std::string& name, ISvcLocator* svc);
diff --git a/Control/AthenaExamples/AthExHive/src/ThreadInitTool.h b/Control/AthenaExamples/AthExHive/src/ThreadInitTool.h
index 2b972cc1d740d0200b0b158d358ae299c4b3751f..1c2f6b22ca4b3301930f40ddcf5e0eb338cc8c64 100644
--- a/Control/AthenaExamples/AthExHive/src/ThreadInitTool.h
+++ b/Control/AthenaExamples/AthExHive/src/ThreadInitTool.h
@@ -27,7 +27,7 @@
 //-------------------------------------------------------------------------------
 
 
-class ThreadInitTool: virtual public extends1<AthAlgTool, IThreadInitTool> {
+class ThreadInitTool: virtual public extends<AthAlgTool, IThreadInitTool> {
 
 public:
   ThreadInitTool( const std::string&, const std::string&, const IInterface* );
diff --git a/Control/AthenaExamples/AthExHive/src/condEx/ASCIICondDbSvc.h b/Control/AthenaExamples/AthExHive/src/condEx/ASCIICondDbSvc.h
index ba503fa95a2c15623d9913e07f0bd5e08ca9cf0d..b1a25a1b2260ed0d983af55e7a3bd2310c0b0980 100644
--- a/Control/AthenaExamples/AthExHive/src/condEx/ASCIICondDbSvc.h
+++ b/Control/AthenaExamples/AthExHive/src/condEx/ASCIICondDbSvc.h
@@ -17,7 +17,7 @@
 #include <vector>
 #include <mutex>
 
-class ASCIICondDbSvc: public extends1<AthService, IASCIICondDbSvc> {
+class ASCIICondDbSvc: public extends<AthService, IASCIICondDbSvc> {
 public:
 
   ASCIICondDbSvc(const std::string& name, ISvcLocator* svc);
diff --git a/Control/AthenaExamples/AthExHive/src/loopTest/HiveTool.h b/Control/AthenaExamples/AthExHive/src/loopTest/HiveTool.h
index 75889d51dcc743bfaf9072cd2a6891bd7b0eced6..83c903ad30aa72d2e49711ad790025b988018ff9 100644
--- a/Control/AthenaExamples/AthExHive/src/loopTest/HiveTool.h
+++ b/Control/AthenaExamples/AthExHive/src/loopTest/HiveTool.h
@@ -13,7 +13,7 @@
 
 #include <string>
 
-class HiveTool : public extends1<AthAlgTool,IHiveTool> {
+class HiveTool : public extends<AthAlgTool,IHiveTool> {
 public:
   HiveTool( const std::string&, const std::string&, const IInterface* );
   virtual ~HiveTool();
diff --git a/Control/AthenaServices/src/AthTPCnvSvc.h b/Control/AthenaServices/src/AthTPCnvSvc.h
index 150f171ea160d8c2ab2672699267649af03937a9..571511567bcc5a132b7271c7500eec2b7f8bb648 100644
--- a/Control/AthenaServices/src/AthTPCnvSvc.h
+++ b/Control/AthenaServices/src/AthTPCnvSvc.h
@@ -28,7 +28,7 @@ class ICLIDSvc;
 
 
 class AthTPCnvSvc
-  : public extends1<AthService, ITPCnvSvc>
+  : public extends<AthService, ITPCnvSvc>
 { 
  public: 
 
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/CollectionGetterRegistryTool.h b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/CollectionGetterRegistryTool.h
index 1140a6585fb3ae9db62c4fea6314060a4cfd324e..d725302cbe85fd9ea041f8b90a1be432f2b285d6 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/CollectionGetterRegistryTool.h
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/CollectionGetterRegistryTool.h
@@ -43,7 +43,7 @@ namespace D3PD {
  * collection getters are stateful.)
  */
 class CollectionGetterRegistryTool
-  : public extends1<AthAlgTool, ICollectionGetterRegistryTool>
+  : public extends<AthAlgTool, ICollectionGetterRegistryTool>
 {
 public:
   /**
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/ContainedAssociationFillerTool.h b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/ContainedAssociationFillerTool.h
index 48ca840703589ecd93fb14207b257dfdc851045d..b8eb9cf30366275d1e34b0275d191f4d78286679 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/ContainedAssociationFillerTool.h
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/ContainedAssociationFillerTool.h
@@ -50,7 +50,7 @@ namespace  D3PD {
  *                  Omitted if empty.
  */
 class ContainedAssociationFillerTool
-  : public extends1<AthAlgTool, IBlockFillerTool>, public AddVariable
+  : public extends<AthAlgTool, IBlockFillerTool>, public AddVariable
 {
 public:
   /**
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/ContainedMultiAssociationFillerTool.h b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/ContainedMultiAssociationFillerTool.h
index 7f93af3d05a084f3ead7c0da281c1512facf7b97..3e56b65095ef11557ae44c357cbc2681a460010c 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/ContainedMultiAssociationFillerTool.h
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/ContainedMultiAssociationFillerTool.h
@@ -54,7 +54,7 @@ namespace  D3PD {
  *                  Omitted if empty.
  */
 class ContainedMultiAssociationFillerTool
-  : public extends1<AthAlgTool, IBlockFillerTool>, public AddVariable
+  : public extends<AthAlgTool, IBlockFillerTool>, public AddVariable
 {
 public:
   /**
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/ContainedVectorMultiAssociationFillerTool.h b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/ContainedVectorMultiAssociationFillerTool.h
index d0640e7aca73cf12d25bbf5924fdb08748219051..ec559b4f3eddab0b3fb57ebfad07e4cc3f6d0de5 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/ContainedVectorMultiAssociationFillerTool.h
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/ContainedVectorMultiAssociationFillerTool.h
@@ -57,7 +57,7 @@ namespace  D3PD {
  *                  Omitted if empty (default).
  */
 class ContainedVectorMultiAssociationFillerTool
-  : public extends1<VectorFillerToolBase, IBlockFillerTool>
+  : public extends<VectorFillerToolBase, IBlockFillerTool>
 {
 public:
   /**
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/FirstAssociationTool.h b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/FirstAssociationTool.h
index d6ed42553c0b2b94951b841f2b14fa916dde92c7..2bd6540e5774b670ce5aa7e57479bc78be063c40 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/FirstAssociationTool.h
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/FirstAssociationTool.h
@@ -35,7 +35,7 @@ class IMultiAssociationTool;
  * association tool by only using the first result from the association.
  */
 class FirstAssociationTool
-  : public extends1<AthAlgTool, ISingleAssociationTool>
+  : public extends<AthAlgTool, ISingleAssociationTool>
 {
 public:
   /**
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/IndexAssociationFillerTool.h b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/IndexAssociationFillerTool.h
index e6b67a57da3b3e97f4fdd26df7cfeb05d68ccd74..9339afa15ff44c68ef633cbb1bf3384b29d2ea82 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/IndexAssociationFillerTool.h
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/IndexAssociationFillerTool.h
@@ -59,7 +59,7 @@ class ICollectionGetterTool;
  *   CollectionGetterRegistry - The ICollectionGetterRegistryTool instance.
  */
 class IndexAssociationFillerTool
-  : public extends1<AthAlgTool, IBlockFillerTool>, public AddVariable
+  : public extends<AthAlgTool, IBlockFillerTool>, public AddVariable
 {
 public:
   /**
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/IndexMultiAssociationFillerTool.h b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/IndexMultiAssociationFillerTool.h
index a686c648ba7f2dfb57e5c8d9adce155afd4b86ca..2f5c1197cb8305538c036bee2b023961d0845aa1 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/IndexMultiAssociationFillerTool.h
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/IndexMultiAssociationFillerTool.h
@@ -61,7 +61,7 @@ class ICollectionRegistryTool;
  *   CollectionGetterRegistry - The ICollectionGetterRegistryTool instance.
  */
 class IndexMultiAssociationFillerTool
-  : public extends1<AthAlgTool, IBlockFillerTool>, public AddVariable
+  : public extends<AthAlgTool, IBlockFillerTool>, public AddVariable
 {
 public:
   /**
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/ObjFillerTool.h b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/ObjFillerTool.h
index af34568413b8f31f3f87aa655fb79806ac0bf7aa..356173c16d369fd52b9b2e9403194f283d6243e7 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/ObjFillerTool.h
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/ObjFillerTool.h
@@ -47,7 +47,7 @@ class ID3PD;
  * to each.
  */
 class ObjFillerTool
-  : public extends2<AthAlgTool, IObjFillerTool, IIncidentListener>,
+  : public extends<AthAlgTool, IObjFillerTool, IIncidentListener>,
     public AddVariable
 {
 public:
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/VectorFillerTool.h b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/VectorFillerTool.h
index 0f7deabc55269d0b1db9a1d40a5e4499bcb8e8a4..b0cbf4a56296aa49419023b66c046cb05bd6bf30 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/VectorFillerTool.h
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/VectorFillerTool.h
@@ -66,7 +66,7 @@ class ID3PD;
  * to each.
  */
 class VectorFillerTool
-  : public extends2<VectorFillerToolBase, IObjFillerTool, IIncidentListener>
+  : public extends<VectorFillerToolBase, IObjFillerTool, IIncidentListener>
 {
 public:
   /**
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/VoidObjFillerTool.h b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/VoidObjFillerTool.h
index 029df5e702d201698d9b7ee44c94b163565b8625..472b650072f7e68b74667ea9ae053750f552a9a8 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/VoidObjFillerTool.h
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/VoidObjFillerTool.h
@@ -43,7 +43,7 @@ class ID3PD;
  * For each event, we loop over all block filler tools.
  */
 class VoidObjFillerTool
-  : public extends2<AthAlgTool, IObjFillerTool, IIncidentListener>,
+  : public extends<AthAlgTool, IObjFillerTool, IIncidentListener>,
     public AddVariable
 {
 public:
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerRoot/src/RootD3PDSvc.h b/PhysicsAnalysis/D3PDMaker/D3PDMakerRoot/src/RootD3PDSvc.h
index c24a3c06d191689100d2de4ce91d3f9605adc5af..90e83c054c8d63f7b735fe8f49fab4ba93d355cc 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerRoot/src/RootD3PDSvc.h
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerRoot/src/RootD3PDSvc.h
@@ -35,7 +35,7 @@ namespace D3PD {
  * @brief Service to create a root-based D3PD.
  */
 class RootD3PDSvc
-  : public extends1<AthService, ID3PDSvc>
+  : public extends<AthService, ID3PDSvc>
 {
 public:
   /**
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerToolImpl.h b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerToolImpl.h
index caee1ee6905befef1c80908188dad4dcedb57583..66e83ffe02fe28d33acd364c97d5a36e0becfd1f 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerToolImpl.h
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerToolImpl.h
@@ -40,7 +40,7 @@ namespace D3PD {
  * interface.
  */       
 class BlockFillerToolImpl
-  : public extends1<AthAlgTool, IBlockFillerTool>, public AddVariable
+  : public extends<AthAlgTool, IBlockFillerTool>, public AddVariable
 {
 public:
   /**
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/CollectionGetterToolImpl.h b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/CollectionGetterToolImpl.h
index 3d47d5901d74d0588540c8521f2757acdcfdab46..5fbda8b5eaf8adf737436b893e559f9a54704f6b 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/CollectionGetterToolImpl.h
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/CollectionGetterToolImpl.h
@@ -38,7 +38,7 @@ namespace D3PD {
  * the pieces that don't depend on the template argument.
  */
 class CollectionGetterToolImpl
-  : public extends1<ObjGetterToolImpl, ICollectionGetterTool>
+  : public extends<ObjGetterToolImpl, ICollectionGetterTool>
 {
 public:
   /**
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/MultiAssociationToolImpl.h b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/MultiAssociationToolImpl.h
index 73f9dc1955b12e4babe0a9621d7aed44681e8421..7c95bc5994c0420f0f70abd2913790cc00153ef8 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/MultiAssociationToolImpl.h
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/MultiAssociationToolImpl.h
@@ -41,7 +41,7 @@ namespace D3PD {
  * be overridden if the tool should itself fill any tuple variables.
  */
 class MultiAssociationToolImpl
-  : public extends1<AthAlgTool, IMultiAssociationTool>,
+  : public extends<AthAlgTool, IMultiAssociationTool>,
     public AddVariable
 {
 public:
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/ObjGetterToolImpl.h b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/ObjGetterToolImpl.h
index ede0f3df79da5c994ef3651762e4d1d5da25ab90..418287547b4fa9374cca83fc1dea31bae9a05d11 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/ObjGetterToolImpl.h
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/ObjGetterToolImpl.h
@@ -37,7 +37,7 @@ namespace D3PD {
  * @c ObjGetterTool.
  */       
 class ObjGetterToolImpl
-  : public extends1<AthAlgTool, IObjGetterTool>
+  : public extends<AthAlgTool, IObjGetterTool>
 {
 public:
   /**
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/SingleAssociationToolImpl.h b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/SingleAssociationToolImpl.h
index 978301d7a9bc61f0f4882d406d5bec1c1e1182ab..87721ee8e33484cc596fd3b5023b8e106ae844d3 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/SingleAssociationToolImpl.h
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/SingleAssociationToolImpl.h
@@ -42,7 +42,7 @@ namespace D3PD {
  * be overridden if the tool should itself fill any tuple variables.
  */
 class SingleAssociationToolImpl
-  : public extends1<AthAlgTool, ISingleAssociationTool>,
+  : public extends<AthAlgTool, ISingleAssociationTool>,
     public AddVariable
 {
 public:
diff --git a/Simulation/G4Atlas/G4AtlasTools/src/G4CaloTransportTool.h b/Simulation/G4Atlas/G4AtlasTools/src/G4CaloTransportTool.h
index 7f8cc6c2de319602dde28d6fd9e82cff0f5386b6..7561e70742568f22aac3f2f76bccf55821bbcad6 100644
--- a/Simulation/G4Atlas/G4AtlasTools/src/G4CaloTransportTool.h
+++ b/Simulation/G4Atlas/G4AtlasTools/src/G4CaloTransportTool.h
@@ -21,7 +21,7 @@ class G4FieldTrack;
 ///
 /// @author Joshua Falco Beirer <joshua.falco.beirer@cern.ch>
 ///
-class G4CaloTransportTool : virtual public extends1<AthAlgTool, IG4CaloTransportTool>
+class G4CaloTransportTool : virtual public extends<AthAlgTool, IG4CaloTransportTool>
 {
 
   public:
diff --git a/Simulation/G4Atlas/G4AtlasTools/src/G4ThreadInitTool.h b/Simulation/G4Atlas/G4AtlasTools/src/G4ThreadInitTool.h
index b1e2ce119f33c7e9dacbf79b39e9638fe5be1285..462e567b4b6fb3904a07df8d8096631ee94c39cc 100644
--- a/Simulation/G4Atlas/G4AtlasTools/src/G4ThreadInitTool.h
+++ b/Simulation/G4Atlas/G4AtlasTools/src/G4ThreadInitTool.h
@@ -16,7 +16,7 @@
 ///
 /// @author Steve Farrell <Steven.Farrell@cern.ch>
 ///
-class G4ThreadInitTool : virtual public extends1<AthAlgTool, IThreadInitTool>
+class G4ThreadInitTool : virtual public extends<AthAlgTool, IThreadInitTool>
 {
 
   public:
diff --git a/Simulation/G4Sim/G4HiveEx/src/G4InitTool.h b/Simulation/G4Sim/G4HiveEx/src/G4InitTool.h
index 935f358452099c4bfa090c600c8b5e8233b02dd4..3bb71b0ad146295c4b2120a38c1f673f7af43a08 100644
--- a/Simulation/G4Sim/G4HiveEx/src/G4InitTool.h
+++ b/Simulation/G4Sim/G4HiveEx/src/G4InitTool.h
@@ -11,7 +11,7 @@
 #include <string>
 #include <atomic>
 
-class G4InitTool: virtual public extends1<AthAlgTool, IThreadInitTool> {
+class G4InitTool: virtual public extends<AthAlgTool, IThreadInitTool> {
 
 public:
   G4InitTool( const std::string&, const std::string&, const IInterface* );
diff --git a/Tracking/Acts/ActsTrackReconstruction/src/KalmanFitter.h b/Tracking/Acts/ActsTrackReconstruction/src/KalmanFitter.h
index 63d98c426c94fd184f45721eccf2e6f4712a5da5..160932f7c1cb08ab2e4e5ed85ff096c7f5ea1fb1 100644
--- a/Tracking/Acts/ActsTrackReconstruction/src/KalmanFitter.h
+++ b/Tracking/Acts/ActsTrackReconstruction/src/KalmanFitter.h
@@ -85,7 +85,7 @@ struct PRDSourceLinkSurfaceAccessor {
   const Acts::Surface* operator()(const Acts::SourceLink& sourceLink) const;
 };
 
-class KalmanFitter : public extends2<AthAlgTool, Trk::ITrackFitter, ActsTrk::IFitterTool> { 
+class KalmanFitter : public extends<AthAlgTool, Trk::ITrackFitter, ActsTrk::IFitterTool> { 
 public:
 
   KalmanFitter(const std::string&,const std::string&,const IInterface*);
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/L1TopoSimulation/IControlHistSvc.h b/Trigger/TrigT1/L1Topo/L1TopoSimulation/L1TopoSimulation/IControlHistSvc.h
index 9ee10b38efa19f4d8944fd5e8cd96ef4d0b9065d..5eb7048ba158a90ea62ef7551d89d441079a6832 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/L1TopoSimulation/IControlHistSvc.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/L1TopoSimulation/IControlHistSvc.h
@@ -13,7 +13,7 @@
 namespace LVL1 {
 
 
-  class IControlHistSvc : virtual public extend_interfaces1<IAlgTool> {
+  class IControlHistSvc : virtual public extend_interfaces<IAlgTool> {
 
 
     public:
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/L1TopoSimulation/IInputTOBConverter.h b/Trigger/TrigT1/L1Topo/L1TopoSimulation/L1TopoSimulation/IInputTOBConverter.h
index 3492960cb71b36f0d94f191f3a5c038cef336d06..e06db565f519d55082cc9d75b84e818152a92e26 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/L1TopoSimulation/IInputTOBConverter.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/L1TopoSimulation/IInputTOBConverter.h
@@ -19,7 +19,7 @@ namespace LVL1 {
    *
    * \brief Interface for tools to convert any input to TOBs for topo steering
    */
-  class IInputTOBConverter : virtual public extend_interfaces1<IAlgTool> {
+  class IInputTOBConverter : virtual public extend_interfaces<IAlgTool> {
   public:
      DeclareInterfaceID(IInputTOBConverter, 0, 1);
 
diff --git a/graphics/JiveXML/JiveXML/ExternalONCRPCServerSvc.h b/graphics/JiveXML/JiveXML/ExternalONCRPCServerSvc.h
index 15602c8cfbdd5c3d6e7f7b1892b515a261c79b11..6ac7b1926985e1d66fed0893f16f926591e667f9 100644
--- a/graphics/JiveXML/JiveXML/ExternalONCRPCServerSvc.h
+++ b/graphics/JiveXML/JiveXML/ExternalONCRPCServerSvc.h
@@ -20,7 +20,7 @@ namespace JiveXML {
    * running as standalone application or in another athena application. It only
    * provides means for streaming events to that server.
    */
-  class ExternalONCRPCServerSvc : public extends1<AthService, IServerSvc> {
+  class ExternalONCRPCServerSvc : public extends<AthService, IServerSvc> {
 
   public:
     
diff --git a/graphics/JiveXML/JiveXML/ONCRPCServerSvc.h b/graphics/JiveXML/JiveXML/ONCRPCServerSvc.h
index d143cbdc96cd57f02e1317336e87816150b5cfdd..7ac19ef5dd02e30cbc93006b544cc49a0d1d5820 100644
--- a/graphics/JiveXML/JiveXML/ONCRPCServerSvc.h
+++ b/graphics/JiveXML/JiveXML/ONCRPCServerSvc.h
@@ -39,7 +39,7 @@ namespace JiveXML {
    * forbid you to start several servers with the same ONCRPCSERVERPROG.
    */
 
-  class ONCRPCServerSvc : public extends1<AthService, IServerSvc>, 
+  class ONCRPCServerSvc : public extends<AthService, IServerSvc>, 
                           virtual public IServer {
    public: