diff --git a/defaults/main.yml b/defaults/main.yml
index 078e7da..0e9b6cf 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -49,12 +49,12 @@ mosquitto_tls_ciphers:
 mosquitto_ca_path: /etc/pki/tls/certs/
 # You can deploy your certificates from a file or from content.
 # If you enable mosquitto_tls_source_use_content you have to put the content of your cert files into
-# mosquitto_tls_cert_file and mosquitto_tls_cert_file.
+# mosquitto_tls_cert_path and mosquitto_tls_cert_path.
 mosquitto_tls_source_use_content: False
 # If you enable mosquitto_tls_source_use_files theses variables have to contain the path to your
 # certificate files located on the ansible "master" host
 mosquitto_tls_source_use_files: True
 mosquitto_tls_cert_source: mycert.pem
 mosquitto_tls_key_source: mykey.pem
-mosquitto_tls_cert_file: "{{ mosquitto_base_dir }}/tls/certs/mycert.pem"
-mosquitto_tls_key_file: "{{ mosquitto_base_dir }}/tls/private/mykey.pem"
+mosquitto_tls_cert_path: "{{ mosquitto_base_dir }}/tls/certs/mycert.pem"
+mosquitto_tls_key_path: "{{ mosquitto_base_dir }}/tls/private/mykey.pem"
diff --git a/tasks/tls.yml b/tasks/tls.yml
index c1fff32..a663441 100644
--- a/tasks/tls.yml
+++ b/tasks/tls.yml
@@ -24,7 +24,6 @@
       - { src: "{{ mosquitto_tls_cert_source }}", dest: '{{ mosquitto_tls_cert_path }}', mode: '0750' }
     loop_control:
       label: "{{ item.dest }}"
-    register: __mosquitto_certs_file
     when: mosquitto_tls_source_use_files
 
   - name: Copy certs and private key (content)
@@ -37,7 +36,6 @@
       - { src: "{{ mosquitto_tls_cert_source }}", dest: '{{ mosquitto_tls_cert_path }}', mode: '0750' }
     loop_control:
       label: "{{ item.dest }}"
-    register: __mosquitto_certs_content
     when: mosquitto_tls_source_use_content
   become: True
   become_user: "{{ mosquitto_user }}"
diff --git a/templates/etc/mosquitto/mosquitto.conf.j2 b/templates/etc/mosquitto/mosquitto.conf.j2
index efd24c2..c15ca3a 100644
--- a/templates/etc/mosquitto/mosquitto.conf.j2
+++ b/templates/etc/mosquitto/mosquitto.conf.j2
@@ -209,10 +209,10 @@ port {{ mosquitto_port }}
 capath {{ mosquitto_ca_path }}
 
 # Path to the PEM encoded server certificate.
-certfile {{ mosquitto_tls_cert_file }}
+certfile {{ mosquitto_tls_cert_path }}
 
 # Path to the PEM encoded keyfile.
-keyfile {{ mosquitto_tls_key_file }}
+keyfile {{ mosquitto_tls_key_path }}
 
 # This option defines the version of the TLS protocol to use for this listener.
 # The default value allows v1.2, v1.1 and v1.0. The valid values are tlsv1.2