diff --git a/src/@dates/private/comparison_arg_checks.m b/src/@dates/private/comparison_arg_checks.m
index b3ea15f947e3acb30ada8844800e55a79021a110..c57ea5d718d24c0c467c208008fb07a59d17c801 100644
--- a/src/@dates/private/comparison_arg_checks.m
+++ b/src/@dates/private/comparison_arg_checks.m
@@ -51,7 +51,7 @@ p = varargin{2};
 
 %@test:1
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ try
@@ -67,7 +67,7 @@ p = varargin{2};
 
 %@test:2
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ try
@@ -83,7 +83,7 @@ p = varargin{2};
 
 %@test:3
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ try
@@ -99,7 +99,7 @@ p = varargin{2};
 
 %@test:4
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ try
@@ -115,7 +115,7 @@ p = varargin{2};
 
 %@test:5
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ try
@@ -131,7 +131,7 @@ p = varargin{2};
 
 %@test:6
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ try
@@ -147,7 +147,7 @@ p = varargin{2};
 
 %@test:7
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ try
diff --git a/src/@dates/private/dates4display.m b/src/@dates/private/dates4display.m
index 13be7ffadc346e09d55cf9b5f29df41a951ae3ee..58163731122139769c1194e2e4c02156b82c23a9 100644
--- a/src/@dates/private/dates4display.m
+++ b/src/@dates/private/dates4display.m
@@ -49,7 +49,7 @@ str = sprintf('%s%s>\n', str, date2string(o.time(o.length(),:),o.freq));
 
 %@test:1
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ try
@@ -75,7 +75,7 @@ str = sprintf('%s%s>\n', str, date2string(o.time(o.length(),:),o.freq));
 
 %@test:2
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ try
@@ -101,7 +101,7 @@ str = sprintf('%s%s>\n', str, date2string(o.time(o.length(),:),o.freq));
 
 %@test:3
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ try
@@ -127,7 +127,7 @@ str = sprintf('%s%s>\n', str, date2string(o.time(o.length(),:),o.freq));
 
 %@test:4
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ try
diff --git a/src/@dates/private/greaterorequal.m b/src/@dates/private/greaterorequal.m
index b7c1d85c855617e573d67b77c309e995ea14e731..23775c8370a09e503f9513e54b72777b991b647c 100644
--- a/src/@dates/private/greaterorequal.m
+++ b/src/@dates/private/greaterorequal.m
@@ -31,7 +31,7 @@ end
 
 %@test:1
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [2, 4];
@@ -54,7 +54,7 @@ end
 
 %@test:2
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
@@ -77,7 +77,7 @@ end
 
 %@test:3
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
@@ -100,7 +100,7 @@ end
 
 %@test:4
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
@@ -123,7 +123,7 @@ end
 
 %@test:5
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
diff --git a/src/@dates/private/greaterthan.m b/src/@dates/private/greaterthan.m
index cbcf9c36305741bb1282e182af7ac2b2f04f6be0..80c7dbed2c4880180f5fa658459ca8280b3279c5 100644
--- a/src/@dates/private/greaterthan.m
+++ b/src/@dates/private/greaterthan.m
@@ -31,7 +31,7 @@ end
 
 %@test:1
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [2, 4];
@@ -54,7 +54,7 @@ end
 
 %@test:2
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
@@ -77,7 +77,7 @@ end
 
 %@test:3
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
@@ -100,7 +100,7 @@ end
 
 %@test:4
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
@@ -123,7 +123,7 @@ end
 
 %@test:5
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
diff --git a/src/@dates/private/lessorequal.m b/src/@dates/private/lessorequal.m
index 7fcfcde3a7151ce18d773ef9d39c910e806d44a6..6c256688f66fbc82b8ed7f13f6f792dd8219648d 100644
--- a/src/@dates/private/lessorequal.m
+++ b/src/@dates/private/lessorequal.m
@@ -31,7 +31,7 @@ end
 
 %@test:1
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [2, 4];
@@ -54,7 +54,7 @@ end
 
 %@test:2
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
@@ -77,7 +77,7 @@ end
 
 %@test:3
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
@@ -100,7 +100,7 @@ end
 
 %@test:4
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
@@ -123,7 +123,7 @@ end
 
 %@test:5
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
diff --git a/src/@dates/private/lessthan.m b/src/@dates/private/lessthan.m
index 578c2f3fd0712b62dbb05a23912481a7cc15b516..2fadb74c5d710ce4ee80cd69c8a6f82b3c2cbb73 100644
--- a/src/@dates/private/lessthan.m
+++ b/src/@dates/private/lessthan.m
@@ -31,7 +31,7 @@ end
 
 %@test:1
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [2, 4];
@@ -54,7 +54,7 @@ end
 
 %@test:2
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
@@ -77,7 +77,7 @@ end
 
 %@test:3
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
@@ -100,7 +100,7 @@ end
 
 %@test:4
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
@@ -123,7 +123,7 @@ end
 
 %@test:5
 %$ OPATH = pwd();
-%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ DSERIES_PATH = strrep(which('@dseries/initialize'),'/@dseries/initialize.m','');
 %$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];