diff --git a/doc/training-guides/basic-install-guide/lab003-compute-node.xml b/doc/training-guides/basic-install-guide/lab_compute-node.xml
similarity index 99%
rename from doc/training-guides/basic-install-guide/lab003-compute-node.xml
rename to doc/training-guides/basic-install-guide/lab_compute-node.xml
index 87be485b..2adeca7a 100644
--- a/doc/training-guides/basic-install-guide/lab003-compute-node.xml
+++ b/doc/training-guides/basic-install-guide/lab_compute-node.xml
@@ -3,7 +3,7 @@
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink"
  version="5.0"
-  xml:id="lab003-compute-node">
+  xml:id="lab_compute-node">
   <title>Compute Node</title>
   <orderedlist>
     <listitem>
@@ -14,7 +14,7 @@
     <title>Network Diagram</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="../figures/lab000-virtual-box/image03.png"
+        <imagedata fileref="../figures/lab_virtual-box/image03.png"
                    contentwidth="7in"/>
       </imageobject>
     </mediaobject>
diff --git a/doc/training-guides/basic-install-guide/lab001-control-node.xml b/doc/training-guides/basic-install-guide/lab_control-node.xml
similarity index 99%
rename from doc/training-guides/basic-install-guide/lab001-control-node.xml
rename to doc/training-guides/basic-install-guide/lab_control-node.xml
index aef2fe8e..b6a035e3 100644
--- a/doc/training-guides/basic-install-guide/lab001-control-node.xml
+++ b/doc/training-guides/basic-install-guide/lab_control-node.xml
@@ -2,14 +2,14 @@
 <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="lab001-control-node.xml">
+  xml:id="lab_control-node.xml">
   <title>Control Node</title>
   <para><emphasis role="bold">Network Diagram :</emphasis></para>
   <figure>
     <title>Network Diagram</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="../figures/lab000-virtual-box/image03.png"
+        <imagedata fileref="../figures/lab_virtual-box/image03.png"
                    contentwidth="7in"/>
       </imageobject>
     </mediaobject>
diff --git a/doc/training-guides/basic-install-guide/lab000-important-terms.xml b/doc/training-guides/basic-install-guide/lab_important-terms.xml
similarity index 98%
rename from doc/training-guides/basic-install-guide/lab000-important-terms.xml
rename to doc/training-guides/basic-install-guide/lab_important-terms.xml
index 2647e04f..50781df6 100644
--- a/doc/training-guides/basic-install-guide/lab000-important-terms.xml
+++ b/doc/training-guides/basic-install-guide/lab_important-terms.xml
@@ -2,7 +2,7 @@
 <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="lab000-important-terms">
+  xml:id="lab_important-terms">
   <title>Important terms</title>
   <formalpara>
     <title>Host Operating System (Host)</title>
diff --git a/doc/training-guides/basic-install-guide/lab002-network-node.xml b/doc/training-guides/basic-install-guide/lab_network-node.xml
similarity index 98%
rename from doc/training-guides/basic-install-guide/lab002-network-node.xml
rename to doc/training-guides/basic-install-guide/lab_network-node.xml
index b1e86d9d..55d6a3a9 100644
--- a/doc/training-guides/basic-install-guide/lab002-network-node.xml
+++ b/doc/training-guides/basic-install-guide/lab_network-node.xml
@@ -1,6 +1,6 @@
 <?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="lab002-network-node">
+  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="lab_network-node">
   <title>Network Node</title>
   <orderedlist>
     <listitem>
@@ -11,7 +11,7 @@
     <title>Network Diagram</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="../figures/lab000-virtual-box/image03.png"
+        <imagedata fileref="../figures/lab_virtual-box/image03.png"
                    contentwidth="7in"/>
       </imageobject>
     </mediaobject>
diff --git a/doc/training-guides/basic-install-guide/lab004-openstack-production.xml b/doc/training-guides/basic-install-guide/lab_openstack-production.xml
similarity index 83%
rename from doc/training-guides/basic-install-guide/lab004-openstack-production.xml
rename to doc/training-guides/basic-install-guide/lab_openstack-production.xml
index 25ee780b..4b2d0962 100644
--- a/doc/training-guides/basic-install-guide/lab004-openstack-production.xml
+++ b/doc/training-guides/basic-install-guide/lab_openstack-production.xml
@@ -3,7 +3,7 @@
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink"
  version="5.0"
-  xml:id="lab003-openstack-production.xml">
+  xml:id="lab_openstack-production.xml">
   <title>OpenStack In Production</title>
   <para>More Content To be Added.</para>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/training-guides/basic-install-guide/lab000-virtualbox-basics.xml b/doc/training-guides/basic-install-guide/lab_virtualbox-basics.xml
similarity index 92%
rename from doc/training-guides/basic-install-guide/lab000-virtualbox-basics.xml
rename to doc/training-guides/basic-install-guide/lab_virtualbox-basics.xml
index 0fd71938..49d0b5ac 100644
--- a/doc/training-guides/basic-install-guide/lab000-virtualbox-basics.xml
+++ b/doc/training-guides/basic-install-guide/lab_virtualbox-basics.xml
@@ -7,7 +7,7 @@
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink"
  version="5.0"
-  xml:id="lab000-virtualbox-basics">
+  xml:id="lab_virtualbox-basics">
   <title>VirtualBox basics</title>
   <para><guilabel>Getting Started</guilabel></para>
   <para>The following methods are conventional for deploying
@@ -126,7 +126,7 @@
     <title>Network diagram</title>
     <mediaobject>
       <imageobject>
-        <imagedata  contentwidth="5in" fileref="../figures/lab000-virtual-box/image03.png"/>
+        <imagedata  contentwidth="5in" fileref="../figures/lab_virtual-box/image03.png"/>
       </imageobject>
     </mediaobject>
   </figure>
@@ -139,7 +139,7 @@
       xlink:href="http://www.virtualbox.org/manual/ch06.html#network_hostonly">VirtualBox
       documentation</link>
   </para>
-  <section xml:id="lab000-virtualbox-basics_setup_virtualbox">
+  <section xml:id="lab_virtualbox-basics_setup_virtualbox">
   <title>Setup your VM environment</title>
   <para>Before you can start configuring your environment you need to
     download some of the following stuff:</para>
@@ -169,7 +169,7 @@
       </listitem>
     </itemizedlist>
   </section>
-  <section xml:id="lab000-virtualbox-basics_setup_virtual_networks">
+  <section xml:id="lab_virtualbox-basics_setup_virtual_networks">
     <title>Configure virtual networks</title>
 
     <itemizedlist>
@@ -200,7 +200,7 @@
     <title>Create host only networks</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="../figures/lab000-virtual-box/image13.png"
+        <imagedata fileref="../figures/lab_virtual-box/image13.png"
                    contentwidth="6in"/>
       </imageobject>
     </mediaobject>
@@ -245,7 +245,7 @@
     <title>Vboxnet0</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="../figures/lab000-virtual-box/image19.png"
+        <imagedata fileref="../figures/lab_virtual-box/image19.png"
                    contentwidth="6in"/>
       </imageobject>
     </mediaobject>
@@ -281,7 +281,7 @@
     <title>Vboxnet1</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="../figures/lab000-virtual-box/image16.png"
+        <imagedata fileref="../figures/lab_virtual-box/image16.png"
                    contentwidth="6in"/>
       </imageobject>
     </mediaobject>
@@ -316,13 +316,13 @@
     <title>Image: Vboxnet2</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="../figures/lab000-virtual-box/image08.png"
+        <imagedata fileref="../figures/lab_virtual-box/image08.png"
                    contentwidth="6in"/>
       </imageobject>
     </mediaobject>
   </figure>
   </section>
-  <section xml:id="lab000-virtualbox-basics_setup_install_ssh_ftp">
+  <section xml:id="lab_virtualbox-basics_setup_install_ssh_ftp">
     <title>Install SSH and FTP</title>
     <itemizedlist>
       <listitem>
@@ -348,7 +348,7 @@
       machines.</para>
     </note>
   </section>
-  <section xml:id="lab000-virtualbox-basics_setup_install_vm_instances">
+  <section xml:id="lab_virtualbox-basics_setup_install_vm_instances">
     <title>Install your VM instances</title>
 
     <itemizedlist>
@@ -364,7 +364,7 @@
       familiar with the process.</para>
     </warning>
   </section>
-  <section xml:id="lab000-virtualbox-basics_setup_control_node">
+  <section xml:id="lab_virtualbox-basics_setup_control_node">
     <title>Control node</title>
 
     <para>Create a new virtual machine and select Ubuntu Server.</para>
@@ -372,7 +372,7 @@
     <title>Create new virtual machine</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="../figures/lab000-virtual-box/image11.png"
+        <imagedata fileref="../figures/lab_virtual-box/image11.png"
                    contentwidth="6in"/>
       </imageobject>
     </mediaobject>
@@ -413,7 +413,7 @@
     <title>Adapter1 - Vboxnet0</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="../figures/lab000-virtual-box/image07.png"
+        <imagedata fileref="../figures/lab_virtual-box/image07.png"
                    contentwidth="6in"/>
       </imageobject>
     </mediaobject>
@@ -423,7 +423,7 @@
     <title>Adapter2 - Vboxnet2</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="../figures/lab000-virtual-box/image18.png"
+        <imagedata fileref="../figures/lab_virtual-box/image18.png"
                    contentwidth="6in"/>
       </imageobject>
     </mediaobject>
@@ -433,7 +433,7 @@
     <title>Adapter3 - NAT</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="../figures/lab000-virtual-box/image14.png"
+        <imagedata fileref="../figures/lab_virtual-box/image14.png"
                    contentwidth="6in"/>
       </imageobject>
     </mediaobject>
@@ -447,7 +447,7 @@
       are doing.</para>
     </note>
   </section>
-  <section xml:id="lab000-virtualbox-basics_setup_network_node">
+  <section xml:id="lab_virtualbox-basics_setup_network_node">
     <title>Network node</title>
 
     <para>Create a new virtual machine, minimum RAM is
@@ -458,7 +458,7 @@
     <title>Create New Virtual Machine</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="../figures/lab000-virtual-box/image12.png"
+        <imagedata fileref="../figures/lab_virtual-box/image12.png"
                    contentwidth="6in"/>
       </imageobject>
     </mediaobject>
@@ -501,7 +501,7 @@
     <title>Adapter 1 - Vboxnet0</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="../figures/lab000-virtual-box/image05.png"
+        <imagedata fileref="../figures/lab_virtual-box/image05.png"
                    contentwidth="6in"/>
       </imageobject>
     </mediaobject>
@@ -511,7 +511,7 @@
     <title>Adapter2 - Vboxnet1</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="../figures/lab000-virtual-box/image17.png"
+        <imagedata fileref="../figures/lab_virtual-box/image17.png"
                    contentwidth="6in"/>
       </imageobject>
     </mediaobject>
@@ -521,7 +521,7 @@
     <title>Adapter3 - Vboxnet2</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="../figures/lab000-virtual-box/image02.png"
+        <imagedata fileref="../figures/lab_virtual-box/image02.png"
                    contentwidth="6in"/>
       </imageobject>
     </mediaobject>
@@ -531,7 +531,7 @@
     <title>Adapter4 - NAT</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="../figures/lab000-virtual-box/image00.png"
+        <imagedata fileref="../figures/lab_virtual-box/image00.png"
                    contentwidth="6in"/>
       </imageobject>
     </mediaobject>
@@ -544,7 +544,7 @@
       servers.</para>
     </note>
   </section>
-  <section xml:id="lab000-virtualbox-basics_setup_compute_node">
+  <section xml:id="lab_virtualbox-basics_setup_compute_node">
     <title>Compute node</title>
 
     <para>Create a virtual machine with at least 1,000 MB RAM and
@@ -553,7 +553,7 @@
     <title>Create new virtual machine</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="../figures/lab000-virtual-box/image04.png"
+        <imagedata fileref="../figures/lab_virtual-box/image04.png"
                    contentwidth="6in"/>
       </imageobject>
     </mediaobject>
@@ -591,7 +591,7 @@
     <title>Adapter1 - Vboxnet0</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="../figures/lab000-virtual-box/image15.png"
+        <imagedata fileref="../figures/lab_virtual-box/image15.png"
                    contentwidth="6in"/>
       </imageobject>
     </mediaobject>
@@ -601,7 +601,7 @@
     <title>Adapter2 - Vboxnet1</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="../figures/lab000-virtual-box/image10.png"
+        <imagedata fileref="../figures/lab_virtual-box/image10.png"
                    contentwidth="6in"/>
       </imageobject>
     </mediaobject>
@@ -611,7 +611,7 @@
     <title>Adapter3 - NAT</title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="../figures/lab000-virtual-box/image01.png"
+        <imagedata fileref="../figures/lab_virtual-box/image01.png"
                    contentwidth="6in"/>
       </imageobject>
     </mediaobject>
@@ -624,7 +624,7 @@
       like DNS servers etc.</para>
     </note>
   </section>
-  <section xml:id="lab000-virtualbox-basics_setup_warnings">
+  <section xml:id="lab_virtualbox-basics_setup_warnings">
     <title>Warnings and advice</title>
     <para>Shutting down your Virtual Machine may lead to
         malfunctioning OpenStack Services. Do not directly
diff --git a/doc/training-guides/bk_preface.xml b/doc/training-guides/bk_preface.xml
index 9335ab6c..02b15b69 100644
--- a/doc/training-guides/bk_preface.xml
+++ b/doc/training-guides/bk_preface.xml
@@ -124,8 +124,8 @@
         <?dbhtml stop-chunking?>
         <section xml:id="important-terms">
             <title>Important Terms</title>
-            <xi:include href="./basic-install-guide/lab000-important-terms.xml"
-            xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'lab000-important-terms']/*[not(self::db:title)])">
+            <xi:include href="./basic-install-guide/lab_important-terms.xml"
+            xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'lab_important-terms']/*[not(self::db:title)])">
             </xi:include>
         </section>
         <section xml:id="virtualbox-scripted">
@@ -136,8 +136,8 @@
         </section>
         <section xml:id="virtualbox-manual">
             <title>Building the Training Cluster, Manually</title>
-            <xi:include href="./basic-install-guide/lab000-virtualbox-basics.xml"
-            xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'lab000-virtualbox-basics']/*[not(self::db:title)])">
+            <xi:include href="./basic-install-guide/lab_virtualbox-basics.xml"
+            xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'lab_virtualbox-basics']/*[not(self::db:title)])">
             </xi:include>
         </section>
     </appendix>
diff --git a/doc/training-guides/figures/lab000-virtual-box/image00.png b/doc/training-guides/figures/lab_virtual-box/image00.png
similarity index 100%
rename from doc/training-guides/figures/lab000-virtual-box/image00.png
rename to doc/training-guides/figures/lab_virtual-box/image00.png
diff --git a/doc/training-guides/figures/lab000-virtual-box/image01.png b/doc/training-guides/figures/lab_virtual-box/image01.png
similarity index 100%
rename from doc/training-guides/figures/lab000-virtual-box/image01.png
rename to doc/training-guides/figures/lab_virtual-box/image01.png
diff --git a/doc/training-guides/figures/lab000-virtual-box/image02.png b/doc/training-guides/figures/lab_virtual-box/image02.png
similarity index 100%
rename from doc/training-guides/figures/lab000-virtual-box/image02.png
rename to doc/training-guides/figures/lab_virtual-box/image02.png
diff --git a/doc/training-guides/figures/lab000-virtual-box/image03.png b/doc/training-guides/figures/lab_virtual-box/image03.png
similarity index 100%
rename from doc/training-guides/figures/lab000-virtual-box/image03.png
rename to doc/training-guides/figures/lab_virtual-box/image03.png
diff --git a/doc/training-guides/figures/lab000-virtual-box/image04.png b/doc/training-guides/figures/lab_virtual-box/image04.png
similarity index 100%
rename from doc/training-guides/figures/lab000-virtual-box/image04.png
rename to doc/training-guides/figures/lab_virtual-box/image04.png
diff --git a/doc/training-guides/figures/lab000-virtual-box/image05.png b/doc/training-guides/figures/lab_virtual-box/image05.png
similarity index 100%
rename from doc/training-guides/figures/lab000-virtual-box/image05.png
rename to doc/training-guides/figures/lab_virtual-box/image05.png
diff --git a/doc/training-guides/figures/lab000-virtual-box/image07.png b/doc/training-guides/figures/lab_virtual-box/image07.png
similarity index 100%
rename from doc/training-guides/figures/lab000-virtual-box/image07.png
rename to doc/training-guides/figures/lab_virtual-box/image07.png
diff --git a/doc/training-guides/figures/lab000-virtual-box/image08.png b/doc/training-guides/figures/lab_virtual-box/image08.png
similarity index 100%
rename from doc/training-guides/figures/lab000-virtual-box/image08.png
rename to doc/training-guides/figures/lab_virtual-box/image08.png
diff --git a/doc/training-guides/figures/lab000-virtual-box/image09.png b/doc/training-guides/figures/lab_virtual-box/image09.png
similarity index 100%
rename from doc/training-guides/figures/lab000-virtual-box/image09.png
rename to doc/training-guides/figures/lab_virtual-box/image09.png
diff --git a/doc/training-guides/figures/lab000-virtual-box/image10.png b/doc/training-guides/figures/lab_virtual-box/image10.png
similarity index 100%
rename from doc/training-guides/figures/lab000-virtual-box/image10.png
rename to doc/training-guides/figures/lab_virtual-box/image10.png
diff --git a/doc/training-guides/figures/lab000-virtual-box/image11.png b/doc/training-guides/figures/lab_virtual-box/image11.png
similarity index 100%
rename from doc/training-guides/figures/lab000-virtual-box/image11.png
rename to doc/training-guides/figures/lab_virtual-box/image11.png
diff --git a/doc/training-guides/figures/lab000-virtual-box/image12.png b/doc/training-guides/figures/lab_virtual-box/image12.png
similarity index 100%
rename from doc/training-guides/figures/lab000-virtual-box/image12.png
rename to doc/training-guides/figures/lab_virtual-box/image12.png
diff --git a/doc/training-guides/figures/lab000-virtual-box/image13.png b/doc/training-guides/figures/lab_virtual-box/image13.png
similarity index 100%
rename from doc/training-guides/figures/lab000-virtual-box/image13.png
rename to doc/training-guides/figures/lab_virtual-box/image13.png
diff --git a/doc/training-guides/figures/lab000-virtual-box/image14.png b/doc/training-guides/figures/lab_virtual-box/image14.png
similarity index 100%
rename from doc/training-guides/figures/lab000-virtual-box/image14.png
rename to doc/training-guides/figures/lab_virtual-box/image14.png
diff --git a/doc/training-guides/figures/lab000-virtual-box/image15.png b/doc/training-guides/figures/lab_virtual-box/image15.png
similarity index 100%
rename from doc/training-guides/figures/lab000-virtual-box/image15.png
rename to doc/training-guides/figures/lab_virtual-box/image15.png
diff --git a/doc/training-guides/figures/lab000-virtual-box/image16.png b/doc/training-guides/figures/lab_virtual-box/image16.png
similarity index 100%
rename from doc/training-guides/figures/lab000-virtual-box/image16.png
rename to doc/training-guides/figures/lab_virtual-box/image16.png
diff --git a/doc/training-guides/figures/lab000-virtual-box/image17.png b/doc/training-guides/figures/lab_virtual-box/image17.png
similarity index 100%
rename from doc/training-guides/figures/lab000-virtual-box/image17.png
rename to doc/training-guides/figures/lab_virtual-box/image17.png
diff --git a/doc/training-guides/figures/lab000-virtual-box/image18.png b/doc/training-guides/figures/lab_virtual-box/image18.png
similarity index 100%
rename from doc/training-guides/figures/lab000-virtual-box/image18.png
rename to doc/training-guides/figures/lab_virtual-box/image18.png
diff --git a/doc/training-guides/figures/lab000-virtual-box/image19.png b/doc/training-guides/figures/lab_virtual-box/image19.png
similarity index 100%
rename from doc/training-guides/figures/lab000-virtual-box/image19.png
rename to doc/training-guides/figures/lab_virtual-box/image19.png
diff --git a/doc/training-guides/operator-guide/ch_operator-compute-node-lab.xml b/doc/training-guides/operator-guide/ch_operator-compute-node-lab.xml
index 317959d1..f2e78756 100644
--- a/doc/training-guides/operator-guide/ch_operator-compute-node-lab.xml
+++ b/doc/training-guides/operator-guide/ch_operator-compute-node-lab.xml
@@ -10,8 +10,8 @@
     </section>
   <section xml:id="operator-basic-install-guide-compute-lab">
     <title>Compute Node Lab</title>
-    <xi:include href="../basic-install-guide/lab003-compute-node.xml"
-      xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'lab003-compute-node']/*[not(self::db:title)])">
+    <xi:include href="../basic-install-guide/lab_compute-node.xml"
+      xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'lab_compute-node']/*[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/doc/training-guides/operator-guide/ch_operator-controller-node-lab.xml b/doc/training-guides/operator-guide/ch_operator-controller-node-lab.xml
index b00dc895..9d361522 100644
--- a/doc/training-guides/operator-guide/ch_operator-controller-node-lab.xml
+++ b/doc/training-guides/operator-guide/ch_operator-controller-node-lab.xml
@@ -10,8 +10,8 @@
     </section>
   <section xml:id="operator-basic-install-guide-controller-lab">
         <title>Control Node Lab</title>
-        <xi:include href="../basic-install-guide/lab001-control-node.xml"
-        xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'lab001-control-node.xml']/*[not(self::db:title)])">
+        <xi:include href="../basic-install-guide/lab_control-node.xml"
+        xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'lab_control-node.xml']/*[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/doc/training-guides/operator-guide/ch_operator-network-node-lab.xml b/doc/training-guides/operator-guide/ch_operator-network-node-lab.xml
index 854b1405..7ba2bc77 100644
--- a/doc/training-guides/operator-guide/ch_operator-network-node-lab.xml
+++ b/doc/training-guides/operator-guide/ch_operator-network-node-lab.xml
@@ -10,8 +10,8 @@
     </section>
   <section xml:id="operator-basic-install-guide-network-lab">
     <title>Network Node Lab</title>
-    <xi:include href="../basic-install-guide/lab002-network-node.xml"
-      xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'lab002-network-node']/*[not(self::db:title)])">
+    <xi:include href="../basic-install-guide/lab_network-node.xml"
+      xpointer="xmlns(db=http://docbook.org/ns/docbook) xpath(//*[@xml:id = 'lab_network-node']/*[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>