diff --git a/config/noobs/os.json b/config/noobs/os.json
index 2fb08c7f63..5b5cbbb413 100644
--- a/config/noobs/os.json
+++ b/config/noobs/os.json
@@ -1,6 +1,6 @@
 {
   "name": "@DISTRONAME@_@PROJECT@",
-  "version": "@LIBREELEC_VERSION@",
+  "version": "@DISTRO_VERSION@",
   "release_date": "@RELEASE_DATE@",
   "kernel": "@KERNEL_VERSION@",
   "description": "@DESCRIPTION@",
diff --git a/config/path b/config/path
index 0151372e24..48b04d5a07 100644
--- a/config/path
+++ b/config/path
@@ -16,9 +16,9 @@ set -e
 [ -z "${HOST_NAME}" ] && export HOST_NAME="$($LOCAL_CC -dumpmachine)"
 TARGET_NAME=$TARGET_GCC_ARCH-libreelec-linux-gnu${TARGET_ABI}
 
-BUILD=${BUILD_ROOT}/${BUILD_BASE}.${DISTRONAME}-${DEVICE:-$PROJECT}.${TARGET_ARCH}-${LIBREELEC_VERSION}
-if [ "${LIBREELEC_VERSION}" = "devel" ] ; then
-  BUILD=${BUILD_ROOT}/${BUILD_BASE}.${DISTRONAME}-${DEVICE:-$PROJECT}.${TARGET_ARCH}-${OS_VERSION}-${LIBREELEC_VERSION}
+BUILD=${BUILD_ROOT}/${BUILD_BASE}.${DISTRONAME}-${DEVICE:-$PROJECT}.${TARGET_ARCH}-${DISTRO_VERSION}
+if [ "${DISTRO_VERSION}" = "devel" ] ; then
+  BUILD=${BUILD_ROOT}/${BUILD_BASE}.${DISTRONAME}-${DEVICE:-$PROJECT}.${TARGET_ARCH}-${OS_VERSION}-${DISTRO_VERSION}
 fi
 
 if [ -n "$BUILD_SUFFIX" ]; then
diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options
index 0b93737c0f..4998b31463 100644
--- a/distributions/LibreELEC/options
+++ b/distributions/LibreELEC/options
@@ -172,7 +172,7 @@
 
 # Distribution Specific source location
   DISTRO_MIRROR="http://sources.libreelec.tv/mirror"
-  DISTRO_SRC="http://sources.libreelec.tv/$LIBREELEC_VERSION"
+  DISTRO_SRC="http://sources.libreelec.tv/$DISTRO_VERSION"
 
 # Addon Server Url
   ADDON_SERVER_URL="https://addons.libreelec.tv"
diff --git a/distributions/LibreELEC/version b/distributions/LibreELEC/version
index 1efd036ffa..80b4c1ce36 100644
--- a/distributions/LibreELEC/version
+++ b/distributions/LibreELEC/version
@@ -1,5 +1,5 @@
 # VERSION: set full version, use "devel" for development version
-  LIBREELEC_VERSION="devel"
+  DISTRO_VERSION="devel"
 
 # OS_VERSION: OS Version
   OS_VERSION="13.0"
diff --git a/packages/devel/elfutils/package.mk b/packages/devel/elfutils/package.mk
index 600655dd71..006150323e 100644
--- a/packages/devel/elfutils/package.mk
+++ b/packages/devel/elfutils/package.mk
@@ -14,7 +14,7 @@ PKG_LONGDESC="A collection of utilities to handle ELF objects."
 PKG_TOOLCHAIN="autotools"
 PKG_BUILD_FLAGS="+pic -cfg-libs -cfg-libs:host"
 
-if [ "${LIBREELEC_VERSION}" = "devel" ]; then
+if [ "${DISTRO_VERSION}" = "devel" ]; then
   PKG_PROGRAMS="--enable-programs --program-prefix="
   PKG_PROGRAMS_LIST="readelf"
 else
diff --git a/packages/sysutils/v4l-utils/package.mk b/packages/sysutils/v4l-utils/package.mk
index bccda93218..2262816c29 100644
--- a/packages/sysutils/v4l-utils/package.mk
+++ b/packages/sysutils/v4l-utils/package.mk
@@ -35,7 +35,7 @@ create_multi_keymap() {
 post_makeinstall_target() {
   local f keymap
 
-  if [ ! "${LIBREELEC_VERSION}" == "devel" ]; then
+  if [ ! "${DISTRO_VERSION}" == "devel" ]; then
     rm ${INSTALL}/usr/bin/v4l2-compliance
   fi
 
diff --git a/scripts/image b/scripts/image
index a4caaf0ee6..b6b293452e 100755
--- a/scripts/image
+++ b/scripts/image
@@ -64,24 +64,24 @@ else
   GIT_HASH=$(git rev-parse HEAD)
 fi
 
-if [ "${LIBREELEC_VERSION}" = "devel" ]; then
+if [ "${DISTRO_VERSION}" = "devel" ]; then
   GIT_ABBREV=${GIT_HASH:0:7}
-  DEVEL_VERSION=${LIBREELEC_VERSION}
+  DEVEL_VERSION=${DISTRO_VERSION}
   case "${BUILD_PERIODIC}" in
     nightly)
-      LIBREELEC_VERSION=nightly-$(date +%Y%m%d)-${GIT_ABBREV}
+      DISTRO_VERSION=nightly-$(date +%Y%m%d)-${GIT_ABBREV}
       ;;
     daily)
-      LIBREELEC_VERSION=daily-$(date +%Y%j)-${GIT_ABBREV}
+      DISTRO_VERSION=daily-$(date +%Y%j)-${GIT_ABBREV}
       ;;
     weekly)
-      LIBREELEC_VERSION=weekly-$(date +%G%V)-${GIT_ABBREV}
+      DISTRO_VERSION=weekly-$(date +%G%V)-${GIT_ABBREV}
       ;;
     monthly)
-      LIBREELEC_VERSION=monthly-$(date +%Y%m)-${GIT_ABBREV}
+      DISTRO_VERSION=monthly-$(date +%Y%m)-${GIT_ABBREV}
       ;;
     *)
-      LIBREELEC_VERSION=devel-$(date +%Y%m%d%H%M%S)-${GIT_ABBREV}
+      DISTRO_VERSION=devel-$(date +%Y%m%d%H%M%S)-${GIT_ABBREV}
       ;;
   esac
 fi
@@ -101,17 +101,17 @@ else
 fi
 
 if [ -n "${CUSTOM_VERSION}" ]; then
-  LIBREELEC_VERSION="${CUSTOM_VERSION}"
+  DISTRO_VERSION="${CUSTOM_VERSION}"
 fi
 
 LIBREELEC_ARCH="${DEVICE:-${PROJECT}}.${TARGET_ARCH}"
-TARGET_VERSION="${LIBREELEC_ARCH}-${LIBREELEC_VERSION}"
+TARGET_VERSION="${LIBREELEC_ARCH}-${DISTRO_VERSION}"
 
 if [ -n "${CUSTOM_IMAGE_NAME}" ]; then
   IMAGE_NAME="${CUSTOM_IMAGE_NAME}"
 else
   if [ "${DEVEL_VERSION}" = "devel" ]; then
-    IMAGE_NAME="${DISTRONAME}-${LIBREELEC_ARCH}-${OS_VERSION}-${LIBREELEC_VERSION}"
+    IMAGE_NAME="${DISTRONAME}-${LIBREELEC_ARCH}-${OS_VERSION}-${DISTRO_VERSION}"
   else
     IMAGE_NAME="${DISTRONAME}-${TARGET_VERSION}"
   fi
@@ -166,10 +166,10 @@ echo "${TARGET_VERSION}" >${INSTALL}/etc/release
 # Create /etc/os-release
 cat <<EOF >${INSTALL}/etc/os-release
 NAME="${DISTRONAME}"
-VERSION="${LIBREELEC_VERSION}"
+VERSION="${DISTRO_VERSION}"
 ID="${DISTRONAME,,}"
 VERSION_ID="${OS_VERSION}"
-PRETTY_NAME="${DISTRONAME} (${LIBREELEC_BUILD}): ${LIBREELEC_VERSION}"
+PRETTY_NAME="${DISTRONAME} (${LIBREELEC_BUILD}): ${DISTRO_VERSION}"
 HOME_URL="https://libreelec.tv"
 BUG_REPORT_URL="${ORIGIN_URL}"
 BUILD_ID="${GIT_HASH}"
@@ -188,7 +188,7 @@ ${GREETING1}
 ${GREETING2}
 ${GREETING3}
 ${GREETING4}
-${DISTRONAME} (${LIBREELEC_BUILD}): ${LIBREELEC_VERSION} (${LIBREELEC_ARCH})
+${DISTRONAME} (${LIBREELEC_BUILD}): ${DISTRO_VERSION} (${LIBREELEC_ARCH})
 EOF
 
 ln -sf /etc/issue ${INSTALL}/etc/motd
@@ -406,7 +406,7 @@ if [ "${1}" = "release" -o "${1}" = "mkimage" -o "${1}" = "noobs" ]; then
 
     sed -e "s%@DISTRONAME@%${DISTRONAME}%g" \
       -e "s%@PROJECT@%${DEVICE:-${PROJECT}}%g" \
-      -e "s%@LIBREELEC_VERSION@%${LIBREELEC_VERSION}%g" \
+      -e "s%@DISTRO_VERSION@%${DISTRO_VERSION}%g" \
       -e "s%@RELEASE_DATE@%$(date +%F)%g" \
       -e "s%@KERNEL_VERSION@%$(kernel_version)%g" \
       -e "s%@DESCRIPTION@%${DESCRIPTION}%g" \
diff --git a/tools/distro-tool b/tools/distro-tool
index 00441bc0bd..4ed0a2addd 100755
--- a/tools/distro-tool
+++ b/tools/distro-tool
@@ -742,7 +742,7 @@ get_libreelec_branch() {
   git rev-parse --abbrev-ref HEAD
 }
 
-# 1: LibreELEC variable, eg. LIBREELEC_VERSION
+# 1: LibreELEC variable, eg. DISTRO_VERSION
 get_libreelec_option() {
   local variable="$1"
   cd $LIBREELEC_DIR
@@ -1047,17 +1047,17 @@ LIBREELEC_DIR="$(get_abs_path "${LIBREELEC_DIR}")"
 
 DISTRO_SOURCE="$(get_libreelec_option DISTRO_SRC)"
 DISTRO_MIRROR="$(get_libreelec_option DISTRO_MIRROR)"
-LIBREELEC_VER="$(get_libreelec_option LIBREELEC_VERSION)"
+DISTRO_VER="$(get_libreelec_option DISTRO_VERSION)"
 
 if [ ${IS_MIRROR} = no ]; then
-  TARGET_DIR="$(get_abs_path "${TARGET_DIR}/${LIBREELEC_VER}")"
+  TARGET_DIR="$(get_abs_path "${TARGET_DIR}/${DISTRO_VER}")"
 else
   TARGET_DIR="$(get_abs_path "${TARGET_DIR}/mirror")"
 fi
 check_exists TARGET_DIR || exit
 
 if [ ${IS_MIRROR} = no ]; then
-  DOWNLOAD_DIR="$(get_abs_path "${DOWNLOAD_DIR}/${LIBREELEC_VER}")"
+  DOWNLOAD_DIR="$(get_abs_path "${DOWNLOAD_DIR}/${DISTRO_VER}")"
 else
   DOWNLOAD_DIR="$(get_abs_path "${DOWNLOAD_DIR}/mirror")"
 fi
@@ -1070,9 +1070,9 @@ fi
 
 echo
 if [ ${IS_MIRROR} = yes ]; then
-  echo "Synchronising LibreELEC.tv (branch: $(get_libreelec_branch), version: ${LIBREELEC_VER}) with MIRROR server ${TARGET_DIR}"
+  echo "Synchronising LibreELEC.tv (branch: $(get_libreelec_branch), version: ${DISTRO_VER}) with MIRROR server ${TARGET_DIR}"
 else
-  echo "Synchronising LibreELEC.tv (branch: $(get_libreelec_branch), version: ${LIBREELEC_VER}) with SOURCE server ${TARGET_DIR}"
+  echo "Synchronising LibreELEC.tv (branch: $(get_libreelec_branch), version: ${DISTRO_VER}) with SOURCE server ${TARGET_DIR}"
 fi
 echo
 echo "Distro Source is: ${DISTRO_SOURCE}"