diff --git a/src/@dseries/initialize.m b/src/initialize_dseries_class.m
similarity index 96%
rename from src/@dseries/initialize.m
rename to src/initialize_dseries_class.m
index 4a42ad28e81ed0d640ea7d57221080018c12ad49..154814549a433195b33465d583491f13826ecb20 100644
--- a/src/@dseries/initialize.m
+++ b/src/initialize_dseries_class.m
@@ -1,4 +1,4 @@
-function initialize(fake)
+function initialize_dseries_class()
 
 % Copyright (C) 2015-2019 Dynare Team
 %
@@ -16,7 +16,7 @@ function initialize(fake)
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
 % Get the path to the dseries toolbox.
-dseries_src_root = strrep(which('@dseries/initialize.m'),'@dseries/initialize.m','');
+dseries_src_root = strrep(which('initialize_dseries_class'),'initialize_dseries_class.m','');
 
 % Check that the x13 binary is available
 nox13 = false;
diff --git a/tests/runalltests.m b/tests/runalltests.m
index b82d9c6e2a1788fbf278d0d5528cbcdb843ab3ff..c8e9f3a95e20fb6bbef7c1dddf4ab4e6f5de47c6 100644
--- a/tests/runalltests.m
+++ b/tests/runalltests.m
@@ -15,7 +15,7 @@ function runalltests()
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
-dseries_src_root = strrep(which('runalltests'),'tests/runalltests.m','');
+dseries_src_root = []; % Will be updated by calling initialize_dseries_class().
 
 opath = path();
 
@@ -34,10 +34,10 @@ unit_tests_root = strrep(which('runalltests'),'runalltests.m','');
 
 % Initialize the dseries module
 try
-    dseries().initialize();
+    initialize_dseries_class();
 catch
     addpath([unit_tests_root '../src']);
-    dseries().initialize();
+    initialize_dseries_class();
 end
 
 warning off