diff --git a/bin/mail b/bin/waybar_mail
similarity index 100%
rename from bin/mail
rename to bin/waybar_mail
diff --git a/bin/mediaplayer.py b/bin/waybar_mediaplayer.py
similarity index 100%
rename from bin/mediaplayer.py
rename to bin/waybar_mediaplayer.py
diff --git a/waybar.d/config b/waybar.d/config
index 0e63f4a..a9e05b8 100644
--- a/waybar.d/config
+++ b/waybar.d/config
@@ -42,7 +42,7 @@
         "read": " "
       },
       "escape": true,
-      "exec": "$HOME/.config/sway/bin/mail 2> /dev/null"
+      "exec": "$HOME/.config/sway/bin/waybar_mail 2> /dev/null"
     },
     "custom/media": {
       "format": "{icon} {}",
@@ -55,7 +55,7 @@
         "default": " "
       },
       "escape": true,
-      "exec": "$HOME/.config/sway/bin/mediaplayer.py 2> /dev/null",
+      "exec": "$HOME/.config/sway/bin/waybar_mediaplayer.py 2> /dev/null",
       "exec-if": "pgrep plexamp"
     },
     "clock": {
diff --git a/waybar.d/config_annoyance b/waybar.d/config_annoyance
index 89e22b6..edeb34d 100644
--- a/waybar.d/config_annoyance
+++ b/waybar.d/config_annoyance
@@ -39,7 +39,7 @@
         "read": " "
       },
       "escape": true,
-      "exec": "$HOME/.config/sway/bin/mail 2> /dev/null"
+      "exec": "$HOME/.config/sway/bin/waybar_mail 2> /dev/null"
     },
     "custom/media": {
       "format": "{icon} {}",
@@ -52,7 +52,7 @@
         "default": " "
       },
       "escape": true,
-      "exec": "$HOME/.config/sway/bin/mediaplayer.py 2> /dev/null",
+      "exec": "$HOME/.config/sway/bin/waybar_mediaplayer.py 2> /dev/null",
       "exec-if": "pgrep plexamp"
     },
     "clock": {