diff --git a/matlab/dsge_simulated_theoretical_conditional_variance_decomposition.m b/matlab/dsge_simulated_theoretical_conditional_variance_decomposition.m
index 60c9aaf9f5db015f652d089e6196fee60ca45ab5..4cc3625d4aa7b3aef62a21364bb50ed97f89c56a 100644
--- a/matlab/dsge_simulated_theoretical_conditional_variance_decomposition.m
+++ b/matlab/dsge_simulated_theoretical_conditional_variance_decomposition.m
@@ -54,7 +54,7 @@ if ~posterior
     end
     options_.varlist = options_.prior_analysis_endo_var_list;
 end
-[ivar,vartan ] = set_stationary_variables_list(options_, M_);
+[ivar,vartan ] = get_variables_list(options_, M_);
 if ~posterior
     if exist('temp','var')
         options_.varlist = temp;
diff --git a/matlab/dsge_simulated_theoretical_correlation.m b/matlab/dsge_simulated_theoretical_correlation.m
index d8a81a149c300da55ddfdbe04bba05219d2207a4..61325b57701703ecca6288245933c6261391f295 100644
--- a/matlab/dsge_simulated_theoretical_correlation.m
+++ b/matlab/dsge_simulated_theoretical_correlation.m
@@ -55,7 +55,7 @@ if ~posterior
     end
     options_.varlist = options_.prior_analysis_endo_var_list;
 end
-[ivar,vartan, options_] = set_stationary_variables_list(options_, M_);
+[ivar,vartan, options_] = get_variables_list(options_, M_);
 if ~posterior
     if exist('temp','var')
         options_.varlist = temp;
diff --git a/matlab/dsge_simulated_theoretical_covariance.m b/matlab/dsge_simulated_theoretical_covariance.m
index 1231b8b586adbbea8fd77067345dd9a6e8eaecdd..e8ac8bb6da1403961be0686c4871b1d7b8c9e6b6 100644
--- a/matlab/dsge_simulated_theoretical_covariance.m
+++ b/matlab/dsge_simulated_theoretical_covariance.m
@@ -55,7 +55,7 @@ if ~posterior
     end
     options_.varlist = options_.prior_analysis_endo_var_list;
 end
-[ivar,vartan] = set_stationary_variables_list(options_,M_);
+[ivar,vartan] = get_variables_list(options_,M_);
 if ~posterior
     if exist('temp','var')
         options_.varlist = temp;
diff --git a/matlab/dsge_simulated_theoretical_variance_decomposition.m b/matlab/dsge_simulated_theoretical_variance_decomposition.m
index a4008b31abc7552958e486ea375fbe11a6280510..b70db60c9748aea2b844e6c0a50a409ff9340653 100644
--- a/matlab/dsge_simulated_theoretical_variance_decomposition.m
+++ b/matlab/dsge_simulated_theoretical_variance_decomposition.m
@@ -56,7 +56,7 @@ if ~posterior
     end
     options_.varlist = options_.prior_analysis_endo_var_list;
 end
-[ivar,vartan,options_] = set_stationary_variables_list(options_,M_);
+[ivar,vartan,options_] = get_variables_list(options_,M_);
 if ~posterior
     if exist('temp','var')
         options_.varlist = temp;
diff --git a/matlab/set_stationary_variables_list.m b/matlab/get_variables_list.m
similarity index 83%
rename from matlab/set_stationary_variables_list.m
rename to matlab/get_variables_list.m
index 33b44724282b6d134ea439a2e371a22ea012621c..853b1169f905bba2345468587a02ac32e3903d5a 100644
--- a/matlab/set_stationary_variables_list.m
+++ b/matlab/get_variables_list.m
@@ -1,13 +1,12 @@
-function [ivar,vartan,options_] = set_stationary_variables_list(options_,M_)
-% This function builds a vector of indices targeting to the stationary
-% variables in varlist.
+function [ivar,vartan,options_] = get_variables_list(options_,M_)
+% This function builds a vector of indices in varlist or varobs.
 % 
 % INPUTS 
 %   o options_   [structure]  Describes global options. 
 %   o M_         [structure]  Describes the model.
 % OUTPUTS 
 %   o ivar       [integer]    nvar*1 vector of indices (nvar is the number
-%                             of stationary variables).
+%                             of variables).
 %   o vartan     [char]       array of characters (with nvar rows).
 %   o options_   [structure]  Describes global options.
 % 
@@ -17,7 +16,7 @@ function [ivar,vartan,options_] = set_stationary_variables_list(options_,M_)
 % SPECIAL REQUIREMENTS
 %   None.
 
-% Copyright (C) 2007-2011 Dynare Team
+% Copyright (C) 2007-2012 Dynare Team
 %
 % This file is part of Dynare.
 %
diff --git a/matlab/posterior_analysis.m b/matlab/posterior_analysis.m
index 37e43ba1f217d27e390d35d8055a5d991a981330..50fe1ca88c8c1d96d3334fe7e8e072a4a7cb5c5d 100644
--- a/matlab/posterior_analysis.m
+++ b/matlab/posterior_analysis.m
@@ -33,7 +33,7 @@ switch info
   case {4,5}
     oo_ = job(type,SampleSize,arg1,arg2,arg3,options_,M_,oo_);
   case 6
-    [ivar,vartan] = set_stationary_variables_list(options_,M_);
+    [ivar,vartan] = get_variables_list(options_,M_);
     nvar = length(ivar);
     oo_ = job(type,SampleSize,arg1,arg2,arg3,options_,M_,oo_,nvar,vartan);
   otherwise
diff --git a/matlab/prior_analysis.m b/matlab/prior_analysis.m
index 63e4a678d77c384d873d51ee65ce2a349dc87310..e3113c6b1599e040aaa2cc4b0126f35c2aa08d70 100644
--- a/matlab/prior_analysis.m
+++ b/matlab/prior_analysis.m
@@ -34,7 +34,7 @@ switch info
   case {4,5}
     oo_ = job(type,SampleSize,arg1,arg2,arg3,options_,M_,oo_);
   case 6
-    [ivar,vartan] = set_stationary_variables_list(options_,M_);
+    [ivar,vartan] = get_variables_list(options_,M_);
     nvar = length(ivar);
     oo_ = job(type,SampleSize,arg1,arg2,arg3,options_,M_,oo_,nvar,vartan);
   otherwise