diff --git a/manifests/profile/base/cinder/volume/dellsc.pp b/manifests/profile/base/cinder/volume/dellsc.pp
index eea5eff51..ef39a39f2 100644
--- a/manifests/profile/base/cinder/volume/dellsc.pp
+++ b/manifests/profile/base/cinder/volume/dellsc.pp
@@ -49,8 +49,8 @@ class tripleo::profile::base::cinder::volume::dellsc (
       san_login                    => hiera('cinder::backend::dellsc_iscsi::san_login', undef),
       san_password                 => hiera('cinder::backend::dellsc_iscsi::san_password', undef),
       dell_sc_ssn                  => hiera('cinder::backend::dellsc_iscsi::dell_sc_ssn', undef),
-      iscsi_ip_address             => hiera('cinder::backend::dellsc_iscsi::iscsi_ip_address', undef),
-      iscsi_port                   => hiera('cinder::backend::dellsc_iscsi::iscsi_port', undef),
+      target_ip_address            => hiera('cinder::backend::dellsc_iscsi::iscsi_ip_address', undef),
+      target_port                  => hiera('cinder::backend::dellsc_iscsi::iscsi_port', undef),
       dell_sc_api_port             => hiera('cinder::backend::dellsc_iscsi::dell_sc_api_port', undef),
       dell_sc_server_folder        => hiera('cinder::backend::dellsc_iscsi::dell_sc_server_folder', undef),
       dell_sc_volume_folder        => hiera('cinder::backend::dellsc_iscsi::dell_sc_volume_folder', undef),
diff --git a/manifests/profile/base/cinder/volume/iscsi.pp b/manifests/profile/base/cinder/volume/iscsi.pp
index fd8b3407d..da4454ea8 100644
--- a/manifests/profile/base/cinder/volume/iscsi.pp
+++ b/manifests/profile/base/cinder/volume/iscsi.pp
@@ -67,9 +67,9 @@ class tripleo::profile::base::cinder::volume::iscsi (
     # as it will cause hiera parsing errors
     cinder::backend::iscsi { $backend_name :
       backend_availability_zone => $backend_availability_zone,
-      iscsi_ip_address          => normalize_ip_for_uri($cinder_iscsi_address),
-      iscsi_helper              => $cinder_iscsi_helper,
-      iscsi_protocol            => $cinder_iscsi_protocol,
+      target_ip_address         => normalize_ip_for_uri($cinder_iscsi_address),
+      target_helper             => $cinder_iscsi_helper,
+      target_protocol           => $cinder_iscsi_protocol,
     }
   }
 
diff --git a/spec/classes/tripleo_profile_base_cinder_volume_iscsi_spec.rb b/spec/classes/tripleo_profile_base_cinder_volume_iscsi_spec.rb
index 6cf864ba7..8a81177e1 100644
--- a/spec/classes/tripleo_profile_base_cinder_volume_iscsi_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_volume_iscsi_spec.rb
@@ -49,9 +49,9 @@ describe 'tripleo::profile::base::cinder::volume::iscsi' do
             :size => '10280M'
           )
           is_expected.to contain_cinder__backend__iscsi('tripleo_iscsi').with(
-            :iscsi_ip_address => '127.0.0.1',
-            :iscsi_helper     => 'tgtadm',
-            :iscsi_protocol   => 'iscsi'
+            :target_ip_address => '127.0.0.1',
+            :target_helper     => 'tgtadm',
+            :target_protocol   => 'iscsi'
           )
         end
       end
@@ -70,7 +70,7 @@ describe 'tripleo::profile::base::cinder::volume::iscsi' do
           )
           is_expected.to contain_cinder__backend__iscsi('tripleo_iscsi').with(
             :backend_availability_zone => 'my_zone',
-            :iscsi_ip_address          => '[fe80::fc54:ff:fe9e:7846]',
+            :target_ip_address         => '[fe80::fc54:ff:fe9e:7846]',
           )
         end
       end
diff --git a/spec/fixtures/hieradata/step4.yaml b/spec/fixtures/hieradata/step4.yaml
index 0ccb52c5d..59e4b11dc 100644
--- a/spec/fixtures/hieradata/step4.yaml
+++ b/spec/fixtures/hieradata/step4.yaml
@@ -7,6 +7,7 @@ nova::compute::keymgr_backend: 'castellan.key_manager.barbican_key_manager.Barbi
 tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_address: '127.0.0.1'
 tripleo::profile::base::cinder::volume::nfs::cinder_nfs_servers:
  - '127.0.0.1'
+cinder::backend::dellsc_iscsi::iscsi_ip_address: '127.0.0.1'
 cinder::backend::eqlx::eqlx_chap_login: 'user'
 cinder::backend::eqlx::eqlx_chap_password: 'user'
 cinder::backend::emc_vnx::storage_vnx_pool_names: 'emc-storage-pool'