diff --git a/README.md b/README.md
index 83da86ca..ae3a7495 100644
--- a/README.md
+++ b/README.md
@@ -17,21 +17,21 @@ glance
 Overview
 --------
 
-The glance module is a part of [Stackforge](https://github.com/stackfoge), an effort by the Openstack infrastructure team to provide continuous integration testing and code review for Openstack and Openstack community projects not part of the core software.  The module its self is used to flexibly configure and manage the image service for Openstack.
+The glance module is a part of [Stackforge](https://github.com/stackfoge), an effort by the OpenStack infrastructure team to provide continuous integration testing and code review for OpenStack and OpenStack community projects not part of the core software.  The module its self is used to flexibly configure and manage the image service for OpenStack.
 
 Module Description
 ------------------
 
 The glance module is a thorough attempt to make Puppet capable of managing the entirety of glance.  This includes manifests to provision such things as keystone endpoints, RPC configurations specific to glance, and database connections.  Types are shipped as part of the glance module to assist in manipulation of configuration files.
 
-This module is tested in combination with other modules needed to build and leverage an entire Openstack software stack.  These modules can be found, all pulled together in the [openstack module](https://github.com/stackfoge/puppet-openstack).
+This module is tested in combination with other modules needed to build and leverage an entire OpenStack software stack.  These modules can be found, all pulled together in the [openstack module](https://github.com/stackfoge/puppet-openstack).
 
 Setup
 -----
 
 **What the glance module affects**
 
-* glance, the image service for Openstack.
+* glance, the image service for OpenStack.
 
 ### Installing glance
 
diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index b514f6eb..e3d02ead 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -54,7 +54,7 @@ class glance::keystone::auth(
     configure_user_role => $configure_user_role,
     configure_endpoint  => $configure_endpoint,
     service_type        => $service_type,
-    service_description => 'Openstack Image Service',
+    service_description => 'OpenStack Image Service',
     service_name        => $real_service_name,
     region              => $region,
     password            => $password,
diff --git a/spec/classes/glance_keystone_auth_spec.rb b/spec/classes/glance_keystone_auth_spec.rb
index 79de6b68..8c2e37cd 100644
--- a/spec/classes/glance_keystone_auth_spec.rb
+++ b/spec/classes/glance_keystone_auth_spec.rb
@@ -21,7 +21,7 @@ describe 'glance::keystone::auth' do
     it { should contain_keystone_service('glance').with(
       :ensure      => 'present',
       :type        => 'image',
-      :description => 'Openstack Image Service'
+      :description => 'OpenStack Image Service'
     ) }
 
     it { should contain_keystone_endpoint('RegionOne/glance').with(
@@ -56,7 +56,7 @@ describe 'glance::keystone::auth' do
     it { should contain_keystone_service('glancey').with(
       :ensure      => 'present',
       :type        => 'imagey',
-      :description => 'Openstack Image Service'
+      :description => 'OpenStack Image Service'
     ) }
 
   end
@@ -113,7 +113,7 @@ describe 'glance::keystone::auth' do
     it { should contain_keystone_service('glance').with(
       :ensure      => 'present',
       :type        => 'image',
-      :description => 'Openstack Image Service'
+      :description => 'OpenStack Image Service'
     ) }
   end
 
@@ -133,7 +133,7 @@ describe 'glance::keystone::auth' do
     it { should contain_keystone_service('glance').with(
       :ensure      => 'present',
       :type        => 'image',
-      :description => 'Openstack Image Service'
+      :description => 'OpenStack Image Service'
     ) }
   end