diff --git a/Manuals/Docbook/repository-parts/Directories/trunk.docbook b/Manuals/Docbook/repository-parts/Directories/trunk.docbook
index ed26744..eaa30c6 100644
--- a/Manuals/Docbook/repository-parts/Directories/trunk.docbook
+++ b/Manuals/Docbook/repository-parts/Directories/trunk.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<sect1 id="directories-trunk" xreflabel="trunk">
+<sect1 id="dir-trunk" xreflabel="trunk">
 
     <title><filename class="directory">trunk</filename></title>
     
diff --git a/Manuals/Docbook/repository-parts/Directories/trunk/Identity.docbook b/Manuals/Docbook/repository-parts/Directories/trunk/Identity.docbook
index a8c79b9..b288245 100644
--- a/Manuals/Docbook/repository-parts/Directories/trunk/Identity.docbook
+++ b/Manuals/Docbook/repository-parts/Directories/trunk/Identity.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<sect1 id="directories-trunk-identity" xreflabel="trunk/Identity">
+<sect1 id="dir-trunk-identity" xreflabel="trunk/Identity">
 
     <title><filename class="directory">trunk/Identity</filename></title>
 
diff --git a/Manuals/Docbook/repository-parts/Directories/trunk/Identity/Models.docbook b/Manuals/Docbook/repository-parts/Directories/trunk/Identity/Models.docbook
index d5fa39c..ffb0058 100644
--- a/Manuals/Docbook/repository-parts/Directories/trunk/Identity/Models.docbook
+++ b/Manuals/Docbook/repository-parts/Directories/trunk/Identity/Models.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<sect1 id="directories-trunk-identity-models" xreflabel="trunk/Identity/Models">
+<sect1 id="dir-trunk-identity-models" xreflabel="trunk/Identity/Models">
     <title><filename class="directory">trunk/Identity/Models</filename></title>
     <para>...</para>
 </sect1>
diff --git a/Manuals/Docbook/repository-parts/Directories/trunk/Identity/Models/Themes.docbook b/Manuals/Docbook/repository-parts/Directories/trunk/Identity/Models/Themes.docbook
index 3e6266e..e51cab0 100644
--- a/Manuals/Docbook/repository-parts/Directories/trunk/Identity/Models/Themes.docbook
+++ b/Manuals/Docbook/repository-parts/Directories/trunk/Identity/Models/Themes.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<sect1 id="directories-trunk-identity-models-themes" xreflabel="trunk/Identity/Models/Themes">
+<sect1 id="dir-trunk-identity-models-themes" xreflabel="trunk/Identity/Models/Themes">
 
     <title><filename class="directory">trunk/Identity/Models/Themes</filename></title>
 
diff --git a/Manuals/Docbook/repository-parts/Directories/trunk/Identity/Models/Themes/Default.docbook b/Manuals/Docbook/repository-parts/Directories/trunk/Identity/Models/Themes/Default.docbook
index 7e547d8..ae6ab63 100644
--- a/Manuals/Docbook/repository-parts/Directories/trunk/Identity/Models/Themes/Default.docbook
+++ b/Manuals/Docbook/repository-parts/Directories/trunk/Identity/Models/Themes/Default.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<sect1 id="directories-trunk-identity-models-themes-default"
+<sect1 id="dir-trunk-identity-models-themes-default"
        xreflabel="trunk/Identity/Models/Themes/Default">
 
     <title><filename class="directory">trunk/Identity/Models/Themes/Default</filename></title>
diff --git a/Manuals/Docbook/repository-parts/Directories/trunk/Manuals.docbook b/Manuals/Docbook/repository-parts/Directories/trunk/Manuals.docbook
index 8d9a594..ad5d510 100644
--- a/Manuals/Docbook/repository-parts/Directories/trunk/Manuals.docbook
+++ b/Manuals/Docbook/repository-parts/Directories/trunk/Manuals.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<sect1 id="directories-trunk-manuals" xreflabel="trunk/Manuals">
+<sect1 id="dir-trunk-manuals" xreflabel="trunk/Manuals">
     <title><filename class="directory">trunk/Manuals</filename></title>
     <para>...</para>
 </sect1>
diff --git a/Manuals/Docbook/repository.docbook b/Manuals/Docbook/repository.docbook
index fb643dc..c3bc05b 100644
--- a/Manuals/Docbook/repository.docbook
+++ b/Manuals/Docbook/repository.docbook
@@ -12,16 +12,15 @@
 <!ENTITY intro-usage            SYSTEM "repository-parts/Introduction/usage.docbook">
 
 <!-- Directories -->
-<!ENTITY directories SYSTEM "repository-parts/Directories.docbook">
-<!ENTITY directories-trunk SYSTEM "repository-parts/Directories/trunk.docbook">
-<!ENTITY directories-trunk-identity SYSTEM "repository-parts/Directories/trunk/Identity.docbook">
-<!ENTITY directories-trunk-identity-models SYSTEM "repository-parts/Directories/trunk/Identity/Models.docbook">
-<!ENTITY directories-trunk-identity-models-themes SYSTEM "repository-parts/Directories/trunk/Identity/Models/Themes.docbook">
-<!ENTITY directories-trunk-identity-models-themes-default SYSTEM "repository-parts/Directories/trunk/Identity/Models/Themes/Default.docbook">
-<!ENTITY directories-trunk-manuals SYSTEM "repository-parts/Directories/trunk/Manuals.docbook">
+<!ENTITY dir SYSTEM "repository-parts/Directories.docbook">
+<!ENTITY dir-trunk SYSTEM "repository-parts/Directories/trunk.docbook">
+<!ENTITY dir-trunk-identity SYSTEM "repository-parts/Directories/trunk/Identity.docbook">
+<!ENTITY dir-trunk-identity-models SYSTEM "repository-parts/Directories/trunk/Identity/Models.docbook">
+<!ENTITY dir-trunk-identity-models-themes SYSTEM "repository-parts/Directories/trunk/Identity/Models/Themes.docbook">
+<!ENTITY dir-trunk-identity-models-themes-default SYSTEM "repository-parts/Directories/trunk/Identity/Models/Themes/Default.docbook">
+<!ENTITY dir-trunk-manuals SYSTEM "repository-parts/Directories/trunk/Manuals.docbook">
 
 <!-- Licenses -->
-<!ENTITY licenses               SYSTEM "repository-parts/Licenses.docbook">
 <!ENTITY licenses-gpl           SYSTEM "repository-parts/Licenses/gpl.docbook">
 <!ENTITY licenses-gfdl          SYSTEM "repository-parts/Licenses/gfdl.docbook">