diff --git a/group_vars/fsol.yml b/group_vars/fsolgw.yml
similarity index 100%
rename from group_vars/fsol.yml
rename to group_vars/fsolgw.yml
diff --git a/host_vars/fsol01.home.foo.sh.yml b/host_vars/fsol-gw01.home.foo.sh.yml
similarity index 86%
rename from host_vars/fsol01.home.foo.sh.yml
rename to host_vars/fsol-gw01.home.foo.sh.yml
index d1ec8e3..798ef20 100644
--- a/host_vars/fsol01.home.foo.sh.yml
+++ b/host_vars/fsol-gw01.home.foo.sh.yml
@@ -3,8 +3,8 @@ vmhost: vmhost01.home.foo.sh
 network_interfaces:
   - device: vio0
     vlan: 20
-    mac: 52:54:00:ac:dc:3f
-    ipaddr: 172.20.21.63
+    mac: 52:54:00:ac:dc:03
+    ipaddr: 172.20.21.3
     netmask: 255.255.252.0
     proto: static
   - device: vio1
diff --git a/host_vars/fsol02.home.foo.sh.yml b/host_vars/fsol-gw02.home.foo.sh.yml
similarity index 86%
rename from host_vars/fsol02.home.foo.sh.yml
rename to host_vars/fsol-gw02.home.foo.sh.yml
index 301c1e1..88cce43 100644
--- a/host_vars/fsol02.home.foo.sh.yml
+++ b/host_vars/fsol-gw02.home.foo.sh.yml
@@ -3,8 +3,8 @@ vmhost: vmhost02.home.foo.sh
 network_interfaces:
   - device: vio0
     vlan: 20
-    mac: 52:54:00:ac:dc:40
-    ipaddr: 172.20.21.64
+    mac: 52:54:00:ac:dc:04
+    ipaddr: 172.20.21.4
     netmask: 255.255.252.0
     proto: static
   - device: vio1
diff --git a/hosts b/hosts
index 9578094..7df402b 100644
--- a/hosts
+++ b/hosts
@@ -4,9 +4,9 @@ adm01.home.foo.sh
 [collab]
 collab01.home.foo.sh
 
-[fsol]
-fsol01.home.foo.sh
-fsol02.home.foo.sh
+[fsolgw]
+fsol-gw01.home.foo.sh
+fsol-gw02.home.foo.sh
 
 [git]
 git02.home.foo.sh
@@ -69,7 +69,7 @@ ldap
 collab
 
 [openbsd:children]
-fsol
+fsolgw
 gw
 log
 ns
diff --git a/playbooks/fsol.yml b/playbooks/fsol-gw.yml
similarity index 90%
rename from playbooks/fsol.yml
rename to playbooks/fsol-gw.yml
index 71ff82e..21a00e7 100644
--- a/playbooks/fsol.yml
+++ b/playbooks/fsol-gw.yml
@@ -1,8 +1,8 @@
 ---
-- import_playbook: "include/deploy-kvm-guest.yml myhosts=fsol"
+- import_playbook: "include/deploy-kvm-guest.yml myhosts=fsolgw"
 
 - name: configure instance
-  hosts: fsol
+  hosts: fsolgw
   user: root
   gather_facts: true