diff --git a/packages/virtual/mediacenter/package.mk b/packages/virtual/mediacenter/package.mk
index 6bea07b62b..585b05b32a 100644
--- a/packages/virtual/mediacenter/package.mk
+++ b/packages/virtual/mediacenter/package.mk
@@ -36,27 +36,23 @@ for i in $SKINS; do
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $MEDIACENTER-theme-$i"
 done
 
-if [ "$MEDIACENTER" = "xbmc" ]; then
+if [ "$MEDIACENTER" = "kodi" ]; then
 # some python stuff needed for various addons
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET Imaging"
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET simplejson"
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pycrypto"
 
-# XBMC audio encoder addons
+# Kodi audio encoder addons
   if [ "$OPTICAL_DRIVE_SUPPORT" = "yes" ]; then
     for audioencoder in $KODI_AUDIOENCODER_ADDONS; do
-      PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xbmc-audioencoder-$audioencoder"
+      PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET kodi-audioencoder-$audioencoder"
     done
   fi
 
 # various PVR clients
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xbmc-pvr-addons"
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xbmc-addon-xvdr"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET kodi-pvr-addons"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET kodi-addon-xvdr"
 
 # other packages
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET service.openelec.settings"
 fi
-
-# if [ ! "$LCD_DRIVER" = "none" ]; then
-#   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET script.xbmc.lcd"
-# fi
diff --git a/projects/Cuboxi/options b/projects/Cuboxi/options
index a23117231f..de6261b3b2 100644
--- a/projects/Cuboxi/options
+++ b/projects/Cuboxi/options
@@ -115,8 +115,8 @@
 # SquashFS compression method (gzip / lzo / xz)
   SQUASHFS_COMPRESSION="gzip"
 
-# Mediacenter to use (xbmc / no)
-  MEDIACENTER="xbmc"
+# Mediacenter to use (kodi / no)
+  MEDIACENTER="kodi"
 
 # Skins to install (Confluence)
 # Space separated list is supported,
diff --git a/projects/Generic/options b/projects/Generic/options
index a66af24033..5ce948a30a 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -114,8 +114,8 @@
 # SquashFS compression method (gzip / lzo / xz)
   SQUASHFS_COMPRESSION="gzip"
 
-# Mediacenter to use (xbmc / no)
-  MEDIACENTER="xbmc"
+# Mediacenter to use (kodi / no)
+  MEDIACENTER="kodi"
 
 # Skins to install (Confluence)
 # Space separated list is supported,
diff --git a/projects/RPi/options b/projects/RPi/options
index e0e51524cc..c19cf4ffba 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -114,8 +114,8 @@
 # SquashFS compression method (gzip / lzo / xz)
   SQUASHFS_COMPRESSION="lzo"
 
-# Mediacenter to use (xbmc / no)
-  MEDIACENTER="xbmc"
+# Mediacenter to use (kodi / no)
+  MEDIACENTER="kodi"
 
 # Skins to install (Confluence)
 # Space separated list is supported,