4 files changed, 16 insertions, 14 deletions
diff --git a/tools/Linux/xbmc-standalone.sh.in b/tools/Linux/xbmc-standalone.sh.in
index d392a6cbd4..48c2658501 100644
--- a/tools/Linux/xbmc-standalone.sh.in
+++ b/tools/Linux/xbmc-standalone.sh.in
@@ -21,7 +21,7 @@
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 bindir="@bindir@"
-XBMC="${bindir}/xbmc --standalone $@"
+KODI="${bindir}/kodi --standalone $@"
 
 @XBMC_STANDALONE_SH_PULSE@
 
@@ -31,7 +31,7 @@ LASTSUCCESSFULSTART=$(date +%s)
 
 while [ $(( $LOOP )) = "1" ]
 do
-  $XBMC
+  $KODI
   RET=$?
   NOW=$(date +%s)
   if [ $(( ($RET >= 64 && $RET <=66) || $RET == 0 )) = "1" ]; then # clean exit
@@ -45,7 +45,7 @@ do
       CRASHCOUNT=$((CRASHCOUNT+1))
       if [ $(($CRASHCOUNT >= 3)) = "1" ]; then # Too many, bail out
         LOOP=0
-        echo "XBMC has exited uncleanly 3 times in the last ${DIFF} seconds."
+        echo "KODI has exited uncleanly 3 times in the last ${DIFF} seconds."
         echo "Something is probably wrong"
       fi
     fi
diff --git a/tools/Linux/xbmc-xsession.desktop b/tools/Linux/xbmc-xsession.desktop
index 6455dfeaa8..f2dfe4d4ed 100644
--- a/tools/Linux/xbmc-xsession.desktop
+++ b/tools/Linux/xbmc-xsession.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Name=XBMC
-Comment=This session will start XBMC Media Center
-Exec=xbmc-standalone
-TryExec=xbmc-standalone
+Name=KODI
+Comment=This session will start KODI Media Center
+Exec=kodi-standalone
+TryExec=kodi-standalone
 Type=Application
diff --git a/tools/Linux/xbmc.desktop b/tools/Linux/xbmc.desktop
index 4519ad2167..02bb368aae 100644
--- a/tools/Linux/xbmc.desktop
+++ b/tools/Linux/xbmc.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Version=1.0
-Name=XBMC Media Center
+Name=KODI Media Center
 GenericName=Media Center
 Comment=Manage and view your media 
 Exec=xbmc
diff --git a/tools/Linux/xbmc.sh.in b/tools/Linux/xbmc.sh.in
index ce850fda82..31b5234df1 100644
--- a/tools/Linux/xbmc.sh.in
+++ b/tools/Linux/xbmc.sh.in
@@ -25,6 +25,8 @@ datarootdir="@datarootdir@"
 LIBDIR="@libdir@"
 CRASHLOG_DIR=${CRASHLOG_DIR:-$HOME}
 
+[ "$(basename $0)" == "xbmc" ] && echo "WARNING: running kodi as "xbmc" is deprecated and will be removed in later versions, please switch to using the kodi binary"
+
 # Check for some options used by this script
 while [ "$#" -gt "0" ]
 do
@@ -48,7 +50,7 @@ single_stacktrace()
 {
   # core filename is either "core.$PID" or "core"
   find "$1" -maxdepth $2 -name 'core*' | while read core; do
-      LC_ALL=C gdb --core="$core" --batch 2> /dev/null | grep -q "^Core was generated by \`$LIBDIR/xbmc/xbmc.bin" || continue
+      LC_ALL=C gdb --core="$core" --batch 2> /dev/null | grep -q "^Core was generated by \`$LIBDIR/kodi/kodi.bin" || continue
       echo "=====>  Core file: "$core" ($(stat -c%y "$core"))" >> $FILE
       echo "        =========================================" >> $FILE
       gdb "$LIBDIR/xbmc/xbmc.bin" --core="$core" --batch -ex "thread apply all bt" 2> /dev/null >> $FILE
@@ -58,13 +60,13 @@ single_stacktrace()
 
 print_crash_report()
 {
-  FILE="$CRASHLOG_DIR/xbmc_crashlog-`date +%Y%m%d_%H%M%S`.log"
-  echo "############## XBMC CRASH LOG ###############" >> $FILE
+  FILE="$CRASHLOG_DIR/kodi_crashlog-`date +%Y%m%d_%H%M%S`.log"
+  echo "############## KODI CRASH LOG ###############" >> $FILE
   echo >> $FILE
   echo "################ SYSTEM INFO ################" >> $FILE
   echo -n " Date: " >> $FILE
   date >> $FILE
-  echo " XBMC Options: $*" >> $FILE
+  echo " KODI Options: $*" >> $FILE
   echo -n " Arch: " >> $FILE
   uname -m >> $FILE
   echo -n " Kernel: " >> $FILE
@@ -115,7 +117,7 @@ print_crash_report()
   echo >> $FILE
   echo "############### END LOG FILE ################" >> $FILE
   echo >> $FILE
-  echo "############ END XBMC CRASH LOG #############" >> $FILE
+  echo "############ END KODI CRASH LOG #############" >> $FILE
   echo "Crash report available at $FILE"
 }
 
@@ -129,7 +131,7 @@ if command_exists gdb; then
   # Output warning in case ulimit is unsupported by shell
   eval ulimit -c unlimited
   if [ ! $? = "0" ]; then
-    echo "xbmc: ulimit is unsupported by this shell" 1>&2
+    echo "kodi: ulimit is unsupported by this shell" 1>&2
   fi
 fi