diff --git a/evobackup-client/defaults/main.yml b/evobackup-client/defaults/main.yml
index 576bde1d..e11de5c9 100644
--- a/evobackup-client/defaults/main.yml
+++ b/evobackup-client/defaults/main.yml
@@ -1,13 +1,13 @@
 ---
 evobackup-client__root_key_path: "/root/.ssh/evobackup_id"
-evobackup-client___cron_path: "/etc/cron.daily/zzz_evobackup"
-evobackup-client___cron_template_name: "zzz_evobackup"
-evobackup-client___mail: null
+evobackup-client__cron_path: "/etc/cron.daily/zzz_evobackup"
+evobackup-client__cron_template_name: "zzz_evobackup"
+evobackup-client__mail: null
 evobackup-client__pid_path: "/var/run/evobackup.pid"
-evobackup-client___log_path: "/var/log/evobackup.log"
+evobackup-client__log_path: "/var/log/evobackup.log"
 evobackup-client__backup_path: "/home/backup"
-evobackup-client___ssh_port: null
-evobackup-client___hosts: null
+evobackup-client__ssh_port: null
+evobackup-client__hosts: null
 #  - name: "backups.example.org"
 #    ip: "xxx.xxx.xxx.xxx"
 #    fingerprint: "ecdsa-sha2-nistp256 ..."
diff --git a/evobackup-client/tasks/open_ssh_ports.yml b/evobackup-client/tasks/open_ssh_ports.yml
index 9cc83a3a..7979d233 100644
--- a/evobackup-client/tasks/open_ssh_ports.yml
+++ b/evobackup-client/tasks/open_ssh_ports.yml
@@ -12,7 +12,7 @@
   blockinfile:
     dest: /etc/default/minifirewall
     marker: "# evobackup ssh port"
-    block: "evobackup_port={{ evobackup-client___ssh_port }}"
+    block: "evobackup_port={{ evobackup-client__ssh_port }}"
   when: evobackup-client__minifirewall.stat.exists
   tags:
     - evobackup-client
@@ -23,8 +23,8 @@
     dest: /etc/default/minifirewall
     marker: "# {{ item.name }}"
     block: |
-      /sbin/iptables -A INPUT -p tcp --sport {{ evobackup-client___ssh_port }} --dport 1024:65535 -s {{ item.ip }} -m state --state ESTABLISHED,RELATED -j ACCEPT
-  with_items: "{{ evobackup-client___hosts }}"
+      /sbin/iptables -A INPUT -p tcp --sport {{ evobackup-client__ssh_port }} --dport 1024:65535 -s {{ item.ip }} -m state --state ESTABLISHED,RELATED -j ACCEPT
+  with_items: "{{ evobackup-client__hosts }}"
   when: evobackup-client__minifirewall.stat.exists
   tags:
     - evobackup-client
diff --git a/evobackup-client/tasks/upload_scripts.yml b/evobackup-client/tasks/upload_scripts.yml
index 77646804..2bb94d6e 100644
--- a/evobackup-client/tasks/upload_scripts.yml
+++ b/evobackup-client/tasks/upload_scripts.yml
@@ -3,13 +3,13 @@
 - name: Upload evobackup script
   template:
     src: "{{ item }}"
-    dest: "{{ evobackup-client___cron_path }}"
+    dest: "{{ evobackup-client__cron_path }}"
     force: true
     mode: 0755
   with_first_found:
-    - "templates/evobackup-client/{{ evobackup-client___cron_template_name }}.{{ inventory_hostname }}.sh.j2"
-    - "templates/evobackup-client/{{ evobackup-client___cron_template_name }}.{{ host_group }}.sh.j2"
-    - "templates/evobackup-client/{{ evobackup-client___cron_template_name }}.sh.j2"
+    - "templates/evobackup-client/{{ evobackup-client__cron_template_name }}.{{ inventory_hostname }}.sh.j2"
+    - "templates/evobackup-client/{{ evobackup-client__cron_template_name }}.{{ host_group }}.sh.j2"
+    - "templates/evobackup-client/{{ evobackup-client__cron_template_name }}.sh.j2"
     - "zzz_evobackup.default.sh.j2"
   tags:
     - evobackup-client
diff --git a/evobackup-client/tasks/verify_ssh.yml b/evobackup-client/tasks/verify_ssh.yml
index af4e24a9..99dd6cb4 100644
--- a/evobackup-client/tasks/verify_ssh.yml
+++ b/evobackup-client/tasks/verify_ssh.yml
@@ -3,9 +3,9 @@
 - name: Verify evolix backup servers
   known_hosts:
     path: /root/.ssh/known_hosts
-    name: "[{{ item.name }}]:{{ evobackup-client___ssh_port }}"
-    key: "[{{ item.name }}]:{{ evobackup-client___ssh_port }} {{ item.fingerprint }}"
-  with_list: "{{ evobackup-client___hosts }}"
+    name: "[{{ item.name }}]:{{ evobackup-client__ssh_port }}"
+    key: "[{{ item.name }}]:{{ evobackup-client__ssh_port }} {{ item.fingerprint }}"
+  with_list: "{{ evobackup-client__hosts }}"
   tags:
     - evobackup-client
     - evobackup-client-backup-hosts
diff --git a/evobackup-client/templates/zzz_evobackup.default.sh.j2 b/evobackup-client/templates/zzz_evobackup.default.sh.j2
index 9fd19974..27346930 100644
--- a/evobackup-client/templates/zzz_evobackup.default.sh.j2
+++ b/evobackup-client/templates/zzz_evobackup.default.sh.j2
@@ -18,10 +18,10 @@
 ##### Configuration ###################################################
 
 # email adress for notifications
-MAIL={{ evobackup-client___mail }}
+MAIL={{ evobackup-client__mail }}
 
 # list of hosts (hostname or IP) and SSH port for Rsync
-SERVERS="{% for host in evobackup-client___hosts %}{{ host.name }}:{{ evobackup-client___ssh_port }} {% endfor %}"
+SERVERS="{% for host in evobackup-client__hosts %}{{ host.name }}:{{ evobackup-client__ssh_port }} {% endfor %}"
 
 # timeout (in seconds) for SSH connections
 SSH_CONNECT_TIMEOUT=30