diff --git a/v1/src/openstack-blockstorage-devguide.xml b/v1/bk_blockstorage_api_ref_v1.xml
similarity index 99%
rename from v1/src/openstack-blockstorage-devguide.xml
rename to v1/bk_blockstorage_api_ref_v1.xml
index b5e7cbe..7d9c3f0 100644
--- a/v1/src/openstack-blockstorage-devguide.xml
+++ b/v1/bk_blockstorage_api_ref_v1.xml
@@ -299,13 +299,12 @@ format="SVG" scale="60"/>
         representation that can be used to efficiently determine when
         the state of services has changed.</para>
       <table rules="all">
-        <caption>Response Formats</caption>
-        <?dbfo keep-together="always"?>
+        <caption>Response formats</caption>
         <thead>
           <tr align="center">
             <td>Format</td>
-            <td>Accept Header</td>
-            <td>Query Extension</td>
+            <td>Accept header</td>
+            <td>Query extension</td>
             <td>Default</td>
           </tr>
         </thead>
@@ -384,7 +383,7 @@ format="SVG" scale="60"/>
           for all API operations for all &GET;, &POST;, &PUT;, and
           &DELETE; calls for volumes:</para>
         <table rules="all">
-          <caption>Default Rate Limits</caption>
+          <caption>Default rate limits</caption>
           <thead>
             <tr align="center">
               <td colspan="1">Verb</td>
@@ -442,7 +441,7 @@ format="SVG" scale="60"/>
         <para>Refer to the following table for the absolute limits
           that are set.</para>
         <table rules="all">
-          <caption>Absolute Limits</caption>
+          <caption>Absolute limits</caption>
           <col width="120pt"/>
           <col width="201pt"/>
           <col width="50pt"/>
@@ -479,7 +478,7 @@ format="SVG" scale="60"/>
         <programlisting>2011-05-19T08:07:08-05:00</programlisting>
       </example>
       <table rules="all">
-        <caption>Explanation of Date/Time Format Codes</caption>
+        <caption>Date and time format codes</caption>
         <thead>
           <tr>
             <td>Code</td>
diff --git a/v1/pom.xml b/v1/pom.xml
index 44cb760..f8712b4 100644
--- a/v1/pom.xml
+++ b/v1/pom.xml
@@ -59,7 +59,7 @@
               <webhelpDirname>1.0</webhelpDirname>
               <targetDirectory>${basedir}/target/docbkx/webhelp/api/openstack-block-storage</targetDirectory>
               <includeDateInPdfFilename>0</includeDateInPdfFilename>
-              <pdfFilenameBase>openstack-blockstorage-devguide-1.0</pdfFilenameBase>
+              <pdfFilenameBase>openstack-blockstorage-api-ref</pdfFilenameBase>
             </configuration>
           </execution>
           <execution>
@@ -84,9 +84,9 @@
         <configuration>
           <!-- These parameters apply to pdf and webhelp -->
           <xincludeSupported>true</xincludeSupported>
-          <sourceDirectory>src</sourceDirectory>
+          <sourceDirectory>.</sourceDirectory>
           <includes>
-            openstack-blockstorage-devguide.xml
+            bk_blockstorage_api_ref_v1.xml
           </includes>
           <profileSecurity>reviewer</profileSecurity>
           <branding>openstack</branding>
diff --git a/v1/src/samples/db-faults-badRequest.json b/v1/samples/db-faults-badRequest.json
similarity index 100%
rename from v1/src/samples/db-faults-badRequest.json
rename to v1/samples/db-faults-badRequest.json
diff --git a/v1/src/samples/db-faults-badRequest.xml b/v1/samples/db-faults-badRequest.xml
similarity index 100%
rename from v1/src/samples/db-faults-badRequest.xml
rename to v1/samples/db-faults-badRequest.xml
diff --git a/v1/src/samples/db-faults-instanceFault.json b/v1/samples/db-faults-instanceFault.json
similarity index 100%
rename from v1/src/samples/db-faults-instanceFault.json
rename to v1/samples/db-faults-instanceFault.json
diff --git a/v1/src/samples/db-faults-instanceFault.xml b/v1/samples/db-faults-instanceFault.xml
similarity index 100%
rename from v1/src/samples/db-faults-instanceFault.xml
rename to v1/samples/db-faults-instanceFault.xml
diff --git a/v1/src/samples/db-faults-itemNotFound.json b/v1/samples/db-faults-itemNotFound.json
similarity index 100%
rename from v1/src/samples/db-faults-itemNotFound.json
rename to v1/samples/db-faults-itemNotFound.json
diff --git a/v1/src/samples/db-faults-itemNotFound.xml b/v1/samples/db-faults-itemNotFound.xml
similarity index 100%
rename from v1/src/samples/db-faults-itemNotFound.xml
rename to v1/samples/db-faults-itemNotFound.xml
diff --git a/v2/src/openstack-blockstorage-devguide.xml b/v2/bk_blockstorage_api_ref_v2.xml
similarity index 97%
rename from v2/src/openstack-blockstorage-devguide.xml
rename to v2/bk_blockstorage_api_ref_v2.xml
index cb0e46a..b640307 100644
--- a/v2/src/openstack-blockstorage-devguide.xml
+++ b/v2/bk_blockstorage_api_ref_v2.xml
@@ -5,7 +5,7 @@
 <!ENTITY PUT    '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
 <!ENTITY POST   '<command xmlns="http://docbook.org/ns/docbook">POST</command>'>
 <!ENTITY DELETE '<command xmlns="http://docbook.org/ns/docbook">DELETE</command>'>
-<!ENTITY PRODNAME "OpenStack Block Storage Service">
+<!ENTITY PRODNAME "OpenStack Block Storage">
 <!ENTITY API   'Block Storage API v2.0'>
 <!ENTITY VERSION   'v2'>
 <!ENTITY PRODABBV "">
@@ -30,9 +30,9 @@ format="SVG" scale="60"/>
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns:db="http://docbook.org/ns/docbook" version="5.0"
   xml:id="openstack-blockstorage-devguide">
-  <title>OpenStack Block Storage Service API v2 Reference</title>
+  <title>OpenStack Block Storage API v2 Reference</title>
   <?rax title.font.size="28px" subtitle.font.size="28px"?>
-  <titleabbrev>Block Storage Service API Reference</titleabbrev>
+  <titleabbrev>Block Storage API Reference</titleabbrev>
   <info>
     <author>
       <personname>
@@ -48,8 +48,8 @@ format="SVG" scale="60"/>
       <year>2014</year>
       <holder>OpenStack Foundation</holder>
     </copyright>
-    <releaseinfo>API v2</releaseinfo>
-    <productname>OpenStack Block Storage Service</productname>
+    <releaseinfo>API v2 and extensions</releaseinfo>
+    <productname>OpenStack Block Storage</productname>
     <pubdate/>
     <legalnotice role="apache2">
       <annotation>
@@ -59,9 +59,8 @@ format="SVG" scale="60"/>
     </legalnotice>
     <abstract>
       <para>This document is for software developers who develop
-        applications by using the OpenStack Block Storage Service
-        Application Programming Interface
-        (<abbrev>API</abbrev>).</para>
+        applications by using the OpenStack Block Storage Application
+        Programming Interface (<abbrev>API</abbrev>).</para>
     </abstract>
     <revhistory>
       <revision>
@@ -182,8 +181,8 @@ format="SVG" scale="60"/>
     xmlns:m="http://www.w3.org/1998/Math/MathML"
     xmlns:html="http://www.w3.org/1999/xhtml">
     <title>Overview</title>
-    <para>OpenStack Block Storage Service is a block-level storage
-      solution that enables you to: <itemizedlist>
+    <para>OpenStack Block Storage is a block-level storage solution
+      that enables you to: <itemizedlist>
         <listitem>
           <para>Mount drives to OpenStack Cloud Servers<trademark/> to
             scale storage without paying for more compute
@@ -515,9 +514,8 @@ X-Compute-Request-Id: req-8e0295cd-a283-46e4-96da-cae05cbfd1c7
     </section>
     <section xml:id="datetimeformat">
       <title>Date and time format</title>
-      <para>The Block Storage Service uses an ISO-8601 compliant date
-        format for the display and consumption of date time
-        values.</para>
+      <para>Block Storage uses an ISO-8601 compliant date format for
+        the display and consumption of date time values.</para>
       <example>
         <title>DB service date and time format</title>
         <programlisting>yyyy-MM-dd'T'HH:mm:ss.SSSZ</programlisting>
@@ -577,10 +575,10 @@ X-Compute-Request-Id: req-8e0295cd-a283-46e4-96da-cae05cbfd1c7
     </section>
     <section xml:id="DB_faults">
       <title>Faults</title>
-      <para>When an error occurs, the Block Storage Service returns a
-        fault object containing an HTTP error response code that
-        denotes the type of error. The response body returns
-        additional information about the fault.</para>
+      <para>When an error occurs, Block Storage returns a fault object
+        containing an HTTP error response code that denotes the type
+        of error. The response body returns additional information
+        about the fault.</para>
       <para>The following table lists possible fault types with their
         associated error codes and descriptions.</para>
       <informaltable rules="all" width="100%">
@@ -660,7 +658,7 @@ X-Compute-Request-Id: req-8e0295cd-a283-46e4-96da-cae05cbfd1c7
           <tr>
             <td><code>serviceUnavailable</code></td>
             <td>503</td>
-            <td>The Block Storage Service is not available.</td>
+            <td>Block Storage is not available.</td>
           </tr>
         </tbody>
       </informaltable>
diff --git a/v2/pom.xml b/v2/pom.xml
index 2372a2d..45b8c15 100644
--- a/v2/pom.xml
+++ b/v2/pom.xml
@@ -59,7 +59,7 @@
               <webhelpDirname>2.0</webhelpDirname>
               <targetDirectory>${basedir}/target/docbkx/webhelp/api/openstack-block-storage</targetDirectory>
               <includeDateInPdfFilename>0</includeDateInPdfFilename>
-              <pdfFilenameBase>openstack-blockstorage-devguide-2.0</pdfFilenameBase>
+              <pdfFilenameBase>openstack-blockstorage-api-ref</pdfFilenameBase>
             </configuration>
           </execution>
           <execution>
@@ -84,9 +84,9 @@
         <configuration>
           <!-- These parameters apply to pdf and webhelp -->
           <xincludeSupported>true</xincludeSupported>
-          <sourceDirectory>src</sourceDirectory>
+          <sourceDirectory>.</sourceDirectory>
           <includes>
-            openstack-blockstorage-devguide.xml
+           bk_blockstorage_api_ref_v2.xml
           </includes>
           <profileSecurity>reviewer</profileSecurity>
           <branding>openstack</branding>
diff --git a/v2/src/samples/db-faults-badRequest.json b/v2/samples/db-faults-badRequest.json
similarity index 100%
rename from v2/src/samples/db-faults-badRequest.json
rename to v2/samples/db-faults-badRequest.json
diff --git a/v2/src/samples/db-faults-badRequest.xml b/v2/samples/db-faults-badRequest.xml
similarity index 100%
rename from v2/src/samples/db-faults-badRequest.xml
rename to v2/samples/db-faults-badRequest.xml
diff --git a/v2/src/samples/db-faults-instanceFault.json b/v2/samples/db-faults-instanceFault.json
similarity index 100%
rename from v2/src/samples/db-faults-instanceFault.json
rename to v2/samples/db-faults-instanceFault.json
diff --git a/v2/src/samples/db-faults-instanceFault.xml b/v2/samples/db-faults-instanceFault.xml
similarity index 100%
rename from v2/src/samples/db-faults-instanceFault.xml
rename to v2/samples/db-faults-instanceFault.xml
diff --git a/v2/src/samples/db-faults-itemNotFound.json b/v2/samples/db-faults-itemNotFound.json
similarity index 100%
rename from v2/src/samples/db-faults-itemNotFound.json
rename to v2/samples/db-faults-itemNotFound.json
diff --git a/v2/src/samples/db-faults-itemNotFound.xml b/v2/samples/db-faults-itemNotFound.xml
similarity index 100%
rename from v2/src/samples/db-faults-itemNotFound.xml
rename to v2/samples/db-faults-itemNotFound.xml