diff --git a/doc/source/devref/development.environment.rst b/doc/source/devref/development.environment.rst
index a1c19f57e7c..4a74e120be8 100644
--- a/doc/source/devref/development.environment.rst
+++ b/doc/source/devref/development.environment.rst
@@ -34,7 +34,7 @@ Mac OS X. These instructions assume you're already familiar with
 Git and Gerrit, which is a code repository mirror and code review toolset
 , however if you aren't please see `this Git tutorial`_ for an introduction
 to using Git and `this guide`_ for a tutorial on using Gerrit and Git for
-code contribution to Openstack projects.
+code contribution to OpenStack projects.
 
 .. _this Git tutorial: http://git-scm.com/book/en/Getting-Started
 .. _this guide: http://docs.openstack.org/infra/manual/developers.html#development-workflow
diff --git a/etc/neutron.conf b/etc/neutron.conf
index 3ec158584a8..c6eb55b5340 100644
--- a/etc/neutron.conf
+++ b/etc/neutron.conf
@@ -623,14 +623,14 @@
 
 # Number of pool members allowed per tenant. A negative value means unlimited.
 # The default is unlimited because a member is not a real resource consumer
-# on Openstack. However, on back-end, a member is a resource consumer
+# on OpenStack. However, on back-end, a member is a resource consumer
 # and that is the reason why quota is possible.
 # quota_member = -1
 
 # Number of health monitors allowed per tenant. A negative value means
 # unlimited.
 # The default is unlimited because a health monitor is not a real resource
-# consumer on Openstack. However, on back-end, a member is a resource consumer
+# consumer on OpenStack. However, on back-end, a member is a resource consumer
 # and that is the reason why quota is possible.
 # quota_health_monitor = -1
 
diff --git a/neutron/plugins/brocade/README.md b/neutron/plugins/brocade/README.md
index 1baa3124746..5e42433819f 100644
--- a/neutron/plugins/brocade/README.md
+++ b/neutron/plugins/brocade/README.md
@@ -1,4 +1,4 @@
-Brocade Openstack Neutron Plugin
+Brocade OpenStack Neutron Plugin
 ================================
 
 * up-to-date version of these instructions are located at:
@@ -9,7 +9,7 @@ Brocade Openstack Neutron Plugin
 * Supports VCS (Virtual Cluster of Switches)
 
 
-Openstack Brocade Neutron Plugin implements the Neutron v2.0 API.
+OpenStack Brocade Neutron Plugin implements the Neutron v2.0 API.
 
 This plugin is meant to orchestrate Brocade VCS switches running NOS, examples of these are:
 
@@ -22,7 +22,7 @@ to configure the Brocade switch.
              +------------+        +------------+          +-------------+
              |            |        |            |          |             |
              |            |        |            |          |   Brocade   |
-             | Openstack  |  v2.0  |  Brocade   |  NETCONF |  VCS Switch |
+             | OpenStack  |  v2.0  |  Brocade   |  NETCONF |  VCS Switch |
              | Neutron    +--------+  Neutron   +----------+             |
              |            |        |  Plugin    |          |  VDX 67xx   |
              |            |        |            |          |  VDX 87xx   |
@@ -34,7 +34,7 @@ to configure the Brocade switch.
 Directory Structure
 ===================
 
-Normally you will have your Openstack directory structure as follows:
+Normally you will have your OpenStack directory structure as follows:
 
          /opt/stack/nova/
          /opt/stack/horizon/
diff --git a/neutron/plugins/common/utils.py b/neutron/plugins/common/utils.py
index 61e7c164f24..694423d68bc 100644
--- a/neutron/plugins/common/utils.py
+++ b/neutron/plugins/common/utils.py
@@ -13,7 +13,7 @@
 #    under the License.
 
 """
-Common utilities and helper functions for Openstack Networking Plugins.
+Common utilities and helper functions for OpenStack Networking Plugins.
 """
 
 import webob.exc
diff --git a/neutron/plugins/ml2/drivers/brocade/README.md b/neutron/plugins/ml2/drivers/brocade/README.md
index 6a2cb2a5c49..1d20a5cf6f5 100644
--- a/neutron/plugins/ml2/drivers/brocade/README.md
+++ b/neutron/plugins/ml2/drivers/brocade/README.md
@@ -25,7 +25,7 @@ Currently the mechanism drivers support VLANs only.
              +------------+        +------------+          +-------------+
              |            |        |            |          |             |
    Neutron   |            |        |            |          |   Brocade   |
-     v2.0    | Openstack  |        |  Brocade   |  NETCONF |  VCS Switch |
+     v2.0    | OpenStack  |        |  Brocade   |  NETCONF |  VCS Switch |
          ----+ Neutron    +--------+  Mechanism +----------+             |
              | ML2        |        |  Driver    |          |  VDX 67xx   |
              | Plugin     |        |            |          |  VDX 87xx   |