diff --git a/bk001-ch003-associate-controller-node.xml b/bk001-ch003-associate-controller-node.xml
index ed960a7a..fde9009e 100644
--- a/bk001-ch003-associate-controller-node.xml
+++ b/bk001-ch003-associate-controller-node.xml
@@ -50,7 +50,7 @@
         <section xml:id="associate-glance-cli-commands">
             <title>Image CLI Commands</title>
             <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)])">
+            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>
         </section>
diff --git a/bk001-ch005-associate-compute-node.xml b/bk001-ch005-associate-compute-node.xml
index ed2e5e31..604c80de 100644
--- a/bk001-ch005-associate-compute-node.xml
+++ b/bk001-ch005-associate-compute-node.xml
@@ -36,7 +36,7 @@
         <section xml:id="associate-block-storage-commands">
             <title>Block Storage CLI Commands</title>
           <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)])">
+            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>
         </section>
diff --git a/bk001-ch007-associate-network-node.xml b/bk001-ch007-associate-network-node.xml
index 1fa73a75..72c195c7 100644
--- a/bk001-ch007-associate-network-node.xml
+++ b/bk001-ch007-associate-network-node.xml
@@ -29,7 +29,7 @@
     <section xml:id="associate-network-cli-commands">
         <title>Network CLI Commands</title>
       <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)])">
+          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>
     </section>
diff --git a/bk001-ch009-associate-object-storage-node.xml b/bk001-ch009-associate-object-storage-node.xml
index 19b115ab..a4f2a628 100644
--- a/bk001-ch009-associate-object-storage-node.xml
+++ b/bk001-ch009-associate-object-storage-node.xml
@@ -29,7 +29,7 @@
     <section xml:id="associate-object-store-cli-commands">
         <title>Object Storage CLI Commands</title>
       <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)])">
+          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>
     </section>