9 files changed, 15 insertions, 15 deletions
diff --git a/addons/audioencoder.xbmc.builtin.aac/addon.xml.in b/addons/audioencoder.xbmc.builtin.aac/addon.xml.in
index 91eae19481..8155b4ce48 100644
--- a/addons/audioencoder.xbmc.builtin.aac/addon.xml.in
+++ b/addons/audioencoder.xbmc.builtin.aac/addon.xml.in
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
-  id="audioencoder.xbmc.builtin.aac"
+  id="audioencoder.kodi.builtin.aac"
   version="1.0.0"
   name="AAC encoder"
   provider-name="spiff">
   <extension
-    point="xbmc.audioencoder"
+    point="kodi.audioencoder"
     extension=".m4a"
     library_@CORE_SYSTEM_NAME@="dummy.so"/>
   <extension point="xbmc.addon.metadata">
diff --git a/addons/audioencoder.xbmc.builtin.wma/addon.xml.in b/addons/audioencoder.xbmc.builtin.wma/addon.xml.in
index a29b392161..85d9043f54 100644
--- a/addons/audioencoder.xbmc.builtin.wma/addon.xml.in
+++ b/addons/audioencoder.xbmc.builtin.wma/addon.xml.in
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
-  id="audioencoder.xbmc.builtin.wma"
+  id="audioencoder.kodi.builtin.wma"
   version="1.0.0"
   name="WMA encoder"
   provider-name="spiff">
   <extension
-    point="xbmc.audioencoder"
+    point="kodi.audioencoder"
     extension=".wma"
     library_@CORE_SYSTEM_NAME@="dummy.so"/>
   <extension point="xbmc.addon.metadata">
diff --git a/addons/webinterface.default/js/kodi-webinterface.js b/addons/webinterface.default/js/kodi-webinterface.js
index a8aa184c77..5dd2b15452 100644
--- a/addons/webinterface.default/js/kodi-webinterface.js
+++ b/addons/webinterface.default/js/kodi-webinterface.js
@@ -19155,7 +19155,7 @@ this.Kodi.module("SettingsApp.Show.Kodi", function(Kodi, App, Backbone, Marionet
         'services.webskin': 'xbmc.webinterface',
         'subtitles.tv': 'xbmc.subtitle.module',
         'subtitles.movie': 'xbmc.subtitle.module',
-        'audiocds.encoder': 'xbmc.audioencoder'
+        'audiocds.encoder': 'kodi.audioencoder'
       },
       actionLookups: {
         "musiclibrary.cleanup": "command:kodi:audio:clean",
diff --git a/cmake/installdata/common/addons.txt b/cmake/installdata/common/addons.txt
index d8850afe2a..9efba38b47 100644
--- a/cmake/installdata/common/addons.txt
+++ b/cmake/installdata/common/addons.txt
@@ -1,5 +1,5 @@
-addons/audioencoder.xbmc.builtin.aac/*
-addons/audioencoder.xbmc.builtin.wma/*
+addons/audioencoder.kodi.builtin.aac/*
+addons/audioencoder.kodi.builtin.wma/*
 addons/game.controller.default/*
 addons/kodi.adsp/*
 addons/kodi.audiodecoder/*
diff --git a/system/addon-manifest.xml b/system/addon-manifest.xml
index be65220b50..b70114bf7d 100644
--- a/system/addon-manifest.xml
+++ b/system/addon-manifest.xml
@@ -1,6 +1,6 @@
 <addons>
-  <addon>audioencoder.xbmc.builtin.aac</addon>
-  <addon>audioencoder.xbmc.builtin.wma</addon>
+  <addon>audioencoder.kodi.builtin.aac</addon>
+  <addon>audioencoder.kodi.builtin.wma</addon>
   <addon>game.controller.default</addon>
   <addon>kodi.binary.global.audioengine</addon>
   <addon>kodi.binary.global.main</addon>
diff --git a/system/settings/settings.xml b/system/settings/settings.xml
index 0ffbe7569a..918b208b4f 100755
--- a/system/settings/settings.xml
+++ b/system/settings/settings.xml
@@ -557,9 +557,9 @@
         </setting>
         <setting id="audiocds.encoder" type="addon" label="621" help="36287">
           <level>3</level>
-          <default>audioencoder.xbmc.builtin.aac</default>
+          <default>audioencoder.kodi.builtin.aac</default>
           <constraints>
-            <addontype>xbmc.audioencoder</addontype>
+            <addontype>kodi.audioencoder</addontype>
           </constraints>
           <control type="button" format="addon">
             <show more="true" details="true">installed</show>
diff --git a/xbmc/addons/AddonBuilder.cpp b/xbmc/addons/AddonBuilder.cpp
index b07dc2af33..ba3422665f 100644
--- a/xbmc/addons/AddonBuilder.cpp
+++ b/xbmc/addons/AddonBuilder.cpp
@@ -79,7 +79,7 @@ std::shared_ptr<IAddon> CAddonBuilder::Build()
   if (type == ADDON_AUDIOENCODER)
   {
     // built in audio encoder
-    if (StringUtils::StartsWithNoCase(m_extPoint->plugin->identifier, "audioencoder.xbmc.builtin."))
+    if (StringUtils::StartsWithNoCase(m_extPoint->plugin->identifier, "audioencoder.kodi.builtin."))
       return std::make_shared<CAddonDll>(std::move(m_addonInfo));
   }
 
diff --git a/xbmc/addons/AddonInfo.cpp b/xbmc/addons/AddonInfo.cpp
index ff7f07d330..390e0e9aac 100644
--- a/xbmc/addons/AddonInfo.cpp
+++ b/xbmc/addons/AddonInfo.cpp
@@ -64,7 +64,7 @@ static const TypeMapping types[] =
    {"xbmc.addon.image",                  ADDON_IMAGE,                1039, "DefaultAddonPicture.png" },
    {"xbmc.addon.executable",             ADDON_EXECUTABLE,           1043, "DefaultAddonProgram.png" },
    {"kodi.addon.game",                   ADDON_GAME,                35049, "DefaultAddonGame.png" },
-   {"xbmc.audioencoder",                 ADDON_AUDIOENCODER,         200,  "DefaultAddonAudioEncoder.png" },
+   {"kodi.audioencoder",                 ADDON_AUDIOENCODER,         200,  "DefaultAddonAudioEncoder.png" },
    {"kodi.audiodecoder",                 ADDON_AUDIODECODER,         201,  "DefaultAddonAudioDecoder.png" },
    {"xbmc.service",                      ADDON_SERVICE,             24018, "DefaultAddonService.png" },
    {"kodi.resource.images",              ADDON_RESOURCE_IMAGES,     24035, "DefaultAddonImages.png" },
diff --git a/xbmc/cdrip/CDDARipJob.cpp b/xbmc/cdrip/CDDARipJob.cpp
index bdb7516f05..cb3d864394 100644
--- a/xbmc/cdrip/CDDARipJob.cpp
+++ b/xbmc/cdrip/CDDARipJob.cpp
@@ -185,8 +185,8 @@ int CCDDARipJob::RipChunk(CFile& reader, CEncoder* encoder, int& percent)
 CEncoder* CCDDARipJob::SetupEncoder(CFile& reader)
 {
   CEncoder* encoder = NULL;
-  if (CServiceBroker::GetSettings().GetString(CSettings::SETTING_AUDIOCDS_ENCODER) == "audioencoder.xbmc.builtin.aac" ||
-      CServiceBroker::GetSettings().GetString(CSettings::SETTING_AUDIOCDS_ENCODER) == "audioencoder.xbmc.builtin.wma")
+  if (CServiceBroker::GetSettings().GetString(CSettings::SETTING_AUDIOCDS_ENCODER) == "audioencoder.kodi.builtin.aac" ||
+      CServiceBroker::GetSettings().GetString(CSettings::SETTING_AUDIOCDS_ENCODER) == "audioencoder.kodi.builtin.wma")
   {
     std::shared_ptr<IEncoder> enc(new CEncoderFFmpeg());
     encoder = new CEncoder(enc);