diff --git a/README.md b/README.md
index 578e7c7..b81439c 100644
--- a/README.md
+++ b/README.md
@@ -61,8 +61,8 @@ These modules are based on the [openstack documentation](http://docs.openstack.o
 
 ### Volumes:
 
-  Every node that is configured to be a nova volume service must have a volume
-  group called `nova-volumes`.
+  Every node that is configured to be a cinder volume service must have a volume
+  group called `cinder-volumes`.
 
 ### Compute nodes
 
diff --git a/examples/site.pp b/examples/site.pp
index 0b047c4..9e54ffe 100644
--- a/examples/site.pp
+++ b/examples/site.pp
@@ -145,7 +145,7 @@ node /openstack_compute/ {
     vnc_enabled        => true,
     verbose            => $verbose,
     manage_volumes     => true,
-    nova_volume        => 'nova-volumes'
+    volume_group       => 'cinder-volumes'
   }
 
 }
diff --git a/manifests/all.pp b/manifests/all.pp
index d7fdb7f..ad08379 100644
--- a/manifests/all.pp
+++ b/manifests/all.pp
@@ -33,7 +33,7 @@
 #  [verbose] If the services should log verbosely. Optional. Defaults to false.
 #  [purge_nova_config] Whether unmanaged nova.conf entries should be purged. Optional. Defaults to true.
 #  [libvirt_type] The virualization type being controlled by libvirt.  Optional. Defaults to 'kvm'.
-#  [nova_volume] The name of the volume group to use for nova volume allocation. Optional. Defaults to 'nova-volumes'.
+#  [volume_group] The name of the volume group to use for nova volume allocation. Optional. Defaults to 'cinder-volumes'.
 #  [horizon] (bool) is horizon installed. Defaults to: true
 # === Examples
 #
@@ -350,7 +350,7 @@ class openstack::all (
     class { 'cinder::volume': }
     class { 'cinder::volume::iscsi':
       iscsi_ip_address => '127.0.0.1',
-      volume_group     => $nova_volume,
+      volume_group     => $volume_group,
     }
   } else {
     # Set up nova-volume
diff --git a/manifests/cinder.pp b/manifests/cinder.pp
index fe1c80b..59dfe5b 100644
--- a/manifests/cinder.pp
+++ b/manifests/cinder.pp
@@ -2,7 +2,7 @@ class openstack::cinder(
   $sql_connection,
   $rabbit_password,
   $rabbit_host     = '127.0.0.1',
-  $volume_group    = 'nova-volumes',
+  $volume_group    = 'cinder-volumes',
   $enabled         = true
 ) {
 
diff --git a/manifests/compute.pp b/manifests/compute.pp
index f2f8f36..45ac506 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -57,7 +57,7 @@ class openstack::compute (
   $cinder                        = true,
   $cinder_sql_connection         = undef,
   $manage_volumes                = true,
-  $nova_volume                   = 'cinder-volumes',
+  $volume_group                  = 'cinder-volumes',
   $iscsi_ip_address              = '127.0.0.1',
   # General
   $migration_support             = false,
@@ -208,8 +208,8 @@ class openstack::compute (
     }
     class { 'cinder::volume': }
     class { 'cinder::volume::iscsi':
-      iscsi_ip_address => $internal_address,
-      volume_group     => $nova_volume,
+      iscsi_ip_address => $iscsi_ip_address,
+      volume_group     => $volume_group,
     }
 
     # set in nova::api