diff --git a/README.md b/README.md
index 16786471..652631b3 100644
--- a/README.md
+++ b/README.md
@@ -123,7 +123,7 @@ Utilization of this module can come in many forms.  It was designed to be capabl
 
 Need a feature? Found a bug? Let us know!
 
-We are extremely interested in growing a community of OpenStack experts and users around these modules so they can serve as an example of consolidated best practices of how to deploy openstack.
+We are extremely interested in growing a community of OpenStack experts and users around these modules so they can serve as an example of consolidated best practices of how to deploy OpenStack.
 
 The best way to get help with this set of modules is to email the group associated with this project:
 
diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp
index 581c9425..383097f2 100644
--- a/manifests/dashboard.pp
+++ b/manifests/dashboard.pp
@@ -41,7 +41,7 @@
 #   Defaults to '127.0.0.1'
 #
 # [*servername*]
-#   (optional) DNS name used to connect to Openstack Dashboard.
+#   (optional) DNS name used to connect to OpenStack Dashboard.
 #   Default value fqdn.
 #
 # [*listen_ssl*]
diff --git a/metadata.json b/metadata.json
index ef8db77a..16e4664f 100644
--- a/metadata.json
+++ b/metadata.json
@@ -2,7 +2,7 @@
   "name": "eNovance-cloud",
   "version": "2.2.0",
   "author": "eNovance",
-  "summary": "eNovance Openstack Module",
+  "summary": "eNovance OpenStack Module",
   "license": "Apache-2.0",
   "source": "https://github.com/stackforge/puppet-openstack-cloud",
   "project_page": "https://wiki.openstack.org/wiki/Puppet-openstack/puppet-openstack-cloud",
@@ -17,7 +17,7 @@
     {"name": "pe","version_requirement": "3.x"},
     {"name": "puppet","version_requirement": "3.x"}
   ],
-  "description": "Puppet module that pulls together all the individual components of Openstack, resulting is a complete and functional stack",
+  "description": "Puppet module that pulls together all the individual components of OpenStack, resulting is a complete and functional stack",
   "dependencies": [
     {"name":"stackforge/glance","version_requirement":">=5.0.0 <6.0.0"},
     {"name":"stackforge/horizon","version_requirement":">=5.0.0 <6.0.0"},
diff --git a/spec/classes/cloud_loadbalancer_spec.rb b/spec/classes/cloud_loadbalancer_spec.rb
index fff54bc0..93ac18b2 100644
--- a/spec/classes/cloud_loadbalancer_spec.rb
+++ b/spec/classes/cloud_loadbalancer_spec.rb
@@ -259,7 +259,7 @@ describe 'cloud::loadbalancer' do
       )}
     end # configure monitor haproxy listen
 
-    context 'configure Openstack Nova with novnc' do
+    context 'configure OpenStack Nova with novnc' do
       it { is_expected.to contain_haproxy__listen('novnc_cluster').with(
         :ipaddress => [params[:vip_public_ip]],
         :ports     => '6080',