diff --git a/ebos/eclbasevanguard.hh b/ebos/eclbasevanguard.hh
index ef65595ded..d78d158b5b 100644
--- a/ebos/eclbasevanguard.hh
+++ b/ebos/eclbasevanguard.hh
@@ -457,7 +457,7 @@ public:
         // written to disk (every N report step)
         int outputInterval = EWOMS_GET_PARAM(TypeTag, int, EclOutputInterval);
         if (outputInterval >= 0)
-            schedule().restart().overrideRestartWriteInterval(outputInterval);
+            schedule().rst_override_interval(outputInterval);
 
         // Initialize parallelWells with all local wells
         const auto& schedule_wells = schedule().getWellsatEnd();
diff --git a/ebos/ecloutputblackoilmodule.hh b/ebos/ecloutputblackoilmodule.hh
index dafb6970f7..c2ed7c9eac 100644
--- a/ebos/ecloutputblackoilmodule.hh
+++ b/ebos/ecloutputblackoilmodule.hh
@@ -253,10 +253,10 @@ public:
 
         // Summary output is for all steps
         const Opm::SummaryConfig summaryConfig = simulator_.vanguard().summaryConfig();
+        const auto& schedule = simulator_.vanguard().schedule();
 
         // Only output RESTART_AUXILIARY asked for by the user.
-        const Opm::RestartConfig& restartConfig = simulator_.vanguard().schedule().restart();
-        std::map<std::string, int> rstKeywords = restartConfig.getRestartKeywords(reportStepNum);
+        std::map<std::string, int> rstKeywords = schedule.rst_keywords(reportStepNum);
         for (auto& [keyword, should_write] : rstKeywords) {
             if (this->isOutputCreationDirective_(keyword)) {
                 // 'BASIC', 'FREQ' and similar.  Don't attempt to create
@@ -265,7 +265,7 @@ public:
                 should_write = 0;
             }
             else {
-                should_write = restartConfig.getKeyword(keyword, reportStepNum);
+                should_write = schedule.rst_keyword(reportStepNum, keyword);
             }
         }
 
@@ -300,7 +300,6 @@ public:
 
         // Well RFT data
         if (!substep) {
-            const auto& schedule = simulator_.vanguard().schedule();
             const auto& rft_config = schedule[reportStepNum].rft_config();
             for (const auto& well: schedule.getWells(reportStepNum)) {
 
@@ -334,7 +333,7 @@ public:
         // 1) when we want to restart
         // 2) when it is ask for by the user via restartConfig
         // 3) when it is not a substep
-        if (!isRestart && (!restartConfig.getWriteRestartFile(reportStepNum, log) || substep))
+        if (!isRestart && (!schedule.write_rst_file(reportStepNum, log) || substep))
             return;
 
         // always output saturation of active phases
diff --git a/opm/simulators/wells/BlackoilWellModel_impl.hpp b/opm/simulators/wells/BlackoilWellModel_impl.hpp
index c335eb6c68..5977b903e7 100644
--- a/opm/simulators/wells/BlackoilWellModel_impl.hpp
+++ b/opm/simulators/wells/BlackoilWellModel_impl.hpp
@@ -1417,7 +1417,7 @@ namespace Opm {
         computeAverageFormationFactor(B_avg);
 
         const Opm::SummaryConfig& summaryConfig = ebosSimulator_.vanguard().summaryConfig();
-        const bool write_restart_file = ebosSimulator_.vanguard().schedule().restart().getWriteRestartFile(reportStepIdx);
+        const bool write_restart_file = ebosSimulator_.vanguard().schedule().write_rst_file(reportStepIdx);
         int exception_thrown = 0;
         for (const auto& well : well_container_) {
             const bool needed_for_summary = ((summaryConfig.hasSummaryKey( "WWPI:" + well->name()) ||