diff --git a/matlab/dr1.m b/matlab/dr1.m
index e68df1b2e..f69d90943 100644
--- a/matlab/dr1.m
+++ b/matlab/dr1.m
@@ -82,10 +82,10 @@ function [dr,info,M_,options_,oo_] = dr1(dr,task,M_,options_,oo_)
         end
         old_solve_algo = options_.solve_algo;
         %  options_.solve_algo = 1;
-        oo_.steady_state = dynare_solve('ramsey_static',oo_.steady_state,0,M_,options_,oo_,it_);
+        oo_.steady_state = dynare_solve('dyn_ramsey_static_',oo_.steady_state,0,M_,options_,oo_,it_);
         options_.solve_algo = old_solve_algo;
-        [junk,junk,multbar] = ramsey_static(oo_.steady_state,M_,options_,oo_,it_);
-        [jacobia_,M_] = ramsey_dynamic(oo_.steady_state,multbar,M_,options_,oo_,it_);
+        [junk,junk,multbar] = dyn_ramsey_static_(oo_.steady_state,M_,options_,oo_,it_);
+        [jacobia_,M_] = dyn_ramsey_dynamic_(oo_.steady_state,multbar,M_,options_,oo_,it_);
         klen = M_.maximum_lag + M_.maximum_lead + 1;
         dr.ys = [oo_.steady_state;zeros(M_.exo_nbr,1);multbar];
 % $$$         if options_.ramsey_policy == 2
diff --git a/matlab/dr1_sparse.m b/matlab/dr1_sparse.m
index 7cebec385..984aa58ac 100644
--- a/matlab/dr1_sparse.m
+++ b/matlab/dr1_sparse.m
@@ -80,10 +80,10 @@ function [dr,info,M_,options_,oo_] = dr1_sparse(dr,task,M_,options_,oo_)
         end
         old_solve_algo = options_.solve_algo;
         %  options_.solve_algo = 1;
-        oo_.steady_state = dynare_solve('ramsey_static',oo_.steady_state,0,M_,options_,oo_,it_);
+        oo_.steady_state = dynare_solve('dyn_ramsey_static_',oo_.steady_state,0,M_,options_,oo_,it_);
         options_.solve_algo = old_solve_algo;
-        [junk,junk,multbar] = ramsey_static(oo_.steady_state,M_,options_,oo_,it_);
-        [jacobia_,M_] = ramsey_dynamic(oo_.steady_state,multbar,M_,options_,oo_,it_);
+        [junk,junk,multbar] = dyn_ramsey_static_(oo_.steady_state,M_,options_,oo_,it_);
+        [jacobia_,M_] = dyn_ramsey_dynamic_(oo_.steady_state,multbar,M_,options_,oo_,it_);
         klen = M_.maximum_lag + M_.maximum_lead + 1;
         dr.ys = [oo_.steady_state;zeros(M_.exo_nbr,1);multbar];
 % $$$         if options_.ramsey_policy == 2
diff --git a/matlab/ramsey_dynamic.m b/matlab/dyn_ramsey_dynamic_.m
similarity index 94%
rename from matlab/ramsey_dynamic.m
rename to matlab/dyn_ramsey_dynamic_.m
index 5dcb3df17..fda44da2e 100644
--- a/matlab/ramsey_dynamic.m
+++ b/matlab/dyn_ramsey_dynamic_.m
@@ -1,7 +1,7 @@
-function [J,M_] = ramsey_dynamic(ys,lbar,M_,options_,oo_,it_)
+function [J,M_] = dyn_ramsey_dynamic_(ys,lbar,M_,options_,oo_,it_)
 
-% function J = ramsey_dynamic(ys,lbar)
-% ramsey_dynamic sets up the Jacobian of the expanded model for optimal
+% function J = dyn_ramsey_dynamic_(ys,lbar)
+% dyn_ramsey_dynamic_ sets up the Jacobian of the expanded model for optimal
 % policies. It modifies several fields of M_
 %
 % INPUTS:
diff --git a/matlab/ramsey_static.m b/matlab/dyn_ramsey_static_.m
similarity index 93%
rename from matlab/ramsey_static.m
rename to matlab/dyn_ramsey_static_.m
index 5a02f723f..9362eeaec 100644
--- a/matlab/ramsey_static.m
+++ b/matlab/dyn_ramsey_static_.m
@@ -1,6 +1,6 @@
-function [resids, rJ,mult] = ramsey_static(x,M_,options_,oo_,it_)
+function [resids, rJ,mult] = dyn_ramsey_static_(x,M_,options_,oo_,it_)
 
-% function [resids, rJ,mult] = ramsey_static(x)
+% function [resids, rJ,mult] = dyn_ramsey_static_(x)
 % Computes the static first order conditions for optimal policy
 %
 % INPUTS