diff --git a/Vagrantfile b/Vagrantfile
index 5984042e5..e0c5dcc9a 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -57,7 +57,7 @@ ansible_provision = proc do |ansible|
     'nfss'             => (0..NNFSS - 1).map { |j| "#{LABEL_PREFIX}nfs#{j}" },
     'rbd_mirrors'      => (0..NRBD_MIRRORS - 1).map { |j| "#{LABEL_PREFIX}rbd_mirror#{j}" },
     'clients'          => (0..CLIENTS - 1).map { |j| "#{LABEL_PREFIX}client#{j}" },
-    'iscsi_gws'        => (0..NISCSI_GWS - 1).map { |j| "#{LABEL_PREFIX}iscsi_gw#{j}" },
+    'iscsigws'        => (0..NISCSI_GWS - 1).map { |j| "#{LABEL_PREFIX}iscsigw#{j}" },
     'mgrs'             => (0..MGRS - 1).map { |j| "#{LABEL_PREFIX}mgr#{j}" }
   }
 
diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index a2adeb602..a68999ee3 100644
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -52,7 +52,7 @@ dummy:
 #restapi_group_name: restapis
 #rbdmirror_group_name: rbdmirrors
 #client_group_name: clients
-#iscsi_gw_group_name: iscsi-gws
+#iscsi_gw_group_name: iscsigws
 #mgr_group_name: mgrs
 
 # If check_firewall is true, then ansible will try to determine if the
diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 9897d662a..2b25c3a2a 100644
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -52,7 +52,7 @@ fetch_directory: ~/ceph-ansible-keys
 #restapi_group_name: restapis
 #rbdmirror_group_name: rbdmirrors
 #client_group_name: clients
-#iscsi_gw_group_name: iscsi-gws
+#iscsi_gw_group_name: iscsigws
 #mgr_group_name: mgrs
 
 # If check_firewall is true, then ansible will try to determine if the
diff --git a/infrastructure-playbooks/purge-iscsi-gateways.yml b/infrastructure-playbooks/purge-iscsi-gateways.yml
index a773ba678..fa86d126e 100644
--- a/infrastructure-playbooks/purge-iscsi-gateways.yml
+++ b/infrastructure-playbooks/purge-iscsi-gateways.yml
@@ -20,7 +20,7 @@
         igw_purge_type: "{{ purge_config }}"
 
 - name: Removing the gateway configuration
-  hosts: iscsi-gws
+  hosts: iscsigws
   become: yes
   vars:
     - igw_purge_type: "{{hostvars['localhost']['igw_purge_type']}}"
diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 8e343f57b..863f95fb8 100644
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -44,7 +44,7 @@ nfs_group_name: nfss
 restapi_group_name: restapis
 rbdmirror_group_name: rbdmirrors
 client_group_name: clients
-iscsi_gw_group_name: iscsi-gws
+iscsi_gw_group_name: iscsigws
 mgr_group_name: mgrs
 
 # If check_firewall is true, then ansible will try to determine if the
diff --git a/site.yml.sample b/site.yml.sample
index 684d6278f..9da493682 100644
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -12,7 +12,7 @@
   - rbdmirrors
   - clients
   - mgrs
-  - iscsi-gws
+  - iscsigws
 
   gather_facts: false
 
@@ -347,7 +347,7 @@
             status: "Complete"
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
-- hosts: iscsi-gws
+- hosts: iscsigws
   gather_facts: false
   become: True
   pre_tasks:
diff --git a/tests/conftest.py b/tests/conftest.py
index 1c1a2285f..23fbdedcd 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -60,7 +60,7 @@ def node(host, request):
     if "nfss" in group_names and ceph_stable_release == "jewel":
         pytest.skip("nfs nodes can not be tested with ceph release jewel")
 
-    if group_names == ["iscsi-gws"] and ceph_stable_release == "jewel":
+    if group_names == ["iscsigws"] and ceph_stable_release == "jewel":
         pytest.skip("iscsigws nodes can not be tested with ceph release jewel")  # noqa E501
 
     if request.node.get_closest_marker("from_luminous") and ceph_release_num[ceph_stable_release] < ceph_release_num['luminous']:  # noqa E501
diff --git a/tests/functional/centos/7/cluster/group_vars/iscsi-gws b/tests/functional/centos/7/cluster/group_vars/iscsigws
similarity index 100%
rename from tests/functional/centos/7/cluster/group_vars/iscsi-gws
rename to tests/functional/centos/7/cluster/group_vars/iscsigws
diff --git a/tests/functional/centos/7/cluster/hosts b/tests/functional/centos/7/cluster/hosts
index 7a0cb15ac..8b193dcfe 100644
--- a/tests/functional/centos/7/cluster/hosts
+++ b/tests/functional/centos/7/cluster/hosts
@@ -26,5 +26,5 @@ ceph-nfs0
 [rbdmirrors]
 ceph-rbd-mirror0
 
-[iscsi-gws]
+[iscsigws]
 ceph-iscsi-gw0 ceph_repository="dev"