diff --git a/roles/ffmwu-meshing/tasks/mwu-m-bes.yml b/roles/ffmwu-meshing/tasks/backend-scripts.yml
similarity index 100%
rename from roles/ffmwu-meshing/tasks/mwu-m-bes.yml
rename to roles/ffmwu-meshing/tasks/backend-scripts.yml
diff --git a/roles/ffmwu-meshing/tasks/mwu-m-fastd-com.yml b/roles/ffmwu-meshing/tasks/fastd-community.yml
similarity index 90%
rename from roles/ffmwu-meshing/tasks/mwu-m-fastd-com.yml
rename to roles/ffmwu-meshing/tasks/fastd-community.yml
index 1553d57..a2d01ff 100644
--- a/roles/ffmwu-meshing/tasks/mwu-m-fastd-com.yml
+++ b/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'
diff --git a/roles/ffmwu-meshing/tasks/mwu-m-fastd-com-r.yml b/roles/ffmwu-meshing/tasks/fastd-config.yml
similarity index 100%
rename from roles/ffmwu-meshing/tasks/mwu-m-fastd-com-r.yml
rename to roles/ffmwu-meshing/tasks/fastd-config.yml
diff --git a/roles/ffmwu-meshing/tasks/mwu-m-fastd-com-g.yml b/roles/ffmwu-meshing/tasks/fastd-gate.yml
similarity index 77%
rename from roles/ffmwu-meshing/tasks/mwu-m-fastd-com-g.yml
rename to roles/ffmwu-meshing/tasks/fastd-gate.yml
index 334ba76..f9dbe7e 100644
--- a/roles/ffmwu-meshing/tasks/mwu-m-fastd-com-g.yml
+++ b/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
diff --git a/roles/ffmwu-meshing/tasks/mwu-m-fastd-com-o.yml b/roles/ffmwu-meshing/tasks/fastd-meshonly.yml
similarity index 89%
rename from roles/ffmwu-meshing/tasks/mwu-m-fastd-com-o.yml
rename to roles/ffmwu-meshing/tasks/fastd-meshonly.yml
index de04d6f..698024d 100644
--- a/roles/ffmwu-meshing/tasks/mwu-m-fastd-com-o.yml
+++ b/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
diff --git a/roles/ffmwu-meshing/tasks/mwu-m-fastd.yml b/roles/ffmwu-meshing/tasks/fastd.yml
similarity index 87%
rename from roles/ffmwu-meshing/tasks/mwu-m-fastd.yml
rename to roles/ffmwu-meshing/tasks/fastd.yml
index b813413..3a212bb 100644
--- a/roles/ffmwu-meshing/tasks/mwu-m-fastd.yml
+++ b/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
diff --git a/roles/ffmwu-meshing/tasks/main.yml b/roles/ffmwu-meshing/tasks/main.yml
index ff92209..932c89d 100644
--- a/roles/ffmwu-meshing/tasks/main.yml
+++ b/roles/ffmwu-meshing/tasks/main.yml
@@ -1,10 +1,10 @@
 ---
 
   # 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
diff --git a/roles/ffmwu-meshing/tasks/mwu-m-pkgs.yml b/roles/ffmwu-meshing/tasks/packages.yml
similarity index 94%
rename from roles/ffmwu-meshing/tasks/mwu-m-pkgs.yml
rename to roles/ffmwu-meshing/tasks/packages.yml
index 15f8a06..2164b6a 100644
--- a/roles/ffmwu-meshing/tasks/mwu-m-pkgs.yml
+++ b/roles/ffmwu-meshing/tasks/packages.yml
@@ -1,6 +1,6 @@
 ---
 
-- include: mwu-m-repos.yml
+- include: repos.yml
 
 - name: ensure mandatory packages
   apt:
diff --git a/roles/ffmwu-meshing/tasks/mwu-m-repos.yml b/roles/ffmwu-meshing/tasks/repos.yml
similarity index 100%
rename from roles/ffmwu-meshing/tasks/mwu-m-repos.yml
rename to roles/ffmwu-meshing/tasks/repos.yml