diff --git a/api-ref/source/v3/samples/admin/credential-update-request.json b/api-ref/source/v3/samples/admin/credential-update-request.json
index 2da3a1c3da..50c9e77f27 100644
--- a/api-ref/source/v3/samples/admin/credential-update-request.json
+++ b/api-ref/source/v3/samples/admin/credential-update-request.json
@@ -1,6 +1,6 @@
 {
     "credential": {
-        "blob": "{\"access\":\"181920\",\"secrete\":\"secretKey\"}",
+        "blob": "{\"access\":\"181920\",\"secret\":\"secretKey\"}",
         "project_id": "731fc6f265cd486d900f16e84c5cb594",
         "type": "ec2",
         "user_id": "bb5476fd12884539b41d5a88f838d773"
diff --git a/api-ref/source/v3/samples/admin/credential-update-response.json b/api-ref/source/v3/samples/admin/credential-update-response.json
index 5b82117406..f4607b25dd 100644
--- a/api-ref/source/v3/samples/admin/credential-update-response.json
+++ b/api-ref/source/v3/samples/admin/credential-update-response.json
@@ -4,7 +4,7 @@
         "links": {
             "self": "http://example.com/identity/v3/credentials/207e9b76935efc03804d3dd6ab52d22e9b22a0711e4ada4ff8b76165a07311d7"
         },
-        "blob": "{\"access\":\"181920\",\"secrete\":\"secretKey\"}",
+        "blob": "{\"access\":\"181920\",\"secret\":\"secretKey\"}",
         "project_id": "731fc6f265cd486d900f16e84c5cb594",
         "type": "ec2",
         "id": "207e9b76935efc03804d3dd6ab52d22e9b22a0711e4ada4ff8b76165a07311d7"
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index d2d4f930c4..53db268bb0 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -1522,7 +1522,7 @@ can be invoked as follows:
 
     # Using password authentication, with environment variables
     $ export OS_USERNAME=admin
-    $ export OS_PASSWORD=secrete
+    $ export OS_PASSWORD=secret
     $ export OS_PROJECT_NAME=admin
     $ export OS_AUTH_URL=http://localhost:35357/v2.0
     $ openstack user list
@@ -1530,8 +1530,8 @@ can be invoked as follows:
     $ openstack token issue
 
     # Using password authentication, with flags
-    $ openstack --os-username=admin --os-password=secrete --os-project-name=admin --os-auth-url=http://localhost:35357/v2.0 user list
-    $ openstack --os-username=admin --os-password=secrete --os-project-name=admin --os-auth-url=http://localhost:35357/v2.0 project create demo
+    $ openstack --os-username=admin --os-password=secret --os-project-name=admin --os-auth-url=http://localhost:35357/v2.0 user list
+    $ openstack --os-username=admin --os-password=secret --os-project-name=admin --os-auth-url=http://localhost:35357/v2.0 project create demo
 
 
 Using an LDAP server
diff --git a/doc/source/devref/api_curl_examples.rst b/doc/source/devref/api_curl_examples.rst
index 066efe97c0..bc3a41a72d 100644
--- a/doc/source/devref/api_curl_examples.rst
+++ b/doc/source/devref/api_curl_examples.rst
@@ -851,7 +851,7 @@ Authenticate by exchanging credentials for an access token:
 
 .. code-block:: bash
 
-    $ curl -d '{"auth":{"tenantName": "customer-x", "passwordCredentials": {"username": "joeuser", "password": "secrete"}}}' -H "Content-type: application/json" http://localhost:35357/v2.0/tokens
+    $ curl -d '{"auth":{"tenantName": "customer-x", "passwordCredentials": {"username": "joeuser", "password": "secret"}}}' -H "Content-type: application/json" http://localhost:35357/v2.0/tokens
 
 Returns:
 
diff --git a/keystone/auth/plugins/base.py b/keystone/auth/plugins/base.py
index b865d82b8a..4f9c59e2e6 100644
--- a/keystone/auth/plugins/base.py
+++ b/keystone/auth/plugins/base.py
@@ -75,7 +75,7 @@ class AuthMethodHandler(object):
                         "password": {
                             "user": {
                                 "id": "s23sfad1",
-                                "password": "secrete"
+                                "password": "secret"
                             }
                         },
                         "token": {
diff --git a/tools/sample_data.sh b/tools/sample_data.sh
index 103452b20d..505e5a3d5a 100755
--- a/tools/sample_data.sh
+++ b/tools/sample_data.sh
@@ -48,7 +48,7 @@ type openstack >/dev/null 2>&1 || {
     exit 1
     }
 
-ADMIN_PASSWORD=${ADMIN_PASSWORD:-secrete}
+ADMIN_PASSWORD=${ADMIN_PASSWORD:-secret}
 NOVA_PASSWORD=${NOVA_PASSWORD:-${SERVICE_PASSWORD:-nova}}
 GLANCE_PASSWORD=${GLANCE_PASSWORD:-${SERVICE_PASSWORD:-glance}}
 EC2_PASSWORD=${EC2_PASSWORD:-${SERVICE_PASSWORD:-ec2}}