diff --git a/1-setup.sh b/1-setup.sh
index 42baf52..14d5577 100755
--- a/1-setup.sh
+++ b/1-setup.sh
@@ -159,7 +159,7 @@ if [ $(whoami) = "root"  ]; then
     groupadd libvirt
     useradd -m -G wheel,libvirt -s /bin/bash $USERNAME 
 
-# use chpasswd to enter $username:$password
+# use chpasswd to enter $USERNAME:$password
     echo "$USERNAME:$PASSWORD" | chpasswd
 	cp -R /root/ArchTitus /home/$USERNAME/
     chown -R $USERNAME: /home/$USERNAME/ArchTitus
diff --git a/3-post-setup.sh b/3-post-setup.sh
index 9690617..1671f1c 100755
--- a/3-post-setup.sh
+++ b/3-post-setup.sh
@@ -80,7 +80,7 @@ sed -i 's/^%wheel ALL=(ALL) NOPASSWD: ALL/# %wheel ALL=(ALL) NOPASSWD: ALL/' /et
 sed -i 's/^# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/' /etc/sudoers
 
 rm -r /root/ArchTitus
-rm -r /home/$username/ArchTitus
+rm -r /home/$USERNAME/ArchTitus
 
 # Replace in the same state
 cd $pwd
diff --git a/archtitus.sh b/archtitus.sh
index adb1d2d..461a58e 100755
--- a/archtitus.sh
+++ b/archtitus.sh
@@ -20,7 +20,7 @@ echo -ne "
     source $SCRIPT_DIR/setup.conf
     bash 0-preinstall.sh
     arch-chroot /mnt /root/ArchTitus/1-setup.sh
-    arch-chroot /mnt /usr/bin/runuser -u $username -- /home/$username/ArchTitus/2-user.sh
+    arch-chroot /mnt /usr/bin/runuser -u $USERNAME -- /home/$USERNAME/ArchTitus/2-user.sh
     arch-chroot /mnt /root/ArchTitus/3-post-setup.sh
 
 echo -ne "