diff --git a/openstackclient/common/openstackkeyring.py b/openstackclient/common/openstackkeyring.py
index 115e564440..30450e80c8 100644
--- a/openstackclient/common/openstackkeyring.py
+++ b/openstackclient/common/openstackkeyring.py
@@ -13,7 +13,7 @@
 #   under the License.
 #
 
-"""Keyring backend for Openstack, to store encrypted password in a file."""
+"""Keyring backend for OpenStack, to store encrypted password in a file."""
 
 from Crypto.Cipher import AES
 
@@ -24,8 +24,8 @@ import os
 KEYRING_FILE = os.path.join(os.path.expanduser('~'), '.openstack-keyring.cfg')
 
 
-class OpenstackKeyring(keyring.backends.file.BaseKeyring):
-    """Openstack Keyring to store encrypted password."""
+class OpenStackKeyring(keyring.backends.file.BaseKeyring):
+    """OpenStack Keyring to store encrypted password."""
     filename = KEYRING_FILE
 
     def supported(self):
@@ -56,5 +56,5 @@ class OpenstackKeyring(keyring.backends.file.BaseKeyring):
 
 def os_keyring():
     """Initialize the openstack keyring."""
-    ring = 'openstackclient.common.openstackkeyring.OpenstackKeyring'
+    ring = 'openstackclient.common.openstackkeyring.OpenStackKeyring'
     return keyring.core.load_keyring(None, ring)