diff --git a/api-ref/pom.xml b/api-ref/pom.xml
index 5ae6b35c4..e79f1903a 100644
--- a/api-ref/pom.xml
+++ b/api-ref/pom.xml
@@ -103,6 +103,17 @@
               <pdfFilename>bk-api-ref-compute-v2-ext</pdfFilename>
             </configuration>
           </execution>
+          <execution>
+            <id>os-api-ref-data-processing-v1.1</id>
+            <goals>
+              <goal>generate-html</goal>
+            </goals>
+            <phase>generate-sources</phase>
+            <configuration>
+              <includes> api-ref-data-processing-v1.1.xml</includes>
+              <pdfFilename>bk-api-ref-data-processing-v1.1</pdfFilename>
+            </configuration>
+          </execution>
           <execution>
             <id>os-api-ref-database-v1</id>
             <goals>
@@ -159,18 +170,7 @@
             </configuration>
           </execution>
           <execution>
-            <id>os-api-ref-data-processing-v1.1</id>
-            <goals>
-              <goal>generate-html</goal>
-            </goals>
-            <phase>generate-sources</phase>
-            <configuration>
-              <includes> api-ref-data-processing-v1.1.xml</includes>
-              <pdfFilename>bk-api-ref-data-processing-v1.1</pdfFilename>
-            </configuration>
-          </execution>
-          <execution>
-            <id>os-api-ref-databases-v1</id>
+            <id>os-api-ref-identity-v2-ext</id>
             <goals>
               <goal>generate-html</goal>
             </goals>
diff --git a/api-ref/src/docbkx/ch_blockstorage-api-v2.xml b/api-ref/src/docbkx/ch_blockstorage-api-v2.xml
index 0757d1bbe..7d92af913 100644
--- a/api-ref/src/docbkx/ch_blockstorage-api-v2.xml
+++ b/api-ref/src/docbkx/ch_blockstorage-api-v2.xml
@@ -7,7 +7,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     version="5.0-extension RackBook-2.0" xml:id="blockstorage-v2"
     role="api-reference">
-    <title>Block Storage API v2 (CURRENT)</title>
+    <title>Block Storage API v2 (SUPPORTED)</title>
     <para>Manage volumes and snapshots for use with the Block Storage API, also known as cinder
         services.</para>
     <section xml:id="versions-cinder-v2">
diff --git a/api-ref/src/docbkx/ch_compute-v2.1.xml b/api-ref/src/docbkx/ch_compute-v2.1.xml
index ec80573b1..fe923dd4a 100644
--- a/api-ref/src/docbkx/ch_compute-v2.1.xml
+++ b/api-ref/src/docbkx/ch_compute-v2.1.xml
@@ -11,7 +11,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     version="5.0-extension RackBook-2.0" xml:id="compute-v2.1"
     role="api-reference">
-  <title>Compute API v2.1 (EXPERIMENTAL)</title>
+  <title>Compute API v2.1 (CURRENT)</title>
   <note><para>XML support in requests and responses has been deprecated for the Compute
       API v2.1 (originally referred to as API v3).</para></note>
   <!-- GET v2.1/extensions does not work -->
diff --git a/api-ref/src/docbkx/ch_compute-v2.xml b/api-ref/src/docbkx/ch_compute-v2.xml
index 747b4001f..6b770b54e 100644
--- a/api-ref/src/docbkx/ch_compute-v2.xml
+++ b/api-ref/src/docbkx/ch_compute-v2.xml
@@ -10,7 +10,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     version="5.0-extension RackBook-2.0" xml:id="compute-v2"
     role="api-reference">
-    <title>Compute API v2 (CURRENT)</title>
+    <title>Compute API v2 (SUPPORTED)</title>
     <para>Launch virtual machines from images or images stored on persistent volumes. API v1.1 is
         identical to API v2.</para>
     <note>
diff --git a/api-ref/src/docbkx/itemizedlist-service-list.xml b/api-ref/src/docbkx/itemizedlist-service-list.xml
index 27f72751f..38533ca81 100644
--- a/api-ref/src/docbkx/itemizedlist-service-list.xml
+++ b/api-ref/src/docbkx/itemizedlist-service-list.xml
@@ -26,56 +26,29 @@
       <para>
          <link xlink:href="api-ref-compute-v2.1.html">
          Compute API
-         v2.1 (EXPERIMENTAL)</link>
+         v2.1 (CURRENT)</link>
       </para>
    </listitem>
    <listitem>
       <para>
          <link xlink:href="api-ref-compute-v2.html">
          Compute API
-         v2 (CURRENT)</link>
+         v2 (SUPPORTED)</link>
       </para>
    </listitem>
    <listitem>
       <para>
          <link xlink:href="api-ref-compute-v2-ext.html">
          Compute
-         API v2 extensions (CURRENT)</link>
+         API v2 extensions (SUPPORTED)</link>
       </para>
    </listitem>
-   <listitem>
-      <para>
-         <link xlink:href="api-ref-database-v1.html">
-         Database
-         Service API v1.0 (CURRENT)</link>
-      </para>
-   </listitem>
-    <listitem>
-        <para><link xlink:href="api-ref-blockstorage-v2.html">Block
-                Storage API v2 (CURRENT)</link></para>
-    </listitem>
-    <listitem>
-        <para><link xlink:href="api-ref-blockstorage-v1.html">Block
-                Storage API v1 (CURRENT)</link></para>
-    </listitem>
-    <listitem>
-        <para><link xlink:href="api-ref-compute-v2.1.html">Compute API
-                v2.1 (CURRENT)</link></para>
-    </listitem>
-    <listitem>
-        <para><link xlink:href="api-ref-compute-v2.html">Compute API
-                v2 (SUPPORTED)</link></para>
-    </listitem>
-    <listitem>
-        <para><link xlink:href="api-ref-compute-v2-ext.html">Compute
-                API v2 extensions (SUPPORTED)</link></para>
-    </listitem>
     <listitem>
         <para><link xlink:href="api-ref-data-processing-v1.1.html">Data
                 Processing v1.1 (CURRENT)</link></para>
     </listitem>
     <listitem>
-        <para><link xlink:href="api-ref-databases-v1.html">Database
+        <para><link xlink:href="api-ref-database-v1.html">Database
                 Service API v1.0 (CURRENT)</link></para>
     </listitem>
     <listitem>