diff --git a/src/scripts/elua/apps/docgen/keyref.lua b/src/scripts/elua/apps/docgen/keyref.lua
index a28e6125b4..56311d9742 100644
--- a/src/scripts/elua/apps/docgen/keyref.lua
+++ b/src/scripts/elua/apps/docgen/keyref.lua
@@ -30,7 +30,7 @@ M.build = function()
         f:finish()
         local lf = writer.Writer({ "ref", lang, "keyword-link" })
         lf:write_raw("/", dutil.path_join(
-            dutil.nspace_to_path(dutil.get_root_ns()), "auto",
+            dutil.nspace_to_path(dutil.get_root_ns()),
             "ref", lang, "key", "{FNAME}"
         ))
         lf:write_nl()
diff --git a/src/scripts/elua/apps/docgen/util.lua b/src/scripts/elua/apps/docgen/util.lua
index 48e375da95..65968ac3e7 100644
--- a/src/scripts/elua/apps/docgen/util.lua
+++ b/src/scripts/elua/apps/docgen/util.lua
@@ -23,7 +23,7 @@ M.nspace_to_path = function(ns)
 end
 
 M.make_page = function(path, ext)
-    return M.path_join(doc_root, "auto", path .. "." .. ext)
+    return M.path_join(doc_root, path .. "." .. ext)
 end
 
 M.get_root_ns = function()
@@ -31,7 +31,7 @@ M.get_root_ns = function()
 end
 
 M.mkdir_r = function(dirn)
-    assert(cutil.file_mkpath(M.path_join(doc_root, "auto", dirn)))
+    assert(cutil.file_mkpath(M.path_join(doc_root, dirn)))
 end
 
 M.mkdir_p = function(path)
@@ -39,7 +39,7 @@ M.mkdir_p = function(path)
 end
 
 M.rm_root = function()
-    cutil.file_rmrf(M.path_join(doc_root, "auto"))
+    cutil.file_rmrf(doc_root)
 end
 
 M.init = function(root, rns)
diff --git a/src/scripts/elua/apps/docgen/writer.lua b/src/scripts/elua/apps/docgen/writer.lua
index 67b6765596..4690ed7c91 100644
--- a/src/scripts/elua/apps/docgen/writer.lua
+++ b/src/scripts/elua/apps/docgen/writer.lua
@@ -73,7 +73,7 @@ local write_include = function(self, tp, name, flags)
     if type(name) == "table" then
         if name[#name] == true then
             name[#name] = nil
-            name = ":" .. root_nspace .. ":auto:"
+            name = ":" .. root_nspace .. ":"
                        .. table.concat(name, ":")
         elseif name[#name] == false then
             name[#name] = nil
@@ -272,7 +272,7 @@ writers["dokuwiki"] = util.Object:clone {
         if type(target) == "table" then
             if target[#target] == true then
                 target[#target] = nil
-                target = ":" .. root_nspace .. ":auto:"
+                target = ":" .. root_nspace .. ":"
                              .. table.concat(target, ":")
             elseif target[#target] == false then
                 target[#target] = nil
diff --git a/src/scripts/elua/apps/gendoc.lua b/src/scripts/elua/apps/gendoc.lua
index 63ad69bf36..97c9715a40 100644
--- a/src/scripts/elua/apps/gendoc.lua
+++ b/src/scripts/elua/apps/gendoc.lua
@@ -327,7 +327,7 @@ local build_reftable = function(f, title, ctitle, ctype, t, iscl)
 end
 
 local build_ref = function()
-    local f = writer.Writer("reference", "EFL Reference")
+    local f = writer.Writer("start", "EFL Reference")
     printgen("Generating reference...")
 
     f:write_editable({ "reference" }, "general")
@@ -1601,7 +1601,7 @@ getopt.parse {
             set_theme(opts["graph-theme"])
         end
         local rootns = (not opts["n"] or opts["n"] == "")
-            and "develop:efl" or opts["n"]
+            and "develop:api" or opts["n"]
         local dr
         if not opts["r"] or opts["r"] == "" then
             dr = "dokuwiki/data/pages"