Adding debian version 2.0~a1-1.

77 files changed, 103 insertions, 100 deletions

diff --git a/helpers/lh b/helpers/lh
index bb4d76b1f..ecf9b4ad5 100755
--- a/helpers/lh
+++ b/helpers/lh
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'utility to build Debian Live systems')"
@@ -34,7 +34,10 @@ case "${1}" in
 		COMMAND="${1}"
 		shift
 
-		if [ -x "$(which lh_${COMMAND} 2>/dev/null)" ]
+		if [ -x /usr/share/live-helper/helpers/lh_${COMMAND} ]
+		then
+			LH=1 exec /usr/share/live-helper/helpers/lh_"${COMMAND}" "${@}"
+		elif [ -x "$(which lh_${COMMAND} 2>/dev/null)" ]
 		then
 			LH=1 exec lh_"${COMMAND}" "${@}"
 		else
diff --git a/helpers/lh_binary b/helpers/lh_binary
index 271bfd784..f5508c5b9 100755
--- a/helpers/lh_binary
+++ b/helpers/lh_binary
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build binary images')"
diff --git a/helpers/lh_binary_chroot b/helpers/lh_binary_chroot
index cef600edf..619482694 100755
--- a/helpers/lh_binary_chroot
+++ b/helpers/lh_binary_chroot
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'copy chroot into chroot')"
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 32d0ce040..daa927f33 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'install debian-installer into binary')"
diff --git a/helpers/lh_binary_disk b/helpers/lh_binary_disk
index 2d209fb4b..8905e6dc7 100755
--- a/helpers/lh_binary_disk
+++ b/helpers/lh_binary_disk
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'install disk information into binary')"
diff --git a/helpers/lh_binary_encryption b/helpers/lh_binary_encryption
index d64af3743..711f3daa5 100755
--- a/helpers/lh_binary_encryption
+++ b/helpers/lh_binary_encryption
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'encrypts rootfs')"
diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub
index d0e3221d9..0d23ebb8d 100755
--- a/helpers/lh_binary_grub
+++ b/helpers/lh_binary_grub
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'installs grub into binary')"
diff --git a/helpers/lh_binary_grub2 b/helpers/lh_binary_grub2
index 7be3bf53f..2946214d5 100755
--- a/helpers/lh_binary_grub2
+++ b/helpers/lh_binary_grub2
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'installs grub2 into binary')"
diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index 57d33cd99..7c8ed6658 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'copy files into binary')"
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index a4dc2ac16..edf21a0df 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build iso binary image')"
diff --git a/helpers/lh_binary_linux-image b/helpers/lh_binary_linux-image
index 0b1c5420b..e3bcb380d 100755
--- a/helpers/lh_binary_linux-image
+++ b/helpers/lh_binary_linux-image
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'install linux-image into binary')"
diff --git a/helpers/lh_binary_local-hooks b/helpers/lh_binary_local-hooks
index fbc99e5ab..704879b7c 100755
--- a/helpers/lh_binary_local-hooks
+++ b/helpers/lh_binary_local-hooks
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'execute local hooks in binary')"
diff --git a/helpers/lh_binary_local-includes b/helpers/lh_binary_local-includes
index 95e0a1be2..63986aeca 100755
--- a/helpers/lh_binary_local-includes
+++ b/helpers/lh_binary_local-includes
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'copy files into binary')"
diff --git a/helpers/lh_binary_local-packageslists b/helpers/lh_binary_local-packageslists
index 60006d799..43d8005ba 100755
--- a/helpers/lh_binary_local-packageslists
+++ b/helpers/lh_binary_local-packageslists
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'install local packages into binary')"
diff --git a/helpers/lh_binary_manifest b/helpers/lh_binary_manifest
index 981699af8..4c40115a7 100755
--- a/helpers/lh_binary_manifest
+++ b/helpers/lh_binary_manifest
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'create manifest')"
diff --git a/helpers/lh_binary_md5sum b/helpers/lh_binary_md5sum
index 1ca7a1e4f..6cc88dfa5 100755
--- a/helpers/lh_binary_md5sum
+++ b/helpers/lh_binary_md5sum
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'create binary md5sums')"
diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest
index edd9225bf..cfe455c2d 100755
--- a/helpers/lh_binary_memtest
+++ b/helpers/lh_binary_memtest
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'installs a memtest into binary')"
diff --git a/helpers/lh_binary_net b/helpers/lh_binary_net
index 15f6388ca..05ecce71e 100755
--- a/helpers/lh_binary_net
+++ b/helpers/lh_binary_net
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build netboot binary image')"
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index f254d84d5..aab7e5a57 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build rootfs image')"
diff --git a/helpers/lh_binary_silo b/helpers/lh_binary_silo
index 18a6b8793..e3734c933 100755
--- a/helpers/lh_binary_silo
+++ b/helpers/lh_binary_silo
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'installs silo into binary')"
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 67ba35bc4..75d6cd51f 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'installs syslinux into binary')"
diff --git a/helpers/lh_binary_tar b/helpers/lh_binary_tar
index 7c769d594..019b42f44 100755
--- a/helpers/lh_binary_tar
+++ b/helpers/lh_binary_tar
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build harddisk binary image')"
diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd
index 8be8aed5f..997c24b0d 100755
--- a/helpers/lh_binary_usb-hdd
+++ b/helpers/lh_binary_usb-hdd
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build binary image')"
diff --git a/helpers/lh_binary_virtual-hdd b/helpers/lh_binary_virtual-hdd
index b5d78761f..83dec0c9c 100755
--- a/helpers/lh_binary_virtual-hdd
+++ b/helpers/lh_binary_virtual-hdd
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build binary image')"
diff --git a/helpers/lh_binary_win32-loader b/helpers/lh_binary_win32-loader
index b25a2686a..d5a97e1ee 100755
--- a/helpers/lh_binary_win32-loader
+++ b/helpers/lh_binary_win32-loader
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'copy win32-loader into binary')"
diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot
index a80833cba..6f528c190 100755
--- a/helpers/lh_binary_yaboot
+++ b/helpers/lh_binary_yaboot
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'installs yaboot into binary')"
diff --git a/helpers/lh_bootstrap b/helpers/lh_bootstrap
index 696fdf93f..823c4654a 100755
--- a/helpers/lh_bootstrap
+++ b/helpers/lh_bootstrap
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'bootstrap a Debian system')"
diff --git a/helpers/lh_bootstrap_cache b/helpers/lh_bootstrap_cache
index 5a3489018..a0254283f 100755
--- a/helpers/lh_bootstrap_cache
+++ b/helpers/lh_bootstrap_cache
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'cache bootstrap stage')"
diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap
index 0ac72a74f..2694aba60 100755
--- a/helpers/lh_bootstrap_cdebootstrap
+++ b/helpers/lh_bootstrap_cdebootstrap
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'bootstrap a Debian system with cdebootstrap(1)')"
diff --git a/helpers/lh_bootstrap_copy b/helpers/lh_bootstrap_copy
index b70fcea03..456c89dce 100755
--- a/helpers/lh_bootstrap_copy
+++ b/helpers/lh_bootstrap_copy
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'bootstrap by copying the host system')"
diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap
index d9fcdd0ca..b347a6b92 100755
--- a/helpers/lh_bootstrap_debootstrap
+++ b/helpers/lh_bootstrap_debootstrap
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'bootstrap a Debian system with debootstrap(8)')"
@@ -57,10 +57,10 @@ then
 	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch ${LH_ARCHITECTURE}"
 fi
 
-if [ "${LH_CATEGORIES}" != "main" ]
+if [ "${LH_ARCHIVE_AREAS}" != "main" ]
 then
-	# Modify categories to remove leading/trailing whitespaces and replace other whitepspace with commas
-	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components $(echo ${LH_ARCHIVE_AREAS} | sed -e 's| |,|g')"
+	# Modify archive areas to remove leading/trailing whitespaces and replace other whitepspace with commas
+	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components $(echo ${LH_ARCHIVE_AREAS} | sed -E -e 's/^[ \t]*//;s/[ \t]*$//' -e 's/[ \t]+/,/g')"
 fi
 
 if [ -n "${LH_BOOTSTRAP_CONFIG}" ]
diff --git a/helpers/lh_build b/helpers/lh_build
index 43a33de37..7d5abf0f7 100755
--- a/helpers/lh_build
+++ b/helpers/lh_build
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Read meta config
 if [ "${1}" != "noautoconfig" ] && [ -x scripts/build ]
diff --git a/helpers/lh_chroot b/helpers/lh_chroot
index 6cb705e64..df14a0fa6 100755
--- a/helpers/lh_chroot
+++ b/helpers/lh_chroot
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'customize the Debian system')"
diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt
index 1c35849fd..4396aebaa 100755
--- a/helpers/lh_chroot_apt
+++ b/helpers/lh_chroot_apt
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'manage /etc/apt/apt.conf')"
diff --git a/helpers/lh_chroot_cache b/helpers/lh_chroot_cache
index 6a21fcbb4..dacf8c023 100755
--- a/helpers/lh_chroot_cache
+++ b/helpers/lh_chroot_cache
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'cache chroot stage')"
diff --git a/helpers/lh_chroot_debianchroot b/helpers/lh_chroot_debianchroot
index e0f79836c..6916d2dad 100755
--- a/helpers/lh_chroot_debianchroot
+++ b/helpers/lh_chroot_debianchroot
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'manage /etc/debian_chroot')"
diff --git a/helpers/lh_chroot_devpts b/helpers/lh_chroot_devpts
index 762469133..d652fe515 100755
--- a/helpers/lh_chroot_devpts
+++ b/helpers/lh_chroot_devpts
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'mount /dev/pts')"
diff --git a/helpers/lh_chroot_dpkg b/helpers/lh_chroot_dpkg
index f18526c87..7fd6e67ab 100755
--- a/helpers/lh_chroot_dpkg
+++ b/helpers/lh_chroot_dpkg
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'manage /sbin/dpkg')"
diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks
index cc12630fd..5aa45a638 100755
--- a/helpers/lh_chroot_hacks
+++ b/helpers/lh_chroot_hacks
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'execute hacks in chroot')"
diff --git a/helpers/lh_chroot_hooks b/helpers/lh_chroot_hooks
index 4821d4645..04fe4876a 100755
--- a/helpers/lh_chroot_hooks
+++ b/helpers/lh_chroot_hooks
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'execute hooks in chroot')"
diff --git a/helpers/lh_chroot_hostname b/helpers/lh_chroot_hostname
index 17b5499db..9cafcf635 100755
--- a/helpers/lh_chroot_hostname
+++ b/helpers/lh_chroot_hostname
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'manage /bin/hostname')"
diff --git a/helpers/lh_chroot_hosts b/helpers/lh_chroot_hosts
index 827a4ef00..2b7fc2555 100755
--- a/helpers/lh_chroot_hosts
+++ b/helpers/lh_chroot_hosts
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'manage /etc/hosts')"
diff --git a/helpers/lh_chroot_install-packages b/helpers/lh_chroot_install-packages
index 01fc633a7..b200e0a03 100755
--- a/helpers/lh_chroot_install-packages
+++ b/helpers/lh_chroot_install-packages
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'install queued packages into chroot')"
diff --git a/helpers/lh_chroot_interactive b/helpers/lh_chroot_interactive
index b39be3771..242cb669b 100755
--- a/helpers/lh_chroot_interactive
+++ b/helpers/lh_chroot_interactive
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'make build interactive')"
diff --git a/helpers/lh_chroot_linux-image b/helpers/lh_chroot_linux-image
index cc2c8e8a0..76515ef23 100755
--- a/helpers/lh_chroot_linux-image
+++ b/helpers/lh_chroot_linux-image
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'manage /etc/kernel-img.conf')"
diff --git a/helpers/lh_chroot_local-hooks b/helpers/lh_chroot_local-hooks
index 878becb39..5c076b0c9 100755
--- a/helpers/lh_chroot_local-hooks
+++ b/helpers/lh_chroot_local-hooks
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'execute local hooks in chroot')"
diff --git a/helpers/lh_chroot_local-includes b/helpers/lh_chroot_local-includes
index 5394d4b28..399175010 100755
--- a/helpers/lh_chroot_local-includes
+++ b/helpers/lh_chroot_local-includes
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'copy local files into chroot')"
diff --git a/helpers/lh_chroot_local-packages b/helpers/lh_chroot_local-packages
index f4e518237..f2cdfb07d 100755
--- a/helpers/lh_chroot_local-packages
+++ b/helpers/lh_chroot_local-packages
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'queue install of local packages into chroot')"
diff --git a/helpers/lh_chroot_local-patches b/helpers/lh_chroot_local-patches
index 42f8b449b..303ffd156 100755
--- a/helpers/lh_chroot_local-patches
+++ b/helpers/lh_chroot_local-patches
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'apply local patches against chroot')"
diff --git a/helpers/lh_chroot_local-preseed b/helpers/lh_chroot_local-preseed
index 08dfab0e4..2256babe5 100755
--- a/helpers/lh_chroot_local-preseed
+++ b/helpers/lh_chroot_local-preseed
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'execute local preseed in chroot')"
diff --git a/helpers/lh_chroot_localization b/helpers/lh_chroot_localization
index 3135f22de..12104e78f 100755
--- a/helpers/lh_chroot_localization
+++ b/helpers/lh_chroot_localization
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'install localization packages into chroot')"
diff --git a/helpers/lh_chroot_packages b/helpers/lh_chroot_packages
index 9f9ba8563..61a2fa645 100755
--- a/helpers/lh_chroot_packages
+++ b/helpers/lh_chroot_packages
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'queue install of packages into chroot')"
diff --git a/helpers/lh_chroot_packageslists b/helpers/lh_chroot_packageslists
index c437e0eba..464369daa 100755
--- a/helpers/lh_chroot_packageslists
+++ b/helpers/lh_chroot_packageslists
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'queue install of packages lists into chroot')"
diff --git a/helpers/lh_chroot_preseed b/helpers/lh_chroot_preseed
index 75d93b733..6058e733a 100755
--- a/helpers/lh_chroot_preseed
+++ b/helpers/lh_chroot_preseed
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'execute preseed in chroot')"
diff --git a/helpers/lh_chroot_proc b/helpers/lh_chroot_proc
index 757b9c78c..7878bf5e5 100755
--- a/helpers/lh_chroot_proc
+++ b/helpers/lh_chroot_proc
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'mount /proc')"
diff --git a/helpers/lh_chroot_resolv b/helpers/lh_chroot_resolv
index 3a2635e17..0b24a2398 100755
--- a/helpers/lh_chroot_resolv
+++ b/helpers/lh_chroot_resolv
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'manage /etc/resolv.conf')"
diff --git a/helpers/lh_chroot_selinuxfs b/helpers/lh_chroot_selinuxfs
index c30d7cd95..1a81c571e 100755
--- a/helpers/lh_chroot_selinuxfs
+++ b/helpers/lh_chroot_selinuxfs
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'mount /selinux')"
diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources
index 0da87015c..31c612478 100755
--- a/helpers/lh_chroot_sources
+++ b/helpers/lh_chroot_sources
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'manage /etc/apt/sources.list')"
@@ -42,33 +42,33 @@ case "${1}" in
 		Create_lockfile .lock
 
 		# Configure custom sources.list
-		echo "deb ${LH_MIRROR_CHROOT} ${LH_DISTRIBUTION} ${LH_CATEGORIES}" > chroot/etc/apt/sources.list
+		echo "deb ${LH_MIRROR_CHROOT} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" > chroot/etc/apt/sources.list
 
 		if [ "${LH_SOURCE}" = "enabled" ]
 		then
-			echo "deb-src ${LH_MIRROR_CHROOT} ${LH_DISTRIBUTION} ${LH_CATEGORIES}" >> chroot/etc/apt/sources.list
+			echo "deb-src ${LH_MIRROR_CHROOT} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 		fi
 
 		if [ "${LH_SECURITY}" = "enabled" ]
 		then
 			case "${LH_MODE}" in
 				ubuntu)
-					echo "deb ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}-security ${LH_CATEGORIES}" >> chroot/etc/apt/sources.list
+					echo "deb ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 
 					if [ "${LH_SOURCE}" = "enabled" ]
 					then
-						echo "deb-src ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}-security ${LH_CATEGORIES}" >> chroot/etc/apt/sources.list
+						echo "deb-src ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 					fi
 					;;
 
 				*)
 					if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
 					then
-						echo "deb ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_CATEGORIES}" >> chroot/etc/apt/sources.list
+						echo "deb ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 
 						if [ "${LH_SOURCE}" = "enabled" ]
 						then
-							echo "deb-src ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_CATEGORIES}" >> chroot/etc/apt/sources.list
+							echo "deb-src ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 						fi
 					fi
 					;;
@@ -365,33 +365,33 @@ case "${1}" in
 			rm -rf chroot/var/lib/apt/lists
 			mkdir -p chroot/var/lib/apt/lists/partial
 
-			echo "deb ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_CATEGORIES}" > chroot/etc/apt/sources.list
+			echo "deb ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" > chroot/etc/apt/sources.list
 
 			if [ "${LH_SOURCE}" = "enabled" ]
 			then
-				echo "deb-src ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_CATEGORIES}" >> chroot/etc/apt/sources.list
+				echo "deb-src ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 			fi
 
 			if [ "${LH_SECURITY}" = "enabled" ]
 			then
 				case "${LH_MODE}" in
 					ubuntu)
-						echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_CATEGORIES}" >> chroot/etc/apt/sources.list
+						echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 
 						if [ "${LH_SOURCE}" = "enabled" ]
 						then
-							echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_CATEGORIES}" >> chroot/etc/apt/sources.list
+							echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 						fi
 						;;
 
 					*)
 						if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
 						then
-							echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_CATEGORIES}" >> chroot/etc/apt/sources.list
+							echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 
 							if [ "${LH_SOURCE}" = "enabled" ]
 							then
-								echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_CATEGORIES}" >> chroot/etc/apt/sources.list
+								echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 							fi
 						fi
 						;;
diff --git a/helpers/lh_chroot_symlinks b/helpers/lh_chroot_symlinks
index 69cbd20eb..abdbbf761 100755
--- a/helpers/lh_chroot_symlinks
+++ b/helpers/lh_chroot_symlinks
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'convert symlinks')"
diff --git a/helpers/lh_chroot_sysfs b/helpers/lh_chroot_sysfs
index 9906ad29f..d68f3e67f 100755
--- a/helpers/lh_chroot_sysfs
+++ b/helpers/lh_chroot_sysfs
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'mount /sys')"
diff --git a/helpers/lh_chroot_sysv-rc b/helpers/lh_chroot_sysv-rc
index 54aed0c4b..74a9702f7 100755
--- a/helpers/lh_chroot_sysv-rc
+++ b/helpers/lh_chroot_sysv-rc
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'manage /usr/sbin/policy-rc.d')"
diff --git a/helpers/lh_chroot_sysvinit b/helpers/lh_chroot_sysvinit
index d9caa0424..0bd0db28f 100755
--- a/helpers/lh_chroot_sysvinit
+++ b/helpers/lh_chroot_sysvinit
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'configure sysvinit')"
diff --git a/helpers/lh_chroot_tasks b/helpers/lh_chroot_tasks
index 0a7dddd42..ff8e60ae1 100755
--- a/helpers/lh_chroot_tasks
+++ b/helpers/lh_chroot_tasks
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'install tasks into chroot')"
diff --git a/helpers/lh_clean b/helpers/lh_clean
index 823b660ee..29bddbdc4 100755
--- a/helpers/lh_clean
+++ b/helpers/lh_clean
@@ -21,7 +21,7 @@ then
 fi
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'clean up system build directories')"
diff --git a/helpers/lh_config b/helpers/lh_config
index d74b21d34..58729d2f6 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -21,7 +21,7 @@ then
 fi
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 SYSTEM_LH_CONFFILE="/etc/default/live-helper"
@@ -109,7 +109,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [--quiet]\n\
 \t    [--root-command sudo]\n\
 \t    [--use-fakeroot enabled|disabled]\n\
-\t    [--categories CATEGORY|\"CATEGORIES\"]\n\
+\t    [--archive-areas ARCHIVE_AREA|\"ARCHIVE_AREAS\"]\n\
 \t    [--security enabled|disabled]\n\
 \t    [--source enabled|disabled]\n\
 \t    [-s|--source-images iso|net|tar|usb-hdd]\n\
@@ -136,7 +136,7 @@ Local_arguments ()
 		initramfs:,fdisk:,losetup:,mode:,root-command:,use-fakeroot:,tasksel:,includes:,
 		templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,clean,
 		distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-binary:,
-		mirror-binary-security:,categories:,chroot-filesystem:,union-filesystem:,exposed-root:,virtual-root-size:,
+		mirror-binary-security:,archive-areas:,chroot-filesystem:,union-filesystem:,exposed-root:,virtual-root-size:,
 		gzip-options:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,
 		packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,binary-filesystem:,binary-images:,
 		binary-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,chroot-build:,
@@ -409,8 +409,8 @@ Local_arguments ()
 				shift 2
 				;;
 
-			--categories)
-				LH_CATEGORIES="${2}"
+			--archive-areas)
+				LH_ARCHIVE_AREAS="${2}"
 				shift 2
 				;;
 
@@ -977,9 +977,9 @@ LH_MIRROR_BINARY="${LH_MIRROR_BINARY}"
 # (Default: ${LH_MIRROR_BINARY_SECURITY})
 LH_MIRROR_BINARY_SECURITY="${LH_MIRROR_BINARY_SECURITY}"
 
-# \$LH_CATEGORIES: select categories to use
-# (Default: ${LH_CATEGORIES})
-LH_CATEGORIES="${LH_CATEGORIES}"
+# \$LH_ARCHIVE_AREAS: select archive areas to use
+# (Default: ${LH_ARCHIVE_AREAS})
+LH_ARCHIVE_AREAS="${LH_ARCHIVE_AREAS}"
 EOF
 
 # Creating lh_chroot_* configuration
diff --git a/helpers/lh_source b/helpers/lh_source
index 84429e175..8d11c443b 100755
--- a/helpers/lh_source
+++ b/helpers/lh_source
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build source images')"
diff --git a/helpers/lh_source_debian b/helpers/lh_source_debian
index 7b4434576..b3cd08b93 100755
--- a/helpers/lh_source_debian
+++ b/helpers/lh_source_debian
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'debian sources')"
diff --git a/helpers/lh_source_debian-live b/helpers/lh_source_debian-live
index 809794c00..ecd12fdb5 100755
--- a/helpers/lh_source_debian-live
+++ b/helpers/lh_source_debian-live
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'copy debian-live config into source')"
diff --git a/helpers/lh_source_disk b/helpers/lh_source_disk
index a69be6746..b52775ff7 100755
--- a/helpers/lh_source_disk
+++ b/helpers/lh_source_disk
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'install disk information into source')"
diff --git a/helpers/lh_source_iso b/helpers/lh_source_iso
index 4e1534131..b65fae02e 100755
--- a/helpers/lh_source_iso
+++ b/helpers/lh_source_iso
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build iso source image')"
diff --git a/helpers/lh_source_md5sum b/helpers/lh_source_md5sum
index 8d0a14997..8f3fcdcae 100755
--- a/helpers/lh_source_md5sum
+++ b/helpers/lh_source_md5sum
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'create source md5sums')"
diff --git a/helpers/lh_source_net b/helpers/lh_source_net
index eb32ed9ad..f10db2896 100755
--- a/helpers/lh_source_net
+++ b/helpers/lh_source_net
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build source net image')"
diff --git a/helpers/lh_source_tar b/helpers/lh_source_tar
index cbf3f839d..d8cb41ad4 100755
--- a/helpers/lh_source_tar
+++ b/helpers/lh_source_tar
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build source tarball')"
diff --git a/helpers/lh_source_usb-hdd b/helpers/lh_source_usb-hdd
index 3434fd56f..a8183db6b 100755
--- a/helpers/lh_source_usb-hdd
+++ b/helpers/lh_source_usb-hdd
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build source image')"
diff --git a/helpers/lh_source_virtual-hdd b/helpers/lh_source_virtual-hdd
index e02f0a0b5..59ee2b5e1 100755
--- a/helpers/lh_source_virtual-hdd
+++ b/helpers/lh_source_virtual-hdd
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build source image')"
diff --git a/helpers/lh_testroot b/helpers/lh_testroot
index fef9db81a..c4a427678 100755
--- a/helpers/lh_testroot
+++ b/helpers/lh_testroot
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'ensure that a system is built as root')"
diff --git a/helpers/live-helper b/helpers/live-helper
index e4ce2be19..e551498d7 100755
--- a/helpers/live-helper
+++ b/helpers/live-helper
@@ -22,7 +22,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 if [ -x "$(which man 2>/dev/null)" ]
 then