diff --git a/.travis.yml b/.travis.yml
index 68498ce..5ce16a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,13 @@
 env:
-  - PLATFORM='docker-stretch-default-mariadb-master'   ANSIBLE_VERSION='ansible>=2.5,<2.6'
-  - PLATFORM='docker-stretch-upstream-mariadb-master'  ANSIBLE_VERSION='ansible>=2.5,<2.6'
-  - PLATFORM='docker-stretch-upstream-mariadbgalera-1' ANSIBLE_VERSION='ansible>=2.5,<2.6'
-  - PLATFORM='docker-stretch-default-mariadb-master'   ANSIBLE_VERSION='ansible>=2.6,<2.7'
-  - PLATFORM='docker-stretch-upstream-mariadb-master'  ANSIBLE_VERSION='ansible>=2.6,<2.7'
-  - PLATFORM='docker-stretch-upstream-mariadbgalera-1' ANSIBLE_VERSION='ansible>=2.6,<2.7'
-  - PLATFORM='docker-stretch-default-mariadb-master'   ANSIBLE_VERSION='ansible>=2.7,<2.7'
-  - PLATFORM='docker-stretch-upstream-mariadb-master'  ANSIBLE_VERSION='ansible>=2.7,<2.7'
-  - PLATFORM='docker-stretch-upstream-mariadbgalera-1' ANSIBLE_VERSION='ansible>=2.7,<2.7'
+  - PLATFORM='docker-stretch-default-master'    ANSIBLE_VERSION='ansible>=2.5,<2.6'
+  - PLATFORM='docker-stretch-upstream-master'   ANSIBLE_VERSION='ansible>=2.5,<2.6'
+  - PLATFORM='docker-stretch-upstream-galera-1' ANSIBLE_VERSION='ansible>=2.5,<2.6'
+  - PLATFORM='docker-stretch-default-master'    ANSIBLE_VERSION='ansible>=2.6,<2.7'
+  - PLATFORM='docker-stretch-upstream-master'   ANSIBLE_VERSION='ansible>=2.6,<2.7'
+  - PLATFORM='docker-stretch-upstream-galera-1' ANSIBLE_VERSION='ansible>=2.6,<2.7'
+  - PLATFORM='docker-stretch-default-master'    ANSIBLE_VERSION='ansible>=2.7,<2.8'
+  - PLATFORM='docker-stretch-upstream-master'   ANSIBLE_VERSION='ansible>=2.7,<2.8'
+  - PLATFORM='docker-stretch-upstream-galera-1' ANSIBLE_VERSION='ansible>=2.7,<2.8'
 
 sudo: required
 
diff --git a/Vagrantfile b/Vagrantfile
index ac28e86..626399f 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -20,9 +20,9 @@ Vagrant.configure("2") do |config|
     { os_name: 'stretch', vbox: vbox_deb_stretch, docker: nil,            vars: {mariadb_origin: 'default'  }, groups: ['slave'] },
     { os_name: 'stretch', vbox: vbox_deb_stretch, docker: dk_deb_stretch, vars: {mariadb_origin: 'upstream' }, groups: ['master'] },
     { os_name: 'stretch', vbox: vbox_deb_stretch, docker: nil,            vars: {mariadb_origin: 'upstream' }, groups: ['slave'] },
-    { os_name: 'stretch', vbox: vbox_deb_stretch, docker: dk_deb_stretch, vars: {mariadb_origin: 'upstream' }, groups: ['mariadbgalera', '1'] },
-    { os_name: 'stretch', vbox: vbox_deb_stretch, docker: nil,            vars: {mariadb_origin: 'upstream' }, groups: ['mariadbgalera', '2'] },
-    { os_name: 'stretch', vbox: vbox_deb_stretch, docker: nil,            vars: {mariadb_origin: 'upstream' }, groups: ['mariadbgalera', '3'] },
+    { os_name: 'stretch', vbox: vbox_deb_stretch, docker: dk_deb_stretch, vars: {mariadb_origin: 'upstream' }, groups: ['galera', '1'] },
+    { os_name: 'stretch', vbox: vbox_deb_stretch, docker: nil,            vars: {mariadb_origin: 'upstream' }, groups: ['galera', '2'] },
+    { os_name: 'stretch', vbox: vbox_deb_stretch, docker: nil,            vars: {mariadb_origin: 'upstream' }, groups: ['galera', '3'] },
   ]
 
   cases.each_with_index do |opts,index|
diff --git a/tests/group_vars/mariadbgalera b/tests/group_vars/galera
similarity index 60%
rename from tests/group_vars/mariadbgalera
rename to tests/group_vars/galera
index f9f9ddb..7dbf857 100644
--- a/tests/group_vars/mariadbgalera
+++ b/tests/group_vars/galera
@@ -1,5 +1,5 @@
 mariadb_use_galera: true
 mariadb_galera_members:
-  - '{% if is_docker %}docker-{% else %}vbox-{% endif %}{{ ansible_distribution_release }}-upstream-mariadbgalera-1'
-  - '{% if is_docker %}docker-{% else %}vbox-{% endif %}{{ ansible_distribution_release }}-upstream-mariadbgalera-2'
-  - '{% if is_docker %}docker-{% else %}vbox-{% endif %}{{ ansible_distribution_release }}-upstream-mariadbgalera-3'
+  - '{% if is_docker %}docker-{% else %}vbox-{% endif %}{{ ansible_distribution_release }}-upstream-galera-1'
+  - '{% if is_docker %}docker-{% else %}vbox-{% endif %}{{ ansible_distribution_release }}-upstream-galera-2'
+  - '{% if is_docker %}docker-{% else %}vbox-{% endif %}{{ ansible_distribution_release }}-upstream-galera-3'
diff --git a/tests/test.yml b/tests/test.yml
index ec5163b..32c1f34 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -65,9 +65,9 @@
         msg: "Slave issue"
       when: slave.Slave_IO_Running != 'Yes' or slave.Slave_SQL_Running != 'Yes'
 
-- hosts: mariadbgalera
+- hosts: galera
   vars:
-    mariadb_galera_primary_node: '{% if is_docker %}docker-{% else %}vbox-{% endif %}{{ ansible_distribution_release }}-upstream-mariadbgalera-1'
+    mariadb_galera_primary_node: '{% if is_docker %}docker-{% else %}vbox-{% endif %}{{ ansible_distribution_release }}-upstream-galera-1'
     mariadb_wsrep_node_address: "{{ ansible_all_ipv4_addresses[0] }}"
     mariadb_version: '10.1'
   pre_tasks: