diff --git a/src/bin/easyrule b/src/bin/easyrule
index 28322cb8f..aac19717e 100755
--- a/src/bin/easyrule
+++ b/src/bin/easyrule
@@ -28,7 +28,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once("legacy.inc");
+require_once("pfsense-utils.inc");
 require_once("easyrule.inc");
 require_once("filter.inc");
 require_once("shaper.inc");
@@ -43,7 +43,7 @@ foreach ($ifdisp as $kif => $kdescr) {
 
 /* Borrow this function from guiconfig.inc since we can't include it for use at the CLI
 
- - Maybe these need to be moved to util.inc or legacy.inc?
+ - Maybe these need to be moved to util.inc or pfsense-utils.inc?
 
 */
 function pconfig_to_address(&$adr, $padr, $pmask, $pnot=false, $pbeginport=0, $pendport=0) {
diff --git a/src/etc/inc/functions.inc b/src/etc/inc/functions.inc
index 91ac8512c..a3514b90d 100644
--- a/src/etc/inc/functions.inc
+++ b/src/etc/inc/functions.inc
@@ -138,7 +138,7 @@ if(!function_exists("dom_title")) {
 require_once("interfaces.inc");
 require_once("gwlb.inc");
 require_once("services.inc");
-require_once("legacy.inc");
+require_once("pfsense-utils.inc");
 require_once("certs.inc");
 require_once("system.inc");
 require_once("vslb.inc");
diff --git a/src/etc/inc/openvpn.inc b/src/etc/inc/openvpn.inc
index de6bfd0dd..5306e83dc 100644
--- a/src/etc/inc/openvpn.inc
+++ b/src/etc/inc/openvpn.inc
@@ -31,7 +31,7 @@
 
 require_once('config.inc');
 require_once('certs.inc');
-require_once('legacy.inc');
+require_once('pfsense-utils.inc');
 require_once('auth.inc');
 
 global $openvpn_prots;
diff --git a/src/etc/inc/legacy.inc b/src/etc/inc/pfsense-utils.inc
similarity index 100%
rename from src/etc/inc/legacy.inc
rename to src/etc/inc/pfsense-utils.inc
diff --git a/src/etc/inc/pkg-utils.inc b/src/etc/inc/pkg-utils.inc
index 88b68a70d..cce14615d 100644
--- a/src/etc/inc/pkg-utils.inc
+++ b/src/etc/inc/pkg-utils.inc
@@ -32,7 +32,7 @@ require_once("globals.inc");
 require_once("xmlrpc.inc");
 require_once("service-utils.inc");
 require_once("xmlparse.inc");
-require_once("legacy.inc");
+require_once("pfsense-utils.inc");
 
 if(!function_exists("update_status")) {
 	function update_status($status) {
@@ -1251,7 +1251,7 @@ function stop_packages()
 	require_once("shaper.inc");
 	require_once("captiveportal.inc");
 	require_once("pkg-utils.inc");
-	require_once("legacy.inc");
+	require_once("pfsense-utils.inc");
 	require_once("service-utils.inc");
 
 	global $config, $g;
diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup
index ed6b3f410..02b2a10c0 100755
--- a/src/etc/rc.bootup
+++ b/src/etc/rc.bootup
@@ -111,7 +111,7 @@ require_once("captiveportal.inc");
 echo ".";
 require_once("rrd.inc");
 echo ".";
-require_once("legacy.inc");
+require_once("pfsense-utils.inc");
 echo ".";
 
 /* get system memory amount */
diff --git a/src/etc/rc.start_packages b/src/etc/rc.start_packages
index 3cca1e276..da557c878 100755
--- a/src/etc/rc.start_packages
+++ b/src/etc/rc.start_packages
@@ -33,7 +33,7 @@ require_once("filter.inc");
 require_once("shaper.inc");
 require_once("captiveportal.inc");
 require_once("pkg-utils.inc");
-require_once("legacy.inc");
+require_once("pfsense-utils.inc");
 require_once("service-utils.inc");
 
 log_error("Restarting/Starting all packages.");
diff --git a/src/etc/rc.update_urltables b/src/etc/rc.update_urltables
index dcb96e573..0207da736 100755
--- a/src/etc/rc.update_urltables
+++ b/src/etc/rc.update_urltables
@@ -3,7 +3,7 @@
 
 require_once("config.inc");
 require_once("util.inc");
-require_once("legacy.inc");
+require_once("pfsense-utils.inc");
 
 if (!is_array($config['aliases']['alias'])) {
 	// No aliases
diff --git a/src/www/bandwidth_by_ip.php b/src/www/bandwidth_by_ip.php
index 2ed2ccce8..1e00a555f 100755
--- a/src/www/bandwidth_by_ip.php
+++ b/src/www/bandwidth_by_ip.php
@@ -35,7 +35,7 @@
 
 require_once('guiconfig.inc');
 require_once('interfaces.inc');
-require_once('legacy.inc');
+require_once('pfsense-utils.inc');
 require_once('util.inc');
 
 $listedIPs = "";
diff --git a/src/www/diag_packet_capture.php b/src/www/diag_packet_capture.php
index ec70a30c3..c4656a57b 100644
--- a/src/www/diag_packet_capture.php
+++ b/src/www/diag_packet_capture.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014 Deciso B.V.
 
@@ -73,7 +74,7 @@ if ($_POST['downloadbtn'] == gettext("Download Capture"))
 
 $pgtitle = array(gettext("Diagnostics"), gettext("Packet Capture"));
 require_once("guiconfig.inc");
-require_once("legacy.inc");
+require_once("pfsense-utils.inc");
 
 $fp = "/root/";
 $fn = "packetcapture.cap";
diff --git a/src/etc/inc/fbegin.inc b/src/www/fbegin.inc
similarity index 100%
rename from src/etc/inc/fbegin.inc
rename to src/www/fbegin.inc
diff --git a/src/etc/inc/fend.inc b/src/www/fend.inc
similarity index 100%
rename from src/etc/inc/fend.inc
rename to src/www/fend.inc
diff --git a/src/etc/inc/foot.inc b/src/www/foot.inc
similarity index 100%
rename from src/etc/inc/foot.inc
rename to src/www/foot.inc
diff --git a/src/www/getserviceproviders.php b/src/www/getserviceproviders.php
index 16c211ea9..4a6d2a449 100644
--- a/src/www/getserviceproviders.php
+++ b/src/www/getserviceproviders.php
@@ -28,7 +28,7 @@
 */
 
 require_once("guiconfig.inc");
-require_once("legacy.inc");
+require_once("pfsense-utils.inc");
 
 $serviceproviders_xml = "/usr/local/share/mobile-broadband-provider-info/serviceproviders.xml";
 $serviceproviders_contents = file_get_contents($serviceproviders_xml);
diff --git a/src/etc/inc/guiconfig.inc b/src/www/guiconfig.inc
similarity index 100%
rename from src/etc/inc/guiconfig.inc
rename to src/www/guiconfig.inc
diff --git a/src/etc/inc/head.inc b/src/www/head.inc
similarity index 100%
rename from src/etc/inc/head.inc
rename to src/www/head.inc
diff --git a/src/www/includes/functions.inc.php b/src/www/includes/functions.inc.php
index ac566c483..d164f98b3 100644
--- a/src/www/includes/functions.inc.php
+++ b/src/www/includes/functions.inc.php
@@ -5,7 +5,7 @@ if(Connection_Aborted()) {
 }
 
 require_once("config.inc");
-require_once("legacy.inc");
+require_once("pfsense-utils.inc");
 
 function get_stats() {
 	$stats['cpu'] = cpu_usage();
diff --git a/src/etc/inc/shortcuts.inc b/src/www/shortcuts.inc
similarity index 100%
rename from src/etc/inc/shortcuts.inc
rename to src/www/shortcuts.inc
diff --git a/src/www/system_firmware_auto.php b/src/www/system_firmware_auto.php
index 0a95cb817..7e29e8a63 100755
--- a/src/www/system_firmware_auto.php
+++ b/src/www/system_firmware_auto.php
@@ -31,7 +31,7 @@
 $nocsrf = true;
 
 require_once('guiconfig.inc');
-require_once('legacy.inc');
+require_once('pfsense-utils.inc');
 
 $curcfg = $config['system']['firmware'];
 
diff --git a/src/www/system_firmware_check.php b/src/www/system_firmware_check.php
index 4f5e695b4..143277dce 100644
--- a/src/www/system_firmware_check.php
+++ b/src/www/system_firmware_check.php
@@ -29,7 +29,7 @@
 */
 
 require_once("guiconfig.inc");
-require_once("legacy.inc");
+require_once("pfsense-utils.inc");
 require_once("script/load_phalcon.php");
 
 /* Setup variables for upgrade procedure */
diff --git a/src/www/widgets/widgets/captive_portal_status.widget.php b/src/www/widgets/widgets/captive_portal_status.widget.php
index 04cd30783..0729f45f0 100644
--- a/src/www/widgets/widgets/captive_portal_status.widget.php
+++ b/src/www/widgets/widgets/captive_portal_status.widget.php
@@ -32,7 +32,7 @@ $nocsrf = true;
 
 require_once("globals.inc");
 require_once("guiconfig.inc");
-require_once("legacy.inc");
+require_once("pfsense-utils.inc");
 require_once("functions.inc");
 require_once("captiveportal.inc");
 
diff --git a/src/www/widgets/widgets/carp_status.widget.php b/src/www/widgets/widgets/carp_status.widget.php
index d007a264b..20ee56e0d 100644
--- a/src/www/widgets/widgets/carp_status.widget.php
+++ b/src/www/widgets/widgets/carp_status.widget.php
@@ -30,7 +30,7 @@
 $nocsrf = true;
 
 require_once("guiconfig.inc");
-require_once("legacy.inc");
+require_once("pfsense-utils.inc");
 require_once("functions.inc");
 require_once("widgets/include/carp_status.inc");
 
diff --git a/src/www/widgets/widgets/dyn_dns_status.widget.php b/src/www/widgets/widgets/dyn_dns_status.widget.php
index 732edd42b..d75e9d1b2 100644
--- a/src/www/widgets/widgets/dyn_dns_status.widget.php
+++ b/src/www/widgets/widgets/dyn_dns_status.widget.php
@@ -31,7 +31,7 @@
 $nocsrf = true;
 
 require_once("guiconfig.inc");
-require_once("legacy.inc");
+require_once("pfsense-utils.inc");
 require_once("functions.inc");
 require_once("widgets/include/dyn_dns_status.inc");
 
diff --git a/src/www/widgets/widgets/gateways.widget.php b/src/www/widgets/widgets/gateways.widget.php
index de8a33804..c5bfcdfa2 100644
--- a/src/www/widgets/widgets/gateways.widget.php
+++ b/src/www/widgets/widgets/gateways.widget.php
@@ -29,7 +29,7 @@
 $nocsrf = true;
 
 require_once("guiconfig.inc");
-require_once("legacy.inc");
+require_once("pfsense-utils.inc");
 require_once("functions.inc");
 require_once("widgets/include/gateways.inc");
 
diff --git a/src/www/widgets/widgets/interface_list.widget.php b/src/www/widgets/widgets/interface_list.widget.php
index a95b4e1cc..3a0d182aa 100644
--- a/src/www/widgets/widgets/interface_list.widget.php
+++ b/src/www/widgets/widgets/interface_list.widget.php
@@ -32,7 +32,7 @@
 $nocsrf = true;
 
 require_once("guiconfig.inc");
-require_once("legacy.inc");
+require_once("pfsense-utils.inc");
 require_once("functions.inc");
 require_once("widgets/include/interfaces.inc");
 
diff --git a/src/www/widgets/widgets/interface_statistics.widget.php b/src/www/widgets/widgets/interface_statistics.widget.php
index fbf523b95..0a9888c36 100644
--- a/src/www/widgets/widgets/interface_statistics.widget.php
+++ b/src/www/widgets/widgets/interface_statistics.widget.php
@@ -32,7 +32,7 @@
 $nocsrf = true;
 
 require_once("guiconfig.inc");
-require_once("legacy.inc");
+require_once("pfsense-utils.inc");
 require_once("functions.inc");
 require_once("widgets/include/interface_statistics.inc");
 
diff --git a/src/www/widgets/widgets/load_balancer_status.widget.php b/src/www/widgets/widgets/load_balancer_status.widget.php
index 857999f56..d8c4ff327 100644
--- a/src/www/widgets/widgets/load_balancer_status.widget.php
+++ b/src/www/widgets/widgets/load_balancer_status.widget.php
@@ -34,7 +34,7 @@
 $nocsrf = true;
 
 require_once("guiconfig.inc");
-require_once("legacy.inc");
+require_once("pfsense-utils.inc");
 require_once("functions.inc");
 require_once("vslb.inc");
 
diff --git a/src/www/widgets/widgets/log.widget.php b/src/www/widgets/widgets/log.widget.php
index 0c173bc7b..3261b4b32 100644
--- a/src/www/widgets/widgets/log.widget.php
+++ b/src/www/widgets/widgets/log.widget.php
@@ -32,7 +32,7 @@
 $nocsrf = true;
 
 require_once("guiconfig.inc");
-require_once("legacy.inc");
+require_once("pfsense-utils.inc");
 require_once("functions.inc");
 require_once("filter_log.inc");
 
diff --git a/src/www/widgets/widgets/ntp_status.widget.php b/src/www/widgets/widgets/ntp_status.widget.php
index e3f51ba93..7b479ea1c 100644
--- a/src/www/widgets/widgets/ntp_status.widget.php
+++ b/src/www/widgets/widgets/ntp_status.widget.php
@@ -32,7 +32,7 @@
 $nocsrf = true;
 
 require_once("guiconfig.inc");
-require_once("legacy.inc");
+require_once("pfsense-utils.inc");
 require_once("functions.inc");
 require_once("widgets/include/ntp_status.inc");
 
diff --git a/src/www/widgets/widgets/picture.widget.php b/src/www/widgets/widgets/picture.widget.php
index 880cf7552..437606978 100644
--- a/src/www/widgets/widgets/picture.widget.php
+++ b/src/www/widgets/widgets/picture.widget.php
@@ -29,7 +29,7 @@
 $nocsrf = true;
 
 require_once("guiconfig.inc");
-require_once("legacy.inc");
+require_once("pfsense-utils.inc");
 require_once("functions.inc");
 
 if($_GET['getpic']=="true") {
diff --git a/src/www/widgets/widgets/rss.widget.php b/src/www/widgets/widgets/rss.widget.php
index 38be60515..ca8b0abe4 100644
--- a/src/www/widgets/widgets/rss.widget.php
+++ b/src/www/widgets/widgets/rss.widget.php
@@ -29,7 +29,7 @@
 $nocsrf = true;
 
 require_once("guiconfig.inc");
-require_once("legacy.inc");
+require_once("pfsense-utils.inc");
 require_once("functions.inc");
 
 if($_POST['rssfeed']) {
diff --git a/src/www/widgets/widgets/smart_status.widget.php b/src/www/widgets/widgets/smart_status.widget.php
index 906377d78..6ab7c560b 100644
--- a/src/www/widgets/widgets/smart_status.widget.php
+++ b/src/www/widgets/widgets/smart_status.widget.php
@@ -28,7 +28,7 @@
 */
 
 require_once("guiconfig.inc");
-require_once("legacy.inc");
+require_once("pfsense-utils.inc");
 require_once("functions.inc");
 require_once("widgets/include/smart_status.inc");
 
diff --git a/src/www/widgets/widgets/traffic_graphs.widget.php b/src/www/widgets/widgets/traffic_graphs.widget.php
index a08183d5c..3c6af1f2a 100644
--- a/src/www/widgets/widgets/traffic_graphs.widget.php
+++ b/src/www/widgets/widgets/traffic_graphs.widget.php
@@ -32,7 +32,7 @@
 $nocsrf = true;
 
 require_once("guiconfig.inc");
-require_once("legacy.inc");
+require_once("pfsense-utils.inc");
 require_once("functions.inc");
 
 $first_time = false;