diff --git a/doc/training-guides/developer-guide/bk003-developer-training-guide.xml b/doc/training-guides/developer-guide/bk003-developer-training-guide.xml
deleted file mode 100644
index 75efc999..00000000
--- a/doc/training-guides/developer-guide/bk003-developer-training-guide.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<book 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="bk004-developer-training-guide">
-  <title>Developer Training Guide</title>
-    <xi:include href="./bk003-ch001-developer-getting-started.xml"/>
-    <xi:include href="./bk003-ch002-developer-getting-started-lab.xml"/>
-    <xi:include href="./bk003-ch003-developer-getting-started-quiz.xml"/>
-    <xi:include href="./bk003-ch004-developer-apis-in-depth.xml"/>
-    <xi:include href="./bk003-ch005-developer-apis-day-two-lab.xml"/>
-    <xi:include href="./bk003-ch006-developer-apis-day-two-quiz.xml"/>
-    <xi:include href="./bk003-ch007-developer-apis-day-three-lab.xml"/>
-    <xi:include href="./bk003-ch008-developer-apis-day-three-quiz.xml"/>
-    <xi:include href="./bk003-ch009-developer-apis-day-four-lab.xml"/>
-    <xi:include href="./bk003-ch010-developer-apis-day-four-quiz.xml"/>
-    <xi:include href="./bk003-ch011-developer-how-to-partipate.xml"/>
-    <xi:include href="./bk003-ch012-developer-how-to-participate-day-five-lab.xml"/>
-    <xi:include href="./bk003-ch013-developer-how-to-participate-day-five-quiz.xml"/>
-    <xi:include href="./bk003-ch014-developer-how-to-participate-day-six-lab.xml"/>
-    <xi:include href="./bk003-ch015-developer-how-to-participate-day-six-quiz.xml"/>
-    <xi:include href="./bk003-ch016-developer-how-to-participate-day-seven-lab.xml"/>
-    <xi:include href="./bk003-ch017-developer-how-to-participate-day-seven-quiz.xml"/>
-    <xi:include href="./bk003-ch018-developer-how-to-participate-day-eight-lab.xml"/>
-    <xi:include href="./bk003-ch019-developer-how-to-participate-day-eight-quiz.xml"/>
-    <xi:include href="./bk003-ch020-developer-how-to-participate-day-nine-lab.xml"/>
-    <xi:include href="./bk003-ch021-developer-how-to-participate-day-nine-quiz.xml"/>
-    <xi:include href="./bk003-ch022-developer-assessment.xml"/>
-    <xi:include href="./bk003-ch023-developer-how-to-participate-bootcamp.xml"/>
-</book>
\ No newline at end of file
diff --git a/doc/training-guides/developer-guide/bk_developer-training-guide.xml b/doc/training-guides/developer-guide/bk_developer-training-guide.xml
new file mode 100644
index 00000000..dcb76bc6
--- /dev/null
+++ b/doc/training-guides/developer-guide/bk_developer-training-guide.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<book 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="bk_developer-training-guide">
+  <title>Developer Training Guide</title>
+    <xi:include href="./ch_developer-getting-started.xml"/>
+    <xi:include href="./ch_developer-getting-started-lab.xml"/>
+    <xi:include href="./ch_developer-getting-started-quiz.xml"/>
+    <xi:include href="./ch_developer-apis-in-depth.xml"/>
+    <xi:include href="./ch_developer-apis-day-two-lab.xml"/>
+    <xi:include href="./ch_developer-apis-day-two-quiz.xml"/>
+    <xi:include href="./ch_developer-apis-day-three-lab.xml"/>
+    <xi:include href="./ch_developer-apis-day-three-quiz.xml"/>
+    <xi:include href="./ch_developer-apis-day-four-lab.xml"/>
+    <xi:include href="./ch_developer-apis-day-four-quiz.xml"/>
+    <xi:include href="./ch_developer-how-to-partipate.xml"/>
+    <xi:include href="./ch_developer-how-to-participate-day-five-lab.xml"/>
+    <xi:include href="./ch_developer-how-to-participate-day-five-quiz.xml"/>
+    <xi:include href="./ch_developer-how-to-participate-day-six-lab.xml"/>
+    <xi:include href="./ch_developer-how-to-participate-day-six-quiz.xml"/>
+    <xi:include href="./ch_developer-how-to-participate-day-seven-lab.xml"/>
+    <xi:include href="./ch_developer-how-to-participate-day-seven-quiz.xml"/>
+    <xi:include href="./ch_developer-how-to-participate-day-eight-lab.xml"/>
+    <xi:include href="./ch_developer-how-to-participate-day-eight-quiz.xml"/>
+    <xi:include href="./ch_developer-how-to-participate-day-nine-lab.xml"/>
+    <xi:include href="./ch_developer-how-to-participate-day-nine-quiz.xml"/>
+    <xi:include href="./ch_developer-assessment.xml"/>
+    <xi:include href="./ch_developer-how-to-participate-bootcamp.xml"/>
+</book>
diff --git a/doc/training-guides/developer-guide/bk003-ch009-developer-apis-day-four-lab.xml b/doc/training-guides/developer-guide/ch_developer-apis-day-four-lab.xml
similarity index 100%
rename from doc/training-guides/developer-guide/bk003-ch009-developer-apis-day-four-lab.xml
rename to doc/training-guides/developer-guide/ch_developer-apis-day-four-lab.xml
diff --git a/doc/training-guides/developer-guide/bk003-ch010-developer-apis-day-four-quiz.xml b/doc/training-guides/developer-guide/ch_developer-apis-day-four-quiz.xml
similarity index 100%
rename from doc/training-guides/developer-guide/bk003-ch010-developer-apis-day-four-quiz.xml
rename to doc/training-guides/developer-guide/ch_developer-apis-day-four-quiz.xml
diff --git a/doc/training-guides/developer-guide/bk003-ch007-developer-apis-day-three-lab.xml b/doc/training-guides/developer-guide/ch_developer-apis-day-three-lab.xml
similarity index 100%
rename from doc/training-guides/developer-guide/bk003-ch007-developer-apis-day-three-lab.xml
rename to doc/training-guides/developer-guide/ch_developer-apis-day-three-lab.xml
diff --git a/doc/training-guides/developer-guide/bk003-ch008-developer-apis-day-three-quiz.xml b/doc/training-guides/developer-guide/ch_developer-apis-day-three-quiz.xml
similarity index 100%
rename from doc/training-guides/developer-guide/bk003-ch008-developer-apis-day-three-quiz.xml
rename to doc/training-guides/developer-guide/ch_developer-apis-day-three-quiz.xml
diff --git a/doc/training-guides/developer-guide/bk003-ch005-developer-apis-day-two-lab.xml b/doc/training-guides/developer-guide/ch_developer-apis-day-two-lab.xml
similarity index 100%
rename from doc/training-guides/developer-guide/bk003-ch005-developer-apis-day-two-lab.xml
rename to doc/training-guides/developer-guide/ch_developer-apis-day-two-lab.xml
diff --git a/doc/training-guides/developer-guide/bk003-ch006-developer-apis-day-two-quiz.xml b/doc/training-guides/developer-guide/ch_developer-apis-day-two-quiz.xml
similarity index 100%
rename from doc/training-guides/developer-guide/bk003-ch006-developer-apis-day-two-quiz.xml
rename to doc/training-guides/developer-guide/ch_developer-apis-day-two-quiz.xml
diff --git a/doc/training-guides/developer-guide/bk003-ch004-developer-apis-in-depth.xml b/doc/training-guides/developer-guide/ch_developer-apis-in-depth.xml
similarity index 100%
rename from doc/training-guides/developer-guide/bk003-ch004-developer-apis-in-depth.xml
rename to doc/training-guides/developer-guide/ch_developer-apis-in-depth.xml
diff --git a/doc/training-guides/developer-guide/bk003-ch022-developer-assessment.xml b/doc/training-guides/developer-guide/ch_developer-assessment.xml
similarity index 100%
rename from doc/training-guides/developer-guide/bk003-ch022-developer-assessment.xml
rename to doc/training-guides/developer-guide/ch_developer-assessment.xml
diff --git a/doc/training-guides/developer-guide/bk003-ch002-developer-getting-started-lab.xml b/doc/training-guides/developer-guide/ch_developer-getting-started-lab.xml
similarity index 100%
rename from doc/training-guides/developer-guide/bk003-ch002-developer-getting-started-lab.xml
rename to doc/training-guides/developer-guide/ch_developer-getting-started-lab.xml
diff --git a/doc/training-guides/developer-guide/bk003-ch003-developer-getting-started-quiz.xml b/doc/training-guides/developer-guide/ch_developer-getting-started-quiz.xml
similarity index 100%
rename from doc/training-guides/developer-guide/bk003-ch003-developer-getting-started-quiz.xml
rename to doc/training-guides/developer-guide/ch_developer-getting-started-quiz.xml
diff --git a/doc/training-guides/developer-guide/bk003-ch001-developer-getting-started.xml b/doc/training-guides/developer-guide/ch_developer-getting-started.xml
similarity index 100%
rename from doc/training-guides/developer-guide/bk003-ch001-developer-getting-started.xml
rename to doc/training-guides/developer-guide/ch_developer-getting-started.xml
diff --git a/doc/training-guides/developer-guide/bk003-ch023-developer-how-to-participate-bootcamp.xml b/doc/training-guides/developer-guide/ch_developer-how-to-participate-bootcamp.xml
similarity index 100%
rename from doc/training-guides/developer-guide/bk003-ch023-developer-how-to-participate-bootcamp.xml
rename to doc/training-guides/developer-guide/ch_developer-how-to-participate-bootcamp.xml
diff --git a/doc/training-guides/developer-guide/bk003-ch018-developer-how-to-participate-day-eight-lab.xml b/doc/training-guides/developer-guide/ch_developer-how-to-participate-day-eight-lab.xml
similarity index 100%
rename from doc/training-guides/developer-guide/bk003-ch018-developer-how-to-participate-day-eight-lab.xml
rename to doc/training-guides/developer-guide/ch_developer-how-to-participate-day-eight-lab.xml
diff --git a/doc/training-guides/developer-guide/bk003-ch019-developer-how-to-participate-day-eight-quiz.xml b/doc/training-guides/developer-guide/ch_developer-how-to-participate-day-eight-quiz.xml
similarity index 100%
rename from doc/training-guides/developer-guide/bk003-ch019-developer-how-to-participate-day-eight-quiz.xml
rename to doc/training-guides/developer-guide/ch_developer-how-to-participate-day-eight-quiz.xml
diff --git a/doc/training-guides/developer-guide/bk003-ch012-developer-how-to-participate-day-five-lab.xml b/doc/training-guides/developer-guide/ch_developer-how-to-participate-day-five-lab.xml
similarity index 100%
rename from doc/training-guides/developer-guide/bk003-ch012-developer-how-to-participate-day-five-lab.xml
rename to doc/training-guides/developer-guide/ch_developer-how-to-participate-day-five-lab.xml
diff --git a/doc/training-guides/developer-guide/bk003-ch013-developer-how-to-participate-day-five-quiz.xml b/doc/training-guides/developer-guide/ch_developer-how-to-participate-day-five-quiz.xml
similarity index 100%
rename from doc/training-guides/developer-guide/bk003-ch013-developer-how-to-participate-day-five-quiz.xml
rename to doc/training-guides/developer-guide/ch_developer-how-to-participate-day-five-quiz.xml
diff --git a/doc/training-guides/developer-guide/bk003-ch020-developer-how-to-participate-day-nine-lab.xml b/doc/training-guides/developer-guide/ch_developer-how-to-participate-day-nine-lab.xml
similarity index 100%
rename from doc/training-guides/developer-guide/bk003-ch020-developer-how-to-participate-day-nine-lab.xml
rename to doc/training-guides/developer-guide/ch_developer-how-to-participate-day-nine-lab.xml
diff --git a/doc/training-guides/developer-guide/bk003-ch021-developer-how-to-participate-day-nine-quiz.xml b/doc/training-guides/developer-guide/ch_developer-how-to-participate-day-nine-quiz.xml
similarity index 100%
rename from doc/training-guides/developer-guide/bk003-ch021-developer-how-to-participate-day-nine-quiz.xml
rename to doc/training-guides/developer-guide/ch_developer-how-to-participate-day-nine-quiz.xml
diff --git a/doc/training-guides/developer-guide/bk003-ch016-developer-how-to-participate-day-seven-lab.xml b/doc/training-guides/developer-guide/ch_developer-how-to-participate-day-seven-lab.xml
similarity index 100%
rename from doc/training-guides/developer-guide/bk003-ch016-developer-how-to-participate-day-seven-lab.xml
rename to doc/training-guides/developer-guide/ch_developer-how-to-participate-day-seven-lab.xml
diff --git a/doc/training-guides/developer-guide/bk003-ch017-developer-how-to-participate-day-seven-quiz.xml b/doc/training-guides/developer-guide/ch_developer-how-to-participate-day-seven-quiz.xml
similarity index 100%
rename from doc/training-guides/developer-guide/bk003-ch017-developer-how-to-participate-day-seven-quiz.xml
rename to doc/training-guides/developer-guide/ch_developer-how-to-participate-day-seven-quiz.xml
diff --git a/doc/training-guides/developer-guide/bk003-ch014-developer-how-to-participate-day-six-lab.xml b/doc/training-guides/developer-guide/ch_developer-how-to-participate-day-six-lab.xml
similarity index 100%
rename from doc/training-guides/developer-guide/bk003-ch014-developer-how-to-participate-day-six-lab.xml
rename to doc/training-guides/developer-guide/ch_developer-how-to-participate-day-six-lab.xml
diff --git a/doc/training-guides/developer-guide/bk003-ch015-developer-how-to-participate-day-six-quiz.xml b/doc/training-guides/developer-guide/ch_developer-how-to-participate-day-six-quiz.xml
similarity index 100%
rename from doc/training-guides/developer-guide/bk003-ch015-developer-how-to-participate-day-six-quiz.xml
rename to doc/training-guides/developer-guide/ch_developer-how-to-participate-day-six-quiz.xml
diff --git a/doc/training-guides/developer-guide/bk003-ch011-developer-how-to-partipate.xml b/doc/training-guides/developer-guide/ch_developer-how-to-partipate.xml
similarity index 100%
rename from doc/training-guides/developer-guide/bk003-ch011-developer-how-to-partipate.xml
rename to doc/training-guides/developer-guide/ch_developer-how-to-partipate.xml
diff --git a/doc/training-guides/st-training-guides.xml b/doc/training-guides/st-training-guides.xml
index 135b019a..f13d8617 100644
--- a/doc/training-guides/st-training-guides.xml
+++ b/doc/training-guides/st-training-guides.xml
@@ -95,7 +95,7 @@
     <xi:include href="bk000-preface.xml"/>
     <xi:include href="associate-guide/bk_associate-training-guide.xml"/>
     <xi:include href="operator-guide/bk_operator-training-guide.xml"/>
-    <xi:include href="developer-guide/bk003-developer-training-guide.xml"/>
+    <xi:include href="developer-guide/bk_developer-training-guide.xml"/>
     <xi:include href="architect-guide/bk_architect-training-guide.xml"/>
     <!-- For Juno Release -->
     <!-- xi:include href="basic-install-guide/bk-openstack-basic-install-guide.xml"/ -->