diff --git a/v2.0/ch_neutron_preface.xml b/v2.0/ch_neutron_preface.xml
index 169273f..92eaf1d 100644
--- a/v2.0/ch_neutron_preface.xml
+++ b/v2.0/ch_neutron_preface.xml
@@ -25,7 +25,7 @@ format="SVG" scale="60"/>
 format="SVG" scale="60"/>
 </imageobject>
 </inlinemediaobject>'>
- <!ENTITY APIv2   'Networking API v2.0'>
+ <!ENTITY APIv2   'Networking (neutron) API v2.0'>
 ]>
 <preface xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -33,14 +33,14 @@ format="SVG" scale="60"/>
     xml:id="ch_preface">
     <?dbhtml stop-chunking?>
     <title>Preface</title>
-    <para>The OpenStack Networking project provides virtual networking services
-        among devices managed by the <link
-            xlink:href="http://wiki.openstack.org/OpenStack">OpenStack</link>
-        compute service.</para>
-    <para>This document describes the
-        &APIv2; features.</para>
+    <para>The OpenStack Networking (neutron) project provides virtual
+        networking services among devices managed by the <link
+            xlink:href="http://wiki.openstack.org/OpenStack"
+            >OpenStack</link> compute service.</para>
+    <para>This document describes the &APIv2; features.</para>
     <para>We welcome feedback, comments, and bug reports at <link
-            xlink:href="http://bugs.launchpad.net/Neutron">bugs.launchpad.net/Neutron</link>.</para>
+            xlink:href="http://bugs.launchpad.net/Neutron"
+            >bugs.launchpad.net/Neutron</link>.</para>
     <section xml:id="Intended_Audience-d1e85">
         <title>Intended Audience</title>
         <para xmlns:svg="http://www.w3.org/2000/svg"
@@ -49,10 +49,10 @@ format="SVG" scale="60"/>
             xmlns:db="http://docbook.org/ns/docbook">This guide is for
             software developers who create applications by using the
             &APIv2;. To use this information, you should have a
-            general understanding of the OpenStack Networking
-            service, the OpenStack compute service, and the
-            integration between the two. You should also have access
-            to a plug-in that implements the &APIv2;.</para>
+            general understanding of the OpenStack Networking service,
+            the OpenStack compute service, and the integration between
+            the two. You should also have access to a plug-in that
+            implements the &APIv2;.</para>
         <para xmlns:svg="http://www.w3.org/2000/svg"
             xmlns:m="http://www.w3.org/1998/Math/MathML"
             xmlns:html="http://www.w3.org/1999/xhtml"
@@ -85,28 +85,29 @@ format="SVG" scale="60"/>
         <para>Use the following resources in conjunction with this
             guide:</para>
         <informaltable rules="all">
-                <thead>
-                    <tr>
-                        <th>Resource</th>
-                        <th>See</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td>
-                            <para>Related documents</para>
-                        </td>
-                        <td><link xlink:href="http://docs.openstack.org"
-                                >OpenStack Manuals</link></td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <para>OpenStack Neutron Wiki</para>
-                        </td>
-                        <td><link xlink:href="http://wiki.openstack.org/Neutron"
-                                >http://wiki.openstack.org/Neutron</link></td>
-                    </tr>
-                </tbody>
-            </informaltable>
+            <thead>
+                <tr>
+                    <th>Resource</th>
+                    <th>See</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <td>
+                        <para>Related documents</para>
+                    </td>
+                    <td><link xlink:href="http://docs.openstack.org"
+                            >OpenStack Documentation</link></td>
+                </tr>
+                <tr>
+                    <td>
+                        <para>OpenStack Neutron Wiki</para>
+                    </td>
+                    <td><link
+                            xlink:href="http://wiki.openstack.org/Neutron"
+                            >http://wiki.openstack.org/Neutron</link></td>
+                </tr>
+            </tbody>
+        </informaltable>
     </section>
 </preface>
diff --git a/v2.0/neutron-api-guide.xml b/v2.0/neutron-api-guide.xml
index afbc597..2d3b799 100644
--- a/v2.0/neutron-api-guide.xml
+++ b/v2.0/neutron-api-guide.xml
@@ -33,8 +33,8 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
     xmlns:db="http://docbook.org/ns/docbook" version="5.0"
     status="final" xml:id="neutron-api-spec">
-    <title>OpenStack Networking API v2.0 Reference</title>
-    <titleabbrev>Networking API Reference</titleabbrev>
+    <title>OpenStack Networking (neutron) API v2.0 Reference</title>
+    <titleabbrev>Networking (neutron) API Reference</titleabbrev>
     <info>
         <author>
             <personname>
@@ -49,7 +49,7 @@
             <holder>OpenStack Foundation</holder>
         </copyright>
         <releaseinfo>API v2.0</releaseinfo>
-        <productname>OpenStack Networking API v2.0</productname>
+        <productname>OpenStack Networking (neutron) API v2.0</productname>
         <pubdate/>
         <legalnotice role="apache2">
             <annotation>
diff --git a/v2.0/section_neutron-security-groups-ext.xml b/v2.0/section_neutron-security-groups-ext.xml
index b985e92..46e0cd6 100644
--- a/v2.0/section_neutron-security-groups-ext.xml
+++ b/v2.0/section_neutron-security-groups-ext.xml
@@ -1,32 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE section [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY ndash  "&#x2013;">
-<!ENTITY mdash  "&#x2014;">
-<!ENTITY hellip "&#x2026;">
-<!ENTITY plusmn "&#xB1;">
-
-<!-- Useful for describing APIs -->
-<!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
-<!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 CHECK  '<inlinemediaobject xmlns="http://docbook.org/ns/docbook">
- <imageobject>
-  <imagedata fileref="figures/Check_mark_23x20_02.svg"
-     format="SVG" scale="60"/>
-</imageobject>
-      </inlinemediaobject>'>
-
-<!ENTITY ARROW  '<inlinemediaobject xmlns="http://docbook.org/ns/docbook">
- <imageobject>
-  <imagedata fileref="figures/Arrow_east.svg"
-     format="SVG" scale="60"/>
-</imageobject>
-      </inlinemediaobject>'>
- <!ENTITY APIv2   'Networking API v2.0'>
-]>
 <section xmlns="http://docbook.org/ns/docbook"
     xmlns:xlink="http://www.w3.org/1999/xlink"
     xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -37,7 +9,26 @@
     status="final" xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xml:id="security_groups">
     <title>Security groups and rules (security-groups)</title>
-    <wadl:resources
-        href="https://raw.github.com/openstack/api-site/master/api-ref/src/wadls/netconn-api/src/security-groups.wadl"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
+    <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
+        <wadl:resource
+            href="https://raw.github.com/openstack/api-site/master/api-ref/src/wadls/netconn-api/src/security-groups.wadl#security_groups">
+            <wadl:method href="#listSecGroups"/>
+            <wadl:method href="#createSecGroup"/>
+        </wadl:resource>
+        <wadl:resource
+            href="https://raw.github.com/openstack/api-site/master/api-ref/src/wadls/netconn-api/src/security-groups.wadl#security_group_id">
+            <wadl:method href="#getSecGroup"/>
+            <wadl:method href="#deleteSecGroup"/>
+        </wadl:resource>
+        <wadl:resource
+            href="https://raw.github.com/openstack/api-site/master/api-ref/src/wadls/netconn-api/src/security-groups.wadl#security_groups_rules">
+            <wadl:method href="#listSecGroupRules"/>
+            <wadl:method href="#createSecGroupRule"/>
+        </wadl:resource>
+        <wadl:resource
+            href="https://raw.github.com/openstack/api-site/master/api-ref/src/wadls/netconn-api/src/security-groups.wadl#rules-security-groups-id">
+            <wadl:method href="#getSecGroupRule"/>
+            <wadl:method href="#deleteSecGroupRule"/>
+        </wadl:resource>
+    </wadl:resources>
 </section>