diff --git a/roles/nfs_server/handlers/main.yml b/roles/nfs_server/handlers/main.yml
index b61664a..526d604 100644
--- a/roles/nfs_server/handlers/main.yml
+++ b/roles/nfs_server/handlers/main.yml
@@ -1,5 +1,5 @@
 ---
-- name: restart nfs-server
-  service:
+- name: Restart nfs-server
+  ansible.builtin.service:
     name: nfs-server
     state: restarted
diff --git a/roles/nfs_server/tasks/main.yml b/roles/nfs_server/tasks/main.yml
index 473b01c..32b1701 100644
--- a/roles/nfs_server/tasks/main.yml
+++ b/roles/nfs_server/tasks/main.yml
@@ -1,24 +1,24 @@
 ---
-- name: disable nfs versions 2 and 3
-  lineinfile:
+- name: Disable NFS versions 2 and 3
+  ansible.builtin.lineinfile:
     path: /etc/nfs.conf
     line: "{{ item }}=n"
     regexp: '^(#\s*)?{{ item }}=.*'
   with_items:
     - vers2
     - vers3
-  notify: restart nfs-server
+  notify: Restart nfs-server
 
-- name: disable nfs over udp
-  lineinfile:
+- name: Disable NFS over UDP
+  ansible.builtin.lineinfile:
     path: /etc/nfs.conf
     line: "udp=n"
     regexp: '^(#\s*)?udp=.*'
     insertbefore: vers2=n
-  notify: restart nfs-server
+  notify: Restart nfs-server
 
-- name: install home/role autocreate scripts
-  copy:
+- name: Install home/role autocreate scripts
+  ansible.builtin.copy:
     dest: "/usr/local/sbin/{{ item }}"
     src: "{{ item }}.sh"
     mode: 0755
@@ -28,8 +28,8 @@
     - mknfshomedir
     - mknfsroledir
 
-- name: add home/role autocreate cron jobs
-  cron:
+- name: Add home/role autocreate cron jobs
+  ansible.builtin.cron:
     name: "{{ item }}"
     user: root
     job: "/usr/local/sbin/{{ item }}"
@@ -37,8 +37,8 @@
     - mknfshomedir
     - mknfsroledir
 
-- name: enable nfs server services
-  service:
+- name: Enable services
+  ansible.builtin.service:
     name: nfs-server
     state: started
     enabled: true