diff --git a/python_apps/media-monitor/airtime-media-monitor-init-d b/python_apps/media-monitor/airtime-media-monitor-init-d
index afe45e137..e6450461b 100755
--- a/python_apps/media-monitor/airtime-media-monitor-init-d
+++ b/python_apps/media-monitor/airtime-media-monitor-init-d
@@ -11,9 +11,9 @@
 
 USERID=pypo
 GROUPID=pypo
-NAME=Airtime
+NAME=Airtime\ Media\ Monitor
 
-DAEMON=/usr/bin/airtime-media-monitor
+DAEMON=/usr/lib/airtime/media-monitor/airtime-media-monitor
 PIDFILE=/var/run/airtime-media-monitor.pid
 
 start () {    
diff --git a/python_apps/media-monitor/install/media-monitor-install.py b/python_apps/media-monitor/install/media-monitor-install.py
index 36f491c57..191430f51 100755
--- a/python_apps/media-monitor/install/media-monitor-install.py
+++ b/python_apps/media-monitor/install/media-monitor-install.py
@@ -65,10 +65,6 @@ try:
   os.system("chmod -R 755 "+config["bin_dir"])
   os.system("chown -R pypo:pypo "+config["bin_dir"])
 
-  print "Creating symbolic links"
-  os.system("rm -f /usr/bin/airtime-media-monitor")
-  os.system("ln -s "+config["bin_dir"]+"/airtime-media-monitor /usr/bin/")
-
   print "Installing media-monitor daemon"
   shutil.copy(config["bin_dir"]+"/airtime-media-monitor-init-d", "/etc/init.d/airtime-media-monitor")
 
diff --git a/python_apps/pypo/airtime-playout-init-d b/python_apps/pypo/airtime-playout-init-d
index 5634baa13..994b0c6f2 100755
--- a/python_apps/pypo/airtime-playout-init-d
+++ b/python_apps/pypo/airtime-playout-init-d
@@ -11,12 +11,12 @@
 
 USERID=pypo
 GROUPID=pypo
-NAME=Airtime
+NAME=Airtime\ Playout
 
-DAEMON0=/usr/bin/airtime-playout
+DAEMON0=/usr/lib/airtime/pypo/bin/airtime-playout
 PIDFILE0=/var/run/airtime-playout.pid
 
-DAEMON1=/usr/bin/airtime-liquidsoap
+DAEMON1=/usr/lib/airtime/pypo/bin/airtime-liquidsoap
 PIDFILE1=/var/run/airtime-liquidsoap.pid
 
 start () {    
@@ -27,8 +27,8 @@ start () {
 stop () {
         # Send TERM after 5 seconds, wait at most 30 seconds.
         start-stop-daemon --stop --oknodo --retry TERM/5/0/30 --quiet --pidfile $PIDFILE0
-        start-stop-daemon --stop --oknodo --retry TERM/5/0/30 --quiet --pidfile $PIDFILE1
         rm -f $PIDFILE0
+        start-stop-daemon --stop --oknodo --retry TERM/5/0/30 --quiet --pidfile $PIDFILE1
         rm -f $PIDFILE1
 }
 
diff --git a/python_apps/pypo/install/pypo-install.py b/python_apps/pypo/install/pypo-install.py
index 32f3f873a..c24ec30bd 100755
--- a/python_apps/pypo/install/pypo-install.py
+++ b/python_apps/pypo/install/pypo-install.py
@@ -103,12 +103,6 @@ try:
   os.system("chown -R pypo:pypo "+config["bin_dir"])
   os.system("chown -R pypo:pypo "+config["cache_base_dir"])
 
-  print "Creating symbolic links"
-  os.system("rm -f /usr/bin/airtime-playout")
-  os.system("ln -s "+config["bin_dir"]+"/bin/airtime-playout /usr/bin/")
-  os.system("rm -f /usr/bin/airtime-liquidsoap")
-  os.system("ln -s "+config["bin_dir"]+"/bin/airtime-liquidsoap /usr/bin/")
-
   print "Installing pypo daemon"
   shutil.copy(config["bin_dir"]+"/bin/airtime-playout-init-d", "/etc/init.d/airtime-playout")
 
diff --git a/python_apps/show-recorder/airtime-show-recorder-init-d b/python_apps/show-recorder/airtime-show-recorder-init-d
index 9444a307e..deb207653 100755
--- a/python_apps/show-recorder/airtime-show-recorder-init-d
+++ b/python_apps/show-recorder/airtime-show-recorder-init-d
@@ -11,9 +11,9 @@
 
 USERID=pypo
 GROUPID=pypo
-NAME=Airtime
+NAME=Airtime\ Show\ Recorder
 
-DAEMON=/usr/bin/airtime-show-recorder
+DAEMON=/usr/lib/airtime/show-recorder/airtime-show-recorder
 PIDFILE=/var/run/airtime-show-recorder.pid
 
 start () {    
diff --git a/python_apps/show-recorder/install/recorder-install.py b/python_apps/show-recorder/install/recorder-install.py
index cb84ee95d..ea8cb84e8 100755
--- a/python_apps/show-recorder/install/recorder-install.py
+++ b/python_apps/show-recorder/install/recorder-install.py
@@ -63,10 +63,6 @@ try:
   os.system("chmod -R 755 "+config["bin_dir"])
   os.system("chown -R pypo:pypo "+config["bin_dir"])
 
-  print "Creating symbolic links"
-  os.system("rm -f /usr/bin/airtime-show-recorder")
-  os.system("ln -s "+config["bin_dir"]+"/airtime-show-recorder /usr/bin/")
-
   print "Installing show-recorder daemon"
   shutil.copy(config["bin_dir"]+"/airtime-show-recorder-init-d", "/etc/init.d/airtime-show-recorder")