diff --git a/office/.config/neomutt/maps b/office/.config/neomutt/maps
index d46c4d2..508ba69 100644
--- a/office/.config/neomutt/maps
+++ b/office/.config/neomutt/maps
@@ -86,8 +86,8 @@ bind  index,pager ro  reply
 macro index,pager \CU "<enter-command> unset pipe_decode<enter><pipe-message>extract_url | fzf | clip<enter>" "get URLs"
 
 # Refresh far imap email
-macro index O "<sync-mailbox><shell-escape>export MBSYNC_PRE=true; sync-mail<enter>" "refresh all e-mail"
+macro index O "<sync-mailbox><shell-escape>export MBSYNC_PRE=true; neomutt-syncmail<enter>" "refresh all e-mail"
 
 # Send mail to taskwarrior
-macro index,pager ,T "<pipe-message>mutt2task -c -d -t<enter>" "add mail as task to taskwarrior with custom description and tags"
-macro index,pager ,t "<pipe-message>mutt2task -c<enter>" "add mail as task to taskwarrior"
+macro index,pager ,T "<pipe-message>neomutt-2task -c -d -t<enter>" "add mail as task to taskwarrior with custom description and tags"
+macro index,pager ,t "<pipe-message>neomutt-2task -c<enter>" "add mail as task to taskwarrior"
diff --git a/office/.local/bin/mutt2task b/office/.local/bin/neomutt-2task
similarity index 100%
rename from office/.local/bin/mutt2task
rename to office/.local/bin/neomutt-2task
diff --git a/office/.local/bin/sync-mail b/office/.local/bin/neomutt-syncmail
similarity index 100%
rename from office/.local/bin/sync-mail
rename to office/.local/bin/neomutt-syncmail
diff --git a/office/README.md b/office/README.md
index c10a58c..44c70a7 100644
--- a/office/README.md
+++ b/office/README.md
@@ -16,7 +16,7 @@ Take care that most of the credential/account setup of course is highly specific
 ## mail
 
 The current mail setup uses `mbsync` (from the isync project) to locally mirror the GMail imap folder.
-It is run through a `sync-mail` script which can invoke pre- and post-sync hooks
+It is run through a `neomutt-syncmail` script which can invoke pre- and post-sync hooks
 (e.g. run your incoming mail through filters as soon as they arrive or ingest them into full-text search engines).[^1]
 The sync script also automatically unlocks any pass directory so that credentials can be put into their respective applications and the directory closes again after use.
 `msmtp` is used for mail sending by neomutt (and git if using git send-email).
diff --git a/services/systemd/.config/systemd/user/mbsync.service b/services/systemd/.config/systemd/user/mbsync.service
index f5d5c3b..cb86e0f 100644
--- a/services/systemd/.config/systemd/user/mbsync.service
+++ b/services/systemd/.config/systemd/user/mbsync.service
@@ -6,4 +6,4 @@ After=network.target network-online.target dbus.socket gpg-agent.socket
 [Service]
 Type=oneshot
 # workaround to allow relative executable invocation (i.e. current users' home dir)
-ExecStart=/bin/bash -c '%h/.local/bin/sync-mail'
+ExecStart=/bin/bash -c '%h/.local/bin/neomutt-syncmail'