diff --git a/CHANGES.rst b/CHANGES.rst
index fe0a74ed559be9460ca9d139db2de9ec2c04d3d1..da6156efeb0acba509f28e72432d84c808c21b2e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -13,7 +13,7 @@ Global
 ---------
 
 * Move ``standard_*`` directories to ``mkexp/*``,
-  rename ``experiments`` to ``types``.
+  rename ``experiments`` to ``types``, move defaults to ``mkexp/``.
   ``standard_*`` is still supported
 
 Templates
diff --git a/mkexp b/mkexp
index f72994fca097f849f732b09a06329cef99d40dae..6966fee9527b3a312450b9f1e4e354d5339e8208 100755
--- a/mkexp
+++ b/mkexp
@@ -67,8 +67,8 @@ def get_exp_template_names(experiment_config_id, config, job_or_namelist):
         get_exp_template_name(config.experiment_kind, job_or_namelist,
                               ExpConfig.typ_lib_path),
         get_exp_template_name(ExpConfig.default_name, job_or_namelist,
-                              ExpConfig.typ_lib_path),
-        get_template_name(job_or_namelist, ExpConfig.typ_lib_path),
+                              ExpConfig.lib_dir),
+        get_template_name(job_or_namelist, ExpConfig.lib_dir),
         # Legacy directory structure
         get_exp_template_name(config.experiment_kind, job_or_namelist),
         get_exp_template_name(ExpConfig.default_name, job_or_namelist),
diff --git a/test/mkexp/types/namelist.tmpl b/test/mkexp/namelist.tmpl
similarity index 100%
rename from test/mkexp/types/namelist.tmpl
rename to test/mkexp/namelist.tmpl