diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh
index c6b4d7e1ec32aacdab5ea9eb51461724f8d3c4a4..be27e9410f0670b9cb4259a44bf61ab63adb3186 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 1c908d946788b9936780cf77ea223a2647dc03d9..d477d96ffcb1f011a5b6d9f969e369192c290e6b 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 544d9525fa027f15ae7fc9426a788ed9ca6b8dc8..26c4e5f82daec3c21d36843548d5f1b758ff5ed1 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 b887f137b47164a72d2cf1fb8ebd1429701c41f8..b16450e50a05b0b6fd26fdf541bd33300a5dd43a 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 80cfd7ce69d9770e5d42fa52c6ffdc59aaa6c4d2..354a8bd40556e03d50bc77cfdd01dd7cd0541ccd 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 ac5cf2f8a317d52c83780b54b050bc99b9184fd0..65beebca67a45c52ca18e314f025d80305cc0820 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