diff --git a/octavia/db/models.py b/octavia/db/models.py
index dade09438a..4b8a0a2b11 100644
--- a/octavia/db/models.py
+++ b/octavia/db/models.py
@@ -118,7 +118,7 @@ class ListenerStatistics(base_models.BASE):
         if value < 0:
             data = {'key': key, 'value': value}
             raise ValueError(data)
-            # TODO(trevor-vardeman): Repair this functionality after Openstack
+            # TODO(trevor-vardeman): Repair this functionality after OpenStack
             # Common is in
             # raise ValueError(_('The %(key)s field can not have '
             #                   'negative value. '
diff --git a/specs/version0.5/tls-data-security.rst b/specs/version0.5/tls-data-security.rst
index c455ea31c8..f85c5ed486 100644
--- a/specs/version0.5/tls-data-security.rst
+++ b/specs/version0.5/tls-data-security.rst
@@ -75,7 +75,7 @@ loaded in the config.
 Alternatives
 ------------
 We could skip the interface and just use Barbican directly, but that would be
-diverging from what seems to be the accepted Openstack model for Secret Store
+diverging from what seems to be the accepted OpenStack model for Secret Store
 integration.
 
 We could also store everything locally or in the DB, but that isn't a real