diff --git a/helpers/lh_binary b/helpers/binary
similarity index 100%
rename from helpers/lh_binary
rename to helpers/binary
diff --git a/helpers/lh_binary_chroot b/helpers/binary_chroot
similarity index 100%
rename from helpers/lh_binary_chroot
rename to helpers/binary_chroot
diff --git a/helpers/lh_binary_debian-installer b/helpers/binary_debian-installer
similarity index 100%
rename from helpers/lh_binary_debian-installer
rename to helpers/binary_debian-installer
diff --git a/helpers/lh_binary_disk b/helpers/binary_disk
similarity index 100%
rename from helpers/lh_binary_disk
rename to helpers/binary_disk
diff --git a/helpers/lh_binary_encryption b/helpers/binary_encryption
similarity index 100%
rename from helpers/lh_binary_encryption
rename to helpers/binary_encryption
diff --git a/helpers/lh_binary_grub b/helpers/binary_grub
similarity index 100%
rename from helpers/lh_binary_grub
rename to helpers/binary_grub
diff --git a/helpers/lh_binary_grub2 b/helpers/binary_grub2
similarity index 100%
rename from helpers/lh_binary_grub2
rename to helpers/binary_grub2
diff --git a/helpers/lh_binary_includes b/helpers/binary_includes
similarity index 100%
rename from helpers/lh_binary_includes
rename to helpers/binary_includes
diff --git a/helpers/lh_binary_iso b/helpers/binary_iso
similarity index 100%
rename from helpers/lh_binary_iso
rename to helpers/binary_iso
diff --git a/helpers/lh_binary_linux-image b/helpers/binary_linux-image
similarity index 100%
rename from helpers/lh_binary_linux-image
rename to helpers/binary_linux-image
diff --git a/helpers/lh_binary_local-hooks b/helpers/binary_local-hooks
similarity index 100%
rename from helpers/lh_binary_local-hooks
rename to helpers/binary_local-hooks
diff --git a/helpers/lh_binary_local-includes b/helpers/binary_local-includes
similarity index 100%
rename from helpers/lh_binary_local-includes
rename to helpers/binary_local-includes
diff --git a/helpers/lh_binary_local-packageslists b/helpers/binary_local-packageslists
similarity index 100%
rename from helpers/lh_binary_local-packageslists
rename to helpers/binary_local-packageslists
diff --git a/helpers/lh_binary_manifest b/helpers/binary_manifest
similarity index 100%
rename from helpers/lh_binary_manifest
rename to helpers/binary_manifest
diff --git a/helpers/lh_binary_md5sum b/helpers/binary_md5sum
similarity index 100%
rename from helpers/lh_binary_md5sum
rename to helpers/binary_md5sum
diff --git a/helpers/lh_binary_memtest b/helpers/binary_memtest
similarity index 100%
rename from helpers/lh_binary_memtest
rename to helpers/binary_memtest
diff --git a/helpers/lh_binary_net b/helpers/binary_net
similarity index 100%
rename from helpers/lh_binary_net
rename to helpers/binary_net
diff --git a/helpers/lh_binary_rootfs b/helpers/binary_rootfs
similarity index 100%
rename from helpers/lh_binary_rootfs
rename to helpers/binary_rootfs
diff --git a/helpers/lh_binary_silo b/helpers/binary_silo
similarity index 100%
rename from helpers/lh_binary_silo
rename to helpers/binary_silo
diff --git a/helpers/lh_binary_syslinux b/helpers/binary_syslinux
similarity index 100%
rename from helpers/lh_binary_syslinux
rename to helpers/binary_syslinux
diff --git a/helpers/lh_binary_tar b/helpers/binary_tar
similarity index 100%
rename from helpers/lh_binary_tar
rename to helpers/binary_tar
diff --git a/helpers/lh_binary_usb-hdd b/helpers/binary_usb-hdd
similarity index 100%
rename from helpers/lh_binary_usb-hdd
rename to helpers/binary_usb-hdd
diff --git a/helpers/lh_binary_virtual-hdd b/helpers/binary_virtual-hdd
similarity index 100%
rename from helpers/lh_binary_virtual-hdd
rename to helpers/binary_virtual-hdd
diff --git a/helpers/lh_binary_win32-loader b/helpers/binary_win32-loader
similarity index 100%
rename from helpers/lh_binary_win32-loader
rename to helpers/binary_win32-loader
diff --git a/helpers/lh_binary_yaboot b/helpers/binary_yaboot
similarity index 100%
rename from helpers/lh_binary_yaboot
rename to helpers/binary_yaboot
diff --git a/helpers/lh_bootstrap b/helpers/bootstrap
similarity index 100%
rename from helpers/lh_bootstrap
rename to helpers/bootstrap
diff --git a/helpers/lh_bootstrap_cache b/helpers/bootstrap_cache
similarity index 100%
rename from helpers/lh_bootstrap_cache
rename to helpers/bootstrap_cache
diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/bootstrap_cdebootstrap
similarity index 100%
rename from helpers/lh_bootstrap_cdebootstrap
rename to helpers/bootstrap_cdebootstrap
diff --git a/helpers/lh_bootstrap_copy b/helpers/bootstrap_copy
similarity index 100%
rename from helpers/lh_bootstrap_copy
rename to helpers/bootstrap_copy
diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/bootstrap_debootstrap
similarity index 100%
rename from helpers/lh_bootstrap_debootstrap
rename to helpers/bootstrap_debootstrap
diff --git a/helpers/lh_build b/helpers/build
similarity index 100%
rename from helpers/lh_build
rename to helpers/build
diff --git a/helpers/lh_chroot b/helpers/chroot
similarity index 100%
rename from helpers/lh_chroot
rename to helpers/chroot
diff --git a/helpers/lh_chroot_apt b/helpers/chroot_apt
similarity index 100%
rename from helpers/lh_chroot_apt
rename to helpers/chroot_apt
diff --git a/helpers/lh_chroot_cache b/helpers/chroot_cache
similarity index 100%
rename from helpers/lh_chroot_cache
rename to helpers/chroot_cache
diff --git a/helpers/lh_chroot_debianchroot b/helpers/chroot_debianchroot
similarity index 100%
rename from helpers/lh_chroot_debianchroot
rename to helpers/chroot_debianchroot
diff --git a/helpers/lh_chroot_devpts b/helpers/chroot_devpts
similarity index 100%
rename from helpers/lh_chroot_devpts
rename to helpers/chroot_devpts
diff --git a/helpers/lh_chroot_dpkg b/helpers/chroot_dpkg
similarity index 100%
rename from helpers/lh_chroot_dpkg
rename to helpers/chroot_dpkg
diff --git a/helpers/lh_chroot_hacks b/helpers/chroot_hacks
similarity index 100%
rename from helpers/lh_chroot_hacks
rename to helpers/chroot_hacks
diff --git a/helpers/lh_chroot_hooks b/helpers/chroot_hooks
similarity index 100%
rename from helpers/lh_chroot_hooks
rename to helpers/chroot_hooks
diff --git a/helpers/lh_chroot_hostname b/helpers/chroot_hostname
similarity index 100%
rename from helpers/lh_chroot_hostname
rename to helpers/chroot_hostname
diff --git a/helpers/lh_chroot_hosts b/helpers/chroot_hosts
similarity index 100%
rename from helpers/lh_chroot_hosts
rename to helpers/chroot_hosts
diff --git a/helpers/lh_chroot_install-packages b/helpers/chroot_install-packages
similarity index 100%
rename from helpers/lh_chroot_install-packages
rename to helpers/chroot_install-packages
diff --git a/helpers/lh_chroot_interactive b/helpers/chroot_interactive
similarity index 100%
rename from helpers/lh_chroot_interactive
rename to helpers/chroot_interactive
diff --git a/helpers/lh_chroot_linux-image b/helpers/chroot_linux-image
similarity index 100%
rename from helpers/lh_chroot_linux-image
rename to helpers/chroot_linux-image
diff --git a/helpers/lh_chroot_local-hooks b/helpers/chroot_local-hooks
similarity index 100%
rename from helpers/lh_chroot_local-hooks
rename to helpers/chroot_local-hooks
diff --git a/helpers/lh_chroot_local-includes b/helpers/chroot_local-includes
similarity index 100%
rename from helpers/lh_chroot_local-includes
rename to helpers/chroot_local-includes
diff --git a/helpers/lh_chroot_local-packages b/helpers/chroot_local-packages
similarity index 100%
rename from helpers/lh_chroot_local-packages
rename to helpers/chroot_local-packages
diff --git a/helpers/lh_chroot_local-packageslists b/helpers/chroot_local-packageslists
similarity index 100%
rename from helpers/lh_chroot_local-packageslists
rename to helpers/chroot_local-packageslists
diff --git a/helpers/lh_chroot_local-patches b/helpers/chroot_local-patches
similarity index 100%
rename from helpers/lh_chroot_local-patches
rename to helpers/chroot_local-patches
diff --git a/helpers/lh_chroot_local-preseed b/helpers/chroot_local-preseed
similarity index 100%
rename from helpers/lh_chroot_local-preseed
rename to helpers/chroot_local-preseed
diff --git a/helpers/lh_chroot_localization b/helpers/chroot_localization
similarity index 100%
rename from helpers/lh_chroot_localization
rename to helpers/chroot_localization
diff --git a/helpers/lh_chroot_packages b/helpers/chroot_packages
similarity index 100%
rename from helpers/lh_chroot_packages
rename to helpers/chroot_packages
diff --git a/helpers/lh_chroot_packageslists b/helpers/chroot_packageslists
similarity index 100%
rename from helpers/lh_chroot_packageslists
rename to helpers/chroot_packageslists
diff --git a/helpers/lh_chroot_preseed b/helpers/chroot_preseed
similarity index 100%
rename from helpers/lh_chroot_preseed
rename to helpers/chroot_preseed
diff --git a/helpers/lh_chroot_proc b/helpers/chroot_proc
similarity index 100%
rename from helpers/lh_chroot_proc
rename to helpers/chroot_proc
diff --git a/helpers/lh_chroot_resolv b/helpers/chroot_resolv
similarity index 100%
rename from helpers/lh_chroot_resolv
rename to helpers/chroot_resolv
diff --git a/helpers/lh_chroot_selinuxfs b/helpers/chroot_selinuxfs
similarity index 100%
rename from helpers/lh_chroot_selinuxfs
rename to helpers/chroot_selinuxfs
diff --git a/helpers/lh_chroot_sources b/helpers/chroot_sources
similarity index 100%
rename from helpers/lh_chroot_sources
rename to helpers/chroot_sources
diff --git a/helpers/lh_chroot_symlinks b/helpers/chroot_symlinks
similarity index 100%
rename from helpers/lh_chroot_symlinks
rename to helpers/chroot_symlinks
diff --git a/helpers/lh_chroot_sysfs b/helpers/chroot_sysfs
similarity index 100%
rename from helpers/lh_chroot_sysfs
rename to helpers/chroot_sysfs
diff --git a/helpers/lh_chroot_sysv-rc b/helpers/chroot_sysv-rc
similarity index 100%
rename from helpers/lh_chroot_sysv-rc
rename to helpers/chroot_sysv-rc
diff --git a/helpers/lh_chroot_sysvinit b/helpers/chroot_sysvinit
similarity index 100%
rename from helpers/lh_chroot_sysvinit
rename to helpers/chroot_sysvinit
diff --git a/helpers/lh_chroot_tasks b/helpers/chroot_tasks
similarity index 100%
rename from helpers/lh_chroot_tasks
rename to helpers/chroot_tasks
diff --git a/helpers/lh_clean b/helpers/clean
similarity index 100%
rename from helpers/lh_clean
rename to helpers/clean
diff --git a/helpers/lh_config b/helpers/config
similarity index 100%
rename from helpers/lh_config
rename to helpers/config
diff --git a/helpers/lh b/helpers/lh
index c22f554d6..8ab9de2df 100755
--- a/helpers/lh
+++ b/helpers/lh
@@ -34,15 +34,15 @@ case "${1}" in
 		COMMAND="${1}"
 		shift
 
-		if [ -x "${LH_BASE}/helpers/lh_${COMMAND}" ]
+		if [ -x "${LH_BASE}/helpers/${COMMAND}" ]
 		then
-			LH=1 exec "${LH_BASE}/helpers/lh_${COMMAND}" "${@}"
-		elif [ -x /usr/share/live-helper/helpers/lh_${COMMAND} ]
+			LH=1 exec "${LH_BASE}/helpers/${COMMAND}" "${@}"
+		elif [ -x /usr/share/live-helper/helpers/${COMMAND} ]
 		then
-			LH=1 exec /usr/share/live-helper/helpers/lh_"${COMMAND}" "${@}"
-		elif [ -x "$(which lh_${COMMAND} 2>/dev/null)" ]
+			LH=1 exec /usr/share/live-helper/helpers/"${COMMAND}" "${@}"
+		elif [ -x "$(which ${COMMAND} 2>/dev/null)" ]
 		then
-			LH=1 exec lh_"${COMMAND}" "${@}"
+			LH=1 exec "${COMMAND}" "${@}"
 		else
 			Echo_error "no such helper"
 			exit 1
diff --git a/helpers/lh_local b/helpers/local
similarity index 100%
rename from helpers/lh_local
rename to helpers/local
diff --git a/helpers/lh_source b/helpers/source
similarity index 100%
rename from helpers/lh_source
rename to helpers/source
diff --git a/helpers/lh_source_debian b/helpers/source_debian
similarity index 100%
rename from helpers/lh_source_debian
rename to helpers/source_debian
diff --git a/helpers/lh_source_debian-live b/helpers/source_debian-live
similarity index 100%
rename from helpers/lh_source_debian-live
rename to helpers/source_debian-live
diff --git a/helpers/lh_source_disk b/helpers/source_disk
similarity index 100%
rename from helpers/lh_source_disk
rename to helpers/source_disk
diff --git a/helpers/lh_source_iso b/helpers/source_iso
similarity index 100%
rename from helpers/lh_source_iso
rename to helpers/source_iso
diff --git a/helpers/lh_source_md5sum b/helpers/source_md5sum
similarity index 100%
rename from helpers/lh_source_md5sum
rename to helpers/source_md5sum
diff --git a/helpers/lh_source_net b/helpers/source_net
similarity index 100%
rename from helpers/lh_source_net
rename to helpers/source_net
diff --git a/helpers/lh_source_tar b/helpers/source_tar
similarity index 100%
rename from helpers/lh_source_tar
rename to helpers/source_tar
diff --git a/helpers/lh_source_usb-hdd b/helpers/source_usb-hdd
similarity index 100%
rename from helpers/lh_source_usb-hdd
rename to helpers/source_usb-hdd
diff --git a/helpers/lh_source_virtual-hdd b/helpers/source_virtual-hdd
similarity index 100%
rename from helpers/lh_source_virtual-hdd
rename to helpers/source_virtual-hdd
diff --git a/helpers/lh_testroot b/helpers/testroot
similarity index 100%
rename from helpers/lh_testroot
rename to helpers/testroot