diff --git a/debian/chroot.install b/debian/chroot.install
index aa71296..ad95127 100755
--- a/debian/chroot.install
+++ b/debian/chroot.install
@@ -33,7 +33,7 @@ if [ "${manage_part}" -eq 0 ]; then
 	sudo vgcreate "${vgname}" "${hdd}"2
 fi
 
-mkfs.ext3 -F -- "${hdd}"1
+mkfs.ext3 -F -L boot -- "${hdd}"1
 
 ## }}}
 ## Create Logical Volumes {{{
@@ -49,12 +49,14 @@ mkfs.ext3 -F -- "${hdd}"1
 [ ! -b /dev/mapper/"${vgname}"-swap ] && lvcreate -n swap -L 2g   "${vgname}"
 
 ### Format the LV in ext4
-for lvname in /dev/mapper/"${vgname}"-*; do
-	mkfs.ext4 -F -- "${lvname}"
+cd -- /dev/"${vgname}" || exit 1
+for lvname in *; do
+	mkfs.ext4 -F -L "${lvname}" -- "${lvname}"
 done
+cd -- - || exit 1
 
 ### And format the swap
-mkswap /dev/mapper/"${vgname}"-swap
+mkswap -L sw01 -- /dev/mapper/"${vgname}"-swap
 ## }}}
 # }}}
 # Debootstrap {{{