diff --git a/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg b/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg
index 0bacc5956..ae498b1fd 100644
--- a/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg
@@ -14,8 +14,8 @@ port="27015"
 defaultmap="co_core"
 maxplayers="24"
 servername="LinuxGSM Server"
-webadminuser="admin"
-webadminpass="admin"
+webinterfaceuser="admin"
+webinterfacepass="admin"
 httpport="8080"
 mods=""
 serverpassword=""
@@ -24,7 +24,7 @@ serverpassword=""
 # -password \"${serverpassword}\"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="-name \"${servername}\" -port ${port} -webadmin -webdomain ${ip} -webuser ${webadminuser} -webpassword \"${webadminpass}\" -webport ${httpport} -map ${defaultmap} -limit ${maxplayers} -config_path \"${servercfgdir}\" -modstorage \"${modstoragedir}\" -mods \"${mods}\""
+startparameters="-name \"${servername}\" -port ${port} -webinterface -webdomain ${ip} -webuser ${webinterfaceuser} -webpassword \"${webinterfacepass}\" -webport ${httpport} -map ${defaultmap} -limit ${maxplayers} -config_path \"${servercfgdir}\" -modstorage \"${modstoragedir}\" -mods \"${mods}\""
 
 #### LinuxGSM Settings ####
 
diff --git a/lgsm/config-default/config-lgsm/ns2server/_default.cfg b/lgsm/config-default/config-lgsm/ns2server/_default.cfg
index dbbd47d33..e92d0ac25 100644
--- a/lgsm/config-default/config-lgsm/ns2server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ns2server/_default.cfg
@@ -14,8 +14,8 @@ port="27015"
 defaultmap="ns2_summit"
 maxplayers="24"
 servername="LinuxGSM Server"
-webadminuser="admin"
-webadminpass="admin"
+webinterfaceuser="admin"
+webinterfacepass="admin"
 httpport="8080"
 mods=""
 serverpassword=""
@@ -24,7 +24,7 @@ serverpassword=""
 # -password \"${serverpassword}\"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="-name \"${servername}\" -port ${port} -webadmin -webdomain ${ip} -webuser ${webadminuser} -webpassword \"${webadminpass}\" -webport ${httpport} -map ${defaultmap} -limit ${maxplayers} -config_path \"${servercfgdir}\" -logdir \"${gamelogdir}\" -modstorage \"${modstoragedir}\" -mods2 \"${mods}\""
+startparameters="-name \"${servername}\" -port ${port} -webinterface -webdomain ${ip} -webuser ${webinterfaceuser} -webpassword \"${webinterfacepass}\" -webport ${httpport} -map ${defaultmap} -limit ${maxplayers} -config_path \"${servercfgdir}\" -logdir \"${gamelogdir}\" -modstorage \"${modstoragedir}\" -mods2 \"${mods}\""
 
 #### LinuxGSM Settings ####
 
diff --git a/lgsm/modules/check_ip.sh b/lgsm/modules/check_ip.sh
index 8dc0567b9..a2a16298c 100644
--- a/lgsm/modules/check_ip.sh
+++ b/lgsm/modules/check_ip.sh
@@ -39,25 +39,25 @@ function fn_is_valid_ip() {
 # If the IP variable has been set by user.
 if fn_is_valid_ip "${ip}"; then
 	queryips=("${ip}")
-	webadminip=("${ip}")
+	httpip=("${ip}")
 	telnetip=("${ip}")
 # If game config does have an IP set.
 elif fn_is_valid_ip "${configip}"; then
 	queryips=("${configip}")
 	ip="${configip}"
-	webadminip=("${configip}")
+	httpip=("${configip}")
 	telnetip=("${configip}")
 # If there is only 1 server IP address.
 # Some IP details can automaticly use the one IP
 elif [ "${#current_ips[@]}" == "1" ]; then
 	queryips=("127.0.0.1" "${current_ips[@]}")
 	ip="0.0.0.0"
-	webadminip=("${current_ips[@]}")
+	httpip=("${current_ips[@]}")
 	telnetip=("${current_ips[@]}")
 # If no ip is set by the user and server has more than one IP.
 else
 	queryips=("127.0.0.1" "${current_ips[@]}")
 	ip="0.0.0.0"
-	webadminip=("${ip}")
+	httpip=("${ip}")
 	telnetip=("${ip}")
 fi
diff --git a/lgsm/modules/command_dev_details.sh b/lgsm/modules/command_dev_details.sh
index 7315e0e68..379ee7606 100644
--- a/lgsm/modules/command_dev_details.sh
+++ b/lgsm/modules/command_dev_details.sh
@@ -60,11 +60,11 @@ declare -A server_details=(
 	['Steam Master Port']="${steammasterport}"
 	['Telnet IP']="${telnetip}"
 	['Tickrate']="${tickrate}"
-	['Web Admin Enabled']="${webadminenabled}"
-	['Web Admin IP']="${webadminip}"
-	['Web Admin Password']="${webadminpass}"
-	['Web Admin Port']="${webadminport}"
-	['Web Admin User']="${webadminuser}"
+	['Web Interface Enabled']="${httpenabled}"
+	['Web Interface IP']="${httpip}"
+	['Web Interface Password']="${webinterfacepass}"
+	['Web Interface Port']="${webinterfaceport}"
+	['Web Interface User']="${webinterfaceuser}"
 	['World Name']="${worldname}"
 	['World Type']="${worldtype}"
 )
diff --git a/lgsm/modules/command_dev_query_raw.sh b/lgsm/modules/command_dev_query_raw.sh
index 0d30e75bf..99f7a3c69 100644
--- a/lgsm/modules/command_dev_query_raw.sh
+++ b/lgsm/modules/command_dev_query_raw.sh
@@ -82,10 +82,10 @@ echo -e "=================================================================="
 		echo -e "HTTP Query:"
 	fi
 
-	if [ -v webadminport ]; then
-		echo -e "Web Admin: \t${webadminport} \t$(ss -tupl | grep -c ${webadminport}) \t$(ss -tupl | grep ${webadminport} | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep ${webadminport} | grep udp | awk '{ print $2 }')"
+	if [ -v webinterfaceport ]; then
+		echo -e "Web Interface: \t${webinterfaceport} \t$(ss -tupl | grep -c ${webinterfaceport}) \t$(ss -tupl | grep ${webinterfaceport} | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep ${webinterfaceport} | grep udp | awk '{ print $2 }')"
 	else
-		echo -e "Web Admin:"
+		echo -e "Web Interface:"
 	fi
 
 	if [ -v clientport ]; then
diff --git a/lgsm/modules/fix_kf.sh b/lgsm/modules/fix_kf.sh
index 3cfb8fd84..4f4c74416 100644
--- a/lgsm/modules/fix_kf.sh
+++ b/lgsm/modules/fix_kf.sh
@@ -7,12 +7,12 @@
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
-echo -e "Applying WebAdmin ROOst.css fix."
+echo -e "Applying webinterface ROOst.css fix."
 echo -e "http://forums.tripwireinteractive.com/showpost.php?p=585435&postcount=13"
 sed -i 's/none}/none;/g' "${serverfiles}/Web/ServerAdmin/ROOst.css"
 sed -i 's/underline}/underline;/g' "${serverfiles}/Web/ServerAdmin/ROOst.css"
 fn_sleep_time
-echo -e "Applying WebAdmin CharSet fix."
+echo -e "Applying webinterface CharSet fix."
 echo -e "http://forums.tripwireinteractive.com/showpost.php?p=442340&postcount=1"
 sed -i 's/CharSet="iso-8859-1"/CharSet="utf-8"/g' "${systemdir}/UWeb.int"
 fn_sleep_time
diff --git a/lgsm/modules/fix_ro.sh b/lgsm/modules/fix_ro.sh
index 5dd1d3fb8..f094c6b38 100644
--- a/lgsm/modules/fix_ro.sh
+++ b/lgsm/modules/fix_ro.sh
@@ -7,12 +7,12 @@
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
-echo -e "Applying WebAdmin ROOst.css fix."
+echo -e "Applying webinterface ROOst.css fix."
 echo -e "http://forums.tripwireinteractive.com/showpost.php?p=585435&postcount=13"
 sed -i 's/none}/none;/g' "${serverfiles}/Web/ServerAdmin/ROOst.css"
 sed -i 's/underline}/underline;/g' "${serverfiles}/Web/ServerAdmin/ROOst.css"
 fn_sleep_time
-echo -e "Applying WebAdmin CharSet fix."
+echo -e "Applying webinterface CharSet fix."
 echo -e "http://forums.tripwireinteractive.com/showpost.php?p=442340&postcount=1"
 sed -i 's/CharSet="iso-8859-1"/CharSet="utf-8"/g' "${systemdir}/uweb.int"
 fn_sleep_time
diff --git a/lgsm/modules/fix_ut2k4.sh b/lgsm/modules/fix_ut2k4.sh
index 0a3b89b33..8cf75417d 100644
--- a/lgsm/modules/fix_ut2k4.sh
+++ b/lgsm/modules/fix_ut2k4.sh
@@ -7,12 +7,12 @@
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
-echo -e "applying WebAdmin ut2003.css fix."
+echo -e "applying webinterface ut2003.css fix."
 echo -e "http://forums.tripwireinteractive.com/showpost.php?p=585435&postcount=13"
 sed -i 's/none}/none;/g' "${serverfiles}/Web/ServerAdmin/ut2003.css"
 sed -i 's/underline}/underline;/g' "${serverfiles}/Web/ServerAdmin/ut2003.css"
 fn_sleep_time
-echo -e "applying WebAdmin CharSet fix."
+echo -e "applying webinterface CharSet fix."
 echo -e "http://forums.tripwireinteractive.com/showpost.php?p=442340&postcount=1"
 sed -i 's/CharSet="iso-8859-1"/CharSet="utf-8"/g' "${systemdir}/UWeb.int"
 fn_sleep_time
diff --git a/lgsm/modules/info_game.sh b/lgsm/modules/info_game.sh
index 1275341db..e3c4bd1b1 100644
--- a/lgsm/modules/info_game.sh
+++ b/lgsm/modules/info_game.sh
@@ -434,9 +434,9 @@ fn_info_game_kf() {
 		fn_info_game_ini "queryportgs" "QueryPort"
 		fn_info_game_ini "servername" "ServerName"
 		fn_info_game_ini "serverpassword" "GamePassword"
-		fn_info_game_ini "webadminenabled" "bEnabled"
-		fn_info_game_ini "webadminpass" "WebAdminPassword"
-		fn_info_game_ini "webadminuser" "AdminName"
+		fn_info_game_ini "httpenabled" "bEnabled"
+		fn_info_game_ini "webinterfacepass" "webinterfacePassword"
+		fn_info_game_ini "webinterfaceuser" "AdminName"
 	fi
 	adminpassword="${adminpassword:-"NOT SET"}"
 	defaultmap="${defaultmap:-"NOT SET"}"
@@ -450,9 +450,9 @@ fn_info_game_kf() {
 	serverpassword="${serverpassword:-"NOT SET"}"
 	steammasterport="28852"
 	steamworksport="20560"
-	webadminenabled="${webadminenabled:-"NOT SET"}"
-	webadminpass="${adminpassword}"
-	webadminuser="${webadminuser:-"NOT SET"}"
+	httpenabled="${httpenabled:-"NOT SET"}"
+	webinterfacepass="${adminpassword}"
+	webinterfaceuser="${webinterfaceuser:-"NOT SET"}"
 }
 
 # Config Type: ini
@@ -467,8 +467,8 @@ fn_info_game_kf2() {
 		fn_info_game_ini "port" "Port"
 		fn_info_game_ini "servername" "ServerName"
 		fn_info_game_ini "serverpassword" "GamePassword"
-		fn_info_game_ini "webadminenabled" "bEnabled"
-		fn_info_game_ini "webadminpass" "WebAdminPassword"
+		fn_info_game_ini "httpenabled" "bEnabled"
+		fn_info_game_ini "webinterfacepass" "webinterfacePassword"
 	fi
 	adminpassword="${adminpassword:-"NOT SET"}"
 	defaultmap="${defaultmap:-"NOT SET"}"
@@ -477,9 +477,9 @@ fn_info_game_kf2() {
 	queryport="${queryport:-"0"}"
 	servername="${servername:-"NOT SET"}"
 	serverpassword="${serverpassword:-"NOT SET"}"
-	webadminenabled="${webadminenabled:-"NOT SET"}"
-	webadminpass="${webadminpass:-"NOT SET"}"
-	webadminuser="Admin"
+	httpenabled="${httpenabled:-"NOT SET"}"
+	webinterfacepass="${webinterfacepass:-"NOT SET"}"
+	webinterfaceuser="Admin"
 }
 
 # Config Type: ini
@@ -696,10 +696,10 @@ fn_info_game_ut99() {
 		fn_info_game_ini "queryportgs" "OldQueryPortNumber"
 		fn_info_game_ini "servername" "ServerName"
 		fn_info_game_ini "serverpassword" "GamePassword"
-		fn_info_game_ini "webadminenabled" "bEnabled"
-		fn_info_game_ini "webadminpass" "AdminPassword"
+		fn_info_game_ini "httpenabled" "bEnabled"
+		fn_info_game_ini "webinterfacepass" "AdminPassword"
 		fn_info_game_ini "httpport" "ListenPort"
-		fn_info_game_ini "webadminuser" "AdminUserName"
+		fn_info_game_ini "webinterfaceuser" "AdminUserName"
 	fi
 	adminpassword="${adminpassword:-"NOT SET"}"
 	beaconport="${beaconport:-"0"}"
@@ -710,9 +710,9 @@ fn_info_game_ut99() {
 	queryportgs="${queryportgs:-"0"}"
 	servername="${servername:-"NOT SET"}"
 	serverpassword="${serverpassword:-"NOT SET"}"
-	webadminenabled="${webadminenabled:-"0"}"
-	webadminpass="${webadminpass:-"NOT SET"}"
-	webadminuser="${webadminuser:-"NOT SET"}"
+	httpenabled="${httpenabled:-"0"}"
+	webinterfacepass="${webinterfacepass:-"NOT SET"}"
+	webinterfaceuser="${webinterfaceuser:-"NOT SET"}"
 }
 
 # Config Type: ini
@@ -726,8 +726,8 @@ fn_info_game_ut3() {
 		fn_info_game_ini "maxplayers" "MaxPlayers"
 		fn_info_game_ini "servername" "ServerName"
 		fn_info_game_ini "serverpassword" "GamePassword"
-		fn_info_game_ini "webadminenabled" "bEnabled"
-		fn_info_game_ini "webadminpass" "AdminPassword"
+		fn_info_game_ini "httpenabled" "bEnabled"
+		fn_info_game_ini "webinterfacepass" "AdminPassword"
 		fn_info_game_ini "httpport" "ListenPort"
 	fi
 	adminpassword="${adminpassword:-"NOT SET"}"
@@ -738,9 +738,9 @@ fn_info_game_ut3() {
 	queryport="${queryport:-"0"}"
 	servername="${servername:-"NOT SET"}"
 	serverpassword="${serverpassword:-"NOT SET"}"
-	webadminenabled="${webadminenabled:-"0"}"
-	webadminpass="${webadminpass:-"NOT SET"}"
-	webadminuser="Admin"
+	httpenabled="${httpenabled:-"0"}"
+	webinterfacepass="${webinterfacepass:-"NOT SET"}"
+	webinterfaceuser="Admin"
 }
 
 # Config Type: ini
@@ -756,8 +756,8 @@ fn_info_game_unreal2() {
 		fn_info_game_ini "queryportgs" "OldQueryPortNumber"
 		fn_info_game_ini "servername" "ServerName"
 		fn_info_game_ini "serverpassword" "GamePassword"
-		fn_info_game_ini "webadminenabled" "bEnabled"
-		fn_info_game_ini "webadminuser" "AdminName"
+		fn_info_game_ini "httpenabled" "bEnabled"
+		fn_info_game_ini "webinterfaceuser" "AdminName"
 	fi
 	adminpassword="${adminpassword:-"NOT SET"}"
 	defaultmap="${defaultmap:-"NOT SET"}"
@@ -767,9 +767,9 @@ fn_info_game_unreal2() {
 	queryportgs="${queryportgs:-"0"}"
 	servername="${servername:-"NOT SET"}"
 	serverpassword="${serverpassword:-"NOT SET"}"
-	webadminenabled="${webadminenabled:-"0"}"
-	webadminpass="${adminpassword:-"NOT SET"}"
-	webadminuser="${webadminuser:-"NOT SET"}"
+	httpenabled="${httpenabled:-"0"}"
+	webinterfacepass="${adminpassword:-"NOT SET"}"
+	webinterfaceuser="${webinterfaceuser:-"NOT SET"}"
 }
 
 # Config Type: ini
@@ -801,8 +801,8 @@ fn_info_game_ut2k4() {
 		fn_info_game_ini "queryportgs" "OldQueryPortNumber"
 		fn_info_game_ini "servername" "ServerName"
 		fn_info_game_ini "serverpassword" "GamePassword"
-		fn_info_game_ini "webadminenabled" "bEnabled"
-		fn_info_game_ini "webadminuser" "AdminName"
+		fn_info_game_ini "httpenabled" "bEnabled"
+		fn_info_game_ini "webinterfaceuser" "AdminName"
 	fi
 	adminpassword="${adminpassword:-"NOT SET"}"
 	defaultmap="${defaultmap:-"NOT SET"}"
@@ -813,9 +813,9 @@ fn_info_game_ut2k4() {
 	queryportgs="${queryportgs:-"0"}"
 	servername="${servername:-"NOT SET"}"
 	serverpassword="${serverpassword:-"NOT SET"}"
-	webadminenabled="${webadminenabled:-"0"}"
-	webadminpass="${adminpassword}"
-	webadminuser="${webadminuser:-"NOT SET"}"
+	httpenabled="${httpenabled:-"0"}"
+	webinterfacepass="${adminpassword}"
+	webinterfaceuser="${webinterfaceuser:-"NOT SET"}"
 }
 
 # Config Type: json
@@ -1437,8 +1437,9 @@ fn_info_game_pc() {
 		fn_info_game_pc_config "port" "hostPort"
 		fn_info_game_pc_config "queryport" "queryPort"
 		fn_info_game_pc_config "steamport" "steamPort"
-		fn_info_game_pc_config "webadminenabled" "enableHttpApi"
+		fn_info_game_pc_config "httpenabled" "enableHttpApi"
 		fn_info_game_pc_config "httpport" "httpApiPort"
+		fn_info_game_pc_config "apiport" "apiPort"
 	fi
 	maxplayers="${maxplayers:-"0"}"
 	port="${port:-"0"}"
@@ -1582,9 +1583,9 @@ fn_info_game_ro() {
 		fn_info_game_ini "queryportgs" "QueryPort"
 		fn_info_game_ini "servername" "ServerName"
 		fn_info_game_ini "serverpassword" "GamePassword"
-		fn_info_game_ini "webadminenabled" "bEnabled"
-		fn_info_game_ini "webadminpass" "WebAdminPassword"
-		fn_info_game_ini "webadminuser" "AdminName"
+		fn_info_game_ini "httpenabled" "bEnabled"
+		fn_info_game_ini "webinterfacepass" "webinterfacePassword"
+		fn_info_game_ini "webinterfaceuser" "AdminName"
 	fi
 	adminpassword="${adminpassword:-"NOT SET"}"
 	defaultmap="${defaultmap:-"NOT SET"}"
@@ -1598,9 +1599,9 @@ fn_info_game_ro() {
 	serverpassword="${serverpassword:-"NOT SET"}"
 	steamport="20610"
 	steammasterport="28902"
-	webadminenabled="${webadminenabled:-"NOT SET"}"
-	webadminpass="${adminpassword}"
-	webadminuser="${webadminuser:-"NOT SET"}"
+	httpenabled="${httpenabled:-"NOT SET"}"
+	webinterfacepass="${adminpassword}"
+	webinterfaceuser="${webinterfaceuser:-"NOT SET"}"
 }
 
 # Config Type: QuakeC
@@ -1822,8 +1823,8 @@ fn_info_game_sdtd() {
 		fn_info_game_xml "telnetenabled" "ServerSettings/@TelnetEnabled"
 		fn_info_game_xml "telnetpass" "ServerSettings/@TelnetPassword"
 		fn_info_game_xml "telnetport" "ServerSettings/@TelnetPort"
-		fn_info_game_xml "webadminenabled" "ServerSettings/@ControlPanelEnabled"
-		fn_info_game_xml "webadminpass" "ServerSettings/@ControlPanelPassword"
+		fn_info_game_xml "httpenabled" "ServerSettings/@ControlPanelEnabled"
+		fn_info_game_xml "webinterfacepass" "ServerSettings/@ControlPanelPassword"
 		fn_info_game_xml "httpport" "ServerSettings/@ControlPanelPort"
 		fn_info_game_xml "worldname" "ServerSettings/@GameWorld"
 
@@ -1832,9 +1833,9 @@ fn_info_game_sdtd() {
 	serverpassword="${serverpassword:-"NOT SET"}"
 	port="${port:-"0"}"
 	queryport="${queryport:-"0"}"
-	webadminenabled="${webadminenabled:-"NOT SET"}"
+	httpenabled="${httpenabled:-"NOT SET"}"
 	httpport="${httpport:-"0"}"
-	webadminpass="${webadminpass:-"NOT SET"}"
+	webinterfacepass="${webinterfacepass:-"NOT SET"}"
 	telnetenabled="${telnetenabled:-"NOT SET"}"
 	telnetport="${telnetport:-"0"}"
 	telnetpass="${telnetpass:-"NOT SET"}"
@@ -1933,8 +1934,8 @@ fn_info_game_spark() {
 	queryport="$((port + 1))"
 	servername="${servername:-"NOT SET"}"
 	serverpassword="${serverpassword:-"NOT SET"}"
-	webadminuser="${webadminuser:-"NOT SET"}"
-	webadminpass="${webadminpass:-"NOT SET"}"
+	webinterfaceuser="${webinterfaceuser:-"NOT SET"}"
+	webinterfacepass="${webinterfacepass:-"NOT SET"}"
 	httpport="${httpport:-"0"}"
 }
 
diff --git a/lgsm/modules/info_messages.sh b/lgsm/modules/info_messages.sh
index 491ea6356..c2348c066 100644
--- a/lgsm/modules/info_messages.sh
+++ b/lgsm/modules/info_messages.sh
@@ -35,8 +35,8 @@ fn_info_message_password_strip() {
 			statspassword="********"
 		fi
 
-		if [ "${webadminpass}" ]; then
-			webadminpass="********"
+		if [ "${webinterfacepass}" ]; then
+			webinterfacepass="********"
 		fi
 
 		if [ "${telnetpass}" ]; then
@@ -989,7 +989,7 @@ fn_info_message_eco() {
 	{
 		fn_port "header"
 		fn_port "Game" port udp
-		fn_port "Web Admin" webadminport tcp
+		fn_port "Web Interface" webinterfaceport tcp
 	} | column -s $'\t' -t
 }
 
@@ -1076,19 +1076,19 @@ fn_info_message_kf() {
 		fn_port "Game" port udp
 		fn_port "Query" queryport udp
 		fn_port "Query (GameSpy)" queryportgs udp
-		fn_port "Web Admin" webadminport tcp
+		fn_port "Web Interface" webinterfaceport tcp
 		fn_port "LAN" lanport udp
 		fn_port "Steamworks P2P" steamworksport udp
 		fn_port "Steam Master Server" steammasterport udp
 	} | column -s $'\t' -t
 	echo -e ""
-	echo -e "${lightgreen}${servername} Web Admin${default}"
+	echo -e "${lightgreen}${servername} Web Interface${default}"
 	fn_messages_separator
 	{
-		echo -e "${lightblue}Web Admin enabled:\t${default}${webadminenabled}"
-		echo -e "${lightblue}Web Admin url:\t${default}http://${webadminip}:${webadminport}"
-		echo -e "${lightblue}Web Admin username:\t${default}${webadminuser}"
-		echo -e "${lightblue}Web Admin password:\t${default}${webadminpass}"
+		echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}"
+		echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${webinterfaceport}"
+		echo -e "${lightblue}Web Interface username:\t${default}${webinterfaceuser}"
+		echo -e "${lightblue}Web Interface password:\t${default}${webinterfacepass}"
 	} | column -s $'\t' -t
 }
 
@@ -1098,16 +1098,16 @@ fn_info_message_kf2() {
 		fn_port "header"
 		fn_port "Game" port udp
 		fn_port "Query" queryport udp
-		fn_port "Web Admin" webadminport tcp
+		fn_port "Web Interface" webinterfaceport tcp
 	} | column -s $'\t' -t
 	echo -e ""
-	echo -e "${lightgreen}${servername} Web Admin${default}"
+	echo -e "${lightgreen}${servername} Web Interface${default}"
 	fn_messages_separator
 	{
-		echo -e "${lightblue}Web Admin enabled:\t${default}${webadminenabled}"
-		echo -e "${lightblue}Web Admin url:\t${default}http://${webadminip}:${webadminport}"
-		echo -e "${lightblue}Web Admin username:\t${default}${webadminuser}"
-		echo -e "${lightblue}Web Admin password:\t${default}${webadminpass}"
+		echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}"
+		echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${webinterfaceport}"
+		echo -e "${lightblue}Web Interface username:\t${default}${webinterfaceuser}"
+		echo -e "${lightblue}Web Interface password:\t${default}${webinterfacepass}"
 	} | column -s $'\t' -t
 }
 
@@ -1193,6 +1193,15 @@ fn_info_message_pc() {
 		fn_port "Game" port udp
 		fn_port "Query" queryport udp
 		fn_port "Steam" steamport udp
+		fn_port "HTTP" httpport tcp
+		fn_port "API" apiport tcp
+	} | column -s $'\t' -t
+	echo -e ""
+	echo -e "${lightgreen}${servername} Web Interface${default}"
+	fn_messages_separator
+	{
+		echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}"
+		echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${httpport}"
 	} | column -s $'\t' -t
 }
 
@@ -1268,19 +1277,19 @@ fn_info_message_ro() {
 		fn_port "header"
 		fn_port "Game" port udp
 		fn_port "Query" queryport udp
-		fn_port "Web Admin" webadminport tcp
+		fn_port "Web Interface" webinterfaceport tcp
 		fn_port "LAN" lanport udp
 		fn_port "Steamworks P2P" steamworksport udp
 		fn_port "Steam Master Server" steammasterport udp
 	} | column -s $'\t' -t
 	echo -e ""
-	echo -e "${lightgreen}${servername} Web Admin${default}"
+	echo -e "${lightgreen}${servername} Web Interface${default}"
 	fn_messages_separator
 	{
-		echo -e "${lightblue}Web Admin enabled:\t${default}${webadminenabled}"
-		echo -e "${lightblue}Web Admin url:\t${default}http://${webadminip}:${webadminport}"
-		echo -e "${lightblue}Web Admin username:\t${default}${webadminuser}"
-		echo -e "${lightblue}Web Admin password:\t${default}${webadminpass}"
+		echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}"
+		echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${webinterfaceport}"
+		echo -e "${lightblue}Web Interface username:\t${default}${webinterfaceuser}"
+		echo -e "${lightblue}Web Interface password:\t${default}${webinterfacepass}"
 	} | column -s $'\t' -t
 }
 
@@ -1356,17 +1365,17 @@ fn_info_message_sdtd() {
 		fn_port "Game" port udp
 		fn_port "Game+2" port3 udp
 		fn_port "Query" queryport tcp
-		fn_port "Web Admin" webadminport tcp
+		fn_port "Web Interface" webinterfaceport tcp
 		fn_port "Telnet" telnetport tcp
 	} | column -s $'\t' -t
 	echo -e ""
-	echo -e "${lightgreen}${gamename} Web Admin${default}"
+	echo -e "${lightgreen}${gamename} Web Interface${default}"
 	fn_messages_separator
 	{
-		echo -e "${lightblue}Web Admin enabled:\t${default}${webadminenabled}"
-		echo -e "${lightblue}Web Admin url:\t${default}http://${webadminip}:${webadminport}/index.html"
-		echo -e "${lightblue}Web Admin username:\t${default}${webadminuser}"
-		echo -e "${lightblue}Web Admin password:\t${default}${webadminpass}"
+		echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}"
+		echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${webinterfaceport}/index.html"
+		echo -e "${lightblue}Web Interface username:\t${default}${webinterfaceuser}"
+		echo -e "${lightblue}Web Interface password:\t${default}${webinterfacepass}"
 	} | column -s $'\t' -t
 	echo -e ""
 	echo -e "${lightgreen}${gamename} Telnet${default}"
@@ -1433,15 +1442,15 @@ fn_info_message_spark() {
 		fn_port "header"
 		fn_port "Game" port udp
 		fn_port "Query" queryport udp
-		fn_port "Web Admin" webadminport tcp
+		fn_port "Web Interface" webinterfaceport tcp
 	} | column -s $'\t' -t
 	echo -e ""
-	echo -e "${lightgreen}${gamename} Web Admin${default}"
+	echo -e "${lightgreen}${gamename} Web Interface${default}"
 	fn_messages_separator
 	{
-		echo -e "${lightblue}Web Admin url:\t${default}http://${webadminip}:${webadminport}/index.html"
-		echo -e "${lightblue}Web Admin username:\t${default}${webadminuser}"
-		echo -e "${lightblue}Web Admin password:\t${default}${webadminpass}"
+		echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${webinterfaceport}/index.html"
+		echo -e "${lightblue}Web Interface username:\t${default}${webinterfaceuser}"
+		echo -e "${lightblue}Web Interface password:\t${default}${webinterfacepass}"
 	} | column -s $'\t' -t
 }
 
@@ -1459,13 +1468,13 @@ fn_info_message_st() {
 		fn_port "header"
 		fn_port "Game" port udp
 		fn_port "Query" queryport udp
-		fn_port "Web Admin" webadminport tcp
+		fn_port "Web Interface" webinterfaceport tcp
 	} | column -s $'\t' -t
 	echo -e ""
-	echo -e "${lightgreen}${gamename} Web Admin${default}"
+	echo -e "${lightgreen}${gamename} Web Interface${default}"
 	fn_messages_separator
 	{
-		echo -e "${lightblue}Web Admin url:\t${default}http://${webadminip}:${webadminport}"
+		echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${webinterfaceport}"
 	} | column -s $'\t' -t
 }
 
@@ -1522,16 +1531,16 @@ fn_info_message_unreal() {
 		fn_port "Game" port udp
 		fn_port "Query" queryport udp
 		fn_port "LAN Beacon" beaconport udp
-		fn_port "Web Admin" webadminport tcp
+		fn_port "Web Interface" webinterfaceport tcp
 	} | column -s $'\t' -t
 	echo -e ""
-	echo -e "${lightgreen}${servername} Web Admin${default}"
+	echo -e "${lightgreen}${servername} Web Interface${default}"
 	fn_messages_separator
 	{
-		echo -e "${lightblue}Web Admin enabled:\t${default}${webadminenabled}"
-		echo -e "${lightblue}Web Admin url:\t${default}http://${webadminip}:${webadminport}"
-		echo -e "${lightblue}Web Admin username:\t${default}${webadminuser}"
-		echo -e "${lightblue}Web Admin password:\t${default}${webadminpass}"
+		echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}"
+		echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${webinterfaceport}"
+		echo -e "${lightblue}Web Interface username:\t${default}${webinterfaceuser}"
+		echo -e "${lightblue}Web Interface password:\t${default}${webinterfacepass}"
 	} | column -s $'\t' -t
 }
 
@@ -1541,17 +1550,17 @@ fn_info_message_ut2k4() {
 		fn_port "Game" port udp
 		fn_port "Query" queryport udp
 		fn_port "Query (GameSpy)" queryportgs udp
-		fn_port "Web Admin" webadminport tcp
+		fn_port "Web Interface" webinterfaceport tcp
 		fn_port "LAN" lanport udp
 	} | column -s $'\t' -t
 	echo -e ""
-	echo -e "${lightgreen}${servername} Web Admin${default}"
+	echo -e "${lightgreen}${servername} Web Interface${default}"
 	fn_messages_separator
 	{
-		echo -e "${lightblue}Web Admin enabled:\t${default}${webadminenabled}"
-		echo -e "${lightblue}Web Admin url:\t${default}http://${webadminip}:${webadminport}"
-		echo -e "${lightblue}Web Admin username:\t${default}${webadminuser}"
-		echo -e "${lightblue}Web Admin password:\t${default}${webadminpass}"
+		echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}"
+		echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${webinterfaceport}"
+		echo -e "${lightblue}Web Interface username:\t${default}${webinterfaceuser}"
+		echo -e "${lightblue}Web Interface password:\t${default}${webinterfacepass}"
 	} | column -s $'\t' -t
 }
 
@@ -1562,16 +1571,16 @@ fn_info_message_unreal() {
 		fn_port "Game" port udp
 		fn_port "Query" queryport udp
 		fn_port "LAN Beacon" beaconport udp
-		fn_port "Web Admin" webadminport tcp
+		fn_port "Web Interface" webinterfaceport tcp
 	} | column -s $'\t' -t
 	echo -e ""
-	echo -e "${lightgreen}${servername} Web Admin${default}"
+	echo -e "${lightgreen}${servername} Web Interface${default}"
 	fn_messages_separator
 	{
-		echo -e "${lightblue}Web Admin enabled:\t${default}${webadminenabled}"
-		echo -e "${lightblue}Web Admin url:\t${default}http://${webadminip}:${webadminport}"
-		echo -e "${lightblue}Web Admin username:\t${default}${webadminuser}"
-		echo -e "${lightblue}Web Admin password:\t${default}${webadminpass}"
+		echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}"
+		echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${webinterfaceport}"
+		echo -e "${lightblue}Web Interface username:\t${default}${webinterfaceuser}"
+		echo -e "${lightblue}Web Interface password:\t${default}${webinterfacepass}"
 	} | column -s $'\t' -t
 }
 
@@ -1598,16 +1607,16 @@ fn_info_message_ut3() {
 		fn_port "header"
 		fn_port "Game" port udp
 		fn_port "Query" queryport udp
-		fn_port "Web Admin" webadminport tcp
+		fn_port "Web Interface" webinterfaceport tcp
 	} | column -s $'\t' -t
 	echo -e ""
-	echo -e "${lightgreen}${servername} Web Admin${default}"
+	echo -e "${lightgreen}${servername} Web Interface${default}"
 	fn_messages_separator
 	{
-		echo -e "${lightblue}Web Admin enabled:\t${default}${webadminenabled}"
-		echo -e "${lightblue}Web Admin url:\t${default}http://${webadminip}:${webadminport}"
-		echo -e "${lightblue}Web Admin username:\t${default}${webadminuser}"
-		echo -e "${lightblue}Web Admin password:\t${default}${webadminpass}"
+		echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}"
+		echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${webinterfaceport}"
+		echo -e "${lightblue}Web Interface username:\t${default}${webinterfaceuser}"
+		echo -e "${lightblue}Web Interface password:\t${default}${webinterfacepass}"
 	} | column -s $'\t' -t
 }