diff --git a/_toc.yml b/_toc.yml
index ff78371b..fa67d68f 100644
--- a/_toc.yml
+++ b/_toc.yml
@@ -12,12 +12,17 @@
     - file: infrastructure-guide/home
       # sections:
 
-- part: RHEL8 Documentation
+- part: RHEL8
   chapters:
     - file: rhel8/index
+    sections:
+      - file: rhel8/installation
+      - file: rhel8/configuration
+      - file: rhel8/vendor_documentation
+      - file: rhel8/design_guiding_principles
 
-- part: RHEL8 Beta Guide
+- part: RHEL8 Guides
   chapters:
-    - file: rhel8-beta/index
-    - file: rhel8-developer-guide/index
+    - file: rhel8-guides-beta/developer_guide
+    - file: rhel8-guides-beta/installation_guide
         
\ No newline at end of file
diff --git a/rhel8-developer-guide/index.md b/rhel8-guides-beta/developer_guide.md
similarity index 100%
rename from rhel8-developer-guide/index.md
rename to rhel8-guides-beta/developer_guide.md
diff --git a/rhel8-beta/index.md b/rhel8-guides-beta/installation_guide.md
similarity index 99%
rename from rhel8-beta/index.md
rename to rhel8-guides-beta/installation_guide.md
index 432ece28..77d3f155 100644
--- a/rhel8-beta/index.md
+++ b/rhel8-guides-beta/installation_guide.md
@@ -1,4 +1,4 @@
-# RHEL-8 Beta Guide
+# Installation Guide
 
 ## Table of Contents
 
diff --git a/rhel8/index.md b/rhel8/index.md
index 803b0460..2cdd1037 100644
--- a/rhel8/index.md
+++ b/rhel8/index.md
@@ -13,4 +13,4 @@ toc: true
 * [Installation](installation)
 * [Configuration](configuration)
 * [Vendor Documentation](vendor_documentation)
-* [Design Guide Principles](design_guide_principles)
\ No newline at end of file
+* [Design Guiding Principles](design_guiding_principles)
\ No newline at end of file