conflict resolution after concurrent edits

roles/ffmwu-meshing/tasks/fastd-community.yml

@@ -13,9 +13,9 @@
 #- debug: var=f_ssh_keyfile
 
 - name: include either gate ...
-  include: mwu-m-fastd-com-g.yml
+  include: fastd-gate.yml
   when: fastd_config == 'gate'
 
 - name: ... or meshing-only style
-  include: mwu-m-fastd-com-o.yml
+  include: fastd-meshonly.yml
   when: fastd_config == 'meshing-only'

roles/ffmwu-meshing/tasks/fastd-gate.yml

@@ -1,5 +1,5 @@
 ---
-# this file included by mwu-m-fastd-com.yml, which is included in a loop,
+# this file included by fastd-community.yml, which is included in a loop,
 # called seperately for each community
 # => configure fastd for one community here
 # hash describing community expected as "mf_com"; also expected: "f_ssh_keyfile"
@@ -12,4 +12,4 @@
     mf_com_repo: "/etc/fastd/{{mf_com.abbreviation}}VPN/peers"
     mf_com_templ: "fastd.conf-gate"
 
-- include: mwu-m-fastd-com-r.yml
+- include: fastd-config.yml

roles/ffmwu-meshing/tasks/fastd-meshonly.yml

@@ -1,5 +1,5 @@
 ---
-# this file included by mwu-m-fastd-com.yml, which is included in a loop,
+# this file included by fastd-community.yml, which is included in a loop,
 # called seperately for each community
 # => configure fastd for one community here
 # hash describing community expected as "mf_com"; also expected: "f_ssh_keyfile"
@@ -16,7 +16,7 @@
     mf_com_repo: "{{tmpdir.stdout}}"
     mf_com_templ: "fastd.conf-meshing"
 
-- include: mwu-m-fastd-com-r.yml
+- include: fastd-config.yml
 
 - name: git add new public key
   command: git add servers

roles/ffmwu-meshing/tasks/fastd.yml

@@ -10,7 +10,7 @@
   changed_when: False
 
   # configure communtity, one by one
-- include: mwu-m-fastd-com.yml  mf_com={{mwu_mf_item.value}}
+- include: fastd-community.yml  mf_com={{mwu_mf_item.value}}
   with_dict: "{{community_params}}"
   loop_control:
     loop_var: mwu_mf_item

roles/ffmwu-meshing/tasks/main.yml

@@ -9,13 +9,13 @@
 
 - block:
     # arp and python packages
-  - include: mwu-m-pkgs.yml
+  - include: packages.yml
 
     # backend scripts
-  - include: mwu-m-bes.yml
+  - include: backend-scripts.yml
 
     # fastd
-  - include: mwu-m-fastd.yml
+  - include: fastd.yml
 
   when: (ansible_managed_meshing is defined) and (ansible_managed_meshing)
 # end block

roles/ffmwu-meshing/tasks/packages.yml

@@ -1,6 +1,6 @@
 ---
 
-- include: mwu-m-repos.yml
+- include: repos.yml
 
 - name: ensure mandatory packages
   apt: