diff --git a/ansible/hypervisor_setup.yml b/ansible/hypervisor_setup.yml
index fbad48e..fa67697 100644
--- a/ansible/hypervisor_setup.yml
+++ b/ansible/hypervisor_setup.yml
@@ -34,12 +34,12 @@
 - block:
     - name: Ensure Open vSwitch package is installed
       package:
-        name: "{{ openvswitch_pkg_name }}"
+        name: "{{ tenks_openvswitch_pkg_name }}"
       become: true
 
     - name: Ensure Open vSwitch is started and enabled
       service:
-        name: openvswitch
+        name: "{{ tenks_openvswitch_service_name }}"
         state: started
         enabled: true
       become: true
diff --git a/ansible/vars/Debian.yml b/ansible/vars/Debian.yml
index 4719aec..046fc5a 100644
--- a/ansible/vars/Debian.yml
+++ b/ansible/vars/Debian.yml
@@ -5,4 +5,7 @@ tenks_ip_path: /sbin/ip
 
 # package that provides the Open vSwitch daemon and userspace
 # utilities
-openvswitch_pkg_name: openvswitch-switch
+tenks_openvswitch_pkg_name: openvswitch-switch
+
+# service name of Open vSwitch daemon (as passed the Ansible service module)
+tenks_openvswitch_service_name: openvswitch-switch
diff --git a/ansible/vars/RedHat.yml b/ansible/vars/RedHat.yml
index 67c12ee..aca26fc 100644
--- a/ansible/vars/RedHat.yml
+++ b/ansible/vars/RedHat.yml
@@ -5,4 +5,7 @@ tenks_ip_path: /usr/sbin/ip
 
 # package that provides the Open vSwitch daemon and userspace
 # utilities
-openvswitch_pkg_name: openvswitch
+tenks_openvswitch_pkg_name: openvswitch
+
+# service name of Open vSwitch daemon (as passed the Ansible service module)
+tenks_openvswitch_service_name: openvswitch