diff --git a/Manuals/Docbook/Entities/Repository/History.docbook b/Manuals/Docbook/Entities/Repository/History.docbook
index 74906a7..41cf7f9 100644
--- a/Manuals/Docbook/Entities/Repository/History.docbook
+++ b/Manuals/Docbook/Entities/Repository/History.docbook
@@ -6,9 +6,9 @@
     <para>This chapter describes, briefly, where we've been and where
     we're going to with the CentOS Artwork Repository.</para>
 
-    &repo-history-section-1;
-    &repo-history-section-2;
-    &repo-history-section-3;
-    &repo-history-section-4;
+    &repo-history-2008;
+    &repo-history-2009;
+    &repo-history-2010;
+    &repo-history-2011;
 
 </chapter>
diff --git a/Manuals/Docbook/repository-parts.docbook b/Manuals/Docbook/repository-parts.docbook
index 00a0bff..47b2b4b 100644
--- a/Manuals/Docbook/repository-parts.docbook
+++ b/Manuals/Docbook/repository-parts.docbook
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
+&preface;
 <part>
     <title>The Repository</title>
-    &repository-history;
-    &repository-copying;
-    &repository-usage;
-    &repository-directories;
+    &repo-history;
+    &repo-copying;
+    &repo-usage;
+    &repo-directories;
 </part>
 
 <part>
diff --git a/Manuals/Docbook/repository-preamble.docbook b/Manuals/Docbook/repository-preamble.docbook
index 92cf82f..9a1eeef 100644
--- a/Manuals/Docbook/repository-preamble.docbook
+++ b/Manuals/Docbook/repository-preamble.docbook
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <bookinfo>
-&book-title;
-&book-authors;
-&book-copyright;
-&book-legalnotice;
-&book-date;
-&book-abstract;
+&repository-title;
+&repository-authors;
+&repository-copyright;
+&repository-legalnotice;
+&repository-date;
+&repository-abstract;
 </bookinfo>
diff --git a/Manuals/Docbook/repository-preface.docbook b/Manuals/Docbook/repository-preface.docbook
deleted file mode 100644
index ff70e1d..0000000
--- a/Manuals/Docbook/repository-preface.docbook
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-&preface-chapter;
diff --git a/Manuals/Docbook/repository.docbook b/Manuals/Docbook/repository.docbook
index 9e71a87..94ec226 100644
--- a/Manuals/Docbook/repository.docbook
+++ b/Manuals/Docbook/repository.docbook
@@ -11,7 +11,6 @@
         <!ENTITY repository-date                                    SYSTEM "repository-date.docbook">
         <!ENTITY repository-abstract                                SYSTEM "repository-abstract.docbook">
         <!ENTITY repository-preamble                                SYSTEM "repository-preamble.docbook">
-        <!ENTITY repository-preface                                 SYSTEM "repository-preface.docbook">
         <!ENTITY repository-parts                                   SYSTEM "repository-parts.docbook">
 
         <!-- Entities/Preface -->
@@ -45,13 +44,13 @@
         <!ENTITY repo-usage-syncronizing-paths                      SYSTEM "Entities/Repository/Usage/syncronizing-paths.docbook">
         <!ENTITY repo-usage-extending-repository                    SYSTEM "Entities/Repository/Usage/extending-repository.docbook">
 
-        <!ENTITY repo-dir                                           SYSTEM "Entities/Repository/Directories.docbook">
-        <!ENTITY repo-dir-trunk                                     SYSTEM "Entities/Repository/Directories/trunk.docbook">
-        <!ENTITY repo-dir-trunk-identity                            SYSTEM "Entities/Repository/Directories/trunk/Identity.docbook">
-        <!ENTITY repo-dir-trunk-identity-models                     SYSTEM "Entities/Repository/Directories/trunk/Identity/Models.docbook">
-        <!ENTITY repo-dir-trunk-identity-models-themes              SYSTEM "Entities/Repository/Directories/trunk/Identity/Models/Themes.docbook">
-        <!ENTITY repo-dir-trunk-identity-models-themes-default      SYSTEM "Entities/Repository/Directories/trunk/Identity/Models/Themes/Default.docbook">
-        <!ENTITY repo-dir-trunk-manual                              SYSTEM "Entities/Repository/Directories/trunk/Manuals.docbook">
+        <!ENTITY repo-dirs                                           SYSTEM "Entities/Repository/Directories.docbook">
+        <!ENTITY repo-dirs-trunk                                     SYSTEM "Entities/Repository/Directories/trunk.docbook">
+        <!ENTITY repo-dirs-trunk-identity                            SYSTEM "Entities/Repository/Directories/trunk/Identity.docbook">
+        <!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">
 
         <!-- Part II: Entities/Licenses -->
         <!ENTITY licenses-gpl                                       SYSTEM "Entities/Licenses/Gpl.docbook">
@@ -91,7 +90,6 @@
     ]>
 
 <book lang="en">
-&book-preamble;
-&book-preface;
-&book-parts;
+&repository-preamble;
+&repository-parts;
 </book>