diff --git a/packages/mediacenter/xbmc-pvr-addons/package.mk b/packages/mediacenter/kodi-pvr-addons/package.mk
similarity index 89%
rename from packages/mediacenter/xbmc-pvr-addons/package.mk
rename to packages/mediacenter/kodi-pvr-addons/package.mk
index 81b2a56b76..f48e4fbffb 100644
--- a/packages/mediacenter/xbmc-pvr-addons/package.mk
+++ b/packages/mediacenter/kodi-pvr-addons/package.mk
@@ -16,18 +16,18 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="xbmc-pvr-addons"
+PKG_NAME="kodi-pvr-addons"
 PKG_VERSION="259d150"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/opdenkamp/xbmc-pvr-addons"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain curl"
+PKG_DEPENDS_TARGET="toolchain curl kodi"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"
-PKG_SHORTDESC="Various PVR addons for XBMC" 
-PKG_LONGDESC="This addons allows XBMC PVR to connect to various TV/PVR backends and tuners."
+PKG_SHORTDESC="Various PVR addons for Kodi"
+PKG_LONGDESC="This addons allows Kodi PVR to connect to various TV/PVR backends and tuners."
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
diff --git a/packages/mediacenter/xbmc-pvr-addons/patches/xbmc-pvr-addons-01-wmc-clean-up-addon-name.patch b/packages/mediacenter/kodi-pvr-addons/patches/kodi-pvr-addons-01-wmc-clean-up-addon-name.patch
similarity index 100%
rename from packages/mediacenter/xbmc-pvr-addons/patches/xbmc-pvr-addons-01-wmc-clean-up-addon-name.patch
rename to packages/mediacenter/kodi-pvr-addons/patches/kodi-pvr-addons-01-wmc-clean-up-addon-name.patch
diff --git a/packages/mediacenter/xbmc-pvr-addons/patches/xbmc-pvr-addons-PR361.patch b/packages/mediacenter/kodi-pvr-addons/patches/kodi-pvr-addons-PR361.patch
similarity index 100%
rename from packages/mediacenter/xbmc-pvr-addons/patches/xbmc-pvr-addons-PR361.patch
rename to packages/mediacenter/kodi-pvr-addons/patches/kodi-pvr-addons-PR361.patch
diff --git a/packages/mediacenter/xbmc-pvr-addons/patches/xbmc-pvr-addons-api_version.patch b/packages/mediacenter/kodi-pvr-addons/patches/kodi-pvr-addons-api_version.patch
similarity index 100%
rename from packages/mediacenter/xbmc-pvr-addons/patches/xbmc-pvr-addons-api_version.patch
rename to packages/mediacenter/kodi-pvr-addons/patches/kodi-pvr-addons-api_version.patch
diff --git a/packages/mediacenter/xbmc-pvr-addons/patches/xbmc-pvr-addons-buildfix.patch b/packages/mediacenter/kodi-pvr-addons/patches/kodi-pvr-addons-buildfix.patch
similarity index 100%
rename from packages/mediacenter/xbmc-pvr-addons/patches/xbmc-pvr-addons-buildfix.patch
rename to packages/mediacenter/kodi-pvr-addons/patches/kodi-pvr-addons-buildfix.patch
diff --git a/packages/mediacenter/xbmc-pvr-addons/patches/xbmc-pvr-addons-xbmc-rebrand.patch b/packages/mediacenter/kodi-pvr-addons/patches/kodi-pvr-addons-xbmc-rebrand.patch
similarity index 100%
rename from packages/mediacenter/xbmc-pvr-addons/patches/xbmc-pvr-addons-xbmc-rebrand.patch
rename to packages/mediacenter/kodi-pvr-addons/patches/kodi-pvr-addons-xbmc-rebrand.patch
diff --git a/tools/mkpkg/mkpkg_xbmc-pvr-addons b/tools/mkpkg/mkpkg_kodi-pvr-addons
similarity index 80%
rename from tools/mkpkg/mkpkg_xbmc-pvr-addons
rename to tools/mkpkg/mkpkg_kodi-pvr-addons
index 36db215920..4fb2c0992b 100755
--- a/tools/mkpkg/mkpkg_xbmc-pvr-addons
+++ b/tools/mkpkg/mkpkg_kodi-pvr-addons
@@ -20,24 +20,24 @@
 ################################################################################
 
 echo "getting sources..."
-  if [ ! -d xbmc-pvr-addons.git ]; then
-    git clone git://github.com/opdenkamp/xbmc-pvr-addons.git -b master xbmc-pvr-addons.git
+  if [ ! -d kodi-pvr-addons.git ]; then
+    git clone git://github.com/opdenkamp/xbmc-pvr-addons.git -b master kodi-pvr-addons.git
   fi
 
-  cd xbmc-pvr-addons.git
+  cd kodi-pvr-addons.git
     git pull
     GIT_REV=`git log -n1 --format=%h`
   cd ..
 
 echo "copying sources..."
-  rm -rf xbmc-pvr-addons-$GIT_REV
-  cp -R xbmc-pvr-addons.git xbmc-pvr-addons-$GIT_REV
+  rm -rf kodi-pvr-addons-$GIT_REV
+  cp -R kodi-pvr-addons.git kodi-pvr-addons-$GIT_REV
 
 echo "cleaning sources..."
-  rm -rf xbmc-pvr-addons-$GIT_REV/.git
+  rm -rf kodi-pvr-addons-$GIT_REV/.git
 
 echo "packing sources..."
-  tar cvJf xbmc-pvr-addons-$GIT_REV.tar.xz xbmc-pvr-addons-$GIT_REV
+  tar cvJf kodi-pvr-addons-$GIT_REV.tar.xz kodi-pvr-addons-$GIT_REV
 
 echo "remove temporary sourcedir..."
-  rm -rf xbmc-pvr-addons-$GIT_REV
+  rm -rf kodi-pvr-addons-$GIT_REV