diff --git a/matlab/moments/conditional_variance_decomposition_ME_mc_analysis.m b/matlab/estimation/conditional_variance_decomposition_ME_mc_analysis.m
similarity index 98%
rename from matlab/moments/conditional_variance_decomposition_ME_mc_analysis.m
rename to matlab/estimation/conditional_variance_decomposition_ME_mc_analysis.m
index c4d4e349694592eaded997db30f36fa436a72ca1..22411fe5c5de23d80d0d8a8fd911b08321bf08cc 100644
--- a/matlab/moments/conditional_variance_decomposition_ME_mc_analysis.m
+++ b/matlab/estimation/conditional_variance_decomposition_ME_mc_analysis.m
@@ -94,7 +94,7 @@ end
 ListOfFiles = dir([ PATH  fname '_' TYPE 'ConditionalVarianceDecompME*.mat']);
 i1 = 1; tmp = zeros(NumberOfSimulations,length(Steps));
 for file = 1:length(ListOfFiles)
-    load([ PATH ListOfFiles(file).name ]);
+    load([ PATH ListOfFiles(file).name ],'Conditional_decomposition_array_ME');
     % 4D-array (endovar,time,exovar,simul)
     i2 = i1 + size(Conditional_decomposition_array_ME,4) - 1;
     tmp(i1:i2,:) = transpose(dynare_squeeze(Conditional_decomposition_array_ME(matrix_pos,:,exogenous_variable_index,:)));
diff --git a/matlab/moments/conditional_variance_decomposition_mc_analysis.m b/matlab/estimation/conditional_variance_decomposition_mc_analysis.m
similarity index 98%
rename from matlab/moments/conditional_variance_decomposition_mc_analysis.m
rename to matlab/estimation/conditional_variance_decomposition_mc_analysis.m
index 74d86fffd5558934484a4cf6860e8b8188cfd26f..3abdc874190b9c424b45b14bd69ccc78446cbf0f 100644
--- a/matlab/moments/conditional_variance_decomposition_mc_analysis.m
+++ b/matlab/estimation/conditional_variance_decomposition_mc_analysis.m
@@ -85,7 +85,7 @@ end
 ListOfFiles = dir([ PATH  fname '_' TYPE 'ConditionalVarianceDecomposition*.mat']);
 i1 = 1; tmp = zeros(NumberOfSimulations,length(Steps));
 for file = 1:length(ListOfFiles)
-    load([ PATH ListOfFiles(file).name ]);
+    load([ PATH ListOfFiles(file).name ],'Conditional_decomposition_array');
     % 4D-array (endovar,time,exovar,simul)
     i2 = i1 + size(Conditional_decomposition_array,4) - 1;
     tmp(i1:i2,:) = transpose(dynare_squeeze(Conditional_decomposition_array(endogenous_variable_index,:,exogenous_variable_index,:)));
diff --git a/matlab/moments/correlation_mc_analysis.m b/matlab/estimation/correlation_mc_analysis.m
similarity index 98%
rename from matlab/moments/correlation_mc_analysis.m
rename to matlab/estimation/correlation_mc_analysis.m
index ecf58c4a458b6f179f8ca7351c57f28f99793529..9aeb04e62b49ea99bacdfae5d5cdba8fee740c26 100644
--- a/matlab/moments/correlation_mc_analysis.m
+++ b/matlab/estimation/correlation_mc_analysis.m
@@ -85,12 +85,11 @@ end
 ListOfFiles = dir([ PATH  fname '_' TYPE 'Correlations*.mat']);
 i1 = 1; tmp = zeros(SampleSize,1);
 for file = 1:length(ListOfFiles)
-    load([ PATH  ListOfFiles(file).name ]);
+    load([ PATH  ListOfFiles(file).name ],'Correlation_array');
     i2 = i1 + rows(Correlation_array) - 1;
     tmp(i1:i2) = Correlation_array(:,indx1,indx2,nar);
     i1 = i2+1;
 end
-name = [ var1 '.' var2 ];
 if options_.estimation.moments_posterior_density.indicator
     [p_mean, p_median, p_var, hpd_interval, p_deciles, density] = ...
         posterior_moments(tmp,1,mh_conf_sig);
diff --git a/matlab/moments/covariance_mc_analysis.m b/matlab/estimation/covariance_mc_analysis.m
similarity index 99%
rename from matlab/moments/covariance_mc_analysis.m
rename to matlab/estimation/covariance_mc_analysis.m
index 5215a74a7da473dd1c6096cff5fe3361bd678bcd..7f9c18597af5f0892f78658d132a8aed840415f8 100644
--- a/matlab/moments/covariance_mc_analysis.m
+++ b/matlab/estimation/covariance_mc_analysis.m
@@ -97,7 +97,7 @@ if options_.contemporaneous_correlation
     var_pos_2=symmetric_matrix_index(indx2,indx2,nvar);
 end
 for file = 1:length(ListOfFiles)
-    load([ PATH ListOfFiles(file).name ]);
+    load([ PATH ListOfFiles(file).name ],'Covariance_matrix');
     i2 = i1 + rows(Covariance_matrix) - 1;
     tmp(i1:i2) = Covariance_matrix(:,symmetric_matrix_index(indx1,indx2,nvar));
     if options_.contemporaneous_correlation
diff --git a/matlab/estimation/variance_decomposition_ME_mc_analysis.m b/matlab/estimation/variance_decomposition_ME_mc_analysis.m
index 9d2e7e85e383e2d658e39e6e8d4ae89d159794bb..0a00e654aa24628d0278b76ca00e34c5bcc60ec1 100644
--- a/matlab/estimation/variance_decomposition_ME_mc_analysis.m
+++ b/matlab/estimation/variance_decomposition_ME_mc_analysis.m
@@ -87,7 +87,7 @@ ListOfFiles = dir([ PATH  fname '_' TYPE 'VarianceDecompME*.mat']);
 i1 = 1; tmp = zeros(NumberOfSimulations,1);
 indice = (indx-1)*rows(exonames)+jndx;
 for file = 1:length(ListOfFiles)
-    load([ PATH ListOfFiles(file).name ]);
+    load([ PATH ListOfFiles(file).name ],'Decomposition_array_ME');
     i2 = i1 + rows(Decomposition_array_ME) - 1;
     tmp(i1:i2) = Decomposition_array_ME(:,indice);
     i1 = i2+1;
diff --git a/matlab/estimation/variance_decomposition_mc_analysis.m b/matlab/estimation/variance_decomposition_mc_analysis.m
index dc4f6f35e51daee54fb90422602ac41f18d314b3..b60b5bc799d30e4129b14cdebd3cb81826a03aa9 100644
--- a/matlab/estimation/variance_decomposition_mc_analysis.m
+++ b/matlab/estimation/variance_decomposition_mc_analysis.m
@@ -85,7 +85,7 @@ ListOfFiles = dir([ PATH  fname '_' TYPE 'VarianceDecomposition*.mat']);
 i1 = 1; tmp = zeros(NumberOfSimulations,1);
 indice = (indx-1)*rows(exonames)+jndx;
 for file = 1:length(ListOfFiles)
-    load([ PATH ListOfFiles(file).name ]);
+    load([ PATH ListOfFiles(file).name ],'Decomposition_array');
     i2 = i1 + rows(Decomposition_array) - 1;
     tmp(i1:i2) = Decomposition_array(:,indice);
     i1 = i2+1;