diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options
index fdaa3e7f1e..fb85faa15c 100644
--- a/distributions/LibreELEC/options
+++ b/distributions/LibreELEC/options
@@ -144,7 +144,7 @@
 # build with MySQL support (mariadb / none)
   KODI_MYSQL_SUPPORT="mariadb"
 
-# build xbmc with optical drive support (yes / no)
+# build Kodi with optical drive support (yes / no)
   KODI_OPTICAL_SUPPORT="yes"
 
 # build with AirPlay support (stream videos from iDevices to KODI) (yes / no)
diff --git a/packages/addons/service/boblightd/config/boblight.X11.sample b/packages/addons/service/boblightd/config/boblight.X11.sample
index 42aaa47345..d514968b9e 100644
--- a/packages/addons/service/boblightd/config/boblight.X11.sample
+++ b/packages/addons/service/boblightd/config/boblight.X11.sample
@@ -1 +1 @@
-# Nothing needed in this file, just rename to boblight.X11 if not using XBMC addon
+# Nothing needed in this file, just rename to boblight.X11 if not using Kodi addon
diff --git a/packages/addons/service/mpd/source/config/mpd.conf b/packages/addons/service/mpd/source/config/mpd.conf
index 195784d693..87ebe297fc 100644
--- a/packages/addons/service/mpd/source/config/mpd.conf
+++ b/packages/addons/service/mpd/source/config/mpd.conf
@@ -194,7 +194,7 @@ state_file "/storage/.kodi/userdata/addon_data/service.multimedia.mpd/state"
 #
 # A BIG FAT WARNING
 #
-# This may block your xbmc audio. It might also play no audio at all,
+# This may block your Kodi audio. It might also play no audio at all,
 # if streamsilence is enabled and you try to use the very same device.
 #
 ###############################################################################
diff --git a/packages/sysutils/eventlircd/evmap/03_0755_2626.evmap b/packages/sysutils/eventlircd/evmap/03_0755_2626.evmap
index e5e57c9023..f46f570575 100644
--- a/packages/sysutils/eventlircd/evmap/03_0755_2626.evmap
+++ b/packages/sysutils/eventlircd/evmap/03_0755_2626.evmap
@@ -50,7 +50,7 @@
  KEY_BACKSPACE     = KEY_EXIT          # BACK
 
  alt+KEY_F4        = KEY_CLOSE         # Close
- meta+KEY_D        = KEY_INFO          # Desktop, remapped to Info in XBMC
- KEY_COMPOSE       = KEY_EPG           # More, remapped to Context Menu in XBMC
+ meta+KEY_D        = KEY_INFO          # Desktop, remapped to Info in Kodi
+ KEY_COMPOSE       = KEY_EPG           # More, remapped to Context Menu in Kodi
  ctrl+KEY_R        = KEY_RECORD        # Record
  KEY_ESC           = KEY_DELETE        # Clear
diff --git a/packages/sysutils/eventlircd/evmap/03_13ec_0006.evmap b/packages/sysutils/eventlircd/evmap/03_13ec_0006.evmap
index 0bb87989ec..2d67c32045 100644
--- a/packages/sysutils/eventlircd/evmap/03_13ec_0006.evmap
+++ b/packages/sysutils/eventlircd/evmap/03_13ec_0006.evmap
@@ -12,5 +12,5 @@
  KEY_PVR           = KEY_MEDIA         # Home
  KEY_AUX           = KEY_CAMERA        # Photo
 
- KEY_MENU          = KEY_EPG           # Menu (used for XBMC's context menu)
- KEY_K             = KEY_EPG           # Title (used for XBMC's context menu)
+ KEY_MENU          = KEY_EPG           # Menu (used for Kodi's context menu)
+ KEY_K             = KEY_EPG           # Title (used for Kodi's context menu)
diff --git a/packages/tools/installer/system.d/installer.service b/packages/tools/installer/system.d/installer.service
index a573b05a28..bcf469d3a1 100644
--- a/packages/tools/installer/system.d/installer.service
+++ b/packages/tools/installer/system.d/installer.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=XBMC Media Center
+Description=Kodi Media Center
 Requires=installer.target
 
 [Service]
diff --git a/projects/ARM/options b/projects/ARM/options
index d67abbb95c..2a1d554117 100644
--- a/projects/ARM/options
+++ b/projects/ARM/options
@@ -63,7 +63,7 @@
   # build with MySQL support (mariadb / none)
     KODI_MYSQL_SUPPORT="no"
 
-  # build xbmc with optical drive support (yes / no)
+  # build Kodi with optical drive support (yes / no)
     KODI_OPTICAL_SUPPORT="no"
 
   # build with AirPlay support (stream videos from iDevices to KODI) (yes / no)