diff --git a/keystoneclient/auth/base.py b/keystoneclient/auth/base.py
index df7521cbd..0036b8cfe 100644
--- a/keystoneclient/auth/base.py
+++ b/keystoneclient/auth/base.py
@@ -252,7 +252,7 @@ class BaseAuthPlugin(object):
 
         :returns: A list of Param objects describing available plugin
                   parameters.
-        :rtype: list
+        :rtype: List
         """
         return []
 
diff --git a/keystoneclient/auth/cli.py b/keystoneclient/auth/cli.py
index d8cc820af..1b8e05435 100644
--- a/keystoneclient/auth/cli.py
+++ b/keystoneclient/auth/cli.py
@@ -32,7 +32,7 @@ def register_argparse_arguments(parser, argv, default=None):
     the options required for that specific plugin if available.
 
     :param argparse.ArgumentParser: the parser to attach argparse options to.
-    :param list argv: the arguments provided to the application.
+    :param List argv: the arguments provided to the application.
     :param str/class default: a default plugin name or a plugin object to use
                               if one isn't specified by the CLI. default: None.
 
diff --git a/keystoneclient/auth/identity/v3/base.py b/keystoneclient/auth/identity/v3/base.py
index d82c28953..3576045a7 100644
--- a/keystoneclient/auth/identity/v3/base.py
+++ b/keystoneclient/auth/identity/v3/base.py
@@ -33,7 +33,7 @@ class BaseAuth(base.BaseIdentityPlugin):
     """Identity V3 Authentication Plugin.
 
     :param string auth_url: Identity service endpoint for authentication.
-    :param list auth_methods: A collection of methods to authenticate with.
+    :param List auth_methods: A collection of methods to authenticate with.
     :param string trust_id: Trust ID for trust scoping.
     :param string domain_id: Domain ID for domain scoping.
     :param string domain_name: Domain name for domain scoping.
@@ -111,7 +111,7 @@ class Auth(BaseAuth):
     """Identity V3 Authentication Plugin.
 
     :param string auth_url: Identity service endpoint for authentication.
-    :param list auth_methods: A collection of methods to authenticate with.
+    :param List auth_methods: A collection of methods to authenticate with.
     :param string trust_id: Trust ID for trust scoping.
     :param string domain_id: Domain ID for domain scoping.
     :param string domain_name: Domain name for domain scoping.
@@ -235,7 +235,7 @@ class AuthMethod(object):
 
         :param session: The communication session.
         :type session: keystoneclient.session.Session
-        :param Auth auth: The auth plugin calling the method.
+        :param base.Auth auth: The auth plugin calling the method.
         :param dict headers: The headers that will be sent with the auth
                              request if a plugin needs to add to them.
         :return: The identifier of this plugin and a dict of authentication
diff --git a/keystoneclient/discover.py b/keystoneclient/discover.py
index 85b0875ad..6b9a16759 100644
--- a/keystoneclient/discover.py
+++ b/keystoneclient/discover.py
@@ -231,7 +231,7 @@ class Discover(_discover.Discover):
 
         :returns: The endpoints returned from the server that match the
                   criteria.
-        :rtype: list
+        :rtype: List
 
         Example::
 
diff --git a/keystoneclient/v3/contrib/federation/identity_providers.py b/keystoneclient/v3/contrib/federation/identity_providers.py
index 85c4a73ff..4675ca366 100644
--- a/keystoneclient/v3/contrib/federation/identity_providers.py
+++ b/keystoneclient/v3/contrib/federation/identity_providers.py
@@ -79,7 +79,7 @@ class IdentityProviderManager(base.CrudManager):
         GET /OS-FEDERATION/identity_providers
 
         :returns: a list of IdentityProvider resource objects.
-        :rtype: list
+        :rtype: List
 
         """
         return super(IdentityProviderManager, self).list(**kwargs)