diff --git a/Manuals/Docbook/Entities/Repository/Directories.docbook b/Manuals/Docbook/Entities/Repository/Directories.docbook
index c027be7..79c04ef 100644
--- a/Manuals/Docbook/Entities/Repository/Directories.docbook
+++ b/Manuals/Docbook/Entities/Repository/Directories.docbook
@@ -13,11 +13,11 @@
     them. For that purpose, the following list of directories is
     available for you to explore:</para>
 
-    &repo-dirs-section-1;
-    &repo-dirs-section-2;
-    &repo-dirs-section-3;
-    &repo-dirs-section-4;
-    &repo-dirs-section-5;
-    &repo-dirs-section-6;
+    &repo-dirs-trunk;
+    &repo-dirs-trunk-identity;
+    &repo-dirs-trunk-identity-models;
+    &repo-dirs-trunk-identity-models-themes;
+    &repo-dirs-trunk-identity-models-themes-default;
+    &repo-dirs-trunk-manuals;
 
 </chapter>
diff --git a/Manuals/Docbook/Entities/Repository/Usage.docbook b/Manuals/Docbook/Entities/Repository/Usage.docbook
index 025912f..13711aa 100644
--- a/Manuals/Docbook/Entities/Repository/Usage.docbook
+++ b/Manuals/Docbook/Entities/Repository/Usage.docbook
@@ -19,12 +19,12 @@
     interchange data and provides the information required to permit
     extracting previous versions of files at any time.</para>
 
-    &repo-usage-section-1;
-    &repo-usage-section-2;
-    &repo-usage-section-3;
-    &repo-usage-section-4;
-    &repo-usage-section-5;
-    &repo-usage-section-6;
-    &repo-usage-section-7;
+    &repo-usage-policy;
+    &repo-usage-organization;
+    &repo-usage-filenames;
+    &repo-usage-worklines;
+    &repo-usage-connection-between-worklines;
+    &repo-usage-syncronizing-paths;
+    &repo-usage-extending-repository;
 
 </chapter>
diff --git a/Manuals/Docbook/Entities/Repository/Usage/Worklines.docbook b/Manuals/Docbook/Entities/Repository/Usage/Worklines.docbook
index 666d3e0..ba692e9 100644
--- a/Manuals/Docbook/Entities/Repository/Usage/Worklines.docbook
+++ b/Manuals/Docbook/Entities/Repository/Usage/Worklines.docbook
@@ -15,9 +15,9 @@
     production standard is required for each available work
     line.</para>
 
-    &repo-usage-section-4-1;
-    &repo-usage-section-4-2;
-    &repo-usage-section-4-3;
-    &repo-usage-section-4-4;
+    &repo-usage-worklines-graphic-design;
+    &repo-usage-worklines-documentation;
+    &repo-usage-worklines-localization;
+    &repo-usage-worklines-automation;
 
 </sect1>
diff --git a/Manuals/Docbook/repository-parts.docbook b/Manuals/Docbook/repository-parts.docbook
index 47b2b4b..e64592a 100644
--- a/Manuals/Docbook/repository-parts.docbook
+++ b/Manuals/Docbook/repository-parts.docbook
@@ -5,7 +5,7 @@
     &repo-history;
     &repo-copying;
     &repo-usage;
-    &repo-directories;
+    &repo-dirs;
 </part>
 
 <part>
diff --git a/Manuals/Docbook/repository.docbook b/Manuals/Docbook/repository.docbook
index 94ec226..6c99bb7 100644
--- a/Manuals/Docbook/repository.docbook
+++ b/Manuals/Docbook/repository.docbook
@@ -32,10 +32,10 @@
         <!ENTITY repo-copying-the-centos-brand                      SYSTEM "Entities/Repository/Copying/the-centos-brand.docbook">
 
         <!ENTITY repo-usage                                         SYSTEM "Entities/Repository/Usage.docbook">
-        <!ENTITY repo-usage-preamble                                SYSTEM "Entities/Repository/Usage/preamble.docbook">
+        <!ENTITY repo-usage-policy                                  SYSTEM "Entities/Repository/Usage/policy.docbook">
         <!ENTITY repo-usage-organization                            SYSTEM "Entities/Repository/Usage/organization.docbook">
         <!ENTITY repo-usage-filenames                               SYSTEM "Entities/Repository/Usage/filenames.docbook">
-        <!ENTITY repo-usage-worklines                               SYSTEM "Entities/Repository/Usage/worklines.docbook">
+        <!ENTITY repo-usage-worklines                               SYSTEM "Entities/Repository/Usage/Worklines.docbook">
         <!ENTITY repo-usage-worklines-graphic-design                SYSTEM "Entities/Repository/Usage/Worklines/graphic-design.docbook">
         <!ENTITY repo-usage-worklines-documentation                 SYSTEM "Entities/Repository/Usage/Worklines/documentation.docbook">
         <!ENTITY repo-usage-worklines-localization                  SYSTEM "Entities/Repository/Usage/Worklines/localization.docbook">
@@ -50,7 +50,7 @@
         <!ENTITY repo-dirs-trunk-identity-models                     SYSTEM "Entities/Repository/Directories/trunk/Identity/Models.docbook">
         <!ENTITY repo-dirs-trunk-identity-models-themes              SYSTEM "Entities/Repository/Directories/trunk/Identity/Models/Themes.docbook">
         <!ENTITY repo-dirs-trunk-identity-models-themes-default      SYSTEM "Entities/Repository/Directories/trunk/Identity/Models/Themes/Default.docbook">
-        <!ENTITY repo-dirs-trunk-manual                              SYSTEM "Entities/Repository/Directories/trunk/Manuals.docbook">
+        <!ENTITY repo-dirs-trunk-manuals                             SYSTEM "Entities/Repository/Directories/trunk/Manuals.docbook">
 
         <!-- Part II: Entities/Licenses -->
         <!ENTITY licenses-gpl                                       SYSTEM "Entities/Licenses/Gpl.docbook">