diff --git a/doc/training-guides/operator-editing-code.xml b/doc/training-guides/operator-editing-code.xml
index 3343a274f7..d2896da914 100644
--- a/doc/training-guides/operator-editing-code.xml
+++ b/doc/training-guides/operator-editing-code.xml
@@ -612,8 +612,8 @@ blueprint training-manuals</computeroutput></screen>
                 <para>Verify the code is good by running <command>mvn
                         clean generate-sources</command> and by
                     reviewing the local HTML in <link
-                        xlink:href="target/docbkx/webhelp/local/training-guide/content/"
-                            >file:///Users/<replaceable>username</replaceable>/code/openstack-manuals/doc/training-guide/target/docbkx/webhelp/local/training-guide/content/</link>.</para>
+                        xlink:href="target/docbkx/webhelp/training-guides/content/"
+                            >file:///Users/<replaceable>username</replaceable>/code/openstack-manuals/doc/training-guides/target/docbkx/webhelp/training-guides/content/</link>.</para>
             </step>
             <step>
                 <para>Merge the branch.</para>
diff --git a/doc/training-guides/sources/convert_rst_xml.py b/doc/training-guides/sources/convert_rst_xml.py
index 2d7ca5987e..b9e4c42385 100644
--- a/doc/training-guides/sources/convert_rst_xml.py
+++ b/doc/training-guides/sources/convert_rst_xml.py
@@ -52,7 +52,7 @@ def patternmatch(directory, docs_location, rstfile):
     except IOError:
         #if file is a directory then recurse
         print("patternmatch:in IOError:directory:" + directory + ", docs_location: " + docs_location + ", rstfile: " + rstfile)
-        os.mkdir(os.path.expanduser("./openstack-manuals/doc/training-guide/sources/" + directory + rstfile))
+        os.mkdir(os.path.expanduser("./openstack-manuals/doc/training-guides/sources/" + directory + rstfile))
         walkdirectories(directory + docs_location, rstfile +"/")
         #docs_location and rstfile are both directories in this case
         return
@@ -78,7 +78,7 @@ def patternmatch(directory, docs_location, rstfile):
         if good_file_found == "false":
             #jump out of called routine
             return
-        outfile = open("./openstack-manuals/doc/training-guide/sources/" +
+        outfile = open("./openstack-manuals/doc/training-guides/sources/" +
                        directory[0] + "/" + docs_location + outfilename[-1] + ".xml", "w+")
         print(directory[0] + "/" + docs_location + outfilename[-1] + ".xml")
     else:
@@ -99,7 +99,7 @@ def patternmatch(directory, docs_location, rstfile):
         if good_file_found == "false":
             #jump out of called routine
             return
-        outfile = open("./openstack-manuals/doc/training-guide/sources/" +
+        outfile = open("./openstack-manuals/doc/training-guides/sources/" +
                        directory + outfilename[-1] + ".xml", "w+")
         print(directory + outfilename[-1] + ".xml")
     #header of new xml file
@@ -195,10 +195,10 @@ def walkdirectories(projectdirectory, sourcedirectory):
 def convert_rst_docbook5(repository_hash):
     for item in repository_hash:
         print("convert_rst_docbook5:start convert rst: " + item + repository_hash[item])
-        os.system("rm -R ./openstack-manuals/doc/training-guide/sources/" + item)
+        os.system("rm -R ./openstack-manuals/doc/training-guides/sources/" + item)
         try:
             #use try for when the remove directory fails
-            os.mkdir("./openstack-manuals/doc/training-guide/sources/" + item)
+            os.mkdir("./openstack-manuals/doc/training-guides/sources/" + item)
         except OSError:
             pass
         walkdirectories(item, repository_hash[item])
@@ -217,4 +217,4 @@ repository_hash = {'cinder/':"/doc/source/devref/"}
 os.chdir("../../../../")#root of repository directories in relation to ./training-guides/sources
 create_repo(repository_hash)
 pull_repo_updates(repository_hash)
-convert_rst_docbook5(repository_hash)
\ No newline at end of file
+convert_rst_docbook5(repository_hash)
diff --git a/doc/training-guides/training-labs/Vagrantfile b/doc/training-guides/training-labs/Vagrantfile
index 63069ba30c..98e3ff7f70 100644
--- a/doc/training-guides/training-labs/Vagrantfile
+++ b/doc/training-guides/training-labs/Vagrantfile
@@ -33,7 +33,7 @@
 # vagrant ssh vmname (ex: vagrant ssh compute)
 #
 # See the remaining OpenStack Training Labs code for more details at GitHub:
-# https://github.com/openstack/openstack-manuals/tree/master/doc/training-guide/training-lab
+# https://github.com/openstack/openstack-manuals/tree/master/doc/training-guides/training-labs
 nodes = {
     'allinone'	=> 51,
 #    'controller'  => 51,
diff --git a/doc/training-guides/training-labs/allinone.sh b/doc/training-guides/training-labs/allinone.sh
index feb9a3145a..f912fb1693 100644
--- a/doc/training-guides/training-labs/allinone.sh
+++ b/doc/training-guides/training-labs/allinone.sh
@@ -8,7 +8,7 @@
 # will cause deployment errors
 #
 # See the remaining OpenStack Training Labs code for more details at GitHub:
-# https://github.com/openstack/openstack-manuals/tree/master/doc/training-guide/training-labs
+# https://github.com/openstack/openstack-manuals/tree/master/doc/training-guides/training-labs
 
 #Change to the root user
 sudo su -
diff --git a/doc/training-guides/training-labs/compute.sh b/doc/training-guides/training-labs/compute.sh
index 7e9f44c6c6..7cc2c35bcd 100644
--- a/doc/training-guides/training-labs/compute.sh
+++ b/doc/training-guides/training-labs/compute.sh
@@ -8,7 +8,7 @@
 # will cause deployment errors
 #
 # See the remaining OpenStack Training Labs code for more details at GitHub:
-# https://github.com/openstack/openstack-manuals/tree/master/doc/training-guide/training-labs
+# https://github.com/openstack/openstack-manuals/tree/master/doc/training-guides/training-labs
 
 #Change to the root user
 sudo su -
diff --git a/doc/training-guides/training-labs/controller.sh b/doc/training-guides/training-labs/controller.sh
index 7e9f44c6c6..7cc2c35bcd 100644
--- a/doc/training-guides/training-labs/controller.sh
+++ b/doc/training-guides/training-labs/controller.sh
@@ -8,7 +8,7 @@
 # will cause deployment errors
 #
 # See the remaining OpenStack Training Labs code for more details at GitHub:
-# https://github.com/openstack/openstack-manuals/tree/master/doc/training-guide/training-labs
+# https://github.com/openstack/openstack-manuals/tree/master/doc/training-guides/training-labs
 
 #Change to the root user
 sudo su -
diff --git a/doc/training-guides/training-labs/network.sh b/doc/training-guides/training-labs/network.sh
index dee6dc37e7..83ab50b2d3 100644
--- a/doc/training-guides/training-labs/network.sh
+++ b/doc/training-guides/training-labs/network.sh
@@ -8,7 +8,7 @@
 # will cause deployment errors
 #
 # See the remaining OpenStack Training Labs code for more details at GitHub:
-# https://github.com/openstack/openstack-manuals/tree/master/doc/training-guide/training-labs
+# https://github.com/openstack/openstack-manuals/tree/master/doc/training-guides/training-labs
 
 #Change to the root user
 sudo su -