diff --git a/doc/common-rst/cli_set_environment_variables_using_openstack_rc.rst b/doc/common-rst/cli_set_environment_variables_using_openstack_rc.rst
index 0ad16a2f82..e39d30bfa8 100644
--- a/doc/common-rst/cli_set_environment_variables_using_openstack_rc.rst
+++ b/doc/common-rst/cli_set_environment_variables_using_openstack_rc.rst
@@ -98,9 +98,9 @@ environment variable settings by using the options that are listed at
 the end of the ``help`` output of the various client commands. For
 example, you can override the ``OS_PASSWORD`` setting in the
 :file:`PROJECT-openrc.sh` file by specifying a password on a
-:command:`keystone` command, as follows::
+:command:`openstack` command, as follows::
 
-  $ keystone --os-password PASSWORD service-list
+  $ openstack --os-password PASSWORD service list
 
 Where ``PASSWORD`` is your password.
 
diff --git a/doc/networking-guide/source/deploy_scenario3a.rst b/doc/networking-guide/source/deploy_scenario3a.rst
index 62d6ad63f1..ae15c6a9b2 100644
--- a/doc/networking-guide/source/deploy_scenario3a.rst
+++ b/doc/networking-guide/source/deploy_scenario3a.rst
@@ -530,9 +530,9 @@ Tenant (VXLAN) network
 
    ::
 
-     $ keystone tenant-get demo
+     $ openstack project show demo
      +-------------+----------------------------------+
-     |   Property  |              Value               |
+     |   Field     |              Value               |
      +-------------+----------------------------------+
      | description |           Demo Tenant            |
      |   enabled   |               True               |
diff --git a/doc/networking-guide/source/scenario_legacy_lb.rst b/doc/networking-guide/source/scenario_legacy_lb.rst
index 64b4e09321..e7f5a3c9e9 100644
--- a/doc/networking-guide/source/scenario_legacy_lb.rst
+++ b/doc/networking-guide/source/scenario_legacy_lb.rst
@@ -835,9 +835,9 @@ This example creates a flat external network and a VXLAN project network.
 
    .. code-block:: console
 
-      $ keystone tenant-get demo
+      $ openstack project show demo
       +-------------+----------------------------------+
-      |   Property  |              Value               |
+      |   Field     |              Value               |
       +-------------+----------------------------------+
       | description |           Demo Project           |
       |   enabled   |               True               |
diff --git a/doc/networking-guide/source/scenario_legacy_ovs.rst b/doc/networking-guide/source/scenario_legacy_ovs.rst
index c4944be373..c8bd5d2f7c 100644
--- a/doc/networking-guide/source/scenario_legacy_ovs.rst
+++ b/doc/networking-guide/source/scenario_legacy_ovs.rst
@@ -971,14 +971,14 @@ This example creates a flat external network and a VXLAN project network.
 
    .. code-block:: console
 
-      $ keystone tenant-get demo
+      $ openstack project show demo
       +-------------+----------------------------------+
-      |   Property  |              Value               |
+      | Field       | Value                            |
       +-------------+----------------------------------+
-      | description |           Demo Project           |
-      |   enabled   |               True               |
-      |      id     | 443cd1596b2e46d49965750771ebbfe1 |
-      |     name    |               demo               |
+      | description | Demo Project                     |
+      | enabled     | True                             |
+      | id          | 443cd1596b2e46d49965750771ebbfe1 |
+      | name        | demo                             |
       +-------------+----------------------------------+
 
 #. Create the project network: