diff --git a/src/ModFile.cc b/src/ModFile.cc
index 586b02842ff5b9fe93ef429d2c7cb35b8eb64c22..609d75dbb051cc159daebab1d9723a577659cfe3 100644
--- a/src/ModFile.cc
+++ b/src/ModFile.cc
@@ -824,13 +824,13 @@ ModFile::writeMOutput(const string &basename, bool clear_all, bool clear_global,
                 << "    clear_persistent_variables(fileparts(which('dynare')), false)" << endl
                 << "end" << endl;
   else if (clear_global)
-    mOutputFile << "clear M_ options_ oo_ estim_params_ bayestopt_ dataset_ dataset_info estimation_info ys0_ ex0_;" << endl;
+    mOutputFile << "clear M_ options_ oo_ estim_params_ bayestopt_ dataset_ dataset_info estimation_info;" << endl;
 
   if (!notime)
     mOutputFile << "tic0 = tic;" << endl;
 
   mOutputFile << "% Define global variables." << endl
-              << "global M_ options_ oo_ estim_params_ bayestopt_ dataset_ dataset_info estimation_info ys0_ ex0_" << endl
+              << "global M_ options_ oo_ estim_params_ bayestopt_ dataset_ dataset_info estimation_info" << endl
               << "options_ = [];" << endl
               << "M_.fname = '" << basename << "';" << endl
               << "M_.dynare_version = '" << PACKAGE_VERSION << "';" << endl
diff --git a/src/NumericalInitialization.cc b/src/NumericalInitialization.cc
index 716abfb9079b42ac1fc428bbbd87e9429ec1d31e..bd498c473cbbe29428300f1297ce69e71b845d27 100644
--- a/src/NumericalInitialization.cc
+++ b/src/NumericalInitialization.cc
@@ -284,8 +284,8 @@ EndValStatement::writeOutput(ostream &output, [[maybe_unused]] const string &bas
          << "% ENDVAL instructions" << endl
          << "%" << endl;
   // Writing endval block to set terminal values for variables
-  output << "ys0_= oo_.steady_state;" << endl
-         << "ex0_ = oo_.exo_steady_state;" << endl;
+  output << "oo_.initial_steady_state = oo_.steady_state;" << endl
+         << "oo_.initial_exo_steady_state = oo_.exo_steady_state;" << endl;
 
   writeInitValues(output);
 }