diff --git a/roles/tobiko-ensure-python3/tasks/platform.yaml b/roles/tobiko-ensure-python3/tasks/platform.yaml
index c5a2c3706..ace45db4f 100644
--- a/roles/tobiko-ensure-python3/tasks/platform.yaml
+++ b/roles/tobiko-ensure-python3/tasks/platform.yaml
@@ -13,11 +13,11 @@
   include_vars: "{{ item }}"
   ignore_errors: yes
   with_first_found:
-    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
-    - "{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yaml"
-    - "{{ ansible_distribution }}.{{ ansible_architecture }}.yaml"
-    - "{{ ansible_distribution }}.yaml"
-    - "{{ ansible_os_family }}.yaml"
+    - "py3-{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
+    - "py3-{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yaml"
+    - "py3-{{ ansible_distribution }}.{{ ansible_architecture }}.yaml"
+    - "py3-{{ ansible_distribution }}.yaml"
+    - "py3-{{ ansible_os_family }}.yaml"
   register: include_platform_vars
 
 
diff --git a/roles/tobiko-ensure-python3/vars/CentOS-7.yaml b/roles/tobiko-ensure-python3/vars/py3-CentOS-7.yaml
similarity index 100%
rename from roles/tobiko-ensure-python3/vars/CentOS-7.yaml
rename to roles/tobiko-ensure-python3/vars/py3-CentOS-7.yaml
diff --git a/roles/tobiko-ensure-python3/vars/Fedora-31.yaml b/roles/tobiko-ensure-python3/vars/py3-Fedora-31.yaml
similarity index 100%
rename from roles/tobiko-ensure-python3/vars/Fedora-31.yaml
rename to roles/tobiko-ensure-python3/vars/py3-Fedora-31.yaml
diff --git a/roles/tobiko-ensure-python3/vars/Fedora.yaml b/roles/tobiko-ensure-python3/vars/py3-Fedora.yaml
similarity index 100%
rename from roles/tobiko-ensure-python3/vars/Fedora.yaml
rename to roles/tobiko-ensure-python3/vars/py3-Fedora.yaml
diff --git a/roles/tobiko-ensure-python3/vars/MacOSX.yaml b/roles/tobiko-ensure-python3/vars/py3-MacOSX.yaml
similarity index 100%
rename from roles/tobiko-ensure-python3/vars/MacOSX.yaml
rename to roles/tobiko-ensure-python3/vars/py3-MacOSX.yaml
diff --git a/roles/tobiko-ensure-python3/vars/RedHat-7.yaml b/roles/tobiko-ensure-python3/vars/py3-RedHat-7.yaml
similarity index 100%
rename from roles/tobiko-ensure-python3/vars/RedHat-7.yaml
rename to roles/tobiko-ensure-python3/vars/py3-RedHat-7.yaml
diff --git a/roles/tobiko-ensure-python3/vars/RedHat.yaml b/roles/tobiko-ensure-python3/vars/py3-RedHat.yaml
similarity index 100%
rename from roles/tobiko-ensure-python3/vars/RedHat.yaml
rename to roles/tobiko-ensure-python3/vars/py3-RedHat.yaml
diff --git a/roles/tobiko-ensure-python3/vars/Ubuntu-18.yaml b/roles/tobiko-ensure-python3/vars/py3-Ubuntu-18.yaml
similarity index 100%
rename from roles/tobiko-ensure-python3/vars/Ubuntu-18.yaml
rename to roles/tobiko-ensure-python3/vars/py3-Ubuntu-18.yaml
diff --git a/roles/tobiko-ensure-python3/vars/Ubuntu.yaml b/roles/tobiko-ensure-python3/vars/py3-Ubuntu.yaml
similarity index 100%
rename from roles/tobiko-ensure-python3/vars/Ubuntu.yaml
rename to roles/tobiko-ensure-python3/vars/py3-Ubuntu.yaml