diff --git a/rpmfusion_nonfree_repo/defaults/main.yml b/rpmfusion_nonfree_repo/defaults/main.yml
index fd0d995..0673d30 100644
--- a/rpmfusion_nonfree_repo/defaults/main.yml
+++ b/rpmfusion_nonfree_repo/defaults/main.yml
@@ -1,4 +1,4 @@
 ---
-rpmfusion_nonfree_keyurl: >-
+rpmfusion_nonfree_repo_keyurl: >-
   https://rpmfusion.org/keys?action=AttachFile&do=get&target=
-rpmfusion_nonfree_baseurl: https://mirrors.rpmfusion.org/nonfree/
+rpmfusion_nonfree_repo_baseurl: https://mirrors.rpmfusion.org/nonfree/
diff --git a/rpmfusion_nonfree_repo/tasks/main.yml b/rpmfusion_nonfree_repo/tasks/main.yml
index a7453cb..0389528 100644
--- a/rpmfusion_nonfree_repo/tasks/main.yml
+++ b/rpmfusion_nonfree_repo/tasks/main.yml
@@ -3,7 +3,7 @@
   ansible.builtin.rpm_key:
     key: >
       {{
-        rpmfusion_nonfree_keyurl + "RPM-GPG-KEY-rpmfusion-nonfree-el-" +
+        rpmfusion_nonfree_repo_keyurl + "RPM-GPG-KEY-rpmfusion-nonfree-el-" +
           ansible_distribution_major_version
       }}
     state: present
@@ -13,7 +13,7 @@
   ansible.builtin.rpm_key:
     key: >
       {{
-        rpmfusion_nonfree_keyurl + "RPM-GPG-KEY-rpmfusion-nonfree-fedora-2020"
+        rpmfusion_nonfree_repo_keyurl + "RPM-GPG-KEY-rpmfusion-nonfree-fedora-2020"
       }}
     state: present
   when: 'ansible_distribution == "Fedora"'
@@ -22,7 +22,7 @@
   ansible.builtin.package:
     name: >
       {{
-        rpmfusion_nonfree_baseurl + "/el/rpmfusion-nonfree-release-" +
+        rpmfusion_nonfree_repo_baseurl + "/el/rpmfusion-nonfree-release-" +
           ansible_distribution_major_version + ".noarch.rpm"
       }}
     state: installed
@@ -32,7 +32,7 @@
   ansible.builtin.package:
     name: >
       {{
-        rpmfusion_nonfree_baseurl + "/fedora/rpmfusion-nonfree-release-" +
+        rpmfusion_nonfree_repo_baseurl + "/fedora/rpmfusion-nonfree-release-" +
           ansible_distribution_version + ".noarch.rpm"
       }}
     state: installed