diff --git a/docs/api/stanzabase.rst b/docs/api/stanzabase.rst
index e31fb26..5a2c9a0 100644
--- a/docs/api/stanzabase.rst
+++ b/docs/api/stanzabase.rst
@@ -96,8 +96,9 @@ of an interface defined by the parent.
 
 .. seealso::
 
-    - :ref:`creating-extension-plugins`
-    - :ref:`overriding-parent-interfaces`
+    - :ref:`create-stanza-plugins`
+    - :ref:`create-extension-plugins`
+    - :ref:`override-parent-interfaces`
      
 
 Registering Stanza Plugins
diff --git a/docs/api/xmlstream.rst b/docs/api/xmlstream.rst
index 7835bf5..65200f6 100644
--- a/docs/api/xmlstream.rst
+++ b/docs/api/xmlstream.rst
@@ -6,3 +6,7 @@ xmlstream
 
 .. autoclass:: XMLStream
     :members:
+
+.. toctree::
+
+    stanzabase
diff --git a/docs/index.rst b/docs/index.rst
index 1608d4c..6898b50 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -87,8 +87,10 @@ Tutorials, FAQs, and How To Guides
 .. toctree::
     :maxdepth: 1
    
+    faq
     xeps
     xmpp_tdg
+    create_stanzas
     create_plugin
     features
     sasl
@@ -118,7 +120,6 @@ API Reference
     api/clientxmpp
     api/basexmpp
     api/xmlstream
-    api/stanzabase
 
 Additional Info
 ---------------