diff --git a/+dat/constructExpRef.m b/+dat/constructExpRef.m
index 7fb19aef..f5346f00 100644
--- a/+dat/constructExpRef.m
+++ b/+dat/constructExpRef.m
@@ -1,6 +1,6 @@
 function ref = constructExpRef(subjectRef, expDate, expSequence)
 %DAT.CONSTRUCTEXPREF Constructs an experiment reference string
-%   ref = DAT.CONSTRUCTEXPREF(subject, dat, seq) constructs and returns a
+%   ref = DAT.CONSTRUCTEXPREF(subject, date, seq) constructs and returns a
 %   standard format string reference, for the experiment using the 'subject',
 %   the 'date' of the experiment (a MATLAB datenum), and the daily sequence
 %   number of the experiment, 'seq' (must be an integer).
diff --git a/docs/setup/paths_template.m b/docs/setup/paths_template.m
index e152289c..9846d67d 100644
--- a/docs/setup/paths_template.m
+++ b/docs/setup/paths_template.m
@@ -18,8 +18,8 @@
   rig = thishost;
 end
 
-server1Name = '\\zserver.cortexlab.net';
-server2Name = '\\zubjects.cortexlab.net';
+server1Name = '\\znas.cortexlab.net';
+server2Name = '\\zserver.cortexlab.net';
 basketName = '\\basket.cortexlab.net'; % for working analyses
 lugaroName = '\\lugaro.cortexlab.net'; % for tape backup
 
@@ -31,18 +31,18 @@
 
 % Under the new system of having data grouped by mouse
 % rather than data type, all experimental data are saved here.
-p.mainRepository = fullfile(server1Name, 'Data', 'Subjects');
+p.mainRepository = fullfile(server1Name, 'Subjects');
 % Optional alternate named repos may be defined using the repo name
 % followed by a number. These are searched in addition to the master repo.
-p.main2Repository = fullfile(server2Name, 'Subjects');
+p.main2Repository = fullfile(server2Name, 'Data', 'Subjects');
 
 % Directory for organisation-wide configuration files, for now these should
 % all remain on zserver
-p.globalConfig = fullfile(server1Name, 'Code', 'Rigging', 'config');
+p.globalConfig = fullfile(server2Name, 'Code', 'Rigging', 'config');
 % Directory for rig-specific configuration files
 p.rigConfig = fullfile(p.globalConfig, rig);
 % Repository for all experiment definitions
-p.expDefinitions = fullfile(server1Name, 'Code', 'Rigging', 'ExpDefinitions');
+p.expDefinitions = fullfile(server2Name, 'Code', 'Rigging', 'ExpDefinitions');
 
 %% Non-essential paths
 % Database url and local queue for cached posts.  If empty or undefined,