diff --git a/bin/lb b/bin/lb
index 1dd6a66cd..00868b50a 100755
--- a/bin/lb
+++ b/bin/lb
@@ -40,7 +40,7 @@ case "${1}" in
 		;;
 
 	*)
-		COMMAND="lb_${1}"
+		COMMAND="${1}"
 		shift
 
 		ENV=""
@@ -74,7 +74,7 @@ case "${1}" in
 			exit 1
 		fi
 
-		Echo "[%s] %s" "$(date +'%F %T')" "${COMMAND} $(echo ${@})"
+		Echo "[%s] %s" "$(date +'%F %T')" "lb ${COMMAND} $(echo ${@})"
 		${ENV} exec "${SCRIPT}" "${@}"
 		;;
 esac
diff --git a/scripts/build/lb_binary b/scripts/build/binary
similarity index 100%
rename from scripts/build/lb_binary
rename to scripts/build/binary
diff --git a/scripts/build/lb_binary_checksums b/scripts/build/binary_checksums
similarity index 100%
rename from scripts/build/lb_binary_checksums
rename to scripts/build/binary_checksums
diff --git a/scripts/build/lb_binary_chroot b/scripts/build/binary_chroot
similarity index 100%
rename from scripts/build/lb_binary_chroot
rename to scripts/build/binary_chroot
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/binary_debian-installer
similarity index 100%
rename from scripts/build/lb_binary_debian-installer
rename to scripts/build/binary_debian-installer
diff --git a/scripts/build/lb_binary_disk b/scripts/build/binary_disk
similarity index 100%
rename from scripts/build/lb_binary_disk
rename to scripts/build/binary_disk
diff --git a/scripts/build/lb_binary_grub b/scripts/build/binary_grub
similarity index 100%
rename from scripts/build/lb_binary_grub
rename to scripts/build/binary_grub
diff --git a/scripts/build/lb_binary_grub2 b/scripts/build/binary_grub2
similarity index 100%
rename from scripts/build/lb_binary_grub2
rename to scripts/build/binary_grub2
diff --git a/scripts/build/lb_binary_hdd b/scripts/build/binary_hdd
similarity index 100%
rename from scripts/build/lb_binary_hdd
rename to scripts/build/binary_hdd
diff --git a/scripts/build/lb_binary_hooks b/scripts/build/binary_hooks
similarity index 100%
rename from scripts/build/lb_binary_hooks
rename to scripts/build/binary_hooks
diff --git a/scripts/build/lb_binary_includes b/scripts/build/binary_includes
similarity index 100%
rename from scripts/build/lb_binary_includes
rename to scripts/build/binary_includes
diff --git a/scripts/build/lb_binary_iso b/scripts/build/binary_iso
similarity index 100%
rename from scripts/build/lb_binary_iso
rename to scripts/build/binary_iso
diff --git a/scripts/build/lb_binary_linux-image b/scripts/build/binary_linux-image
similarity index 100%
rename from scripts/build/lb_binary_linux-image
rename to scripts/build/binary_linux-image
diff --git a/scripts/build/lb_binary_manifest b/scripts/build/binary_manifest
similarity index 100%
rename from scripts/build/lb_binary_manifest
rename to scripts/build/binary_manifest
diff --git a/scripts/build/lb_binary_memtest b/scripts/build/binary_memtest
similarity index 100%
rename from scripts/build/lb_binary_memtest
rename to scripts/build/binary_memtest
diff --git a/scripts/build/lb_binary_netboot b/scripts/build/binary_netboot
similarity index 100%
rename from scripts/build/lb_binary_netboot
rename to scripts/build/binary_netboot
diff --git a/scripts/build/lb_binary_package-lists b/scripts/build/binary_package-lists
similarity index 100%
rename from scripts/build/lb_binary_package-lists
rename to scripts/build/binary_package-lists
diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/binary_rootfs
similarity index 100%
rename from scripts/build/lb_binary_rootfs
rename to scripts/build/binary_rootfs
diff --git a/scripts/build/lb_binary_silo b/scripts/build/binary_silo
similarity index 100%
rename from scripts/build/lb_binary_silo
rename to scripts/build/binary_silo
diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/binary_syslinux
similarity index 100%
rename from scripts/build/lb_binary_syslinux
rename to scripts/build/binary_syslinux
diff --git a/scripts/build/lb_binary_tar b/scripts/build/binary_tar
similarity index 100%
rename from scripts/build/lb_binary_tar
rename to scripts/build/binary_tar
diff --git a/scripts/build/lb_binary_virtual-hdd b/scripts/build/binary_virtual-hdd
similarity index 100%
rename from scripts/build/lb_binary_virtual-hdd
rename to scripts/build/binary_virtual-hdd
diff --git a/scripts/build/lb_binary_win32-loader b/scripts/build/binary_win32-loader
similarity index 100%
rename from scripts/build/lb_binary_win32-loader
rename to scripts/build/binary_win32-loader
diff --git a/scripts/build/lb_binary_yaboot b/scripts/build/binary_yaboot
similarity index 100%
rename from scripts/build/lb_binary_yaboot
rename to scripts/build/binary_yaboot
diff --git a/scripts/build/lb_binary_zsync b/scripts/build/binary_zsync
similarity index 100%
rename from scripts/build/lb_binary_zsync
rename to scripts/build/binary_zsync
diff --git a/scripts/build/lb_bootstrap b/scripts/build/bootstrap
similarity index 100%
rename from scripts/build/lb_bootstrap
rename to scripts/build/bootstrap
diff --git a/scripts/build/lb_bootstrap_cache b/scripts/build/bootstrap_cache
similarity index 100%
rename from scripts/build/lb_bootstrap_cache
rename to scripts/build/bootstrap_cache
diff --git a/scripts/build/lb_bootstrap_cdebootstrap b/scripts/build/bootstrap_cdebootstrap
similarity index 100%
rename from scripts/build/lb_bootstrap_cdebootstrap
rename to scripts/build/bootstrap_cdebootstrap
diff --git a/scripts/build/lb_bootstrap_copy b/scripts/build/bootstrap_copy
similarity index 100%
rename from scripts/build/lb_bootstrap_copy
rename to scripts/build/bootstrap_copy
diff --git a/scripts/build/lb_bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap
similarity index 100%
rename from scripts/build/lb_bootstrap_debootstrap
rename to scripts/build/bootstrap_debootstrap
diff --git a/scripts/build/lb_build b/scripts/build/build
similarity index 100%
rename from scripts/build/lb_build
rename to scripts/build/build
diff --git a/scripts/build/lb_chroot b/scripts/build/chroot
similarity index 100%
rename from scripts/build/lb_chroot
rename to scripts/build/chroot
diff --git a/scripts/build/lb_chroot_apt b/scripts/build/chroot_apt
similarity index 100%
rename from scripts/build/lb_chroot_apt
rename to scripts/build/chroot_apt
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/chroot_archives
similarity index 100%
rename from scripts/build/lb_chroot_archives
rename to scripts/build/chroot_archives
diff --git a/scripts/build/lb_chroot_cache b/scripts/build/chroot_cache
similarity index 100%
rename from scripts/build/lb_chroot_cache
rename to scripts/build/chroot_cache
diff --git a/scripts/build/lb_chroot_debianchroot b/scripts/build/chroot_debianchroot
similarity index 100%
rename from scripts/build/lb_chroot_debianchroot
rename to scripts/build/chroot_debianchroot
diff --git a/scripts/build/lb_chroot_devpts b/scripts/build/chroot_devpts
similarity index 100%
rename from scripts/build/lb_chroot_devpts
rename to scripts/build/chroot_devpts
diff --git a/scripts/build/lb_chroot_dpkg b/scripts/build/chroot_dpkg
similarity index 100%
rename from scripts/build/lb_chroot_dpkg
rename to scripts/build/chroot_dpkg
diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/chroot_hacks
similarity index 100%
rename from scripts/build/lb_chroot_hacks
rename to scripts/build/chroot_hacks
diff --git a/scripts/build/lb_chroot_hooks b/scripts/build/chroot_hooks
similarity index 100%
rename from scripts/build/lb_chroot_hooks
rename to scripts/build/chroot_hooks
diff --git a/scripts/build/lb_chroot_hostname b/scripts/build/chroot_hostname
similarity index 100%
rename from scripts/build/lb_chroot_hostname
rename to scripts/build/chroot_hostname
diff --git a/scripts/build/lb_chroot_hosts b/scripts/build/chroot_hosts
similarity index 100%
rename from scripts/build/lb_chroot_hosts
rename to scripts/build/chroot_hosts
diff --git a/scripts/build/lb_chroot_includes b/scripts/build/chroot_includes
similarity index 100%
rename from scripts/build/lb_chroot_includes
rename to scripts/build/chroot_includes
diff --git a/scripts/build/lb_chroot_install-packages b/scripts/build/chroot_install-packages
similarity index 100%
rename from scripts/build/lb_chroot_install-packages
rename to scripts/build/chroot_install-packages
diff --git a/scripts/build/lb_chroot_interactive b/scripts/build/chroot_interactive
similarity index 100%
rename from scripts/build/lb_chroot_interactive
rename to scripts/build/chroot_interactive
diff --git a/scripts/build/lb_chroot_linux-image b/scripts/build/chroot_linux-image
similarity index 100%
rename from scripts/build/lb_chroot_linux-image
rename to scripts/build/chroot_linux-image
diff --git a/scripts/build/lb_chroot_live-packages b/scripts/build/chroot_live-packages
similarity index 100%
rename from scripts/build/lb_chroot_live-packages
rename to scripts/build/chroot_live-packages
diff --git a/scripts/build/lb_chroot_package-lists b/scripts/build/chroot_package-lists
similarity index 100%
rename from scripts/build/lb_chroot_package-lists
rename to scripts/build/chroot_package-lists
diff --git a/scripts/build/lb_chroot_preseed b/scripts/build/chroot_preseed
similarity index 100%
rename from scripts/build/lb_chroot_preseed
rename to scripts/build/chroot_preseed
diff --git a/scripts/build/lb_chroot_proc b/scripts/build/chroot_proc
similarity index 100%
rename from scripts/build/lb_chroot_proc
rename to scripts/build/chroot_proc
diff --git a/scripts/build/lb_chroot_resolv b/scripts/build/chroot_resolv
similarity index 100%
rename from scripts/build/lb_chroot_resolv
rename to scripts/build/chroot_resolv
diff --git a/scripts/build/lb_chroot_selinuxfs b/scripts/build/chroot_selinuxfs
similarity index 100%
rename from scripts/build/lb_chroot_selinuxfs
rename to scripts/build/chroot_selinuxfs
diff --git a/scripts/build/lb_chroot_sysfs b/scripts/build/chroot_sysfs
similarity index 100%
rename from scripts/build/lb_chroot_sysfs
rename to scripts/build/chroot_sysfs
diff --git a/scripts/build/lb_chroot_sysv-rc b/scripts/build/chroot_sysv-rc
similarity index 100%
rename from scripts/build/lb_chroot_sysv-rc
rename to scripts/build/chroot_sysv-rc
diff --git a/scripts/build/lb_chroot_tmpfs b/scripts/build/chroot_tmpfs
similarity index 100%
rename from scripts/build/lb_chroot_tmpfs
rename to scripts/build/chroot_tmpfs
diff --git a/scripts/build/lb_chroot_upstart b/scripts/build/chroot_upstart
similarity index 100%
rename from scripts/build/lb_chroot_upstart
rename to scripts/build/chroot_upstart
diff --git a/scripts/build/lb_clean b/scripts/build/clean
similarity index 100%
rename from scripts/build/lb_clean
rename to scripts/build/clean
diff --git a/scripts/build/lb_config b/scripts/build/config
similarity index 100%
rename from scripts/build/lb_config
rename to scripts/build/config
diff --git a/scripts/build/lb_source b/scripts/build/source
similarity index 100%
rename from scripts/build/lb_source
rename to scripts/build/source
diff --git a/scripts/build/lb_source_checksums b/scripts/build/source_checksums
similarity index 100%
rename from scripts/build/lb_source_checksums
rename to scripts/build/source_checksums
diff --git a/scripts/build/lb_source_debian b/scripts/build/source_debian
similarity index 100%
rename from scripts/build/lb_source_debian
rename to scripts/build/source_debian
diff --git a/scripts/build/lb_source_debian-live b/scripts/build/source_debian-live
similarity index 100%
rename from scripts/build/lb_source_debian-live
rename to scripts/build/source_debian-live
diff --git a/scripts/build/lb_source_disk b/scripts/build/source_disk
similarity index 100%
rename from scripts/build/lb_source_disk
rename to scripts/build/source_disk
diff --git a/scripts/build/lb_source_hdd b/scripts/build/source_hdd
similarity index 100%
rename from scripts/build/lb_source_hdd
rename to scripts/build/source_hdd
diff --git a/scripts/build/lb_source_iso b/scripts/build/source_iso
similarity index 100%
rename from scripts/build/lb_source_iso
rename to scripts/build/source_iso
diff --git a/scripts/build/lb_source_tar b/scripts/build/source_tar
similarity index 100%
rename from scripts/build/lb_source_tar
rename to scripts/build/source_tar
diff --git a/scripts/build/lb_source_virtual-hdd b/scripts/build/source_virtual-hdd
similarity index 100%
rename from scripts/build/lb_source_virtual-hdd
rename to scripts/build/source_virtual-hdd
diff --git a/scripts/build/lb_testroot b/scripts/build/testroot
similarity index 100%
rename from scripts/build/lb_testroot
rename to scripts/build/testroot