diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 61f458e0..e0d3385d 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -38,7 +38,7 @@ export TEXTDOMAINDIR="/usr/share/locale"
 MINIMAL_INSTALL="yes"
 
 MY_USERNAME='debian'
-MY_PASSWORD='freedombone'
+MY_PASSWORD="${PROJECT_NAME}"
 
 # IP address of the router (gateway)
 ROUTER_IP_ADDRESS="192.168.1.254"
@@ -167,7 +167,7 @@ Your system is not yet installed. To complete the process run the
 following commands, then enter your details.
 
     sudo su
-    freedombone menuconfig
+    ${PROJECT_NAME} menuconfig
 
 " > $rootdir/etc/motd
 }
@@ -232,7 +232,7 @@ EOF
     echo '    else' >> $rootdir/root/.bashrc
     echo '        ENTROPY=$(cat /proc/sys/kernel/random/entropy_avail)' >> $rootdir/root/.bashrc
     echo '        if [ $ENTROPY -lt 500 ]; then' >> $rootdir/root/.bashrc
-    echo '            dialog --backtitle "Freedombone initial setup process" --title "Password Generation" --msgbox "WARNING: The entropy available on this system is too low to generate a password.\n\nThe installation process cannot continue." 8 50' >> $rootdir/root/.bashrc
+    echo '            dialog --backtitle "Initial setup process" --title "Password Generation" --msgbox "WARNING: The entropy available on this system is too low to generate a password.\n\nThe installation process cannot continue." 8 50' >> $rootdir/root/.bashrc
     echo '            exit' >> $rootdir/root/.bashrc
     echo '        fi' >> $rootdir/root/.bashrc
     echo '        NEW_USER_PASSWORD="$(openssl rand -base64 12 | cut -c1-10)"' >> $rootdir/root/.bashrc
@@ -259,12 +259,12 @@ EOF
     echo '$(printf `cat ~/login.txt`)"|chpasswd' >> $rootdir/root/.bashrc
 
 	if [[ $MINIMAL_INSTALL == "no" ]]; then
-		echo '    freedombone menuconfigfull' >> $rootdir/root/.bashrc
+		echo "    ${PROJECT_NAME} menuconfigfull" >> $rootdir/root/.bashrc
 	else
-		echo '    freedombone menuconfig' >> $rootdir/root/.bashrc
+		echo "    ${PROJECT_NAME} menuconfig" >> $rootdir/root/.bashrc
 	fi
     echo '    if [ "$?" = "0" ]; then' >> $rootdir/root/.bashrc
-    echo '        if [ -f ~/freedombone-completed.txt ]; then' >> $rootdir/root/.bashrc
+    echo "        if [ -f ~/${PROJECT_NAME}-completed.txt ]; then" >> $rootdir/root/.bashrc
     # Remove the initial setup files
     echo "            rm /root/.initial_setup" >> $rootdir/root/.bashrc
     echo "            rm /home/${MY_USERNAME}/.initial_setup" >> $rootdir/root/.bashrc
@@ -358,8 +358,8 @@ cd /root/freedombone
 make install
 EOF
 
-chroot "$rootdir" freedombone-image-hardware-setup 2>&1 | \
-    tee $rootdir/var/log/freedombone-image-hardware-setup.log
+chroot "$rootdir" ${PROJECT_NAME}-image-hardware-setup 2>&1 | \
+    tee $rootdir/var/log/${PROJECT_NAME}-image-hardware-setup.log
 
 rm $rootdir/usr/sbin/policy-rc.d