4 files changed, 6 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 64300c8..a89404f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,3 +2,2 @@
 
-        * The launcher binary is now finally called 'opie' (mickeyl)
         * Added Conversion tool for pim-data (eilers)
diff --git a/core/launcher/opie-taskbar.control b/core/launcher/opie-taskbar.control
index d2d070c..778aff3 100644
--- a/core/launcher/opie-taskbar.control
+++ b/core/launcher/opie-taskbar.control
@@ -1,3 +1,3 @@
 Package: opie-taskbar
-Files: bin/opie apps/Settings/Calibrate.desktop pics/launcher pics/devicebuttons/*.png plugins/applets/libsuspendapplet.so* plugins/applets/libhomeapplet.so* plugins/applets/liblogoutapplet.so* plugins/applets/librotateapplet.so* root/etc/init.d/opie
+Files: bin/qpe apps/Settings/Calibrate.desktop pics/launcher pics/devicebuttons/*.png plugins/applets/libsuspendapplet.so* plugins/applets/libhomeapplet.so* plugins/applets/liblogoutapplet.so* plugins/applets/librotateapplet.so* root/etc/init.d/opie
 Priority: required
diff --git a/core/launcher/server.pro b/core/launcher/server.pro
index d4bf39b..4e6a581 100644
--- a/core/launcher/server.pro
+++ b/core/launcher/server.pro
@@ -77,3 +77,3 @@ DEPENDPATH  += $(OPIEDIR)/noncore/settings/mediummount
 LIBS        += -lqpe -lopiecore2 -lopieui2 -lqrsync
-TARGET       = opie
+TARGET       = qpe
 
diff --git a/root/etc/init.d/opie b/root/etc/init.d/opie
index a723864..d49498c 100755
--- a/root/etc/init.d/opie
+++ b/root/etc/init.d/opie
@@ -39,3 +39,3 @@ fi
 
-if [ ! -x $OPIEDIR/bin/opie ] ; then 
+if [ ! -x $OPIEDIR/bin/qpe ] ; then 
     echo Opie not installed
@@ -73,6 +73,6 @@ case $1 in
             echo Starting Opie....
-            $SSHAGENT $OPIEDIR/bin/opie 2>/dev/null >/dev/null &
+            $SSHAGENT $OPIEDIR/bin/qpe 2>/dev/null >/dev/null &
         else
             echo Starting Opie with syslog logging.....
-            ( $SSHAGENT $OPIEDIR/bin/opie 2>&1 | logger ) &
+            ( $SSHAGENT $OPIEDIR/bin/qpe 2>&1 | logger ) &
         fi
@@ -84,3 +84,3 @@ case $1 in
     echo "Killing Opie..."
-    killall opie
+    killall qpe
     killall opie-login