diff --git a/doc/source/configuration/index.rst b/doc/source/configuration/index.rst
index 22f81434..5b876a9e 100644
--- a/doc/source/configuration/index.rst
+++ b/doc/source/configuration/index.rst
@@ -127,14 +127,14 @@ oslo.context.*
      * The name of the authenticated user, if available.
    - * ``%(user)s``
      * The ID of the authenticated user, if available.
-   - * ``%(tenant_name)s``
-     * The name of the authenticated tenant, if available.
-   - * ``%(tenant)s``
-     * The ID of the authenticated tenant, if available.
+   - * ``%(project_name)s``
+     * The name of the authenticated project, if available.
+   - * ``%(project)s``
+     * The ID of the authenticated project, if available.
    - * ``%(user_domain)s``
      * The ID of the authenticated user domain, if available.
    - * ``%(project_domain)s``
-     * The ID of the authenticated project/tenant, if available.
+     * The ID of the authenticated project, if available.
    - * ``%(request_id)s``
      * The ID of the current request. This value can be used to tie
        multiple log messages together as relating to the same
diff --git a/doc/source/user/examples/usage_context.py b/doc/source/user/examples/usage_context.py
index dd5aeadc..dc14c4af 100644
--- a/doc/source/user/examples/usage_context.py
+++ b/doc/source/user/examples/usage_context.py
@@ -80,6 +80,6 @@ if __name__ == '__main__':
     LOG.info("Welcome to Oslo Logging")
     LOG.info("Without context")
     context.RequestContext(user='6ce90b4d',
-                           tenant='d6134462',
+                           project='d6134462',
                            domain='a6b9360e')
     LOG.info("With context")
diff --git a/doc/source/user/guidelines.rst b/doc/source/user/guidelines.rst
index c35c0454..4ed1fd4c 100644
--- a/doc/source/user/guidelines.rst
+++ b/doc/source/user/guidelines.rst
@@ -281,7 +281,7 @@ REST API deprecation warnings
 - Should **not** be logged any higher than ``DEBUG``, since these are
   not operator-facing messages.
 
-- Should be logged no more than once per REST API usage / tenant,
+- Should be logged no more than once per REST API usage / project,
   definitely not on *every* REST API call.
 
 **Rationale:** The users of the REST API don't have access to the