diff --git a/config/functions b/config/functions
index 867f44f615..486f537411 100644
--- a/config/functions
+++ b/config/functions
@@ -318,7 +318,7 @@ show_config() {
   config_message="$config_message\n\n Hardware decoder configuration:"
   config_message="$config_message\n $dashes$dashes"
 
-  config_message="$config_message\n - XBMC Player driver:\t\t\t $KODIPLAYER_DRIVER"
+  config_message="$config_message\n - Kodi Player driver:\t\t\t $KODIPLAYER_DRIVER"
   config_message="$config_message\n - VAAPI Support:\t\t\t $VAAPI"
   config_message="$config_message\n - VDPAU Support:\t\t\t $VDPAU"
 
@@ -331,7 +331,7 @@ show_config() {
   config_message="$config_message\n - ATV Remote support:\t\t\t $ATVCLIENT_SUPPORT"
   config_message="$config_message\n - CEC Adapter support:\t\t\t $CEC_SUPPORT"
   config_message="$config_message\n - IRTrans support:\t\t\t $IRSERVER_SUPPORT"
-  config_message="$config_message\n - XBMC Joystick support:\t\t $JOYSTICK_SUPPORT"
+  config_message="$config_message\n - Kodi Joystick support:\t\t $JOYSTICK_SUPPORT"
 
   # Misc. hardware configuration
 
@@ -363,13 +363,13 @@ show_config() {
   config_message="$config_message\n - SFTP server support:\t\t\t $SFTP_SERVER"
   config_message="$config_message\n - PPTP support:\t\t\t $PPTP_SUPPORT"
   config_message="$config_message\n - OpenVPN support:\t\t\t $OPENVPN_SUPPORT"
-  config_message="$config_message\n - XBMC Airplay support:\t\t $AIRPLAY_SUPPORT"
-  config_message="$config_message\n - XBMC Airtunes support:\t\t $AIRTUNES_SUPPORT"
-  config_message="$config_message\n - XBMC AFP support:\t\t\t $AFP_SUPPORT"
-  config_message="$config_message\n - XBMC NFS support:\t\t\t $NFS_SUPPORT"
-  config_message="$config_message\n - XBMC SAMBA client support:\t\t $SAMBA_SUPPORT"
-  config_message="$config_message\n - XBMC UPNP support:\t\t\t $UPNP_SUPPORT"
-  config_message="$config_message\n - XBMC Webserver support:\t\t $WEBSERVER"
+  config_message="$config_message\n - Kodi Airplay support:\t\t $AIRPLAY_SUPPORT"
+  config_message="$config_message\n - Kodi Airtunes support:\t\t $AIRTUNES_SUPPORT"
+  config_message="$config_message\n - Kodi AFP support:\t\t\t $AFP_SUPPORT"
+  config_message="$config_message\n - Kodi NFS support:\t\t\t $NFS_SUPPORT"
+  config_message="$config_message\n - Kodi SAMBA client support:\t\t $SAMBA_SUPPORT"
+  config_message="$config_message\n - Kodi UPNP support:\t\t\t $UPNP_SUPPORT"
+  config_message="$config_message\n - Kodi Webserver support:\t\t $WEBSERVER"
 
   # OS configuration
 
@@ -399,14 +399,14 @@ fi
   config_message="$config_message\n - NTFS Support (via Fuse):\t\t $NTFS3G"
   config_message="$config_message\n - Install HFS Tools:\t\t\t $HFSTOOLS"
 
-  # XBMC configuration
+  # Kodi configuration
 
-  config_message="$config_message\n\n XBMC configuration:"
+  config_message="$config_message\n\n Kodi configuration:"
   config_message="$config_message\n $dashes$dashes"
 
-  config_message="$config_message\n - XBMC version:\t\t\t $MEDIACENTER"
-  config_message="$config_message\n - XBMC nonfree support:\t\t $NONFREE_SUPPORT"
-  config_message="$config_message\n - XBMC DVDCSS support:\t\t\t $DVDCSS_SUPPORT"
+  config_message="$config_message\n - Kodi version:\t\t\t $MEDIACENTER"
+  config_message="$config_message\n - Kodi nonfree support:\t\t $NONFREE_SUPPORT"
+  config_message="$config_message\n - Kodi DVDCSS support:\t\t\t $DVDCSS_SUPPORT"
 
   for config_skin in $SKINS; do
     config_message="$config_message\n - Include Skin:\t\t\t $config_skin"