diff --git a/tasks/apps.yml b/tasks/apps.yml
index 37776b1bc9b910898209f9ae8e87c2537e609173..bb73b821f2a236262bbac80dd5c619e70e641b3f 100644
--- a/tasks/apps.yml
+++ b/tasks/apps.yml
@@ -7,7 +7,7 @@
 - name: Format json of apps
   ansible.builtin.set_fact: yunohost_installed_apps="{{ yunohost_installed_apps_raw.stdout | from_json }}"
 
-- name: Install apps
+- name: Install yunohost apps
   ansible.builtin.shell: yunohost app install {{ item.link }} --label "{{ item.label }}" --args "{% for key, value in item.args.items() %}{{key}}={{value}}{% if not loop.last %}&{% endif %}{% endfor %}"
-  with_items: "{{ yunohost.apps }}"
+  with_items: "{{ ynh_apps }}"
   when: item.label not in yunohost_installed_apps.values()
diff --git a/tasks/domains.yml b/tasks/domains.yml
index c6c1424195507f9762d9fb7cca91e981512c4faf..404e8c1eb086103bcf232e9aaaee8112e7e8566c 100644
--- a/tasks/domains.yml
+++ b/tasks/domains.yml
@@ -9,5 +9,5 @@
 
 - name: Create domains
   ansible.builtin.shell: yunohost domain add {{ item }}
-  with_items: "{{ yunohost.extra_domains }}"
+  with_items: "{{ ynh_extra_domains }}"
   when: item not in yunohost_installed_domains.domains
diff --git a/tasks/users.yml b/tasks/users.yml
index fac1ed8eea0d09bca5551e066a1f4bbb89cd6823..00d3a3a595f10d6d4f927652221ce927905e98cf 100644
--- a/tasks/users.yml
+++ b/tasks/users.yml
@@ -7,12 +7,12 @@
 - name: Format json of users
   ansible.builtin.set_fact: yunohost_registered_users="{{ yunohost_registered_users_raw.stdout | from_json }}"
 
-- name: Create missing users
+- name: Create missing Yunohost users
   ansible.builtin.shell: |
     yunohost user create {{ item.name }} \
     -f {{ item.firstname }} \
     -l {{ item.lastname }} \
     -d {{ item.mail_domain }} \
     -p {{ item.pass }}
-  loop: "{{ yunohost.users }}"
+  loop: "{{ ynh_users }}"
   when: item.name not in yunohost_registered_users.users.keys()