diff --git a/Reconstruction/egamma/egammaAlgs/src/EMBremCollectionBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/EMBremCollectionBuilder.cxx
index fedb6bc04bac98e87824543b9e7d805598c396f1..bd9cc982d7d646d2c68ce38164b59f379c23b0b0 100644
--- a/Reconstruction/egamma/egammaAlgs/src/EMBremCollectionBuilder.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/EMBremCollectionBuilder.cxx
@@ -32,7 +32,7 @@
 
 EMBremCollectionBuilder::EMBremCollectionBuilder(const std::string& name,
                                                  ISvcLocator* pSvcLocator)
-  : AthAlgorithm(name, pSvcLocator)
+  : AthReentrantAlgorithm(name, pSvcLocator)
 {
 }
 
@@ -66,7 +66,7 @@ StatusCode EMBremCollectionBuilder::EMBremCollectionBuilder::finalize(){
 }
 
 StatusCode
-EMBremCollectionBuilder::execute_r(const EventContext& ctx) const
+EMBremCollectionBuilder::execute(const EventContext& ctx) const
 {
   /*
    * Read in the input
diff --git a/Reconstruction/egamma/egammaAlgs/src/EMBremCollectionBuilder.h b/Reconstruction/egamma/egammaAlgs/src/EMBremCollectionBuilder.h
index 8dbb3cf1a1f1559c3958094f074ee4fc05ca62a5..8c2bd549be06c64c72ec718ac827ecd85eff8f17 100644
--- a/Reconstruction/egamma/egammaAlgs/src/EMBremCollectionBuilder.h
+++ b/Reconstruction/egamma/egammaAlgs/src/EMBremCollectionBuilder.h
@@ -16,7 +16,7 @@
 #include "TrkToolInterfaces/ITrackSlimmingTool.h"
 #include "TrkToolInterfaces/ITrackSummaryTool.h"
 
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "GaudiKernel/EventContext.h"
 #include "StoreGate/ReadHandleKey.h"
@@ -30,7 +30,7 @@
 #include "InDetReadoutGeometry/SiDetectorElementCollection.h"
 
 #include <memory>
-class EMBremCollectionBuilder : public AthAlgorithm 
+class EMBremCollectionBuilder : public AthReentrantAlgorithm 
 {
 
 public:
@@ -39,13 +39,7 @@ public:
 
   virtual StatusCode initialize() override final;
   virtual StatusCode finalize() override final;
-  virtual StatusCode execute() override final
-  {
-    return execute_r(Algorithm::getContext());
-  }
-  // This will become the normal execute when
-  // inheriting from AthReentrantAlgorithm
-  StatusCode execute_r(const EventContext& ctx) const;
+  virtual StatusCode execute(const EventContext& ctx) const override final;
 
 
   struct TrackWithIndex