diff --git a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiZvertexMaker.h b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiZvertexMaker.h
old mode 100755
new mode 100644
index 818cd7fb849d0fdc348a75af4e33b53d94ef8161..12b6ae1dd481ce7935ae90478c510fca6c20ccdd
--- a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiZvertexMaker.h
+++ b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiZvertexMaker.h
@@ -36,8 +36,6 @@ class MsgStream;
 
 namespace InDet{
 
-  static const InterfaceID IID_ISiZvertexMaker("InDet::ISiZvertexMaker",1,0);
-
   class ISiZvertexMaker : virtual public IAlgTool 
     {
       ///////////////////////////////////////////////////////////////////
@@ -46,14 +44,8 @@ namespace InDet{
       
     public:
 
-      ///////////////////////////////////////////////////////////////////
-      // Standard tool methods
-      ///////////////////////////////////////////////////////////////////
-
-      static const InterfaceID& interfaceID();
-      virtual StatusCode initialize ()=0;
-      virtual StatusCode finalize   ()=0;
-      virtual ~ISiZvertexMaker(){};
+      // InterfaceID
+      DeclareInterfaceID(ISiZvertexMaker, 1, 0);
 
       ///////////////////////////////////////////////////////////////////
       // Methods to initialize tool for new event or region
@@ -85,11 +77,6 @@ namespace InDet{
   // Inline methods
   ///////////////////////////////////////////////////////////////////
 
-  inline const InterfaceID& ISiZvertexMaker::interfaceID()
-    {
-      return IID_ISiZvertexMaker;
-    }
-
   ///////////////////////////////////////////////////////////////////
   // Overload of << operator MsgStream
   ///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecTools/SiZvertexTool_xk/SiZvertexTool_xk/SiZvertexMaker_xk.h b/InnerDetector/InDetRecTools/SiZvertexTool_xk/SiZvertexTool_xk/SiZvertexMaker_xk.h
index d7329534dfec1c2c2683f13efca67469a7423762..20e9839147c1ed2e99d386068ce50d1d41c3a0fc 100644
--- a/InnerDetector/InDetRecTools/SiZvertexTool_xk/SiZvertexTool_xk/SiZvertexMaker_xk.h
+++ b/InnerDetector/InDetRecTools/SiZvertexTool_xk/SiZvertexTool_xk/SiZvertexMaker_xk.h
@@ -38,7 +38,7 @@ class MsgStream;
 
 namespace InDet {
 
-  class SiZvertexMaker_xk : virtual public ISiZvertexMaker, public AthAlgTool
+  class SiZvertexMaker_xk : public extends<AthAlgTool, ISiZvertexMaker>
   {
     ///////////////////////////////////////////////////////////////////
     // Public methods:
diff --git a/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/SiZvertexMaker_xk.cxx b/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/SiZvertexMaker_xk.cxx
index 3f44c3f91add6215c5db6519c86ad89d38b7df6f..418d6afe5f8d9f8ef30564186f0a3210089ae268 100644
--- a/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/SiZvertexMaker_xk.cxx
+++ b/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/SiZvertexMaker_xk.cxx
@@ -25,9 +25,8 @@
 
 InDet::SiZvertexMaker_xk::SiZvertexMaker_xk
 (const std::string& t,const std::string& n,const IInterface* p)
-  : AthAlgTool(t,n,p)
+  : base_class(t, n, p)
 {
-  declareInterface<ISiZvertexMaker>(this);
 }
 
 ///////////////////////////////////////////////////////////////////