diff --git a/handlers/main.yml b/handlers/main.yml
index 8fa46e0..f90937d 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,6 +1,6 @@
 ---
 
-- name: restart named
+- name: Restart named
   ansible.builtin.systemd:
     name: "{{ bind_service_name }}"
     state: restarted
diff --git a/tasks/main.yml b/tasks/main.yml
index 3704bdd..f90414e 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: Include OS-specific variables
-  include_vars: "{{ ansible_os_family }}.yml"
+  ansible.builtin.include_vars: "{{ ansible_os_family }}.yml"
 
 - name: Install bind and dependencies
   ansible.builtin.package:
@@ -29,13 +29,13 @@
 
 - name: Remove existing journal files
   block:
-  - name: find existing journal files
-    find:
+  - name: Find existing journal files
+    ansible.builtin.find:
       path: "{{ bind_config_directory }}"
       recurse: true
       patterns: "*.jnl"
     register: files_to_delete
-  - name: delete existing journal files
+  - name: Delete existing journal files
     ansible.builtin.file:
       path: "{{ item.path }}"
       state: absent
@@ -50,7 +50,7 @@
 #     loop_var: view
 
 - name: Create DNS-Zone files
-  include_tasks: template_zone_files.yml
+  ansible.builtin.include_tasks: template_zone_files.yml
   with_items:
   - "{{ bind9_views }}"
   loop_control:
diff --git a/tasks/template_zone_files.yml b/tasks/template_zone_files.yml
index eadcb58..711aaae 100644
--- a/tasks/template_zone_files.yml
+++ b/tasks/template_zone_files.yml
@@ -1,6 +1,6 @@
 ---
 
-- name: create directory for zone {{ zone.file | dirname }}
+- name: "Create directory for zone {{ zone.file | dirname }}"
   ansible.builtin.file:
     path: "{{ bind_config_directory }}/{{ zone.file | dirname }}"
     owner: "{{ bind_unix_user }}"
@@ -13,7 +13,7 @@
     loop_var: zone
   when: zone.file is defined and zone.file | length > 0
 
-- name: "template view {{ view.name }}"
+- name: "Template view {{ view.name }}"
   ansible.builtin.template:
     src: "{{ inventory_hostname }}/etc/named/{{ zone.file }}.j2"
     dest: "{{ bind_config_directory }}/{{ zone.file }}"