diff --git a/bk001-ch003-associate-controller-node.xml b/bk001-ch003-associate-controller-node.xml
index 76927932..ed960a7a 100644
--- a/bk001-ch003-associate-controller-node.xml
+++ b/bk001-ch003-associate-controller-node.xml
@@ -35,7 +35,7 @@
     <title>Administration Tasks</title>
         <section xml:id="associate-identity-cli-commands">
             <title>Identity CI Commands</title>
-            <xi:include href="../common/section_keystone_cli_example_usage.xml"
+            <xi:include href="../common/section_cli_keystone_example_usage.xml"
             xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'example-usage']/*[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,28 +49,28 @@
         </section>
         <section xml:id="associate-glance-cli-commands">
             <title>Image CLI Commands</title>
-            <xi:include href="../common/section_glance_cli_commands.xml"
+            <xi:include href="../common/section_cli_glance_commands.xml"
             xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'glance_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>
         </section>
         <section xml:id="associate-glance-image-list">
             <title>Image List Images</title>
-            <xi:include href="../common/section_glance_cli_manage_images.xml"
+            <xi:include href="../common/section_cli_glance_manage_images.xml"
             xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'glance-image-list']/*[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>
         </section>
          <section xml:id="associate-glance-image-add">
             <title>Image Adding Images</title>
-            <xi:include href="../common/section_glance_cli_manage_images.xml"
+            <xi:include href="../common/section_cli_glance_manage_images.xml"
             xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'glance_add_image']/*[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>
         </section>
         <section xml:id="associate-glance-manage-images">
             <title>Image Manage Images</title>
-            <xi:include href="../common/section_nova_cli_manage_images.xml"
+            <xi:include href="../common/section_cli_nova_manage_images.xml"
             xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'nova_manage_images']/*[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/bk001-ch005-associate-compute-node.xml b/bk001-ch005-associate-compute-node.xml
index 5297e1c4..ed2e5e31 100644
--- a/bk001-ch005-associate-compute-node.xml
+++ b/bk001-ch005-associate-compute-node.xml
@@ -35,42 +35,42 @@
     <title>Administration Tasks</title>
         <section xml:id="associate-block-storage-commands">
             <title>Block Storage CLI Commands</title>
-            <xi:include href="../common/section_cinder_cli_commands.xml"
+          <xi:include href="../common/section_cli_cinder_commands.xml"
             xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'cinder_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>
         </section>
         <section xml:id="associate-block-storage-manage-volumes">
             <title>Block Storage Manage Volumes</title>
-            <xi:include href="../common/section_cinder_cli_manage_volumes.xml"
+          <xi:include href="../common/section_cli_cinder_manage_volumes.xml"
             xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'cli_manage_volumes']/*[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>
         </section>
         <section xml:id="associate-nova-cli-commands">
             <title>Compute CLI Commands</title>
-            <xi:include href="../common/section_nova_cli_commands.xml"
+          <xi:include href="../common/section_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>
         </section>
         <section xml:id="associate-nova-image-creation">
             <title>Compute Image creation</title>
-            <xi:include href="../common/section_nova_cli_images.xml"
+          <xi:include href="../common/section_cli_nova_images.xml"
             xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'nova_manage_images']/*[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>
         </section>
         <section xml:id="associate-nova-boot-instance">
             <title>Compute Boot Instance</title>
-            <xi:include href="../common/section_nova_boot_from_volume.xml"
+            <xi:include href="../common/section_cli_nova_boot_from_volume.xml"
             xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'boot_from_volume']/*[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>
         </section>
         <section xml:id="associate-nova-terminate-instance">
             <title>Compute Terminate Instance</title>
-            <xi:include href="../common/section_nova_cli_terminate.xml"
+          <xi:include href="../common/section_cli_nova_terminate.xml"
             xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'terminating']/*[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/bk001-ch007-associate-network-node.xml b/bk001-ch007-associate-network-node.xml
index a88c7e4f..1fa73a75 100644
--- a/bk001-ch007-associate-network-node.xml
+++ b/bk001-ch007-associate-network-node.xml
@@ -28,17 +28,17 @@
     <title>Administration Tasks</title>
     <section xml:id="associate-network-cli-commands">
         <title>Network CLI Commands</title>
-        <xi:include href="../common/section_neutron_cli_commands.xml"
+      <xi:include href="../common/section_cli_neutron_commands.xml"
           xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'neutron_client_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>
     </section>
     <section xml:id="associate-network-manage">
         <title>Manage Networks</title>
-        <xi:include href="../common/section_neutron_cli_manage_networks.xml"
+      <xi:include href="../common/section_cli_neutron_manage_networks.xml"
           xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'neutron_client_sample_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>
     </section>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/bk001-ch009-associate-object-storage-node.xml b/bk001-ch009-associate-object-storage-node.xml
index debfabbb..19b115ab 100644
--- a/bk001-ch009-associate-object-storage-node.xml
+++ b/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_swift_cli_commands.xml"
+      <xi:include href="../common/section_cli_swift_commands.xml"
           xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'swift_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>
@@ -38,4 +38,4 @@
         <para>Will be included from the swift developer reference</para>
     </section>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/card070-create-floating-ips.xml b/card070-create-floating-ips.xml
index 6c5667e8..745c1cea 100644
--- a/card070-create-floating-ips.xml
+++ b/card070-create-floating-ips.xml
@@ -6,21 +6,21 @@
   xml:id="create-floating-ip">
   <title>Create floating ip</title>
     <!-- this maps to card070 user story title "create-floating-ip" -->
-  <xi:include href="../user-guide/section_nova_cli_floating_ips.xml"
+  <xi:include href="../user-guide/section_cli_nova_floating_ips.xml"
     xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'floating_ips_overview']/*[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>
     <!-- this maps to card070 user story title "create-floating-ip" -->
-  <xi:include href="../user-guide/section_nova_cli_floating_ips.xml"
+  <xi:include href="../user-guide/section_cli_nova_floating_ips.xml"
     xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'floating_ips_proc']/*[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>
     <!-- this maps to card070 user story title "create-floating-ip" -->
-  <xi:include href="../user-guide/section_nova_cli_floating_ips.xml"
+  <xi:include href="../user-guide/section_cli_nova_floating_ips.xml"
     xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'floating_ip_allocate']/*[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>
     <para><link xlink:href="https://blueprints.launchpad.net/openstack-manuals/+filebug" xlink:show="new">Submit a bug on
       the section above. Short description for the bug summary. Paragraph for the description and
       then tag with training-manuals.</link></para>
-</section>
\ No newline at end of file
+</section>