--- a/cubicweb/toolsutils.py	Thu Sep 08 11:57:46 2016 +0200
+++ b/cubicweb/toolsutils.py	Thu May 19 14:27:28 2016 +0200
@@ -131,6 +131,9 @@
     targetdir = normpath(targetdir)
     for dirpath, dirnames, filenames in walk(skeldir):
         tdirpath = dirpath.replace(skeldir, targetdir)
+        if 'cubicweb_CUBENAME' in tdirpath:
+            tdirpath = tdirpath.replace('cubicweb_CUBENAME',
+                                        'cubicweb_' + context['cubename'])
         create_dir(tdirpath)
         for fname in filenames:
             if any(fnmatch(fname, pat) for pat in exclude):