diff --git a/manifests/backend/dellemc_powerflex.pp b/manifests/backend/dellemc_powerflex.pp
index 9555ad9e..1e30ff92 100644
--- a/manifests/backend/dellemc_powerflex.pp
+++ b/manifests/backend/dellemc_powerflex.pp
@@ -22,7 +22,7 @@
 #   Each pool should be specified as a protection_domain_name:storage_pool_name value
 #
 # [*volume_backend_name*]
-#   (optional) The name of the cinder::backend::dellemc_powerflex ressource
+#   (optional) The name of the cinder::backend::dellemc_powerflex resource
 #   Defaults to $name.
 #
 # [*backend_availability_zone*]
@@ -65,7 +65,7 @@
 #   Defaults to $::os_service_default
 #
 # [*san_thin_provision*]
-#   (optional) (Boolean) Wheater to use thin provisioning or not.
+#   (optional) (Boolean) Whether to use thin provisioning or not.
 #   Defaults to $::os_service_default
 #
 # [*driver_ssl_cert_verify*]
diff --git a/manifests/backend/dellemc_sc.pp b/manifests/backend/dellemc_sc.pp
index 1afa95bd..c763a331 100644
--- a/manifests/backend/dellemc_sc.pp
+++ b/manifests/backend/dellemc_sc.pp
@@ -39,7 +39,7 @@
 #   Defaults to 'srv'
 #
 # [*dell_sc_verify_cert*]
-#   (optional) Enable HTTPS SC ceritifcate verification
+#   (optional) Enable HTTPS SC certificate verification
 #   Defaults to $::os_service_default
 #
 # [*dell_sc_volume_folder*]
diff --git a/manifests/backend/dellsc_iscsi.pp b/manifests/backend/dellsc_iscsi.pp
index ad6b3910..8c77366c 100644
--- a/manifests/backend/dellsc_iscsi.pp
+++ b/manifests/backend/dellsc_iscsi.pp
@@ -39,7 +39,7 @@
 #   Defaults to 'srv'
 #
 # [*dell_sc_verify_cert*]
-#   (optional) Enable HTTPS SC ceritifcate verification
+#   (optional) Enable HTTPS SC certificate verification
 #   Defaults to $::os_service_default
 #
 # [*dell_sc_volume_folder*]
diff --git a/manifests/backend/emc_vnx.pp b/manifests/backend/emc_vnx.pp
index d281c175..dfe02304 100644
--- a/manifests/backend/emc_vnx.pp
+++ b/manifests/backend/emc_vnx.pp
@@ -60,7 +60,7 @@
 #   Defaults to $::os_service_default
 #
 # [*iscsi_initiators*]
-#   (optional) Mapping betwene hostname and its iSCSI initiator IP addresses.
+#   (optional) Mapping between hostname and its iSCSI initiator IP addresses.
 #   Defaults to $::os_service_default
 #
 # [*io_port_list*]
diff --git a/manifests/backend/netapp.pp b/manifests/backend/netapp.pp
index 51292e2a..a43a5d31 100644
--- a/manifests/backend/netapp.pp
+++ b/manifests/backend/netapp.pp
@@ -18,7 +18,7 @@
 #   server.
 #
 # [*volume_backend_name*]
-#   (optional) The name of the cinder::backend::netapp ressource
+#   (optional) The name of the cinder::backend::netapp resource
 #   Defaults to $name.
 #
 # [*backend_availability_zone*]
diff --git a/manifests/backend/nvmeof.pp b/manifests/backend/nvmeof.pp
index d8df4e53..7453c2de 100644
--- a/manifests/backend/nvmeof.pp
+++ b/manifests/backend/nvmeof.pp
@@ -13,7 +13,7 @@
 #   (Required) Target user-land tool to use.
 #
 # [*target_protocol*]
-#   (Required) Target rotocol to use.
+#   (Required) Target protocol to use.
 #
 # [*target_prefix*]
 #   (Optional) Prefix for LVM volumes.
diff --git a/manifests/backend/pure.pp b/manifests/backend/pure.pp
index 2c22026f..ab870dd4 100644
--- a/manifests/backend/pure.pp
+++ b/manifests/backend/pure.pp
@@ -51,8 +51,8 @@
 #   Defaults to $::os_service_default
 #
 # [*pure_eradicate_on_delete*]
-#   (Optional) Determines how the Purity system treates deleted volumes.
-#   Whether to immeadiately eradicate on delete or leave for auto-eradication
+#   (Optional) Determines how the Purity system treats deleted volumes.
+#   Whether to immediately eradicate on delete or leave for auto-eradication
 #   in 24 hours
 #   Defaults to $::os_service_default
 #
diff --git a/manifests/backends.pp b/manifests/backends.pp
index 75cc6516..bed9f494 100644
--- a/manifests/backends.pp
+++ b/manifests/backends.pp
@@ -27,7 +27,7 @@ class cinder::backends (
 section are now not supported. You should use ``enabled_backends``option to  \
 set up backends. No volume service(s) started successfully otherwise.")
   } else {
-    # Maybe this could be extented to dynamicly find the enabled names
+    # Maybe this could be extended to dynamically find the enabled names
     cinder_config {
       'DEFAULT/enabled_backends': value => join($enabled_backends, ',');
     }
diff --git a/manifests/deps.pp b/manifests/deps.pp
index e69bd27f..b12b267c 100644
--- a/manifests/deps.pp
+++ b/manifests/deps.pp
@@ -55,7 +55,7 @@ class cinder::deps {
   # Support packages need to be installed in the install phase, but we don't
   # put them in the chain above because we don't want any false dependencies
   # between packages with the cinder-package tag and the cinder-support-package
-  # tag.  Note: the package resources here will have a 'before' relationshop on
+  # tag.  Note: the package resources here will have a 'before' relationship on
   # the cinder::install::end anchor.  The line between cinder-support-package and
   # cinder-package should be whether or not cinder services would need to be
   # restarted if the package state was changed.
diff --git a/manifests/healthcheck.pp b/manifests/healthcheck.pp
index e821a34e..2107894f 100644
--- a/manifests/healthcheck.pp
+++ b/manifests/healthcheck.pp
@@ -14,12 +14,12 @@
 #   Defaults to $::os_service_default
 #
 # [*disable_by_file_path*]
-#   (Optional) Check the presense of a file to determine if an application
+#   (Optional) Check the presence of a file to determine if an application
 #   is running on a port.
 #   Defaults to $::os_service_default
 #
 # [*disable_by_file_paths*]
-#   (Optional) Check the presense of a file to determine if an application
+#   (Optional) Check the presence of a file to determine if an application
 #   is running on a port. Expects a "port:path" list of strings.
 #   Defaults to $::os_service_default
 #
diff --git a/manifests/init.pp b/manifests/init.pp
index 306836d3..df14e93f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -110,7 +110,7 @@
 #
 # [*kombu_compression*]
 #   (optional) Possible values are: gzip, bz2. If not set compression will not
-#   be used. This option may notbe available in future versions. EXPERIMENTAL.
+#   be used. This option may not be available in future versions. EXPERIMENTAL.
 #   (string value)
 #   Defaults to $::os_service_default
 #
@@ -189,7 +189,7 @@
 #   Defaults to false
 #
 # [*allow_availability_zone_fallback*]
-#   (optional) Allow availability zone fallback if preferred availabilty zone cannot be deployed to.
+#   (optional) Allow availability zone fallback if preferred availability zone cannot be deployed to.
 #   Defaults to $::os_service_default
 #
 # [*api_paste_config*]
diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index 8d933ff6..63004b47 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -96,7 +96,7 @@
 #   Defaults to []
 #
 # [*public_url_v3*]
-#   (0ptional) The v3 endpoint's public url.
+#   (Optional) The v3 endpoint's public url.
 #   This url should *not* contain any trailing '/'.
 #   Defaults to 'http://127.0.0.1:8776/v3'
 #
diff --git a/manifests/logging.pp b/manifests/logging.pp
index 845bacfd..23d051c6 100644
--- a/manifests/logging.pp
+++ b/manifests/logging.pp
@@ -69,7 +69,7 @@
 #   See https://docs.python.org/2/howto/logging.html
 #
 # [*default_log_levels*]
-#   (0ptional) Hash of logger (keys) and level (values) pairs.
+#   (Optional) Hash of logger (keys) and level (values) pairs.
 #   Defaults to $::os_service_default.
 #   Example:
 #     { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN',
diff --git a/manifests/scheduler.pp b/manifests/scheduler.pp
index ec56e8d6..cd2b60e4 100644
--- a/manifests/scheduler.pp
+++ b/manifests/scheduler.pp
@@ -9,7 +9,7 @@
 #   Defaults to $::os_service_default.
 #
 # [*package_ensure*]
-#   (Optioanl) The state of the package.
+#   (Optional) The state of the package.
 #   Defaults to 'present'.
 #
 # [*enabled*]
diff --git a/spec/classes/cinder_init_spec.rb b/spec/classes/cinder_init_spec.rb
index 99819d05..044f5a2b 100644
--- a/spec/classes/cinder_init_spec.rb
+++ b/spec/classes/cinder_init_spec.rb
@@ -286,7 +286,7 @@ describe 'cinder' do
       end
     end
 
-    context 'with volume api paramaters' do
+    context 'with volume api parameters' do
       let :params do
         req_params.merge!({
           :enable_force_upload => true,
diff --git a/spec/classes/cinder_quota_spec.rb b/spec/classes/cinder_quota_spec.rb
index e8d87d57..9a18b1f3 100644
--- a/spec/classes/cinder_quota_spec.rb
+++ b/spec/classes/cinder_quota_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'cinder::quota' do
   shared_examples 'cinder quota' do
 
-    context 'with defualt params' do
+    context 'with default params' do
       let :params do
         {}
       end
@@ -32,7 +32,7 @@ describe 'cinder::quota' do
         }
       end
 
-      it 'contains overrided values' do
+      it 'contains overridden values' do
         is_expected.to contain_cinder_config('DEFAULT/quota_volumes').with_value(2000)
         is_expected.to contain_cinder_config('DEFAULT/quota_snapshots').with_value(1000)
         is_expected.to contain_cinder_config('DEFAULT/quota_gigabytes').with_value(100000)
diff --git a/spec/classes/cinder_wsgi_apache_spec.rb b/spec/classes/cinder_wsgi_apache_spec.rb
index 4aeaf883..a6f88add 100644
--- a/spec/classes/cinder_wsgi_apache_spec.rb
+++ b/spec/classes/cinder_wsgi_apache_spec.rb
@@ -29,7 +29,7 @@ describe 'cinder::wsgi::apache' do
       )}
     end
 
-    context'when overriding parameters using different ports' do
+    context 'when overriding parameters using different ports' do
       let :params do
         {
           :servername                  => 'dummy.host',