diff --git a/bibigrid/core/utility/ansible_configurator.py b/bibigrid/core/utility/ansible_configurator.py
index 607cd354..33b9f199 100644
--- a/bibigrid/core/utility/ansible_configurator.py
+++ b/bibigrid/core/utility/ansible_configurator.py
@@ -202,7 +202,7 @@ def generate_common_configuration_yaml(cidrs, configurations, cluster_id, ssh_us
     if master_configuration.get("nfs"):
         nfs_shares = master_configuration.get("nfsShares", [])
         nfs_shares = nfs_shares + DEFAULT_NFS_SHARES
-        common_configuration_yaml["nfs_mounts"] = [{"src": nfs_share, "dst": nfs_share} for nfs_share in nfs_shares]
+        common_configuration_yaml["nfs_shares"] = [{"src": nfs_share, "dst": nfs_share} for nfs_share in nfs_shares]
         common_configuration_yaml["ext_nfs_mounts"] = [{"src": ext_nfs_share, "dst": ext_nfs_share} for ext_nfs_share in
                                                        (master_configuration.get("extNfsShares", []))]
 
diff --git a/resources/playbook/roles/bibigrid/tasks/025-nfs-server.yaml b/resources/playbook/roles/bibigrid/tasks/025-nfs-server.yaml
index 03bce9ca..b6d96bf1 100644
--- a/resources/playbook/roles/bibigrid/tasks/025-nfs-server.yaml
+++ b/resources/playbook/roles/bibigrid/tasks/025-nfs-server.yaml
@@ -3,7 +3,7 @@
     name: "nfs-kernel-server"
     state: present
 
-- name: Create export directories
+- name: Create shared directories
   file:
     path: "{{ item.src }}"
     state: directory
@@ -11,7 +11,7 @@
     group: root
     mode: "0o777"
   with_items:
-    - "{{ nfs_mounts }}"
+    - "{{ nfs_shares }}"
 
 - name: Configure nfs exports
   lineinfile:
@@ -24,6 +24,6 @@
     {{ '10.0.0.0/'+wireguard.mask_bits|default(24)|string + '(rw,nohide,insecure,no_subtree_check,async)'
     if wireguard is defined }}"
   with_items:
-    - "{{ nfs_mounts }}"
+    - "{{ nfs_shares }}"
   notify:
     - nfs-server
diff --git a/resources/playbook/roles/bibigrid/tasks/025-nfs-worker.yaml b/resources/playbook/roles/bibigrid/tasks/025-nfs-worker.yaml
index c45c3e9a..e18f89d1 100644
--- a/resources/playbook/roles/bibigrid/tasks/025-nfs-worker.yaml
+++ b/resources/playbook/roles/bibigrid/tasks/025-nfs-worker.yaml
@@ -10,7 +10,7 @@
     delay: 2
     state: started
 
-- name: Create mount points
+- name: Create shared directories
   file:
     path: "{{ item.dst }}"
     state: directory
@@ -18,7 +18,7 @@
     group: root
     mode: "0o777"
   with_items:
-    - "{{ nfs_mounts }}"
+    - "{{ nfs_shares }}"
 
 - name: Mount shares
   mount:
@@ -27,4 +27,4 @@
     fstype: nfs4
     state: mounted
   with_items:
-    - "{{ nfs_mounts }}"
+    - "{{ nfs_shares }}"