diff --git a/doc/admin-guide/source/dashboard_sessions.rst b/doc/admin-guide/source/dashboard_sessions.rst
index b9a06bee4e..505862b31d 100644
--- a/doc/admin-guide/source/dashboard_sessions.rst
+++ b/doc/admin-guide/source/dashboard_sessions.rst
@@ -11,10 +11,10 @@ back end. You customize the session back end through the
 After architecting and implementing the core OpenStack
 services and other required services, combined with the Dashboard
 service steps below, users and administrators can use
-the OpenStack dashboard. Refer to the
-`OpenStack Dashboard <http://docs.openstack.org/
-user-guide/dashboard.html>`__ chapter of the User Guide for further
-instructions on logging in to the Dashboard.
+the OpenStack dashboard. Refer to the `OpenStack Dashboard
+<http://docs.openstack.org/user-guide/dashboard.html>`__
+chapter of the OpenStack End User Guide for
+further instructions on logging in to the Dashboard.
 
 The following sections describe the pros and cons of each option as it
 pertains to deploying the Dashboard.
diff --git a/doc/admin-guide/source/objectstorage_large-objects.rst b/doc/admin-guide/source/objectstorage_large-objects.rst
index cc474f52f9..3b4046369b 100644
--- a/doc/admin-guide/source/objectstorage_large-objects.rst
+++ b/doc/admin-guide/source/objectstorage_large-objects.rst
@@ -28,8 +28,8 @@ The large object is comprised of two types of objects:
    - **Static large objects**
    - **Dynamic large objects**
 
-To find out more information on large object support, see
-`Large objects <http://docs.openstack.org/user-guide/cli_swift_large_object_creation.html>`_
-in the End User Guide, or
-`Large Object Support <http://docs.openstack.org/developer/swift/overview_large_objects.html>`_
+To find out more information on large object support, see `Large objects
+<http://docs.openstack.org/user-guide/cli_swift_large_object_creation.html>`_
+in the OpenStack End User Guide, or `Large Object Support
+<http://docs.openstack.org/developer/swift/overview_large_objects.html>`_
 in the developer documentation.
diff --git a/doc/contributor-guide/source/topic-tags.rst b/doc/contributor-guide/source/topic-tags.rst
index 5e32685bfd..687e7a451f 100644
--- a/doc/contributor-guide/source/topic-tags.rst
+++ b/doc/contributor-guide/source/topic-tags.rst
@@ -54,7 +54,7 @@ Based on the topic your request refers to, use the following tags:
   Training labs, Training guides
 
 [user-guide]
-  End User Guide
+  OpenStack End User Guide
 
 [WIP]
   Commit is a work in progress
diff --git a/www/api/api-ref-guides.html b/www/api/api-ref-guides.html
index 2c84e3dc44..488e7a10da 100644
--- a/www/api/api-ref-guides.html
+++ b/www/api/api-ref-guides.html
@@ -45,7 +45,7 @@
                     <div class="docs-link-sections">
                         <h3><i class="fa fa-cloud"></i> User Guides</h3>
                         <a href="http://developer.openstack.org/api-guide/quick-start/">API Guide</a>
-                        <a href="/user-guide/">End User Guide (includes Python SDK)</a>
+                        <a href="/user-guide/">OpenStack End User Guide (includes Python SDK)</a>
                         <a href="/cli-reference/">Command-Line Interface Reference</a>
                         <a href="http://developer.openstack.org">Open source software for application development</a>
                     </div>