diff --git a/configure.sh b/configure.sh
index 8cb51c8..4855741 100755
--- a/configure.sh
+++ b/configure.sh
@@ -8,7 +8,7 @@ BASEDIR="$(dirname "${0}" | sed "s|^\.|${PWD}|")"
 cat << EOF
 #######################################
 ##                                   ##
-##  $(cat "${BASEDIR}/title") Script  ##
+##  $(cat "${baseDir}/title") Script  ##
 ##                                   ##
 ##   Jean  <jean@easthighnerd.net>   ##
 ##                                   ##
@@ -25,17 +25,17 @@ EOF
 
 
 printf \
-	'ZOL_FEDORA_VER="2-6"\n' | \
+	'zolFedoraVer="2-6"\n' | \
 	tee \
-		"${BASEDIR}/system.conf" \
+		"${baseDir}/system.conf" \
 		&> \
 		/dev/null
 
 printf \
 	'(NVMe) SSD or HDD?\n'
-select OPTION in 'SSD' 'HDD'
+select option in 'SSD' 'HDD'
 do
-	case "${OPTION}" in
+	case "${option}" in
 	'SSD'|'HDD')
 		break
 		;;
@@ -47,10 +47,10 @@ do
 done
 
 printf \
-	"DISK_TYPE=\"${OPTION}\"\n" | \
+	"diskType=\"${option}\"\n" | \
 	tee \
 		--append \
-		"${BASEDIR}/system.conf" \
+		"${baseDir}/system.conf" \
 		&> \
 		/dev/null
 
@@ -59,9 +59,9 @@ printf \
 
 printf \
 	'\nGet disk from:\n'
-select OPTION in '/dev/disk/by-id/' '/dev/'
+select option in '/dev/disk/by-id/' '/dev/'
 do
-	case "${OPTION}" in
+	case "${option}" in
 	'/dev/disk/by-id/'|'/dev/')
 		break
 		;;
@@ -75,26 +75,26 @@ done
 printf \
 	'\033[2J\033[H'
 
-if [[ "${OPTION}" == '/dev/disk/by-id/' ]]; then
-	DRIVES="$(ls -Ago /dev/disk/by-id/ | grep -v 'sr' | grep -v 'dm-' | grep -v 'nvme-eui.' | grep -v '\-part' | grep -v 'wwn-' | grep -v '_[1-9] -> ' | grep -v 'total' | sed 's|^.*\:[0-5][0-9] ||g; s| -> .*$||g' | tr -d '[:blank:]')"
+if [[ "${option}" == '/dev/disk/by-id/' ]]; then
+	drives="$(ls -Ago /dev/disk/by-id/ | grep -v 'sr' | grep -v 'dm-' | grep -v 'nvme-eui.' | grep -v '\-part' | grep -v 'wwn-' | grep -v '_[1-9] -> ' | grep -v 'total' | sed 's|^.*\:[0-5][0-9] ||g; s| -> .*$||g' | tr -d '[:blank:]')"
 
 	printf \
 		'\nSelect the disk you want to use:\n'
 
-	DRIVES=( ${DRIVES} )
+	drives=( ${drives} )
 	shopt -s extglob
-	MENU="@(${DRIVES[0]}"
+	menu="@(${drives[0]}"
 
-	for ((i=1;i<${#DRIVES[@]};i++)); do
-		MENU+="|${DRIVES[$i]}"
+	for ((i=1;i<${#drives[@]};i++)); do
+		menu+="|${drives[$i]}"
 	done
 
-	MENU+=")"
+	menu+=")"
 
-	select DRIVE in "${DRIVES[@]}"
+	select drive in "${drives[@]}"
 	do
-		case ${DRIVE} in
-		${MENU})
+		case ${drive} in
+		${menu})
 			break
 			;;
 		*)
@@ -105,32 +105,32 @@ if [[ "${OPTION}" == '/dev/disk/by-id/' ]]; then
 	done
 
 	printf \
-		"DISK=\"/dev/disk/by-id/${DRIVE}\"\n" | \
+		"disk=\"/dev/disk/by-id/${drive}\"\n" | \
 		tee \
 			--append \
-			"${BASEDIR}/system.conf" \
+			"${baseDir}/system.conf" \
 			&> \
 			/dev/null
-elif [[ "${OPTION}" == '/dev/' ]]; then
-	DRIVES="$(lsblk -do name | grep -v 'loop' | grep -v 'sr' | grep -v 'zram' | grep -v 'NAME' | tr -d '[:blank:]')"
+elif [[ "${option}" == '/dev/' ]]; then
+	drives="$(lsblk -do name | grep -v 'loop' | grep -v 'sr' | grep -v 'zram' | grep -v 'NAME' | tr -d '[:blank:]')"
 
 	printf \
 		'\nSelect the disk you want to use:\n'
 
-	DRIVES=( ${DRIVES} )
+	drives=( ${drives} )
 	shopt -s extglob
-	MENU="@(${DRIVES[0]}"
+	menu="@(${drives[0]}"
 
-	for ((i=1;i<${#DRIVES[@]};i++)); do
-		MENU+="|${DRIVES[$i]}"
+	for ((i=1;i<${#drives[@]};i++)); do
+		menu+="|${drives[$i]}"
 	done
 
-	MENU+=")"
+	menu+=")"
 
-	select DRIVE in "${DRIVES[@]}"
+	select drive in "${drives[@]}"
 	do
-		case ${DRIVE} in
-		${MENU})
+		case ${drive} in
+		${menu})
 			break
 			;;
 		*)
@@ -141,10 +141,10 @@ elif [[ "${OPTION}" == '/dev/' ]]; then
 	done
 
 	printf \
-		"DISK=\"/dev/${DRIVE}\"\n" | \
+		"disk=\"/dev/${drive}\"\n" | \
 		tee \
 			--append \
-			"${BASEDIR}/system.conf" \
+			"${baseDir}/system.conf" \
 			&> \
 			/dev/null
 fi
@@ -152,52 +152,52 @@ fi
 printf \
 	'\033[2J\033[H'
 
-HOSTNAME='-'
+hostname='-'
 
-while [[ "${HOSTNAME}" == '-' ]] || [[ -z "${HOSTNAME}" ]] || [[ "${HOSTNAME}" = *' '* ]] || [[ "${HOSTNAME}" = *_* ]]; do
+while [[ "${hostname}" == '-' ]] || [[ -z "${hostname}" ]] || [[ "${hostname}" = *' '* ]] || [[ "${hostname}" = *_* ]]; do
 	printf \
 		'\nEnter a hostname for this machine (no spaces or underscores):\n'
 	read \
 		-r \
-		HOSTNAME
+		hostname
 
-	if [[ "${HOSTNAME}" = *' '* ]] || [[ "${HOSTNAME}" = *_* ]]; then
+	if [[ "${hostname}" = *' '* ]] || [[ "${hostname}" = *_* ]]; then
 		printf \
 			'ERROR:\tNo spaces or underscores in the hostname!\n'
 	fi
 done
 
 printf \
-	"HOSTNAME=\"${HOSTNAME}\"\n" | \
+	"hostname=\"${hostname}\"\n" | \
 	tee \
 		--append \
-		"${BASEDIR}/system.conf" \
+		"${baseDir}/system.conf" \
 		&> \
 		/dev/null
 
 printf \
 	'\033[2J\033[H'
 
-USERNAME='-'
+username='-'
 
-while [[ "${USERNAME}" == '-' ]] || [[ -z "${USERNAME}" ]] || [[ "${USERNAME}" = *' '* ]] || [[ "${USERNAME}" = *[A-Z]* ]]; do
+while [[ "${username}" == '-' ]] || [[ -z "${username}" ]] || [[ "${username}" = *' '* ]] || [[ "${username}" = *[A-Z]* ]]; do
 	printf \
 		'\nEnter a name for the new user account (lowercase, no spaces):\n'
 	read \
 		-r \
-		USERNAME
+		username
 
-	if [[ "${USERNAME}" = *' '* ]] || [[ "${USERNAME}" = *[A-Z]* ]]; then
+	if [[ "${username}" = *' '* ]] || [[ "${username}" = *[A-Z]* ]]; then
 		printf \
 			'ERROR:\tNo spaces or uppercase letters in the username!\n'
 	fi
 done
 
 printf \
-	"USERNAME=\"${USERNAME}\"\n" | \
+	"username=\"${username}\"\n" | \
 	tee \
 		--append \
-		"${BASEDIR}/system.conf" \
+		"${baseDir}/system.conf" \
 		&> \
 		/dev/null
 
@@ -206,9 +206,9 @@ printf \
 
 printf \
 	'\nEnable SWAP?\n'
-select OPTION in 'yes' 'no'
+select option in 'yes' 'no'
 do
-	case "${OPTION}" in
+	case "${option}" in
 	'yes'|'no')
 		break
 		;;
@@ -220,10 +220,10 @@ do
 done
 
 printf \
-	"ENABLE_SWAP=\"${OPTION}\"\n" | \
+	"enableSwap=\"${option}\"\n" | \
 	tee \
 		--append \
-		"${BASEDIR}/system.conf" \
+		"${baseDir}/system.conf" \
 		&> \
 		/dev/null
 
@@ -232,9 +232,9 @@ printf \
 
 printf \
 	'\nEnable encryption?\n'
-select OPTION in 'yes' 'no'
+select option in 'yes' 'no'
 do
-	case "${OPTION}" in
+	case "${option}" in
 	'yes'|'no')
 		break
 		;;
@@ -246,10 +246,10 @@ do
 done
 
 printf \
-	"ENCRYPTION=\"${OPTION}\"\n" | \
+	"encryption=\"${option}\"\n" | \
 	tee \
 		--append \
-		"${BASEDIR}/system.conf" \
+		"${baseDir}/system.conf" \
 		&> \
 		/dev/null
 
@@ -258,7 +258,7 @@ printf \
 
 cat << EOF
 
-Configuration stored in '${BASEDIR}/system.conf'
+Configuration stored in '${baseDir}/system.conf'
 
 Press any key to return to the main menu
 EOF