diff --git a/pandora_server/pandora_network b/pandora_server/pandora_network
index 2b76276148..57a1df5584 100755
--- a/pandora_server/pandora_network
+++ b/pandora_server/pandora_network
@@ -6,10 +6,10 @@
 # v1.3 Build 070731
 
 # Configurable path and filenames
-PANDORA_HOME="/etc/pandora"
+PANDORA_HOME="/etc/pandora/pandora_server.conf"
 PANDORA_PID_PATH="/var/run/pandora"
 PANDORA_PID=$PANDORA_PID_PATH/pandora_network.pid
-PANDORA_DAEMON=/usr/bin/pandora_network.pl
+PANDORA_DAEMON=/usr/bin/pandora_network
 
 # Main script
 
diff --git a/pandora_server/pandora_recon b/pandora_server/pandora_recon
index 164b0fab74..6d01287733 100755
--- a/pandora_server/pandora_recon
+++ b/pandora_server/pandora_recon
@@ -6,7 +6,7 @@
 # v1.3 Build 070731
 
 # Configurable path and filenames
-PANDORA_HOME="/etc/pandora"
+PANDORA_HOME="/etc/pandora/pandora_server.conf"
 PANDORA_PID_PATH="/var/run/pandora"
 PANDORA_PID=$PANDORA_PID_PATH/pandora_recon.pid
 PANDORA_DAEMON=/usr/bin/pandora_recon
diff --git a/pandora_server/pandora_server b/pandora_server/pandora_server
index 7d9a8c6c05..77d1dfd4bb 100755
--- a/pandora_server/pandora_server
+++ b/pandora_server/pandora_server
@@ -6,7 +6,7 @@
 # v1.3 Build 070802
 
 # Configurable path and filenames
-PANDORA_HOME="/etc/pandora"
+PANDORA_HOME="/etc/pandora/pandora_server.conf"
 PANDORA_PID_PATH="/var/run/pandora"
 PANDORA_PID=$PANDORA_PID_PATH/pandora_dataserver.pid
 PANDORA_DAEMON=/usr/bin/pandora_server
diff --git a/pandora_server/pandora_snmpconsole b/pandora_server/pandora_snmpconsole
index 5d46782a2e..1ff7789be1 100755
--- a/pandora_server/pandora_snmpconsole
+++ b/pandora_server/pandora_snmpconsole
@@ -8,8 +8,7 @@
 # Compatible with NetSNMP 5.1 or higher
 
 # Configurable path and filenames
-
-PANDORA_HOME="/etc/pandora"
+PANDORA_HOME="/etc/pandora/pandora_server.conf"
 PANDORA_PID_PATH="/var/run/pandora"
 PANDORA_PID=$PANDORA_PID_PATH/pandora_snmp.pid
 PANDORA_DAEMON=/usr/bin/pandora_snmpconsole