diff --git a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiCombinatorialTrackFinder.h b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiCombinatorialTrackFinder.h
old mode 100755
new mode 100644
index 39f37ba7f0ee6635189c11d0e78448d2f0a89f2f..b71106326d9c9121c6cbbcfd1238878970e0667c
--- a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiCombinatorialTrackFinder.h
+++ b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiCombinatorialTrackFinder.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /////////////////////////////////////////////////////////////////////////////////
@@ -15,14 +15,16 @@
 #ifndef ISiCombinatorialTrackFinder_H
 #define ISiCombinatorialTrackFinder_H
 
-#include <list>
-#include <map>
-#include "GaudiKernel/AlgTool.h"
+#include "GeoPrimitives/GeoPrimitives.h"
 #include "TrkParameters/TrackParameters.h"
 #include "TrkSpacePoint/SpacePoint.h"
-#include "GeoPrimitives/GeoPrimitives.h"
 #include "TrkTrack/Track.h"
 
+#include "GaudiKernel/AlgTool.h"
+
+#include <list>
+#include <map>
+
 class MsgStream;
 
 namespace InDetDD {
@@ -33,9 +35,6 @@ namespace InDet {
 
   class TrackQualityCuts;
 
-  static const InterfaceID IID_ISiCombinatorialTrackFinder
-    ("InDet::ISiCombinatorialTrackFinder",1,0);
-
   class ISiCombinatorialTrackFinder : virtual public IAlgTool 
     {
       ///////////////////////////////////////////////////////////////////
@@ -44,13 +43,8 @@ namespace InDet {
       
     public:
 
-      ///////////////////////////////////////////////////////////////////
-      // Standard tool methods
-      ///////////////////////////////////////////////////////////////////
-
-      static const InterfaceID& interfaceID();
-      virtual StatusCode initialize ()=0;
-      virtual StatusCode finalize   ()=0;
+      // InterfaceID
+      DeclareInterfaceID(ISiCombinatorialTrackFinder, 1, 0);
 
       ///////////////////////////////////////////////////////////////////
       // Main methods for track-finding
@@ -104,11 +98,6 @@ namespace InDet {
   // Inline methods
   ///////////////////////////////////////////////////////////////////
 
-  inline const InterfaceID& ISiCombinatorialTrackFinder::interfaceID()
-    {
-      return IID_ISiCombinatorialTrackFinder;
-    }
-
   ///////////////////////////////////////////////////////////////////
   // Overload of << operator MsgStream
   ///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinder_xk.h b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinder_xk.h
index ac463a94b858dafd7a49c8e659bad256fe4eace4..ebb9250da0df637f176df81f6f05a1354d9a4db8 100644
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinder_xk.h
+++ b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinder_xk.h
@@ -53,7 +53,7 @@ namespace InDet {
 
   class SiCombinatorialTrackFinder_xk : 
 
-    virtual public ISiCombinatorialTrackFinder, public AthAlgTool
+    public extends<AthAlgTool, ISiCombinatorialTrackFinder>
     {
       friend class SiTrajectory_xk;
 
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiCombinatorialTrackFinder_xk.cxx b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiCombinatorialTrackFinder_xk.cxx
index d7091b37aeada4efc2149e7e1c66b55ff9556d17..d74dfe49e6ca5bf62f9a4303bc8a3b7d75aa6e2b 100644
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiCombinatorialTrackFinder_xk.cxx
+++ b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiCombinatorialTrackFinder_xk.cxx
@@ -36,9 +36,8 @@
 
 InDet::SiCombinatorialTrackFinder_xk::SiCombinatorialTrackFinder_xk
 (const std::string& t, const std::string& n, const IInterface* p)
-  : AthAlgTool(t, n, p)
+  : base_class(t, n, p)
 {
-  declareInterface<ISiCombinatorialTrackFinder>(this);
 }
 
 ///////////////////////////////////////////////////////////////////