diff --git a/CaloFuture/CaloFutureReco/src/CaloCorrectionBase.cpp b/CaloFuture/CaloFutureReco/src/CaloCorrectionBase.cpp
index d7a9f04a09b885aa562c0ad446242325f07b8349..f2a750e5ce484dc6f2887590e92aade30be0b92f 100644
--- a/CaloFuture/CaloFutureReco/src/CaloCorrectionBase.cpp
+++ b/CaloFuture/CaloFutureReco/src/CaloCorrectionBase.cpp
@@ -118,6 +118,8 @@ namespace LHCb::Calo::Correction {
 
   StatusCode Base::initialize() {
     return ConditionAccessorHolder::initialize().andThen( [&]() -> StatusCode {
+      if ( getProperty( "ConditionName" ).toString().empty() )
+        error() << "No ConditionName given for ECorrection" << endmsg;
       if ( m_hypos.empty() ) return Error( "Empty vector of allowed Calorimeter Hypotheses!" );
       addConditionDerivation( { m_conditionName }, m_params.key(), [&]( nlohmann::json const& cond ) {
         Parameters params;
diff --git a/CaloFuture/CaloFutureReco/src/CaloCorrectionBase.h b/CaloFuture/CaloFutureReco/src/CaloCorrectionBase.h
index cebd8ea3c525dc7ec0ab2147fff33f9fc54715e8..8e910fab86e9566aec7efe1ad3bfb70edfabda01 100644
--- a/CaloFuture/CaloFutureReco/src/CaloCorrectionBase.h
+++ b/CaloFuture/CaloFutureReco/src/CaloCorrectionBase.h
@@ -221,13 +221,7 @@ namespace LHCb::Calo::Correction {
                                                       "acceptable hypotheses" };
 
   private:
-    Gaudi::Property<std::string> m_conditionName{ this, "ConditionName",
-#ifdef USE_DD4HEP
-                                                  "/world/DownstreamRegion/Ecal:EcalClusterMasks"
-#else
-                                                  "Conditions/Reco/Calo/EcalClusterMasks"
-#endif
-    };
+    Gaudi::Property<std::string>              m_conditionName{ this, "ConditionName", "" };
     Gaudi::Property<std::vector<std::string>> m_corrections{ this, "Corrections", { "All" } };
 
     std::optional<Type> accept( const std::string& name ) const {
diff --git a/CaloFuture/CaloFutureReco/src/CaloECorrection.cpp b/CaloFuture/CaloFutureReco/src/CaloECorrection.cpp
index a4400fe49ab88a894c5bb8479dd84768d7c37320..ae4657e97975cc66e07da703b96993420cf56fac 100644
--- a/CaloFuture/CaloFutureReco/src/CaloECorrection.cpp
+++ b/CaloFuture/CaloFutureReco/src/CaloECorrection.cpp
@@ -83,7 +83,7 @@ namespace LHCb::Calo {
   class ECorrection : public extends<Correction::Base, Interfaces::IProcessHypos> {
 
   public:
-    ECorrection( const std::string& type, const std::string& name, const IInterface* parent );
+    using extends::extends;
     StatusCode initialize() override;
     StatusCode process( const DeCalorimeter&, Event::Calo::Hypotheses::Type,
                         Event::Calo::Clusters::reference<SIMDWrapper::Scalar, Pr::ProxyBehaviour::Contiguous>&,
@@ -212,41 +212,6 @@ namespace LHCb::Calo {
     }
   } // namespace
 
-  ECorrection::ECorrection( const std::string& type, const std::string& name, const IInterface* parent )
-      : extends( type, name, parent ) {
-
-    // define conditionName
-    const std::string uName( CaloFutureAlgUtils::toUpper( name ) );
-    if ( uName.find( "ELECTRON" ) != std::string::npos ) {
-      setProperty( "ConditionName",
-#ifdef USE_DD4HEP
-                   "/world/DownstreamRegion/Ecal:ElectronECorrection"
-#else
-                   "Conditions/Reco/Calo/ElectronECorrection"
-#endif
-                   )
-          .ignore();
-    } else if ( uName.find( "MERGED" ) != std::string::npos || uName.find( "SPLITPHOTON" ) != std::string::npos ) {
-      setProperty( "ConditionName",
-#ifdef USE_DD4HEP
-                   "/world/DownstreamRegion/Ecal:SplitPhotonECorrection"
-#else
-                   "Conditions/Reco/Calo/SplitPhotonECorrection"
-#endif
-                   )
-          .ignore();
-    } else if ( uName.find( "PHOTON" ) ) {
-      setProperty( "ConditionName",
-#ifdef USE_DD4HEP
-                   "/world/DownstreamRegion/Ecal:PhotonECorrection"
-#else
-                   "Conditions/Reco/Calo/PhotonECorrection"
-#endif
-                   )
-          .ignore();
-    }
-  }
-
   StatusCode ECorrection::initialize() {
     return extends::initialize().andThen( [&] {
       this->addSharedConditionDerivation( { m_calo.key() }, m_offsets.key(), &createMap );
diff --git a/CaloFuture/CaloFutureReco/src/CaloLCorrection.cpp b/CaloFuture/CaloFutureReco/src/CaloLCorrection.cpp
index cfdc9df0360ad7dbc904baf81052e8c00e2392aa..cc2e38e945fb10501fb4c30ba027622c692b6147 100644
--- a/CaloFuture/CaloFutureReco/src/CaloLCorrection.cpp
+++ b/CaloFuture/CaloFutureReco/src/CaloLCorrection.cpp
@@ -28,7 +28,7 @@ namespace LHCb::Calo {
    */
   class LCorrection : public extends<Correction::Base, Interfaces::IProcessHypos> {
   public:
-    LCorrection( const std::string& type, const std::string& name, const IInterface* parent );
+    using extends::extends;
     using Interfaces::IProcessHypos::process;
     StatusCode process( const DeCalorimeter& calo, Event::Calo::Hypotheses::Type,
                         Event::Calo::Clusters::reference<SIMDWrapper::Scalar, Pr::ProxyBehaviour::Contiguous>&,
@@ -84,40 +84,6 @@ namespace LHCb::Calo {
 
   DECLARE_COMPONENT_WITH_ID( LCorrection, "CaloFutureLCorrection" )
 
-  LCorrection::LCorrection( const std::string& type, const std::string& name, const IInterface* parent )
-      : extends( type, name, parent ) {
-    // define conditionName
-    const std::string uName( CaloFutureAlgUtils::toUpper( name ) );
-    if ( uName.find( "ELECTRON" ) != std::string::npos ) {
-      setProperty( "ConditionName",
-#ifdef USE_DD4HEP
-                   "/world/DownstreamRegion/Ecal:ElectronLCorrection"
-#else
-                   "Conditions/Reco/Calo/ElectronLCorrection"
-#endif
-                   )
-          .ignore();
-    } else if ( uName.find( "MERGED" ) != std::string::npos || uName.find( "SPLITPHOTON" ) != std::string::npos ) {
-      setProperty( "ConditionName",
-#ifdef USE_DD4HEP
-                   "/world/DownstreamRegion/Ecal:SplitPhotonLCorrection"
-#else
-                   "Conditions/Reco/Calo/SplitPhotonLCorrection"
-#endif
-                   )
-          .ignore();
-    } else if ( uName.find( "PHOTON" ) ) {
-      setProperty( "ConditionName",
-#ifdef USE_DD4HEP
-                   "/world/DownstreamRegion/Ecal:PhotonLCorrection"
-#else
-                   "Conditions/Reco/Calo/PhotonLCorrection"
-#endif
-                   )
-          .ignore();
-    }
-  }
-
   StatusCode
   LCorrection::process( const DeCalorimeter& calo, Event::Calo::Hypotheses::Type hypo,
                         Event::Calo::Clusters::reference<SIMDWrapper::Scalar, Pr::ProxyBehaviour::Contiguous>& cluster,
diff --git a/CaloFuture/CaloFutureReco/src/CaloSCorrection.cpp b/CaloFuture/CaloFutureReco/src/CaloSCorrection.cpp
index 46025460d70cc540f02bc3618d75df8081679e48..de197adc57ca40729b24458dd1a01a63d6187b7d 100644
--- a/CaloFuture/CaloFutureReco/src/CaloSCorrection.cpp
+++ b/CaloFuture/CaloFutureReco/src/CaloSCorrection.cpp
@@ -62,8 +62,7 @@ namespace LHCb::Calo {
 
   class SCorrection : public extends<LHCb::Calo::Correction::Base, LHCb::Calo::Interfaces::IProcessHypos> {
   public:
-    SCorrection( const std::string& type, const std::string& name, const IInterface* parent );
-
+    using extends::extends;
     using LHCb::Calo::Interfaces::IProcessHypos::process;
     StatusCode
     process( const DeCalorimeter& calo, LHCb::Event::Calo::Hypotheses::Type,
@@ -137,40 +136,6 @@ namespace LHCb::Calo {
 
   DECLARE_COMPONENT_WITH_ID( SCorrection, "CaloFutureSCorrection" )
 
-  SCorrection::SCorrection( const std::string& type, const std::string& name, const IInterface* parent )
-      : extends( type, name, parent ) {
-
-    // define conditionName
-    const std::string uName( LHCb::CaloFutureAlgUtils::toUpper( name ) );
-    if ( uName.find( "ELECTRON" ) != std::string::npos ) {
-      setProperty( "ConditionName",
-#ifdef USE_DD4HEP
-                   "/world/DownstreamRegion/Ecal:ElectronSCorrection"
-#else
-                   "Conditions/Reco/Calo/ElectronSCorrection"
-#endif
-                   )
-          .ignore();
-    } else if ( uName.find( "MERGED" ) != std::string::npos || uName.find( "SPLITPHOTON" ) != std::string::npos ) {
-      setProperty( "ConditionName",
-#ifdef USE_DD4HEP
-                   "/world/DownstreamRegion/Ecal:SplitPhotonSCorrection"
-#else
-                   "Conditions/Reco/Calo/SplitPhotonSCorrection"
-#endif
-                   )
-          .ignore();
-    } else if ( uName.find( "PHOTON" ) ) {
-      setProperty( "ConditionName",
-#ifdef USE_DD4HEP
-                   "/world/DownstreamRegion/Ecal:PhotonSCorrection"
-#else
-                   "Conditions/Reco/Calo/PhotonSCorrection"
-#endif
-                   )
-          .ignore();
-    }
-  }
   // ============================================================================
 
   StatusCode SCorrection::process(