diff --git a/pre-inst.sh b/pre-inst.sh
index 39a6193..72de033 100755
--- a/pre-inst.sh
+++ b/pre-inst.sh
@@ -9,7 +9,7 @@ printf \
 cat << EOF
 #######################################
 ##                                   ##
-##  $(cat "${BASEDIR}/title") Script  ##
+##  $(cat "${baseDir}/title") Script  ##
 ##                                   ##
 ##   Jean  <jean@easthighnerd.net>   ##
 ##                                   ##
@@ -28,7 +28,7 @@ EOF
 source \
 	/etc/os-release
 source \
-	"${BASEDIR}/system.conf"
+	"${baseDir}/system.conf"
 
 
 if [[ "${ID}" == 'debian' ]]; then
@@ -77,7 +77,7 @@ elif [[ "${ID}" == 'fedora' ]]; then
 
 	dnf install \
 		-y \
-		https://zfsonlinux.org/fedora/zfs-release-${ZOL_FEDORA_VER}$(rpm --eval "%{dist}").noarch.rpm
+		https://zfsonlinux.org/fedora/zfs-release-${zolFedoraVer}$(rpm --eval "%{dist}").noarch.rpm
 
 	dnf install \
 		-y \
@@ -101,11 +101,11 @@ if [[ ! "$(hostname)" == "debian-live" ]]; then
 fi
 
 
-"${BASEDIR}/partition.sh"
+"${baseDir}/partition.sh"
 
 sleep 5
 
-"${BASEDIR}/mkfs.zfs.sh"
+"${baseDir}/zfs.sh"
 
 mkdir \
 	-p \
@@ -128,10 +128,10 @@ elif [[ "${ID}" == 'debian' ]]; then
 fi
 
 printf \
-	"${HOSTNAME}\n" | tee /mnt/etc/hostname &> /dev/null
+	"${hostname}\n" | tee /mnt/etc/hostname &> /dev/null
 
 printf \
-	"127.0.1.1\t${HOSTNAME}\n" | tee --append /mnt/etc/hosts &> /dev/null
+	"127.0.1.1\t${hostname}\n" | tee --append /mnt/etc/hosts &> /dev/null
 
 if [[ "${ID}" == 'debian' ]]; then
 	"${BASEDIR}/base-debian.sh" -2
@@ -191,7 +191,7 @@ printf \
 
 chroot \
 	/mnt \
-	"$(printf "${BASEDIR}\n" | sed 's|.*\/|\/|')/install.sh"
+	"$(printf "${baseDir}\n" | sed 's|.*\/|\/|')/install.sh"
 
 mount | grep -v zfs | tac | awk '/\/mnt/ {print $3}' | xargs -I {} umount -Rlf {}