diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh
index c6b4d7e1..be27e941 100755
--- a/src/freedombone-image-mesh
+++ b/src/freedombone-image-mesh
@@ -373,9 +373,9 @@ function configure_toxcore {
 	echo $'Configuring toxcore' >> $INSTALL_LOG
 
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
-		TOXIC_FILE=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
+		TOXIC_FILE=$(cat /usr/local/bin/${PROJECT_NAME}-app-tox | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
 	else
-		TOXIC_FILE=$(cat /usr/bin/${PROJECT_NAME} | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
+		TOXIC_FILE=$(cat /usr/bin/${PROJECT_NAME}-app-tox | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
 	fi
 
 	echo $'Enabling toxcore daemon' >> $INSTALL_LOG
diff --git a/src/freedombone-mesh b/src/freedombone-mesh
index 1c908d94..d477d96f 100755
--- a/src/freedombone-mesh
+++ b/src/freedombone-mesh
@@ -37,9 +37,9 @@ CONFIG_FILE=$HOME/${PROJECT_NAME}.cfg
 
 MUMBLE_PATH=/usr/bin/mumble
 if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
-    TOXIC_FILE=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
+    TOXIC_FILE=$(cat /usr/local/bin/${PROJECT_NAME}-app-tox | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
 else
-    TOXIC_FILE=$(cat /usr/bin/${PROJECT_NAME} | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
+    TOXIC_FILE=$(cat /usr/bin/${PROJECT_NAME}-app-tox | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
 fi
 DHTNODES=/usr/share/toxic/DHTnodes
 
diff --git a/src/freedombone-mirrors b/src/freedombone-mirrors
index 544d9525..26c4e5f8 100755
--- a/src/freedombone-mirrors
+++ b/src/freedombone-mirrors
@@ -36,10 +36,10 @@ export TEXTDOMAINDIR="/usr/share/locale"
 # Minimum number of characters in a password
 MINIMUM_PASSWORD_LENGTH=10
 if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
-	MINIMUM_PASSWORD_LENGTH=$(cat /usr/local/bin/${PROJECT_NAME} | grep 'MINIMUM_PASSWORD_LENGTH=' | head -n 1 | awk -F '=' '{print $2}')
+	MINIMUM_PASSWORD_LENGTH=$(cat /usr/local/bin/${PROJECT_NAME}-utils-passwords | grep 'MINIMUM_PASSWORD_LENGTH=' | head -n 1 | awk -F '=' '{print $2}')
 else
 	if [ -f /usr/bin/${PROJECT_NAME} ]; then
-		MINIMUM_PASSWORD_LENGTH=$(cat /usr/bin/${PROJECT_NAME} | grep 'MINIMUM_PASSWORD_LENGTH=' | head -n 1 | awk -F '=' '{print $2}')
+		MINIMUM_PASSWORD_LENGTH=$(cat /usr/bin/${PROJECT_NAME}-utils-passwords | grep 'MINIMUM_PASSWORD_LENGTH=' | head -n 1 | awk -F '=' '{print $2}')
 	fi
 fi
 
diff --git a/src/freedombone-remote b/src/freedombone-remote
index b887f137..b16450e5 100755
--- a/src/freedombone-remote
+++ b/src/freedombone-remote
@@ -46,10 +46,10 @@ FRIENDS_SERVERS_LIST=
 # Minimum password length in characters
 MINIMUM_PASSWORD_LENGTH=10
 if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
-	MINIMUM_PASSWORD_LENGTH=$(cat /usr/local/bin/${PROJECT_NAME} | grep 'MINIMUM_PASSWORD_LENGTH=' | head -n 1 | awk -F '=' '{print $2}')
+	MINIMUM_PASSWORD_LENGTH=$(cat /usr/local/bin/${PROJECT_NAME}-utils-passwords | grep 'MINIMUM_PASSWORD_LENGTH=' | head -n 1 | awk -F '=' '{print $2}')
 else
 	if [ -f /usr/bin/${PROJECT_NAME} ]; then
-		MINIMUM_PASSWORD_LENGTH=$(cat /usr/bin/${PROJECT_NAME} | grep 'MINIMUM_PASSWORD_LENGTH=' | head -n 1 | awk -F '=' '{print $2}')
+		MINIMUM_PASSWORD_LENGTH=$(cat /usr/bin/${PROJECT_NAME}-utils-passwords | grep 'MINIMUM_PASSWORD_LENGTH=' | head -n 1 | awk -F '=' '{print $2}')
 	fi
 fi
 
diff --git a/src/freedombone-restore-local b/src/freedombone-restore-local
index 80cfd7ce..354a8bd4 100755
--- a/src/freedombone-restore-local
+++ b/src/freedombone-restore-local
@@ -51,11 +51,11 @@ fi
 
 # get the version of Go being used
 if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
-	GO_VERSION=$(cat /usr/local/bin/${PROJECT_NAME} | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
-	GVM_HOME=$(cat /usr/local/bin/${PROJECT_NAME} | grep 'GVM_HOME=' | head -n 1 | awk -F '=' '{print $2}')
+	GO_VERSION=$(cat /usr/local/bin/${PROJECT_NAME}-utils-go | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
+	GVM_HOME=$(cat /usr/local/bin/${PROJECT_NAME}-utils-go | grep 'GVM_HOME=' | head -n 1 | awk -F '=' '{print $2}')
 else
-	GO_VERSION=$(cat /usr/bin/${PROJECT_NAME} | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
-	GVM_HOME=$(cat /usr/bin/${PROJECT_NAME} | grep 'GVM_HOME=' | head -n 1 | awk -F '=' '{print $2}')
+	GO_VERSION=$(cat /usr/bin/${PROJECT_NAME}-utils-go | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
+	GVM_HOME=$(cat /usr/bin/${PROJECT_NAME}-utils-go | grep 'GVM_HOME=' | head -n 1 | awk -F '=' '{print $2}')
 fi
 
 ADMIN_USERNAME=
diff --git a/src/freedombone-restore-remote b/src/freedombone-restore-remote
index ac5cf2f8..65beebca 100755
--- a/src/freedombone-restore-remote
+++ b/src/freedombone-restore-remote
@@ -89,9 +89,9 @@ fi
 
 # get the version of Go being used
 if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
-	GO_VERSION=$(cat /usr/local/bin/${PROJECT_NAME} | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
+	GO_VERSION=$(cat /usr/local/bin/${PROJECT_NAME}-utils-go | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
 else
-	GO_VERSION=$(cat /usr/bin/${PROJECT_NAME} | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
+	GO_VERSION=$(cat /usr/bin/${PROJECT_NAME}-utils-go | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
 fi
 
 # MariaDB password