diff --git a/python_apps/pypo/bin/airtime-liquidsoap b/python_apps/pypo/bin/libretime-liquidsoap
similarity index 100%
rename from python_apps/pypo/bin/airtime-liquidsoap
rename to python_apps/pypo/bin/libretime-liquidsoap
diff --git a/python_apps/pypo/bin/airtime-playout b/python_apps/pypo/bin/libretime-playout
similarity index 100%
rename from python_apps/pypo/bin/airtime-playout
rename to python_apps/pypo/bin/libretime-playout
diff --git a/python_apps/pypo/bin/pyponotify b/python_apps/pypo/bin/libretime-playout-notify
similarity index 100%
rename from python_apps/pypo/bin/pyponotify
rename to python_apps/pypo/bin/libretime-playout-notify
diff --git a/python_apps/pypo/install/systemd/libretime-liquidsoap.service b/python_apps/pypo/install/systemd/libretime-liquidsoap.service
index ca1eb2f86..fc34cbec9 100644
--- a/python_apps/pypo/install/systemd/libretime-liquidsoap.service
+++ b/python_apps/pypo/install/systemd/libretime-liquidsoap.service
@@ -2,7 +2,7 @@
 Description=Libretime Liquidsoap Service
 
 [Service]
-ExecStart=/usr/local/bin/airtime-liquidsoap
+ExecStart=/usr/local/bin/libretime-liquidsoap
 User=libretime-playout
 Group=libretime-playout
 Restart=always
diff --git a/python_apps/pypo/install/systemd/libretime-playout.service b/python_apps/pypo/install/systemd/libretime-playout.service
index 2009b9645..50b080ec4 100644
--- a/python_apps/pypo/install/systemd/libretime-playout.service
+++ b/python_apps/pypo/install/systemd/libretime-playout.service
@@ -3,7 +3,7 @@ Description=Libretime Playout Service
 After=network-online.target
 
 [Service]
-ExecStart=/usr/local/bin/airtime-playout
+ExecStart=/usr/local/bin/libretime-playout
 User=libretime-pypo
 Group=libretime-pypo
 Restart=always
diff --git a/python_apps/pypo/liquidsoap/1.1/ls_lib.liq b/python_apps/pypo/liquidsoap/1.1/ls_lib.liq
index 2a588f739..5eef76dce 100644
--- a/python_apps/pypo/liquidsoap/1.1/ls_lib.liq
+++ b/python_apps/pypo/liquidsoap/1.1/ls_lib.liq
@@ -1,5 +1,5 @@
 def notify(m)
-  command = "timeout --signal=KILL 45 pyponotify --media-id=#{m['schedule_table_id']} &"
+  command = "timeout --signal=KILL 45 libretime-playout-notify --media-id=#{m['schedule_table_id']} &"
   log(command)
   system(command)
 end
@@ -15,7 +15,7 @@ def notify_stream(m)
   #if a string has a single apostrophe in it, let's comment it out by ending the string before right before it
   #escaping the apostrophe, and then starting a new string right after it. This is why we use 3 apostrophes.
   json_str = string.replace(pattern="'",(fun (s) -> "'\''"), json_str)
-  command = "timeout --signal=KILL 45 pyponotify --webstream='#{json_str}' --media-id=#{!current_dyn_id} &"
+  command = "timeout --signal=KILL 45 libretime-playout-notify --webstream='#{json_str}' --media-id=#{!current_dyn_id} &"
 
   if !current_dyn_id != "-1" then
     log(command)
@@ -97,14 +97,14 @@ def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, de
     source = ref s
     def on_error(msg)
         connected := "false"
-        command = "timeout --signal=KILL 45 pyponotify --error='#{msg}' --stream-id=#{stream} --time=#{!time} &"
+        command = "timeout --signal=KILL 45 libretime-playout-notify --error='#{msg}' --stream-id=#{stream} --time=#{!time} &"
         system(command)
         log(command)
         5.
     end
     def on_connect()
         connected := "true"
-        command = "timeout --signal=KILL 45 pyponotify --connect --stream-id=#{stream} --time=#{!time} &"
+        command = "timeout --signal=KILL 45 libretime-playout-notify --connect --stream-id=#{stream} --time=#{!time} &"
         system(command)
         log(command)
     end
diff --git a/python_apps/pypo/liquidsoap/1.1/ls_script.liq b/python_apps/pypo/liquidsoap/1.1/ls_script.liq
index 56673b698..c494b151d 100644
--- a/python_apps/pypo/liquidsoap/1.1/ls_script.liq
+++ b/python_apps/pypo/liquidsoap/1.1/ls_script.liq
@@ -212,7 +212,7 @@ def make_scheduled_play_unavailable()
 end
 
 def update_source_status(sourcename, status) =
-    command = "timeout --signal=KILL 45 pyponotify --source-name=#{sourcename} --source-status=#{status} &"
+    command = "timeout --signal=KILL 45 libretime-playout-notify --source-name=#{sourcename} --source-status=#{status} &"
     system(command)
     log(command)
 end
@@ -438,6 +438,6 @@ if s4_enable == true then
 end
 
 
-command = "timeout --signal=KILL 45 pyponotify --liquidsoap-started &"
+command = "timeout --signal=KILL 45 libretime-playout-notify --liquidsoap-started &"
 log(command)
 system(command)
diff --git a/python_apps/pypo/liquidsoap/1.3/ls_lib.liq b/python_apps/pypo/liquidsoap/1.3/ls_lib.liq
index 39eca1997..1fa4bae73 100644
--- a/python_apps/pypo/liquidsoap/1.3/ls_lib.liq
+++ b/python_apps/pypo/liquidsoap/1.3/ls_lib.liq
@@ -1,5 +1,5 @@
 def notify(m)
-  command = "timeout --signal=KILL 45 pyponotify --media-id=#{m['schedule_table_id']} &"
+  command = "timeout --signal=KILL 45 libretime-playout-notify --media-id=#{m['schedule_table_id']} &"
   log(command)
   system(command)
 end
@@ -15,7 +15,7 @@ def notify_stream(m)
   #if a string has a single apostrophe in it, let's comment it out by ending the string before right before it
   #escaping the apostrophe, and then starting a new string right after it. This is why we use 3 apostrophes.
   json_str = string.replace(pattern="'",(fun (s) -> "'\''"), json_str)
-  command = "timeout --signal=KILL 45 pyponotify --webstream='#{json_str}' --media-id=#{!current_dyn_id} &"
+  command = "timeout --signal=KILL 45 libretime-playout-notify --webstream='#{json_str}' --media-id=#{!current_dyn_id} &"
 
   if !current_dyn_id != "-1" then
     log(command)
@@ -97,14 +97,14 @@ def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, de
     source = ref s
     def on_error(msg)
         connected := "false"
-        command = "timeout --signal=KILL 45 pyponotify --error='#{msg}' --stream-id=#{stream} --time=#{!time} &"
+        command = "timeout --signal=KILL 45 libretime-playout-notify --error='#{msg}' --stream-id=#{stream} --time=#{!time} &"
         system(command)
         log(command)
         5.
     end
     def on_connect()
         connected := "true"
-        command = "timeout --signal=KILL 45 pyponotify --connect --stream-id=#{stream} --time=#{!time} &"
+        command = "timeout --signal=KILL 45 libretime-playout-notify --connect --stream-id=#{stream} --time=#{!time} &"
         system(command)
         log(command)
     end
diff --git a/python_apps/pypo/liquidsoap/1.3/ls_script.liq b/python_apps/pypo/liquidsoap/1.3/ls_script.liq
index 9f332d724..d8bbc9a9b 100644
--- a/python_apps/pypo/liquidsoap/1.3/ls_script.liq
+++ b/python_apps/pypo/liquidsoap/1.3/ls_script.liq
@@ -212,7 +212,7 @@ def make_scheduled_play_unavailable()
 end
 
 def update_source_status(sourcename, status) =
-    command = "timeout --signal=KILL 45 pyponotify --source-name=#{sourcename} --source-status=#{status} &"
+    command = "timeout --signal=KILL 45 libretime-playout-notify --source-name=#{sourcename} --source-status=#{status} &"
     system(command)
     log(command)
 end
@@ -452,6 +452,6 @@ if s4_enable == true then
 end
 
 
-command = "timeout --signal=KILL 45 pyponotify --liquidsoap-started &"
+command = "timeout --signal=KILL 45 libretime-playout-notify --liquidsoap-started &"
 log(command)
 system(command)
diff --git a/python_apps/pypo/liquidsoap/1.4/ls_lib.liq b/python_apps/pypo/liquidsoap/1.4/ls_lib.liq
index 0632e7a16..0f186852e 100644
--- a/python_apps/pypo/liquidsoap/1.4/ls_lib.liq
+++ b/python_apps/pypo/liquidsoap/1.4/ls_lib.liq
@@ -1,5 +1,5 @@
 def notify(m)
-  command = "timeout --signal=KILL 45 pyponotify --media-id=#{m['schedule_table_id']} &"
+  command = "timeout --signal=KILL 45 libretime-playout-notify --media-id=#{m['schedule_table_id']} &"
   log(command)
   system(command)
 end
@@ -15,7 +15,7 @@ def notify_stream(m)
   #if a string has a single apostrophe in it, let's comment it out by ending the string before right before it
   #escaping the apostrophe, and then starting a new string right after it. This is why we use 3 apostrophes.
   json_str = string.replace(pattern="'",(fun (s) -> "'\''"), json_str)
-  command = "timeout --signal=KILL 45 pyponotify --webstream='#{json_str}' --media-id=#{!current_dyn_id} &"
+  command = "timeout --signal=KILL 45 libretime-playout-notify --webstream='#{json_str}' --media-id=#{!current_dyn_id} &"
 
   if !current_dyn_id != "-1" then
     log(command)
@@ -88,14 +88,14 @@ def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, de
     source = ref s
     def on_error(msg)
         connected := "false"
-        command = "timeout --signal=KILL 45 pyponotify --error='#{msg}' --stream-id=#{stream} --time=#{!time} &"
+        command = "timeout --signal=KILL 45 libretime-playout-notify --error='#{msg}' --stream-id=#{stream} --time=#{!time} &"
         system(command)
         log(command)
         5.
     end
     def on_connect()
         connected := "true"
-        command = "timeout --signal=KILL 45 pyponotify --connect --stream-id=#{stream} --time=#{!time} &"
+        command = "timeout --signal=KILL 45 libretime-playout-notify --connect --stream-id=#{stream} --time=#{!time} &"
         system(command)
         log(command)
     end
diff --git a/python_apps/pypo/liquidsoap/1.4/ls_script.liq b/python_apps/pypo/liquidsoap/1.4/ls_script.liq
index 77f01ece5..d43edde3a 100644
--- a/python_apps/pypo/liquidsoap/1.4/ls_script.liq
+++ b/python_apps/pypo/liquidsoap/1.4/ls_script.liq
@@ -215,7 +215,7 @@ def make_scheduled_play_unavailable()
 end
 
 def update_source_status(sourcename, status) =
-    command = "timeout --signal=KILL 45 pyponotify --source-name=#{sourcename} --source-status=#{status} &"
+    command = "timeout --signal=KILL 45 libretime-playout-notify --source-name=#{sourcename} --source-status=#{status} &"
     system(command)
     log(command)
 end
@@ -455,6 +455,6 @@ if s4_enable == true then
 end
 
 
-command = "timeout --signal=KILL 45 pyponotify --liquidsoap-started &"
+command = "timeout --signal=KILL 45 libretime-playout-notify --liquidsoap-started &"
 log(command)
 system(command)
diff --git a/python_apps/pypo/setup.py b/python_apps/pypo/setup.py
index fada72e35..6c4e0eced 100644
--- a/python_apps/pypo/setup.py
+++ b/python_apps/pypo/setup.py
@@ -25,9 +25,9 @@ setup(
     ],
     package_data={"": ["**/*.liq", "*.cfg", "*.types"]},
     scripts=[
-        "bin/airtime-playout",
-        "bin/airtime-liquidsoap",
-        "bin/pyponotify",
+        "bin/libretime-playout",
+        "bin/libretime-liquidsoap",
+        "bin/libretime-playout-notify",
     ],
     python_requires=">=3.6",
     install_requires=[