diff --git a/README.rst b/README.rst
index 4193aa95..2e71a6cc 100644
--- a/README.rst
+++ b/README.rst
@@ -738,7 +738,7 @@ related to the storage
 Example: ssh-username, ssh-port
 
 For swift storage you should provide additional parameter called 'osrc'
-Osrc should be a path to file with Openstack Credentials like::
+Osrc should be a path to file with OpenStack Credentials like::
 
   unset OS_DOMAIN_NAME
   export OS_AUTH_URL=http://url:5000/v3
@@ -1097,7 +1097,7 @@ optional arguments:
   --noverbose           The inverse of --verbose
   --nowatch-log-file    The inverse of --watch-log-file
   --os-identity-api-version OS_IDENTITY_API_VERSION, --os_auth_ver OS_IDENTITY_API_VERSION
-                        Openstack identity api version, can be 1, 2, 2.0 or 3
+                        OpenStack identity api version, can be 1, 2, 2.0 or 3
   --overwrite           With overwrite removes files from restore path before
                         restore.
   --path-to-backup PATH_TO_BACKUP, -F PATH_TO_BACKUP
diff --git a/doc/source/user/freezer-agent.rst b/doc/source/user/freezer-agent.rst
index 1c768306..ea812a5b 100644
--- a/doc/source/user/freezer-agent.rst
+++ b/doc/source/user/freezer-agent.rst
@@ -422,7 +422,7 @@ Example:
     ssh-username, ssh-port
     
 For swift storage you should provide additional parameter called 'osrc' Osrc
-should be a path to file with Openstack Credentials like:
+should be a path to file with OpenStack Credentials like:
 
 .. code:: bash
 
@@ -795,7 +795,7 @@ Optional Arguments
   --noverbose           The inverse of --verbose
   --nowatch-log-file    The inverse of --watch-log-file
   --os-identity-api-version OS_IDENTITY_API_VERSION, --os_auth_ver OS_IDENTITY_API_VERSION
-                        Openstack identity api version, can be 1, 2, 2.0 or 3
+                        OpenStack identity api version, can be 1, 2, 2.0 or 3
   --overwrite           With overwrite removes files from restore path before
                         restore.
   --path-to-backup PATH_TO_BACKUP, -F PATH_TO_BACKUP
@@ -918,4 +918,4 @@ release does not support env markers which further complicated the installation.
 Copyright
 ---------
 
-The Freezer logo is released under the licence Attribution 3.0 Unported (CC BY3.0).
\ No newline at end of file
+The Freezer logo is released under the licence Attribution 3.0 Unported (CC BY3.0).
diff --git a/specs/python-freezerclient.rst b/specs/python-freezerclient.rst
index c8b88753..6cc9a74a 100644
--- a/specs/python-freezerclient.rst
+++ b/specs/python-freezerclient.rst
@@ -13,7 +13,7 @@ Include the URL of your launchpad blueprint:
 
 * https://blueprints.launchpad.net/freezer/+spec/freezerclient
 
-Freezer needs to align to the other Openstack projects and have a dedicated
+Freezer needs to align to the other OpenStack projects and have a dedicated
 repo/client to communicate with the API and the storage media.
 
 Problem description
diff --git a/specs/tenant_based_backups.rst b/specs/tenant_based_backups.rst
index 82915c86..a2b165e7 100644
--- a/specs/tenant_based_backups.rst
+++ b/specs/tenant_based_backups.rst
@@ -128,7 +128,7 @@ Possible options:
 
 - We can add an additional option called data_input_type, setting the default to fs (file system) or stream and use tenant as backup mode
 
-- When restoring, would probably good to recreate the tenant resources with a tenant name provided by the user (i.e. provided by Openstack environment variable like the OS_TENANT_NAME var). This has the advantage to recreate the resources with a different tenant in case is needed.
+- When restoring, would probably good to recreate the tenant resources with a tenant name provided by the user (i.e. provided by OpenStack environment variable like the OS_TENANT_NAME var). This has the advantage to recreate the resources with a different tenant in case is needed.
 
 - Does the Cinder volumes needs to be attached to the VMs, in case they were when the backup was taken?