diff --git a/source/openstack_compute.rst b/source/openstack_compute.rst
index 00c2965a..3d6743ce 100644
--- a/source/openstack_compute.rst
+++ b/source/openstack_compute.rst
@@ -139,7 +139,8 @@ To install and configure the Compute controller components:
 
 #. Install OpenStack Compute Controller bundle::
 
-    # clr_bundle_add openstack-compute-controller
+    # swupd bundle-add openstack-compute-controller
+    # swupd verify --fix
 
 #. Custom configurations will be located at ``/etc/nova``.
 
diff --git a/source/openstack_identity.rst b/source/openstack_identity.rst
index 95d0938b..587596cc 100644
--- a/source/openstack_identity.rst
+++ b/source/openstack_identity.rst
@@ -58,8 +58,8 @@ Install and configure components
 
 #. Run the following command to install the packages.::
 
-     # clr_bundle_add openstack-identity
-     # swupd_verify --fix
+     # swupd bundle-add openstack-identity
+     # swupd verify --fix
 
 #. Custom configurations will be located at ``/etc/keystone/``.
 
@@ -147,8 +147,8 @@ environment variables to reduce command length.
 
 #. Install the OpenStack Python clients bundle::
 
-     # clr_bundle_add openstack-python-clients
-     # swupd_verify --fix
+     # swupd bundle-add openstack-python-clients
+     # swupd verify --fix
      
 
 Create the service entity and API endpoints
diff --git a/source/openstack_image.rst b/source/openstack_image.rst
index 59e4fdd4..9c0b2832 100644
--- a/source/openstack_image.rst
+++ b/source/openstack_image.rst
@@ -132,8 +132,8 @@ Install and configure components
 
 #. Install OpenStack Image bundle.::
 
-    # clr_bundle_add openstack-image
-    # swupd_verify --fix
+    # swupd bundle-add openstack-image
+    # swupd verify --fix
 
 #. Configurations will be located at ``/etc/glance``.
 
@@ -216,7 +216,7 @@ Finalize installation
     # systemctl start glance-api.service glance-registry.service
 
 Verify operation
-----------------
+~~~~~~~~~~~~~~~~
 
 Verify operation of the Image service using
 `CirrOS <http://launchpad.net/cirros>`__, a small
diff --git a/source/openstack_supporting-database.rst b/source/openstack_supporting-database.rst
index e58ee1a4..fccadc79 100644
--- a/source/openstack_supporting-database.rst
+++ b/source/openstack_supporting-database.rst
@@ -10,8 +10,8 @@ Install and configure the database server
 
 #. Install MariaDB bundle::
 
-     # clr_bundle_add database-mariadb
-     # swupd_verify --fix
+     # swupd bundle-add database-mariadb
+     # swupd verify --fix
 
 #. Create the ``/etc/mariadb/`` folder and the ``/etc/mariadb/openstack.cnf``
    file::
diff --git a/source/openstack_supporting-messaging.rst b/source/openstack_supporting-messaging.rst
index 38109a87..be80167a 100644
--- a/source/openstack_supporting-messaging.rst
+++ b/source/openstack_supporting-messaging.rst
@@ -11,8 +11,8 @@ Install the message queue service
 
 #. Install the message queue bundle.::
 
-   # clr_bundle_add message-broker-rabbitmq
-   # swupd_verify --fix
+   # swupd bundle-add message-broker-rabbitmq
+   # swupd verify --fix
 
 Configuring the message broker service
 --------------------------------------