diff --git a/bin/CheckCreateServerStatus b/bin/CheckCreateServerStatus
index ed198fd..c2ed89d 100755
--- a/bin/CheckCreateServerStatus
+++ b/bin/CheckCreateServerStatus
@@ -43,9 +43,9 @@ then
   exit
 fi
 
-if [ -f /usr/local/gpx/users/$srv_username/$srv_type/$srv_ip\:$srv_port/.gpx_template ]
+if [ -f /usr/local/gpx/users/$srv_username/$srv_type/$srv_ip\-$srv_port/.gpx_template ]
 then
-    pid=`cat /usr/local/gpx/users/$srv_username/$srv_type/$srv_ip\:$srv_port/.gpx_template`
+    pid=`cat /usr/local/gpx/users/$srv_username/$srv_type/$srv_ip\-$srv_port/.gpx_template`
     check_pid=`ps aux | grep $pid | grep -v grep`
 
     if [ "$check_pid" == "" ]
diff --git a/bin/CheckGame b/bin/CheckGame
index acbb6fa..270a252 100755
--- a/bin/CheckGame
+++ b/bin/CheckGame
@@ -41,11 +41,11 @@ then
 fi
 
 # Check for homedir
-if [ ! -d /usr/local/gpx/users/$srv_username/$srv_ip:$srv_port ]; then
+if [ ! -d /usr/local/gpx/users/$srv_username/$srv_ip-$srv_port ]; then
         echo '{"error":"Restart: Game directory ('$gpxdir') doesnt exist!"}'
         exit
 else
-	gpxdir=/usr/local/gpx/users/$srv_username/$srv_ip:$srv_port
+	gpxdir=/usr/local/gpx/users/$srv_username/$srv_ip-$srv_port
 fi
 
 # wtf?
diff --git a/bin/CheckUpdateStatus b/bin/CheckUpdateStatus
index 88f42b2..9c32896 100755
--- a/bin/CheckUpdateStatus
+++ b/bin/CheckUpdateStatus
@@ -42,9 +42,9 @@ then
   exit
 fi
 
-if [ -f /usr/local/gpx/users/$srv_username/$srv_type/$srv_ip\:$srv_port/.gpxupdatepid ]
+if [ -f /usr/local/gpx/users/$srv_username/$srv_type/$srv_ip\-$srv_port/.gpxupdatepid ]
 then
-    pid=`cat /usr/local/gpx/users/$srv_username/$srv_type/$srv_ip\:$srv_port/.gpxupdatepid`
+    pid=`cat /usr/local/gpx/users/$srv_username/$srv_type/$srv_ip\-$srv_port/.gpxupdatepid`
     check_pid=`ps aux | grep $pid | grep -v grep`
 
     if [ "$check_pid" == "" ]
diff --git a/bin/ConfigUpdate b/bin/ConfigUpdate
index e17fe54..03bfffb 100755
--- a/bin/ConfigUpdate
+++ b/bin/ConfigUpdate
@@ -106,7 +106,7 @@ then
 fi
 
 # Check gameserver dir
-gpxdir=/usr/local/gpx/users/$srv_username/$srv_ip:$srv_port
+gpxdir=/usr/local/gpx/users/$srv_username/$srv_ip-$srv_port
 
 if [ ! -d $gpxdir ]
 then
diff --git a/bin/CreateDirectory b/bin/CreateDirectory
index 6bcdb8c..461c8c3 100755
--- a/bin/CreateDirectory
+++ b/bin/CreateDirectory
@@ -46,7 +46,7 @@ then
 fi
 
 # Check for homedir
-gpxdir=/usr/local/gpx/users/$srv_username/$srv_ip:$srv_port
+gpxdir=/usr/local/gpx/users/$srv_username/$srv_ip-$srv_port
 
 if [ ! -d $gpxdir ]
 then
diff --git a/bin/CreateServer b/bin/CreateServer
index 516a80b..93f9299 100755
--- a/bin/CreateServer
+++ b/bin/CreateServer
@@ -71,16 +71,16 @@ then
     exit
 fi
 
-if [ -d /usr/local/gpx/users/$srv_username/$srv_ip\:$srv_port ]
+if [ -d /usr/local/gpx/users/$srv_username/$srv_ip\-$srv_port ]
 then
     echo "CreateServer: Account directory exists!  Exiting."
     echo "$(date) $(hostname) CreateServer: Account directory exists!  Exiting." >> $srv_log
     if [ "$callback_url" ]; then $cback "$callback_url&do=createsrv_status&status=failed" >> /dev/null; fi
     exit
 else
-    echo "$(date) $(hostname) CreateServer: Creating server directory /usr/local/gpx/users/$srv_username/$srv_ip:$srv_port ..." >> $srv_log
-    mkdir -p /usr/local/gpx/users/$srv_username/$srv_ip\:$srv_port
-    gpxdir=/usr/local/gpx/users/$srv_username/$srv_ip:$srv_port
+    echo "$(date) $(hostname) CreateServer: Creating server directory /usr/local/gpx/users/$srv_username/$srv_ip-$srv_port ..." >> $srv_log
+    mkdir -p /usr/local/gpx/users/$srv_username/$srv_ip\-$srv_port
+    gpxdir=/usr/local/gpx/users/$srv_username/$srv_ip-$srv_port
 fi
 
 echo "$(date) $(hostname) CreateServer: Extracting TPL ($tpl_id) to $gpxdir ..." >> $srv_log
diff --git a/bin/DeleteServer b/bin/DeleteServer
index da18dd0..ca3b7bd 100755
--- a/bin/DeleteServer
+++ b/bin/DeleteServer
@@ -36,13 +36,13 @@ then
     exit
 fi
 
-if [ -d /usr/local/gpx/users/$srv_username/$srv_ip\:$srv_port ]
+if [ -d /usr/local/gpx/users/$srv_username/$srv_ip\-$srv_port ]
 then
     # Make sure server is stopped
     /usr/local/gpx/bin/Stop -u $srv_username -i $srv_ip -p $srv_port >> /dev/null 2>&1
 
     # Delete all contents
-    rm -fr /usr/local/gpx/users/$srv_username/$srv_ip\:$srv_port >> /dev/null 2>&1 &
+    rm -fr /usr/local/gpx/users/$srv_username/$srv_ip\-$srv_port >> /dev/null 2>&1 &
 fi
 
 echo "success"
diff --git a/bin/InstallAddon b/bin/InstallAddon
index 7a84f51..15852fe 100755
--- a/bin/InstallAddon
+++ b/bin/InstallAddon
@@ -50,8 +50,8 @@ then
     exit
 fi
 
-nice -n 19 tar -zxf /usr/local/gpx/addons/$tpl_hash.tar.gz -C /usr/local/gpx/users/$srv_username/$srv_type/$srv_ip\:$srv_port/$install_target/ >> /dev/null 2>&1 &
+nice -n 19 tar -zxf /usr/local/gpx/addons/$tpl_hash.tar.gz -C /usr/local/gpx/users/$srv_username/$srv_type/$srv_ip\-$srv_port/$install_target/ >> /dev/null 2>&1 &
 pid=$!
-echo $pid > /usr/local/gpx/users/$srv_username/$srv_type/$srv_ip\:$srv_port/.gpx_addon
+echo $pid > /usr/local/gpx/users/$srv_username/$srv_type/$srv_ip\-$srv_port/.gpx_addon
 
 echo "success"
diff --git a/bin/MoveServerLocal b/bin/MoveServerLocal
index 65c3b27..623809f 100755
--- a/bin/MoveServerLocal
+++ b/bin/MoveServerLocal
@@ -48,7 +48,7 @@ then
   exit
 fi
 
-cur_dir="/usr/local/gpx/users/$srv_username/$srv_ip:$srv_port"
+cur_dir="/usr/local/gpx/users/$srv_username/$srv_ip-$srv_port"
 new_dir="/usr/local/gpx/users/$srv_new_user"
 
 if [ -d $cur_dir ]
diff --git a/bin/RemoveAddon b/bin/RemoveAddon
index 7d76b25..5f6341d 100755
--- a/bin/RemoveAddon
+++ b/bin/RemoveAddon
@@ -56,14 +56,14 @@ fi
 
 for file in `tar --list --file=/usr/local/gpx/addons/$tpl_hash.tar.gz | sort`
 do
-    rm -f /usr/local/gpx/users/$srv_username/$srv_type/$srv_ip\:$srv_port/$install_target/$file
+    rm -f /usr/local/gpx/users/$srv_username/$srv_type/$srv_ip\-$srv_port/$install_target/$file
 done
 
 if [ -n "$remove_dirs" ]
 then
     for dir in `echo $remove_dirs`
     do
-        rm -fr /usr/local/gpx/users/$srv_username/$srv_type/$srv_ip\:$srv_port/$install_target/$dir
+        rm -fr /usr/local/gpx/users/$srv_username/$srv_type/$srv_ip\-$srv_port/$install_target/$dir
     done
 fi
 
diff --git a/bin/Restart b/bin/Restart
index 7a80f25..fc38bb8 100755
--- a/bin/Restart
+++ b/bin/Restart
@@ -71,11 +71,11 @@ fi
 
 # Check for homedir
 usrdir=/usr/local/gpx/users/$srv_username
-gpxdir=$usrdir/$srv_ip:$srv_port
+gpxdir=$usrdir/$srv_ip-$srv_port
 serverlog=/usr/local/gpx/logs/servers.log
 
 # Log this
-echo "$(date) $(hostname) Restart: Restarting $srv_ip:$srv_port for user $srv_username ..." >> $serverlog
+echo "$(date) $(hostname) Restart: Restarting $srv_ip-$srv_port for user $srv_username ..." >> $serverlog
 
 if [ ! -d $gpxdir ]
 then
@@ -87,10 +87,10 @@ fi
 
 if [ "$unsuspend_srv" == "yes" ]
 then
-    if [ -d /usr/local/gpx/users/$srv_username/.$srv_ip\:$srv_port/ ]
+    if [ -d /usr/local/gpx/users/$srv_username/.$srv_ip\-$srv_port/ ]
     then
-	echo "$(date) $(hostname) Restart: Unsuspending $srv_ip:$srv_port for user $srv_username ..." >> $serverlog
-        echo y | mv /usr/local/gpx/users/$srv_username/.$srv_ip\:$srv_port $gpxdir
+	echo "$(date) $(hostname) Restart: Unsuspending $srv_ip-$srv_port for user $srv_username ..." >> $serverlog
+        echo y | mv /usr/local/gpx/users/$srv_username/.$srv_ip\-$srv_port $gpxdir
     else
 	echo "$(date) $(hostname) Restart: Unsuspend: Directory not found, NOT unsuspending." >> $serverlog
     fi
@@ -166,8 +166,8 @@ do
 			screen -wipe 2>&1 >> /dev/null
 
 			# Start screen
-			screen -d -m -S "$srv_ip:$srv_port" $srv_cmd_line 2>&1 >> $serverlog
-                        screen_pid="$(screen -list | grep "$srv_ip:$srv_port" | awk '{print $1}' | awk -F. '{print $1}')"
+			screen -d -m -S "$srv_ip-$srv_port" $srv_cmd_line 2>&1 >> $serverlog
+                        screen_pid="$(screen -list | grep "$srv_ip-$srv_port" | awk '{print $1}' | awk -F. '{print $1}')"
 
                         # Ensure screen started...
                         sleep 1
@@ -231,7 +231,7 @@ port: $srv_port
 pid: $srv_pidfile
 workingdir: $working_dir
 gpxcmd: $srv_cmd_line
-taskset: $taskset_cpu" > /usr/local/gpx/srv.d/$srv_ip:$srv_port
+taskset: $taskset_cpu" > /usr/local/gpx/srv.d/$srv_ip-$srv_port
 fi
 
 echo "success"
diff --git a/bin/ServerOutput b/bin/ServerOutput
index 92df166..d11d15d 100755
--- a/bin/ServerOutput
+++ b/bin/ServerOutput
@@ -47,7 +47,7 @@ then
 fi
 
 # Check for homedir
-gpxdir=/usr/local/gpx/users/$srv_username/$srv_ip:$srv_port
+gpxdir=/usr/local/gpx/users/$srv_username/$srv_ip-$srv_port
 
 if [ ! -d $gpxdir ]
 then
diff --git a/bin/ServerSendCMD b/bin/ServerSendCMD
index edd99af..30676b5 100755
--- a/bin/ServerSendCMD
+++ b/bin/ServerSendCMD
@@ -51,7 +51,7 @@ then
 fi
 
 # Check for homedir
-gpxdir=/usr/local/gpx/users/$srv_username/$srv_ip:$srv_port
+gpxdir=/usr/local/gpx/users/$srv_username/$srv_ip-$srv_port
 
 if [ ! -d $gpxdir ]
 then
diff --git a/bin/SteamCMDFunctions b/bin/SteamCMDFunctions
index 7c8979d..1d50cbe 100755
--- a/bin/SteamCMDFunctions
+++ b/bin/SteamCMDFunctions
@@ -173,10 +173,10 @@ if [ "$update_cmd" ]; then
 		chmod u+x ./.gpxsteam.sh
 
 		screen -wipe >> /dev/null 2>&1
-		# screen -d -m -S "$srv_ip:$srv_port" ./steamcmd.sh +runscript .gpxsteamupdate.txt
-		screen -d -m -S "$srv_ip:$srv_port" ./.gpxsteam.sh
+		# screen -d -m -S "$srv_ip-$srv_port" ./steamcmd.sh +runscript .gpxsteamupdate.txt
+		screen -d -m -S "$srv_ip-$srv_port" ./.gpxsteam.sh
 
-		screen_pid="$(screen -list | grep "$srv_ip:$srv_port" | awk '{print $1}' | awk -F. '{print $1}')"
+		screen_pid="$(screen -list | grep "$srv_ip-$srv_port" | awk '{print $1}' | awk -F. '{print $1}')"
 		pid="$(ps -ef | awk '{print $2,$3}' | grep "$screen_pid" | sort -n | tail -1 | awk '{print $1}')"
 		echo $screen_pid > $gpxdir/.gpxscreen.pid
 
diff --git a/bin/Stop b/bin/Stop
index 4283818..55e4af7 100755
--- a/bin/Stop
+++ b/bin/Stop
@@ -68,8 +68,8 @@ then
 fi
 
 # Check for homedir
-gpxdir=/usr/local/gpx/users/$srv_username/$srv_ip:$srv_port
-gpxsuspdir=/usr/local/gpx/users/$srv_username/.$srv_ip:$srv_port
+gpxdir=/usr/local/gpx/users/$srv_username/$srv_ip-$srv_port
+gpxsuspdir=/usr/local/gpx/users/$srv_username/.$srv_ip-$srv_port
 
 if [ ! -d $gpxdir ]
 then
@@ -116,7 +116,7 @@ then
     # Kill screen if there
     if [ -f $gpxdir/.gpxscreen.pid ]
     then
-	screen -d -S "$srv_ip:$srv_port" -X quit >> /dev/null 2>&1
+	screen -d -S "$srv_ip-$srv_port" -X quit >> /dev/null 2>&1
 
 	scr_pid="$(cat $gpxdir/.gpxscreen.pid)"
 	
@@ -228,8 +228,8 @@ then
 fi
 
 # Remove srv.d file so this does not start on reboot
-if [[ -d /usr/local/gpx/srv.d && -f /usr/local/gpx/srv.d/$srv_ip:$srv_port && "$noremove_srvd" == "" ]]; then
-	rm -f /usr/local/gpx/srv.d/$srv_ip:$srv_port
+if [[ -d /usr/local/gpx/srv.d && -f /usr/local/gpx/srv.d/$srv_ip-$srv_port && "$noremove_srvd" == "" ]]; then
+	rm -f /usr/local/gpx/srv.d/$srv_ip-$srv_port
 fi
 
 echo "success"
diff --git a/bin/UpdateServer b/bin/UpdateServer
index 440738f..f1fc337 100755
--- a/bin/UpdateServer
+++ b/bin/UpdateServer
@@ -74,14 +74,14 @@ fi
 if [ "$callback_url" ]; then $cback "$callback_url&do=createsrv_status&status=updating" >> /dev/null; fi
 
 # Setup
-gpxdir=/usr/local/gpx/users/$srv_username/$srv_ip\:$srv_port
+gpxdir=/usr/local/gpx/users/$srv_username/$srv_ip\-$srv_port
 serverlog=/usr/local/gpx/logs/servers.log
 #updatelog=$gpxdir/.gpxupdate.log
 #echo > $updatelog
 updatelog=$serverlog
 
 # Real logging
-echo "$(date) $(hostname) Update: Updating server $srv_ip:$srv_port for user $srv_username, in dir $gpxdir ..." >> $serverlog
+echo "$(date) $(hostname) Update: Updating server $srv_ip-$srv_port for user $srv_username, in dir $gpxdir ..." >> $serverlog
 
 # Move to correct directory
 cd $gpxdir
@@ -112,7 +112,7 @@ then
 			echo "$(date) $(hostname) Update: Success: Update completed.  ($(date))" >> $updatelog
                         $cback "$callback_url&do=createsrv_status&status=complete" >> /dev/null
 
-			echo "$(date) $(hostname) Update: Server update completed on $srv_ip:$srv_port for user $srv_username." >> $serverlog
+			echo "$(date) $(hostname) Update: Server update completed on $srv_ip-$srv_port for user $srv_username." >> $serverlog
 
                         break
 		# Still running, wait...
@@ -122,7 +122,7 @@ then
 	    	# Something else happened
 	    	else
 			echo "$(date) $(hostname) Update failed: Something odd happened.  Screen PID was: $screen_pid, update PID was: $pid.  Exiting. ($(date))" >> $updatelog
-			 echo "$(date) $(hostname) Update: Failed on $srv_ip:$srv_port for user $srv_username: Something odd happened.  Screen PID was: $screen_pid, update PID was: $pid.  Exiting." >> $serverlog
+			 echo "$(date) $(hostname) Update: Failed on $srv_ip-$srv_port for user $srv_username: Something odd happened.  Screen PID was: $screen_pid, update PID was: $pid.  Exiting." >> $serverlog
 
 	        	$cback "$callback_url&do=createsrv_status&status=failed" >> /dev/null
                         break