diff --git a/doc/cli-reference/bk-cli-reference.xml b/doc/cli-reference/bk-cli-reference.xml
index e112bec9d8..84f976afab 100644
--- a/doc/cli-reference/bk-cli-reference.xml
+++ b/doc/cli-reference/bk-cli-reference.xml
@@ -55,8 +55,13 @@
 
     <xi:include href="ch_preface.xml"/>
     <xi:include href="ch_cli.xml"/>
-    <xi:include href="ch_command_reference.xml"/>
-    <!-- Alternative 2 -->
-<!--    <xi:include href="ch_nova_cli.xml"/> -->
+    <xi:include href="../common/ch_cli_keystone_commands.xml"/>
+    <xi:include href="../common/ch_cli_glance_commands.xml"/>
+    <xi:include href="../common/ch_cli_neutron_commands.xml"/>
+    <xi:include href="../common/ch_cli_nova_commands.xml"/>
+    <xi:include href="../common/ch_cli_cinder_commands.xml"/>
+    <xi:include href="../common/ch_cli_swift_commands.xml"/>
+    <xi:include href="../common/ch_cli_heat_commands.xml"/>
+    <xi:include href="../common/ch_cli_ceilometer_commands.xml"/>
     <xi:include href="../common/app_support.xml"/>
    </book>
diff --git a/doc/cli-reference/ch_command_reference.xml b/doc/cli-reference/ch_command_reference.xml
deleted file mode 100644
index 7b604c2434..0000000000
--- a/doc/cli-reference/ch_command_reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<chapter xmlns="http://docbook.org/ns/docbook"
-        xmlns:xi="http://www.w3.org/2001/XInclude"
-        xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-        xml:id="ch_command_reference">
-        <title>Command reference</title>
-        <xi:include
-                href="../common/section_cli_keystone_commands.xml"/>
-        <?hard page-break?>
-        <xi:include
-                href="../common/section_cli_glance_commands.xml"/>
-        <?hard page-break?>
-        <xi:include
-                href="../common/section_cli_neutron_commands.xml"/>
-        <?hard page-break?>
-        <xi:include
-                href="../common/section_cli_nova_commands.xml"/>
-        <?hard page-break?>
-        <xi:include
-                href="../common/section_cli_cinder_commands.xml"/>
-        <?hard page-break?>
-        <xi:include
-                href="../common/section_cli_swift_commands.xml"/>
-        <?hard page-break?>
-        <xi:include
-                href="../common/section_cli_heat_commands.xml"/>
-        <?hard page-break?>
-        <xi:include
-                href="../common/section_cli_ceilometer_commands.xml"/>
-</chapter>
diff --git a/doc/common/section_cli_ceilometer_commands.xml b/doc/common/ch_cli_ceilometer_commands.xml
similarity index 99%
rename from doc/common/section_cli_ceilometer_commands.xml
rename to doc/common/ch_cli_ceilometer_commands.xml
index a9f951ed82..bf28a286fa 100644
--- a/doc/common/section_cli_ceilometer_commands.xml
+++ b/doc/common/ch_cli_ceilometer_commands.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
+<chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
     xml:id="ceilometerclient_commands">
@@ -1645,4 +1645,4 @@ List trait all traits with name &lt;trait_name&gt; for Event Type &lt;event_type
   </varlistentry>
  </variablelist>
     </section>
-</section>
+</chapter>
diff --git a/doc/common/section_cli_cinder_commands.xml b/doc/common/ch_cli_cinder_commands.xml
similarity index 99%
rename from doc/common/section_cli_cinder_commands.xml
rename to doc/common/ch_cli_cinder_commands.xml
index b9951f8e31..26a4474857 100644
--- a/doc/common/section_cli_cinder_commands.xml
+++ b/doc/common/ch_cli_cinder_commands.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
+<chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
     xml:id="cinderclient_commands">
@@ -2368,4 +2368,4 @@ Upload volume to image service as image.
   </varlistentry>
  </variablelist>
     </section>
-</section>
+</chapter>
diff --git a/doc/common/section_cli_glance_commands.xml b/doc/common/ch_cli_glance_commands.xml
similarity index 99%
rename from doc/common/section_cli_glance_commands.xml
rename to doc/common/ch_cli_glance_commands.xml
index eddc2e2362..6baac5f7c0 100644
--- a/doc/common/section_cli_glance_commands.xml
+++ b/doc/common/ch_cli_glance_commands.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
+<chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
     xml:id="glanceclient_commands">
@@ -1143,4 +1143,4 @@ Describe sharing permissions by image or tenant.
   </varlistentry>
  </variablelist>
     </section>
-</section>
+</chapter>
diff --git a/doc/common/section_cli_heat_commands.xml b/doc/common/ch_cli_heat_commands.xml
similarity index 99%
rename from doc/common/section_cli_heat_commands.xml
rename to doc/common/ch_cli_heat_commands.xml
index 07bfeddde1..8b8e307993 100644
--- a/doc/common/section_cli_heat_commands.xml
+++ b/doc/common/ch_cli_heat_commands.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
+<chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
     xml:id="heatclient_commands">
@@ -923,4 +923,4 @@ Validate a template with parameters.
   </varlistentry>
  </variablelist>
     </section>
-</section>
+</chapter>
diff --git a/doc/common/section_cli_keystone_commands.xml b/doc/common/ch_cli_keystone_commands.xml
similarity index 99%
rename from doc/common/section_cli_keystone_commands.xml
rename to doc/common/ch_cli_keystone_commands.xml
index 741a13fbc5..4e10b0e921 100644
--- a/doc/common/section_cli_keystone_commands.xml
+++ b/doc/common/ch_cli_keystone_commands.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
+<chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
     xml:id="keystoneclient_commands">
@@ -1383,4 +1383,4 @@ Update user's name, email, and enabled status.
   </varlistentry>
  </variablelist>
     </section>
-</section>
+</chapter>
diff --git a/doc/common/section_cli_neutron_commands.xml b/doc/common/ch_cli_neutron_commands.xml
similarity index 99%
rename from doc/common/section_cli_neutron_commands.xml
rename to doc/common/ch_cli_neutron_commands.xml
index 498f5a7db3..4ae8891d61 100644
--- a/doc/common/section_cli_neutron_commands.xml
+++ b/doc/common/ch_cli_neutron_commands.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
+<chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
     xml:id="neutronclient_commands">
@@ -10593,4 +10593,4 @@ Update a given VPNService.
   </varlistentry>
  </variablelist>
     </section>
-</section>
+</chapter>
diff --git a/doc/common/section_cli_nova_commands.xml b/doc/common/ch_cli_nova_commands.xml
similarity index 99%
rename from doc/common/section_cli_nova_commands.xml
rename to doc/common/ch_cli_nova_commands.xml
index 521df2dfbc..e1fa3761b6 100644
--- a/doc/common/section_cli_nova_commands.xml
+++ b/doc/common/ch_cli_nova_commands.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
+<chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
     xml:id="novaclient_commands">
@@ -6812,4 +6812,4 @@ Fetch the x509 root cert.
   </varlistentry>
  </variablelist>
     </section>
-</section>
+</chapter>
diff --git a/doc/common/section_cli_swift_commands.xml b/doc/common/ch_cli_swift_commands.xml
similarity index 99%
rename from doc/common/section_cli_swift_commands.xml
rename to doc/common/ch_cli_swift_commands.xml
index 5c190b5519..2ef04ec881 100644
--- a/doc/common/section_cli_swift_commands.xml
+++ b/doc/common/ch_cli_swift_commands.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
+<chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
     xml:id="swiftclient_commands">
@@ -779,4 +779,4 @@ If the container is not found, it will be created automatically.
   </varlistentry>
  </variablelist>
     </section>
-</section>
+</chapter>
diff --git a/doc/training-guides/bk001-ch003-associate-controller-node.xml b/doc/training-guides/bk001-ch003-associate-controller-node.xml
index fde9009e11..02640e8064 100644
--- a/doc/training-guides/bk001-ch003-associate-controller-node.xml
+++ b/doc/training-guides/bk001-ch003-associate-controller-node.xml
@@ -49,7 +49,7 @@
         </section>
         <section xml:id="associate-glance-cli-commands">
             <title>Image CLI Commands</title>
-            <xi:include href="../common/section_cli_glance_commands.xml"
+            <xi:include href="../common/ch_cli_glance_commands.xml"
             xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'glanceclient_commands']/*[not(self::db:title)])">
               <xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
             </xi:include>
diff --git a/doc/training-guides/bk001-ch005-associate-compute-node.xml b/doc/training-guides/bk001-ch005-associate-compute-node.xml
index 604c80de38..5c763b1b9f 100644
--- a/doc/training-guides/bk001-ch005-associate-compute-node.xml
+++ b/doc/training-guides/bk001-ch005-associate-compute-node.xml
@@ -35,7 +35,7 @@
     <title>Administration Tasks</title>
         <section xml:id="associate-block-storage-commands">
             <title>Block Storage CLI Commands</title>
-          <xi:include href="../common/section_cli_cinder_commands.xml"
+          <xi:include href="../common/ch_cli_cinder_commands.xml"
             xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'cinderclient_commands']/*[not(self::db:title)])">
               <xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
             </xi:include>
@@ -49,7 +49,7 @@
         </section>
         <section xml:id="associate-nova-cli-commands">
             <title>Compute CLI Commands</title>
-          <xi:include href="../common/section_cli_nova_commands.xml"
+          <xi:include href="../common/ch_cli_nova_commands.xml"
             xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'novaclient_commands']/*[not(self::db:title)])">
               <xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
             </xi:include>
diff --git a/doc/training-guides/bk001-ch007-associate-network-node.xml b/doc/training-guides/bk001-ch007-associate-network-node.xml
index 72c195c759..42b8f93219 100644
--- a/doc/training-guides/bk001-ch007-associate-network-node.xml
+++ b/doc/training-guides/bk001-ch007-associate-network-node.xml
@@ -28,7 +28,7 @@
     <title>Administration Tasks</title>
     <section xml:id="associate-network-cli-commands">
         <title>Network CLI Commands</title>
-      <xi:include href="../common/section_cli_neutron_commands.xml"
+      <xi:include href="../common/ch_cli_neutron_commands.xml"
           xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'neutronclient_commands']/*[not(self::db:title)])">
           <xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
         </xi:include>
diff --git a/doc/training-guides/bk001-ch009-associate-object-storage-node.xml b/doc/training-guides/bk001-ch009-associate-object-storage-node.xml
index a4f2a628ad..54a17f3352 100644
--- a/doc/training-guides/bk001-ch009-associate-object-storage-node.xml
+++ b/doc/training-guides/bk001-ch009-associate-object-storage-node.xml
@@ -28,7 +28,7 @@
     <title>Administration Tasks</title>
     <section xml:id="associate-object-store-cli-commands">
         <title>Object Storage CLI Commands</title>
-      <xi:include href="../common/section_cli_swift_commands.xml"
+      <xi:include href="../common/ch_cli_swift_commands.xml"
           xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'swiftclient_commands']/*[not(self::db:title)])">
           <xi:fallback><para><mediaobject><imageobject><imagedata fileref="figures/openstack-training-remote-content-not-available.png" format="PNG"/></imageobject></mediaobject>Remote content not available</para><para>image source</para><para><link xlink:href="https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing">https://docs.google.com/drawings/d/1J2LZSxmc06xKyxMgPjv5fC0blV7qK6956-AeTmFOZD4/edit?usp=sharing</link></para></xi:fallback>
         </xi:include>