From bde2f2d494138f2201704eec737bcc7029def434 Mon Sep 17 00:00:00 2001
From: jo <ljonas@riseup.net>
Date: Sun, 3 Oct 2021 14:57:45 +0200
Subject: [PATCH 1/5] Rename python apps

BREAKING: Remove old packages using
sudo pip uninstall \
  airtime-playout \
  airtime-celery \
  api_clients

Fix libretime-api-client import for playout
---
 python_apps/airtime-celery/setup.py | 2 +-
 python_apps/api_clients/setup.py    | 2 +-
 python_apps/pypo/setup.py           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/python_apps/airtime-celery/setup.py b/python_apps/airtime-celery/setup.py
index ea8ecec5b..c9d51bc98 100644
--- a/python_apps/airtime-celery/setup.py
+++ b/python_apps/airtime-celery/setup.py
@@ -6,7 +6,7 @@ from setuptools import setup
 os.chdir(os.path.dirname(os.path.realpath(__file__)))
 
 setup(
-    name="airtime-celery",
+    name="libretime-celery",
     version="0.1",
     description="LibreTime Celery",
     author="LibreTime Contributors",
diff --git a/python_apps/api_clients/setup.py b/python_apps/api_clients/setup.py
index ad2a20f7a..d43859bc1 100644
--- a/python_apps/api_clients/setup.py
+++ b/python_apps/api_clients/setup.py
@@ -6,7 +6,7 @@ from setuptools import setup
 os.chdir(os.path.dirname(os.path.realpath(__file__)))
 
 setup(
-    name="api_clients",
+    name="libretime-api-client",
     version="2.0.0",
     description="LibreTime API Client",
     author="LibreTime Contributors",
diff --git a/python_apps/pypo/setup.py b/python_apps/pypo/setup.py
index 6a41fb46e..fada72e35 100644
--- a/python_apps/pypo/setup.py
+++ b/python_apps/pypo/setup.py
@@ -8,7 +8,7 @@ here = Path(__file__).parent
 chdir(here)
 
 setup(
-    name="airtime-playout",
+    name="libretime-playout",
     version="1.0",
     description="LibreTime Playout",
     author="LibreTime Contributors",
@@ -31,7 +31,7 @@ setup(
     ],
     python_requires=">=3.6",
     install_requires=[
-        f"api_clients @ file://localhost/{here.parent}/api_clients#egg=api_clients",
+        f"libretime-api-client @ file://localhost/{here.parent}/api_clients#egg=libretime-api-client",
         "amqplib",
         "configobj",
         "defusedxml",

From 8be1366bef404010f4a72cf102a0d2b4e37f8dfe Mon Sep 17 00:00:00 2001
From: jo <ljonas@riseup.net>
Date: Sun, 3 Oct 2021 15:18:00 +0200
Subject: [PATCH 2/5] Rename python apps entrypoints

BREAKING: Remove old entrypoints using
sudo rm -f \
  /usr/{bin,local/bin}/airtime-liquidsoap \
  /usr/{bin,local/bin}/airtime-playout \
  /usr/{bin,local/bin}/pyponotify
---
 .../pypo/bin/{airtime-liquidsoap => libretime-liquidsoap} | 0
 .../pypo/bin/{airtime-playout => libretime-playout}       | 0
 .../pypo/bin/{pyponotify => libretime-playout-notify}     | 0
 .../pypo/install/systemd/libretime-liquidsoap.service     | 2 +-
 .../pypo/install/systemd/libretime-playout.service        | 2 +-
 python_apps/pypo/liquidsoap/1.1/ls_lib.liq                | 8 ++++----
 python_apps/pypo/liquidsoap/1.1/ls_script.liq             | 4 ++--
 python_apps/pypo/liquidsoap/1.3/ls_lib.liq                | 8 ++++----
 python_apps/pypo/liquidsoap/1.3/ls_script.liq             | 4 ++--
 python_apps/pypo/liquidsoap/1.4/ls_lib.liq                | 8 ++++----
 python_apps/pypo/liquidsoap/1.4/ls_script.liq             | 4 ++--
 python_apps/pypo/setup.py                                 | 6 +++---
 12 files changed, 23 insertions(+), 23 deletions(-)
 rename python_apps/pypo/bin/{airtime-liquidsoap => libretime-liquidsoap} (100%)
 rename python_apps/pypo/bin/{airtime-playout => libretime-playout} (100%)
 rename python_apps/pypo/bin/{pyponotify => libretime-playout-notify} (100%)

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=[

From 25e947c8bf6379667211862fccf3b12f65722be6 Mon Sep 17 00:00:00 2001
From: jo <ljonas@riseup.net>
Date: Sun, 3 Oct 2021 16:12:04 +0200
Subject: [PATCH 3/5] Rename airtime-liquidsoap to libretime-liquidsoap

BREAKING:
sudo rm -f \
  /etc/logrotate.d/airtime-liquidsoap
---
 install                                                       | 2 +-
 python_apps/pypo/liquidsoap/__main__.py                       | 2 +-
 .../{airtime-liquidsoap.logrotate => logrotate.conf}          | 2 +-
 python_apps/pypo/pypo/pypofetch.py                            | 2 +-
 utils/airtime-test-soundcard.py                               | 4 ++--
 utils/airtime-test-stream.py                                  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename python_apps/pypo/liquidsoap/{airtime-liquidsoap.logrotate => logrotate.conf} (65%)

diff --git a/install b/install
index bc73d5388..007d97bf5 100755
--- a/install
+++ b/install
@@ -1015,7 +1015,7 @@ if [ ! -d /var/log/airtime ]; then
 
   verbose "\n * Copying logrotate files..."
   loudCmd "cp ${AIRTIMEROOT}/legacy/build/airtime-php.logrotate /etc/logrotate.d/airtime-php"
-  loudCmd "cp ${AIRTIMEROOT}/python_apps/pypo/liquidsoap/airtime-liquidsoap.logrotate /etc/logrotate.d/airtime-liquidsoap"
+  loudCmd "cp ${AIRTIMEROOT}/python_apps/pypo/liquidsoap/logrotate.conf /etc/logrotate.d/libretime-liquidsoap"
 fi
 
 verbose "\n * Installing API client..."
diff --git a/python_apps/pypo/liquidsoap/__main__.py b/python_apps/pypo/liquidsoap/__main__.py
index e25e07aab..77f1b8259 100644
--- a/python_apps/pypo/liquidsoap/__main__.py
+++ b/python_apps/pypo/liquidsoap/__main__.py
@@ -36,7 +36,7 @@ def run():
     )
     exec_args = [
         "/usr/bin/liquidsoap",
-        "airtime-liquidsoap",
+        "libretime-liquidsoap",
         script_path,
         "--verbose",
         "-f",
diff --git a/python_apps/pypo/liquidsoap/airtime-liquidsoap.logrotate b/python_apps/pypo/liquidsoap/logrotate.conf
similarity index 65%
rename from python_apps/pypo/liquidsoap/airtime-liquidsoap.logrotate
rename to python_apps/pypo/liquidsoap/logrotate.conf
index fd340722b..620a818cb 100644
--- a/python_apps/pypo/liquidsoap/airtime-liquidsoap.logrotate
+++ b/python_apps/pypo/liquidsoap/logrotate.conf
@@ -6,6 +6,6 @@
   notifempty
   sharedscripts
   postrotate
-    systemctl kill --signal=SIGUSR1 airtime-liquidsoap >/dev/null 2>&1 || true
+    systemctl kill --signal=SIGUSR1 libretime-liquidsoap >/dev/null 2>&1 || true
   endscript
 }
diff --git a/python_apps/pypo/pypo/pypofetch.py b/python_apps/pypo/pypo/pypofetch.py
index dc2cb5c85..a57722a0b 100644
--- a/python_apps/pypo/pypo/pypofetch.py
+++ b/python_apps/pypo/pypo/pypofetch.py
@@ -193,7 +193,7 @@ class PypoFetch(Thread):
 
             self.logger.info("Restarting Liquidsoap")
             subprocess.call(
-                "kill -9 `pidof airtime-liquidsoap`", shell=True, close_fds=True
+                "kill -9 `pidof libretime-liquidsoap`", shell=True, close_fds=True
             )
 
             # Wait here and poll Liquidsoap until it has started up
diff --git a/utils/airtime-test-soundcard.py b/utils/airtime-test-soundcard.py
index d9345b107..0da138f25 100644
--- a/utils/airtime-test-soundcard.py
+++ b/utils/airtime-test-soundcard.py
@@ -30,9 +30,9 @@ def find_liquidsoap_binary():
     the location of this binary.
     """
 
-    rv = subprocess.call("which airtime-liquidsoap > /dev/null", shell=True)
+    rv = subprocess.call("which libretime-liquidsoap > /dev/null", shell=True)
     if rv == 0:
-        return "airtime-liquidsoap"
+        return "libretime-liquidsoap"
 
     return None
 
diff --git a/utils/airtime-test-stream.py b/utils/airtime-test-stream.py
index 0bf6a25ce..977d79b03 100644
--- a/utils/airtime-test-stream.py
+++ b/utils/airtime-test-stream.py
@@ -30,7 +30,7 @@ def printUsage():
 
 def find_liquidsoap_binary():
     """
-    With libretime 3.0 we are no longer depending upon the airtime-liquidsoap binary
+    With libretime 3.0 we are no longer depending upon the libretime-liquidsoap binary
     but use a generic install of liquidsoap. This takes care of checking if it is on the
     path and will lead to an error otherwise.
     """

From 18cfd175a2015d3d596244426353417719034493 Mon Sep 17 00:00:00 2001
From: jo <ljonas@riseup.net>
Date: Sun, 3 Oct 2021 16:17:34 +0200
Subject: [PATCH 4/5] Rename airtime-playout to libretime-playout

---
 dev_tools/toggle-pypo-debug.sh | 8 ++++----
 uninstall                      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev_tools/toggle-pypo-debug.sh b/dev_tools/toggle-pypo-debug.sh
index e8409bbaf..6f5bfbeaa 100755
--- a/dev_tools/toggle-pypo-debug.sh
+++ b/dev_tools/toggle-pypo-debug.sh
@@ -11,8 +11,8 @@ usage() {
 
 if [ "$1" = "--enable" ]; then
 
-  /etc/init.d/airtime-playout stop
-  /etc/init.d/airtime-playout start-liquidsoap
+  /etc/init.d/libretime-playout stop
+  /etc/init.d/libretime-playout start-liquidsoap
 
   user=$2
 
@@ -30,8 +30,8 @@ elif [ "$1" = "--disable" ]; then
   chown -Rv $user:$user /var/tmp/airtime/pypo/
   chmod -v a+r /etc/airtime/api_client.cfg
 
-  /etc/init.d/airtime-playout stop-liquidsoap
-  /etc/init.d/airtime-playout start
+  /etc/init.d/libretime-playout stop-liquidsoap
+  /etc/init.d/libretime-playout start
 else
   usage
 fi
diff --git a/uninstall b/uninstall
index 1ef277f46..f82c72414 100755
--- a/uninstall
+++ b/uninstall
@@ -49,7 +49,7 @@ echo -e "The following files, directories, and services will be removed:\n"
 for i in ${FILES[*]}; do
   echo "$i"
 done
-echo "pip3 airtime-playout"
+echo "pip3 libretime-playout"
 
 echo -e "\nIf your web root is not listed, you will need to manually remove it."
 
@@ -87,6 +87,6 @@ if [[ $IN == "y" || $IN == "Y" ]]; then
   dropLibreTimeDatabase
 fi
 
-pip3 uninstall -y airtime-playout airtime-media-monitor airtime-analyzer
+pip3 uninstall -y libretime-playout airtime-media-monitor airtime-analyzer
 service apache2 restart
 echo "...Done"

From 69d85c4236823577c8d8a79ba42c8d6bf810c2be Mon Sep 17 00:00:00 2001
From: jo <ljonas@riseup.net>
Date: Tue, 12 Oct 2021 14:05:55 +0200
Subject: [PATCH 5/5] Fix legacy services check names

---
 legacy/application/models/Systemstatus.php | 13 +++++++------
 legacy/build/airtime-setup/load.php        | 16 ++++++++--------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/legacy/application/models/Systemstatus.php b/legacy/application/models/Systemstatus.php
index d7ffbbd95..c552eba06 100644
--- a/legacy/application/models/Systemstatus.php
+++ b/legacy/application/models/Systemstatus.php
@@ -5,15 +5,15 @@ class Application_Model_Systemstatus
     public static function GetMonitStatus($p_ip)
     {
         $CC_CONFIG = Config::getConfig();
-//         $monit_user = $CC_CONFIG['monit_user'];
-//         $monit_password = $CC_CONFIG['monit_password'];
+        //         $monit_user = $CC_CONFIG['monit_user'];
+        //         $monit_password = $CC_CONFIG['monit_password'];
 
         $url = "http://{$p_ip}:2812/_status?format=xml";
 
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($ch, CURLOPT_URL, $url);
-//         curl_setopt($ch, CURLOPT_USERPWD, "$monit_user:$monit_password");
+        //         curl_setopt($ch, CURLOPT_USERPWD, "$monit_user:$monit_password");
         //wait a max of 3 seconds before aborting connection attempt
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 3);
         $result = curl_exec($ch);
@@ -42,7 +42,8 @@ class Application_Model_Systemstatus
             'status' => 0,
             'memory_perc' => '0%',
             'memory_kb' => '0',
-            'cpu_perc' => '0%', ];
+            'cpu_perc' => '0%',
+        ];
 
         $notMonitored = [
             'name' => $p_serviceName,
@@ -153,7 +154,7 @@ class Application_Model_Systemstatus
 
         $docRoot = self::GetMonitStatus($ip);
 
-        return self::ExtractServiceInformation($docRoot, 'airtime-playout');
+        return self::ExtractServiceInformation($docRoot, 'libretime-playout');
     }
 
     public static function GetLiquidsoapStatus()
@@ -166,7 +167,7 @@ class Application_Model_Systemstatus
 
         $docRoot = self::GetMonitStatus($ip);
 
-        return self::ExtractServiceInformation($docRoot, 'airtime-liquidsoap');
+        return self::ExtractServiceInformation($docRoot, 'libretime-liquidsoap');
     }
 
     public static function GetMediaMonitorStatus()
diff --git a/legacy/build/airtime-setup/load.php b/legacy/build/airtime-setup/load.php
index 4cc935c60..43a140942 100644
--- a/legacy/build/airtime-setup/load.php
+++ b/legacy/build/airtime-setup/load.php
@@ -136,13 +136,13 @@ function checkAnalyzerService()
 }
 
 /**
- * Check if airtime-playout is currently running.
+ * Check if libretime-playout is currently running.
  *
- * @return bool true if airtime-playout is running
+ * @return bool true if libretime-playout is running
  */
 function checkPlayoutService()
 {
-    exec('pgrep -f airtime-playout', $out, $status);
+    exec('pgrep -f libretime-playout', $out, $status);
     if ($out > 0) {
         return posix_kill(rtrim($out[0]), 0);
     }
@@ -151,13 +151,13 @@ function checkPlayoutService()
 }
 
 /**
- * Check if airtime-liquidsoap is currently running.
+ * Check if libretime-liquidsoap is currently running.
  *
- * @return bool true if airtime-liquidsoap is running
+ * @return bool true if libretime-liquidsoap is running
  */
 function checkLiquidsoapService()
 {
-    exec('pgrep -f airtime-liquidsoap', $out, $status);
+    exec('pgrep -f libretime-liquidsoap', $out, $status);
     if ($out > 0) {
         return posix_kill(rtrim($out[0]), 0);
     }
@@ -166,9 +166,9 @@ function checkLiquidsoapService()
 }
 
 /**
- * Check if airtime-celery is currently running.
+ * Check if libretime-celery is currently running.
  *
- * @return bool true if airtime-celery is running
+ * @return bool true if libretime-celery is running
  */
 function checkCeleryService()
 {